summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rw-r--r--contrib/libogg/A00-automake.patch12
-rw-r--r--contrib/libogg/module.defs11
2 files changed, 3 insertions, 20 deletions
diff --git a/contrib/libogg/A00-automake.patch b/contrib/libogg/A00-automake.patch
deleted file mode 100644
index 69a3f198f..000000000
--- a/contrib/libogg/A00-automake.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur libogg-1.3.0.orig/configure.in libogg-1.3.0/configure.in
---- libogg-1.3.0.orig/configure.in 2011-08-04 13:11:08.000000000 -0400
-+++ libogg-1.3.0/configure.in 2013-01-28 23:40:03.000000000 -0500
-@@ -19,7 +19,7 @@
- AM_PROG_CC_C_O
-
- dnl config.h
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADER(config.h)
-
- dnl Set some options based on environment
-
diff --git a/contrib/libogg/module.defs b/contrib/libogg/module.defs
index 9f426bcd8..b67dd8fb3 100644
--- a/contrib/libogg/module.defs
+++ b/contrib/libogg/module.defs
@@ -1,14 +1,9 @@
$(eval $(call import.MODULE.defs,LIBOGG,libogg))
$(eval $(call import.CONTRIB.defs,LIBOGG))
-LIBOGG.FETCH.url = https://download.handbrake.fr/handbrake/contrib/libogg-1.3.0.tar.gz
-LIBOGG.FETCH.url += http://downloads.xiph.org/releases/ogg/libogg-1.3.0.tar.gz
-LIBOGG.FETCH.sha256 = a8de807631014615549d2356fd36641833b8288221cea214f8a72750efe93780
-LIBOGG.EXTRACT.tarbase = libogg-1.3.0
-
-# TODO: libogg >= 1.3.2, tarbase unnecessary
-#LIBOGG.FETCH.url = http://downloads.xiph.org/releases/ogg/libogg-1.3.2.tar.gz
-#LIBOGG.FETCH.sha256 = e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692
+LIBOGG.FETCH.url = https://download.handbrake.fr/handbrake/contrib/libogg-1.3.2.tar.gz
+LIBOGG.FETCH.url += https://downloads.xiph.org/releases/ogg/libogg-1.3.2.tar.gz
+LIBOGG.FETCH.sha256 = e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692
LIBOGG.CONFIGURE.extra = --disable-sdl