[vlc-devel] commit: contrib/libtheora: added a hack to support Xcode 3.1. x aka compiling on Mac OS X 10.5.x ( Felix Paul Kühne )

[git version control]

vlc | branch: 1.0-bugfix | Felix Paul Kühne <fkuehne at videolan.org> | Tue Oct 27 18:14:31 2009 +0100| [0651b6b03c4848c080c081804c88e55697de9181] | committer: Felix Paul Kühne 

contrib/libtheora: added a hack to support Xcode 3.1.x aka compiling on Mac OS X 10.5.x

This is not needed for Xcode 3.2.x

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

 extras/contrib/src/Makefile                        |    7 ++++++-
 extras/contrib/src/Patches/libtheora-xcode31.patch |   20 ++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 24b11af..33bb6bd 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -804,6 +804,11 @@ libtheora: libtheora-$(THEORA_VERSION).tar.bz2
 ifdef HAVE_WIN32
 	patch -p0 < Patches/theora-doc.patch
 endif
+ifdef HAVE_DARWIN_OS
+ifndef HAVE_DARWIN_10
+	patch -p0 < Patches/libtheora-xcode31.patch
+endif
+endif
 	(cd $@; autoconf)
 
 THEORACONF = --disable-sdltest --disable-oggtest --disable-vorbistest --disable-examples
@@ -819,7 +824,7 @@ endif
 ifdef HAVE_BEOS
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF) --disable-asm && make && make install)
 else
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF)&& make && make install)
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF) && make && make install)
 endif
 	$(INSTALL_NAME)
 	touch $@
diff --git a/extras/contrib/src/Patches/libtheora-xcode31.patch b/extras/contrib/src/Patches/libtheora-xcode31.patch
new file mode 100644
index 0000000..c9d9be2
--- /dev/null
+++ b/extras/contrib/src/Patches/libtheora-xcode31.patch
@@ -0,0 +1,20 @@
+--- libtheora-1.0/lib/enc/x86_32/dct_decode_mmx.c	2008-10-21 05:36:19.000000000 +0200
++++ libtheora/lib/enc/x86_32/dct_decode_mmx.c	2009-10-27 18:10:51.000000000 +0100
+@@ -30,7 +30,7 @@
+                           const ogg_int16_t *_ll){
+   long esi;
+   _pix-=_ystride*2;
+-  __asm__ __volatile__(
++  __asm__(
+     /*mm0=0*/
+     "pxor %%mm0,%%mm0\n\t"
+     /*esi=_ystride*3*/
+@@ -213,7 +213,7 @@
+                            const ogg_int16_t *_ll){
+   long esi;
+   long edi;
+-  __asm__ __volatile__(
++  __asm__(
+     /*x x x x 3 2 1 0*/
+     "movd (%[pix]),%%mm0\n\t"
+     /*esi=_ystride*3*/