summaryrefslogtreecommitdiff
path: root/data/vorbis
diff options
context:
space:
mode:
authorJay Freeman <saurik@saurik.com>2008-04-06 10:28:29 +0000
committerJay Freeman <saurik@saurik.com>2008-04-06 10:28:29 +0000
commitd699a01fabaa04a1aad60f6ca5777f82ee24839a (patch)
tree1eb62bad23b14a0877c5b9171f2a5f9358c8d592 /data/vorbis
parent8a49e427447f40fdd43fc4b5f513b166dd639e2a (diff)
Drastic, sweeping modifications to support iPhone 1.2.0/2.0.
git-svn-id: http://svn.telesphoreo.org/trunk@199 514c082c-b64e-11dc-b46d-3d985efe055d
Diffstat (limited to 'data/vorbis')
l---------data/vorbis/_metadata/ogg.dep1
-rw-r--r--data/vorbis/libogg.diff12
-rw-r--r--data/vorbis/make.sh1
-rw-r--r--data/vorbis/optimizer.diff14
4 files changed, 13 insertions, 15 deletions
diff --git a/data/vorbis/_metadata/ogg.dep b/data/vorbis/_metadata/ogg.dep
new file mode 120000
index 000000000..3ac0dd64e
--- /dev/null
+++ b/data/vorbis/_metadata/ogg.dep
@@ -0,0 +1 @@
+../../ogg \ No newline at end of file
diff --git a/data/vorbis/libogg.diff b/data/vorbis/libogg.diff
new file mode 100644
index 000000000..13183b7bb
--- /dev/null
+++ b/data/vorbis/libogg.diff
@@ -0,0 +1,12 @@
+diff -ru libvorbis-1.2.0/lib/Makefile.in libvorbis-1.2.0+iPhone/lib/Makefile.in
+--- libvorbis-1.2.0/lib/Makefile.in 2007-07-25 16:46:35.000000000 +0000
++++ libvorbis-1.2.0+iPhone/lib/Makefile.in 2008-03-30 21:00:31.000000000 +0000
+@@ -264,7 +264,7 @@
+ libvorbis_la_LIBADD = @OGG_LIBS@ @VORBIS_LIBS@
+ libvorbisfile_la_SOURCES = vorbisfile.c
+ libvorbisfile_la_LDFLAGS = -no-undefined -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
+-libvorbisfile_la_LIBADD = libvorbis.la
++libvorbisfile_la_LIBADD = @OGG_LIBS@ libvorbis.la
+ libvorbisenc_la_SOURCES = vorbisenc.c
+ libvorbisenc_la_LDFLAGS = -no-undefined -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@
+ libvorbisenc_la_LIBADD = libvorbis.la
diff --git a/data/vorbis/make.sh b/data/vorbis/make.sh
index df8e2a88c..1b3c1b776 100644
--- a/data/vorbis/make.sh
+++ b/data/vorbis/make.sh
@@ -1,7 +1,6 @@
pkg:extract
cd *
pkg:patch
-autoconf
pkg:configure
make
pkg:install
diff --git a/data/vorbis/optimizer.diff b/data/vorbis/optimizer.diff
deleted file mode 100644
index d323090d2..000000000
--- a/data/vorbis/optimizer.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru libvorbis-1.2.0/configure.in libvorbis-1.2.0+iPhone/configure.in
---- libvorbis-1.2.0/configure.in 2007-07-25 16:27:00.000000000 +0000
-+++ libvorbis-1.2.0+iPhone/configure.in 2008-02-27 02:24:20.000000000 +0000
-@@ -161,8 +161,8 @@
- 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";;
-+ 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";;
- *)
- DEBUG="-g -Wall -W -D__NO_MATH_INLINES -fsigned-char"
- CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"