Commit a4119701 authored by hartman's avatar hartman
Browse files

Ugly patch to make the mmx compile on MacIntel. This might be a GCC ASM bug in 4.0.1

parent 17c15b2e
...@@ -145,12 +145,12 @@ ifdef HAVE_DARWIN_OS ...@@ -145,12 +145,12 @@ ifdef HAVE_DARWIN_OS
.dvdcss .dvdnav .dvdread .dvbpsi .live .caca .mod \ .dvdcss .dvdnav .dvdread .dvbpsi .live .caca .mod \
.png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager .SDL_image \ .png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager .SDL_image \
.glib .libidl .gecko .mpcdec .dirac_encoder .dirac_decoder .aclocal \ .glib .libidl .gecko .mpcdec .dirac_encoder .dirac_decoder .aclocal \
.libdca .tag .libdca .tag .goom2k4
# .expat .clinkcc don't work with SDK yet # .expat .clinkcc don't work with SDK yet
# .glib .libidl .gecko are required to build the mozilla plugin # .glib .libidl .gecko are required to build the mozilla plugin
# .mozilla will build an entire mozilla. it can be used if we need to create a new .gecko package # .mozilla will build an entire mozilla. it can be used if we need to create a new .gecko package
ifneq ($(HOST),i686-apple-darwin8) ifneq ($(HOST),i686-apple-darwin8)
all: .goom2k4 .x264 all: .x264
endif endif
else else
...@@ -1124,6 +1124,7 @@ goom: goom$(GOOM2k4_VERSION).tar.gz ...@@ -1124,6 +1124,7 @@ goom: goom$(GOOM2k4_VERSION).tar.gz
$(EXTRACT_GZ) $(EXTRACT_GZ)
ifdef HAVE_DARWIN_OS ifdef HAVE_DARWIN_OS
patch -p 0 < Patches/goom.patch patch -p 0 < Patches/goom.patch
patch -p 0 < Patches/goom2k4-0-mmx.patch
endif endif
ifdef HAVE_WIN32 ifdef HAVE_WIN32
(cd $@; dos2unix configure.in) (cd $@; dos2unix configure.in)
......
diff -ruN goom.orig/src/xmmx.c goom/src/xmmx.c
--- goom.orig/src/xmmx.c 2006-10-01 22:10:15.000000000 +0200
+++ goom/src/xmmx.c 2006-10-01 23:45:59.000000000 +0200
@@ -69,8 +69,8 @@
*/
asm volatile
- ("#1 \n\t movq %[brutS], %%mm0"
- "#1 \n\t movq %[brutD], %%mm1"
+ ("#1 \n\t movq (%[brutS]), %%mm0"
+ "#1 \n\t movq (%[brutD]), %%mm1"
"#1 \n\t psubd %%mm0, %%mm1" /* mm1 = D - S */
"#1 \n\t movq %%mm1, %%mm2" /* mm2 = D - S */
"#1 \n\t pslld $16, %%mm1"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment