[vlc-commits] Contribs: update libvorbis to 1.3.5

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Mar  3 12:21:20 2015 +0100| [3b82206fccd3282cc11a51dd0fb1d8ba4e2a3a75] | committer: Jean-Baptiste Kempf

Contribs: update libvorbis to 1.3.5

And drop all our patches :)

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

 contrib/src/vorbis/SHA512SUMS |    2 +-
 contrib/src/vorbis/msvc.patch |   11 -----------
 contrib/src/vorbis/osx.patch  |   13 -------------
 contrib/src/vorbis/rules.mak  |    6 +-----
 4 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/contrib/src/vorbis/SHA512SUMS b/contrib/src/vorbis/SHA512SUMS
index 7f4234f..47a99f7 100644
--- a/contrib/src/vorbis/SHA512SUMS
+++ b/contrib/src/vorbis/SHA512SUMS
@@ -1 +1 @@
-f705c7740bec2dc6584ab8f103491a9d462136e3fa76454bde47e2ba04466b896ef066f7f925ad0a44d4c659c962717bc9099b3cecc20f12270d0ad53369ad53  libvorbis-1.3.4.tar.xz
+f18f32edc43f65fea2dd4133e2828a0ced9e5b0797c4569bd26989fc1409ad599359e7c796bffc082ad36189f9722c7b38837384cea66d217beac8b425299ef8  libvorbis-1.3.5.tar.xz
diff --git a/contrib/src/vorbis/msvc.patch b/contrib/src/vorbis/msvc.patch
deleted file mode 100644
index 1fa6320..0000000
--- a/contrib/src/vorbis/msvc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libvorbis/lib/os.h	2014-01-22 10:53:32.000000000 +0100
-+++ /home/vlc/vlc/contrib/windowsphone/libvorbis/lib/os.h	2014-12-15 16:54:46.588645600 +0100
-@@ -120,7 +120,7 @@
-
- /* MSVC inline assembly. 32 bit only; inline ASM isn't implemented in the
-  * 64 bit compiler */
--#if defined(_MSC_VER) && !defined(_WIN64) && !defined(_WIN32_WCE)
-+#if defined(_MSC_VER) && !defined(_WIN64) && !defined(_WIN32_WCE) && !defined(_M_ARM)
- #  define VORBIS_FPU_CONTROL
-
- typedef ogg_int16_t vorbis_fpu_control;
diff --git a/contrib/src/vorbis/osx.patch b/contrib/src/vorbis/osx.patch
deleted file mode 100644
index 8ae4812..0000000
--- a/contrib/src/vorbis/osx.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libvorbis/configure.ac.orig	2012-09-07 00:17:47.000000000 +0200
-+++ libvorbis/configure.ac	2012-09-07 00:18:01.000000000 +0200
-@@ -199,8 +199,8 @@
- 		PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char $sparc_cpu" ;;
- 	*-*-darwin*)
- 		DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char"
--		CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
--		PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";;
-+		CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O3 -ffast-math -fsigned-char"
-+		PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O3 -ffast-math -fsigned-char";;
- 	*-*-os2*)
- 		# Use -W instead of -Wextra because gcc on OS/2 is an old version.
- 		DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
diff --git a/contrib/src/vorbis/rules.mak b/contrib/src/vorbis/rules.mak
index eed4fec..d970e9a 100644
--- a/contrib/src/vorbis/rules.mak
+++ b/contrib/src/vorbis/rules.mak
@@ -1,6 +1,6 @@
 # libvorbis
 
-VORBIS_VERSION := 1.3.4
+VORBIS_VERSION := 1.3.5
 VORBIS_URL := http://downloads.xiph.org/releases/vorbis/libvorbis-$(VORBIS_VERSION).tar.xz
 #VORBIS_URL := $(CONTRIB_VIDEOLAN)/libvorbis-$(VORBIS_VERSION).tar.gz
 
@@ -25,10 +25,6 @@ $(TARBALLS)/libvorbis-$(VORBIS_VERSION).tar.xz:
 
 libvorbis: libvorbis-$(VORBIS_VERSION).tar.xz .sum-vorbis
 	$(UNPACK)
-	$(APPLY) $(SRC)/vorbis/osx.patch
-ifdef HAVE_VISUALSTUDIO
-	$(APPLY) $(SRC)/vorbis/msvc.patch
-endif
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)