[osx/ios] changed. bump libvorbis to 1.2.3 to get rid of unused stati…

…c warnings. drop patches and sedify them in the Makefiles

lib/DllVorbisfile.h

@@ -25,6 +25,10 @@
   #include "config.h"
 #endif
 #if defined(_LINUX) || defined(__APPLE__) || defined(WIN32)
+  // avoid unused symbol warnings from the static callbacks
+  // defined in vorbisfile.h on 1.2.3 and above
+  #define OV_EXCLUDE_STATIC_CALLBACKS
+
   #include <vorbis/vorbisfile.h>
   #include "utils/log.h"
 #else

tools/osx/ios-depends/libvorbis/Makefile

@@ -8,7 +8,7 @@ include ../config.mk
 
 # lib name, version
 LIBNAME=libvorbis
-VERSION=1.2.0
+VERSION=1.2.3
 SOURCE=$(LIBNAME)-$(VERSION)
 # download location and format
 BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs
@@ -38,8 +38,8 @@ $(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
 	-rm -rf $(SOURCE)
 	$(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
 	echo $(SOURCE) > .gitignore
-	cd $(SOURCE); patch -p1 < ../01-libvorbis-fix-libtool-flags.patch
-	cd $(SOURCE); patch -p1 < ../02-libvorbis-only-build-lib.patch
+	sed -ie "s|DDARWIN -fno-common -force_cpusubtype_ALL|DARWIN_NO_CARBON -fno-common -noforce_cpusubtype_ALL|" "$(SOURCE)/configure"
+	sed -ie "s|SUBDIRS = m4 include vq lib examples test doc|SUBDIRS = m4 include lib|" "$(SOURCE)/Makefile.in"
 	cd $(SOURCE); $(CONFIGURE)
 
 $(LIBDYLIB): $(SOURCE)

tools/osx/osx-depends/libvorbis/Makefile

@@ -8,10 +8,11 @@ include ../config.mk
 
 # lib name, version
 LIBNAME=libvorbis
-VERSION=1.2.0
+VERSION=1.2.3
 SOURCE=$(LIBNAME)-$(VERSION)
 # download location and format
-BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs
+#BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs
+BASE_URL=http://downloads.xiph.org/releases/vorbis
 ARCHIVE=$(SOURCE).tar.gz
 TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs
 RETRIEVE_TOOL=/usr/bin/curl
@@ -35,8 +36,8 @@ $(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
 	-rm -rf $(SOURCE)
 	$(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
 	echo $(SOURCE) > .gitignore
-	cd $(SOURCE); patch -p1 < ../01-libvorbis-fix-libtool-flags.patch
-	cd $(SOURCE); patch -p1 < ../02-libvorbis-only-build-lib.patch
+	sed -ie "s|DDARWIN -fno-common -force_cpusubtype_ALL|DARWIN_NO_CARBON -fno-common -noforce_cpusubtype_ALL|" "$(SOURCE)/configure"
+	sed -ie "s|SUBDIRS = m4 include vq lib examples test doc|SUBDIRS = m4 include lib|" "$(SOURCE)/Makefile.in"
 	cd $(SOURCE); $(CONFIGURE)
 
 $(LIBDYLIB): $(SOURCE)