Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[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
  • Loading branch information...
commit 47c2ad51782a287f91b74a3e14308ee0bcdd2d92 1 parent 690a54f
@davilla davilla authored
View
4 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
View
17 tools/osx/ios-depends/libvorbis/01-libvorbis-fix-libtool-flags.patch
@@ -1,17 +0,0 @@
-diff -ruN libvorbis-1.2.0/configure libvorbis-1.2.0.mod/configure
---- libvorbis-1.2.0/configure 2007-07-25 12:46:37.000000000 -0400
-+++ libvorbis-1.2.0.mod/configure 2010-10-29 11:46:06.000000000 -0400
-@@ -19476,9 +19476,9 @@
- CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
- PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
- *-*-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";;
-+ DEBUG="-DARWIN_NO_CARBON -fno-common -noforce_cpusubtype_ALL -Wall -g -O0 -fsigned-char"
-+ CFLAGS="-DARWIN_NO_CARBON -fno-common -noforce_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
-+ PROFILE="-DARWIN_NO_CARBON -fno-common -noforce_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";;
- *)
- DEBUG="-g -Wall -W -D__NO_MATH_INLINES -fsigned-char"
- CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
-
View
13 tools/osx/ios-depends/libvorbis/02-libvorbis-only-build-lib.patch
@@ -1,13 +0,0 @@
-diff -ruN libvorbis-1.2.0.org/Makefile.in libvorbis-1.2.0/Makefile.in
---- libvorbis-1.2.0.org/Makefile.in 2007-07-25 12:46:36.000000000 -0400
-+++ libvorbis-1.2.0/Makefile.in 2010-10-29 11:47:46.000000000 -0400
-@@ -221,7 +221,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = 1.6 foreign dist-zip dist-bzip2
--SUBDIRS = lib include doc examples vq
-+SUBDIRS = lib include
- m4datadir = $(datadir)/aclocal
- m4data_DATA = vorbis.m4
- pkgconfigdir = $(libdir)/pkgconfig
-
View
6 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)
View
17 tools/osx/osx-depends/libvorbis/01-libvorbis-fix-libtool-flags.patch
@@ -1,17 +0,0 @@
-diff -ruN libvorbis-1.2.0/configure libvorbis-1.2.0.mod/configure
---- libvorbis-1.2.0/configure 2007-07-25 12:46:37.000000000 -0400
-+++ libvorbis-1.2.0.mod/configure 2010-10-29 11:46:06.000000000 -0400
-@@ -19476,9 +19476,9 @@
- CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
- PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
- *-*-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";;
-+ DEBUG="-DARWIN_NO_CARBON -fno-common -noforce_cpusubtype_ALL -Wall -g -O0 -fsigned-char"
-+ CFLAGS="-DARWIN_NO_CARBON -fno-common -noforce_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
-+ PROFILE="-DARWIN_NO_CARBON -fno-common -noforce_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";;
- *)
- DEBUG="-g -Wall -W -D__NO_MATH_INLINES -fsigned-char"
- CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
-
View
13 tools/osx/osx-depends/libvorbis/02-libvorbis-only-build-lib.patch
@@ -1,13 +0,0 @@
-diff -ruN libvorbis-1.2.0.org/Makefile.in libvorbis-1.2.0/Makefile.in
---- libvorbis-1.2.0.org/Makefile.in 2007-07-25 12:46:36.000000000 -0400
-+++ libvorbis-1.2.0/Makefile.in 2010-10-29 11:47:46.000000000 -0400
-@@ -221,7 +221,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = 1.6 foreign dist-zip dist-bzip2
--SUBDIRS = lib include doc examples vq
-+SUBDIRS = lib include
- m4datadir = $(datadir)/aclocal
- m4data_DATA = vorbis.m4
- pkgconfigdir = $(libdir)/pkgconfig
-
View
9 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)
Please sign in to comment.
Something went wrong with that request. Please try again.