[vlc-commits] contrib: update libogg to 1.3.3

[Tristan Matthews]

vlc | branch: master | Tristan Matthews <tmatth at videolan.org> | Wed Nov 15 16:21:05 2017 -0500| [f7f184fa2526dc5506c7ea3bcb3787586c2bec9c] | committer: Tristan Matthews

contrib: update libogg to 1.3.3

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f7f184fa2526dc5506c7ea3bcb3787586c2bec9c
---

 contrib/src/ogg/SHA512SUMS                                   | 2 +-
 contrib/src/ogg/{libogg-1.1.patch => libogg-configure.patch} | 8 ++++----
 contrib/src/ogg/libogg-disable-check.patch                   | 5 ++---
 contrib/src/ogg/rules.mak                                    | 4 ++--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/contrib/src/ogg/SHA512SUMS b/contrib/src/ogg/SHA512SUMS
index 15c990a771..617c820c4d 100644
--- a/contrib/src/ogg/SHA512SUMS
+++ b/contrib/src/ogg/SHA512SUMS
@@ -1 +1 @@
-dc9552b15ceccd7e12bff39a6670120ae53af74ce97254d047c28f49ba6a320f55059ed509ec1d8758a972c72514f2866634d829f3cb528c2f595cb056e9bca6  libogg-1.3.2.tar.xz
+37d8e4329bf7a997a95d84a55c325a5a893ec84bb4d5b7ea638e5cb13201a0619e71ecd9710a8371def69f092c62dcc59ec0a607db246028ee8a62678386260b  libogg-1.3.3.tar.xz
diff --git a/contrib/src/ogg/libogg-1.1.patch b/contrib/src/ogg/libogg-configure.patch
similarity index 91%
rename from contrib/src/ogg/libogg-1.1.patch
rename to contrib/src/ogg/libogg-configure.patch
index bf74b0cb83..026a36c5f3 100644
--- a/contrib/src/ogg/libogg-1.1.patch
+++ b/contrib/src/ogg/libogg-configure.patch
@@ -1,6 +1,6 @@
---- libogg/configure.in	2010-11-01 21:13:42.000000000 +0100
-+++ libogg.new/configure.in	2010-11-03 23:59:54.267733114 +0100
-@@ -28,17 +28,17 @@
+--- libogg-1.3.3/configure.ac	2017-11-07 15:33:00.000000000 -0500
++++ libogg-1.3.3-new/configure.ac	2017-11-15 16:00:23.786278061 -0500
+@@ -27,17 +27,17 @@
          case $host in 
          *-*-irix*)
                  DEBUG="-g -signed" 
@@ -21,7 +21,7 @@
                  PROFILE="-g -p" 
  		;;
          esac
-@@ -46,27 +46,27 @@
+@@ -45,27 +45,27 @@
          case $host in 
          *-*-linux*)
                  DEBUG="-g -Wall -fsigned-char"
diff --git a/contrib/src/ogg/libogg-disable-check.patch b/contrib/src/ogg/libogg-disable-check.patch
index 5801b372be..7d422b706b 100644
--- a/contrib/src/ogg/libogg-disable-check.patch
+++ b/contrib/src/ogg/libogg-disable-check.patch
@@ -1,6 +1,5 @@
-diff -ru libogg/src/Makefile.am libogg/src/Makefile.am
---- libogg/src/Makefile.am	2011-08-04 19:07:42.000000000 +0200
-+++ libogg-f/src/Makefile.am	2012-03-21 13:05:23.000000000 +0100
+--- libogg-1.3.3/src/Makefile.am	2017-06-12 13:14:31.000000000 -0400
++++ libogg-1.3.3-new/src/Makefile.am	2017-11-15 16:03:05.434272042 -0500
 @@ -9,7 +9,7 @@
  
  # build and run the self tests on 'make check'
diff --git a/contrib/src/ogg/rules.mak b/contrib/src/ogg/rules.mak
index 24dd7cc1e9..e24e3ab024 100644
--- a/contrib/src/ogg/rules.mak
+++ b/contrib/src/ogg/rules.mak
@@ -1,6 +1,6 @@
 # libogg
 
-OGG_VERSION := 1.3.2
+OGG_VERSION := 1.3.3
 
 OGG_URL := http://downloads.xiph.org/releases/ogg/libogg-$(OGG_VERSION).tar.xz
 #OGG_CVSROOT := :pserver:anoncvs at xiph.org:/usr/local/cvsroot
@@ -17,7 +17,7 @@ $(TARBALLS)/libogg-$(OGG_VERSION).tar.xz:
 
 libogg: libogg-$(OGG_VERSION).tar.xz .sum-ogg
 	$(UNPACK)
-	$(APPLY) $(SRC)/ogg/libogg-1.1.patch
+	$(APPLY) $(SRC)/ogg/libogg-configure.patch
 	$(APPLY) $(SRC)/ogg/libogg-disable-check.patch
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)