[vlc-devel] commit: Contribs: Die if NO_RELOCATION (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Sep 19 15:32:37 2008 -0700| [129582fb64723cfd56bd584a982fba10f071a38f] | committer: Jean-Baptiste Kempf 

Contribs: Die if NO_RELOCATION

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

 extras/contrib/src/Makefile                        |   15 +--
 .../Patches/ffmpeg-svn-mmx_removal-darwin9.patch   |  138 --------------------
 2 files changed, 4 insertions(+), 149 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 7f3aad8..ed1e352 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -143,10 +143,6 @@ ifdef HAVE_DARWIN_OS_ON_INTEL
 FFMPEGCONF += --enable-memalign-hack --cpu=pentium-m
 endif
 
-ifdef NO_TEXT_RELOCATION
-FFMPEGCONF += --disable-mmx
-endif
-
 ifdef HAVE_DARWIN_OS
 X264CONF += --enable-pic
 ifdef HAVE_DARWIN_OS_ON_INTEL
@@ -793,11 +789,7 @@ THEORACONF = --disable-sdltest --disable-oggtest --disable-vorbistest --disable-
 ifdef HAVE_BEOS
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF) --disable-asm && make && make install)
 else
-  ifdef NO_TEXT_RELOCATION
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-asm $(THEORACONF) && make && make install)
-  else
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF)&& make && make install)
-  endif
 endif
 	$(INSTALL_NAME)
 	touch $@
@@ -1081,14 +1073,15 @@ endif
 ifdef HAVE_DARWIN_OS_ON_INTEL
 	(cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch)
 endif
-ifdef NO_TEXT_RELOCATION
-	(cd $@; patch -p0 < ../Patches/ffmpeg-svn-mmx_removal-darwin9.patch)
-endif
 ifdef HAVE_UCLIBC
 	patch -p0 < Patches/ffmpeg-svn-uclibc.patch
 	patch -p0 < Patches/ffmpeg-svn-internal-define.patch
 	patch -p0 < Patches/ffmpeg-svn-libavformat.patch
 endif
+ifdef NO_TEXT_RELOCATION
+	echo "Broken LD. Fix your tools."
+	exit -1
+endif
 else
 ffmpeg-$(FFMPEG_VERSION).tar.gz:
 	echo "ffmpeg snapshot is too old, you MUST use subversion !"
diff --git a/extras/contrib/src/Patches/ffmpeg-svn-mmx_removal-darwin9.patch b/extras/contrib/src/Patches/ffmpeg-svn-mmx_removal-darwin9.patch
deleted file mode 100644
index cbf8f18..0000000
--- a/extras/contrib/src/Patches/ffmpeg-svn-mmx_removal-darwin9.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-Index: libpostproc/postprocess.c
-===================================================================
---- libpostproc/postprocess.c	(révision 14661)
-+++ libpostproc/postprocess.c	(copie de travail)
-@@ -552,9 +552,6 @@
- 
- //Note: we have C, MMX, MMX2, 3DNOW version there is no 3DNOW+MMX2 one
- //Plain C versions
--#if !defined (HAVE_MMX) || defined (RUNTIME_CPUDETECT)
--#define COMPILE_C
--#endif
- 
- #ifdef HAVE_ALTIVEC
- #define COMPILE_ALTIVEC
-@@ -562,17 +559,8 @@
- 
- #if defined(ARCH_X86)
- 
--#if (defined (HAVE_MMX) && !defined (HAVE_3DNOW) && !defined (HAVE_MMX2)) || defined (RUNTIME_CPUDETECT)
--#define COMPILE_MMX
--#endif
-+#define COMPILE_C
- 
--#if defined (HAVE_MMX2) || defined (RUNTIME_CPUDETECT)
--#define COMPILE_MMX2
--#endif
--
--#if (defined (HAVE_3DNOW) && !defined (HAVE_MMX2)) || defined (RUNTIME_CPUDETECT)
--#define COMPILE_3DNOW
--#endif
- #endif /* defined(ARCH_X86) */
- 
- #undef HAVE_MMX
-@@ -640,15 +628,7 @@
-     // someone might exchange the CPU whithout restarting MPlayer ;)
- #ifdef RUNTIME_CPUDETECT
- #if defined(ARCH_X86)
--    // ordered per speed fastest first
--    if(c->cpuCaps & PP_CPU_CAPS_MMX2)
--        postProcess_MMX2(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c);
--    else if(c->cpuCaps & PP_CPU_CAPS_3DNOW)
--        postProcess_3DNow(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c);
--    else if(c->cpuCaps & PP_CPU_CAPS_MMX)
--        postProcess_MMX(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c);
--    else
--        postProcess_C(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c);
-+    postProcess_C(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c);
- #else
- #ifdef HAVE_ALTIVEC
-     if(c->cpuCaps & PP_CPU_CAPS_ALTIVEC)
-Index: libswscale/yuv2rgb.c
-===================================================================
---- libswscale/yuv2rgb.c	(révision 27432)
-+++ libswscale/yuv2rgb.c	(copie de travail)
-@@ -148,6 +148,7 @@
- };
- #endif
- 
-+#if 0
- #ifdef HAVE_MMX
- 
- /* hope these constant values are cache line aligned */
-@@ -181,6 +182,7 @@
- #include "yuv2rgb_template.c"
- 
- #endif /* HAVE_MMX */
-+#endif
- 
- const int32_t Inverse_Table_6_9[8][4] = {
-     {117504, 138453, 13954, 34903}, /* no sequence_display_extension */
-Index: libswscale/swscale.c
-===================================================================
---- libswscale/swscale.c	(révision 27432)
-+++ libswscale/swscale.c	(copie de travail)
-@@ -820,9 +820,7 @@
- 
- //Note: we have C, X86, MMX, MMX2, 3DNOW version therse no 3DNOW+MMX2 one
- //Plain C versions
--#if !defined (HAVE_MMX) || defined (RUNTIME_CPUDETECT) || !defined(CONFIG_GPL)
- #define COMPILE_C
--#endif
- 
- #ifdef ARCH_POWERPC
- #if (defined (HAVE_ALTIVEC) || defined (RUNTIME_CPUDETECT)) && defined (CONFIG_GPL)
-@@ -830,6 +828,7 @@
- #endif //HAVE_ALTIVEC
- #endif //ARCH_POWERPC
- 
-+#if 0
- #if defined(ARCH_X86)
- 
- #if ((defined (HAVE_MMX) && !defined (HAVE_3DNOW) && !defined (HAVE_MMX2)) || defined (RUNTIME_CPUDETECT)) && defined (CONFIG_GPL)
-@@ -844,6 +843,7 @@
- #define COMPILE_3DNOW
- #endif
- #endif //ARCH_X86 || ARCH_X86_64
-+#endif
- 
- #undef HAVE_MMX
- #undef HAVE_MMX2
-@@ -1490,15 +1490,8 @@
- #if defined(RUNTIME_CPUDETECT) && defined (CONFIG_GPL)
- #if defined(ARCH_X86)
-     // ordered per speed fastest first
--    if (flags & SWS_CPU_CAPS_MMX2)
--        return swScale_MMX2;
--    else if (flags & SWS_CPU_CAPS_3DNOW)
--        return swScale_3DNow;
--    else if (flags & SWS_CPU_CAPS_MMX)
--        return swScale_MMX;
--    else
--        return swScale_C;
--
-+    /* VLC Hack: only C */
-+    return swScale_C;
- #else
- #ifdef ARCH_POWERPC
-     if (flags & SWS_CPU_CAPS_ALTIVEC)
-Index: libswscale/rgb2rgb.c
-===================================================================
---- libswscale/rgb2rgb.c	(révision 27432)
-+++ libswscale/rgb2rgb.c	(copie de travail)
-@@ -158,6 +158,7 @@
- #define RENAME(a) a ## _C
- #include "rgb2rgb_template.c"
- 
-+#if 0
- #if defined(ARCH_X86) && defined(CONFIG_GPL)
- 
- //MMX versions
-@@ -188,6 +189,7 @@
- #include "rgb2rgb_template.c"
- 
- #endif //ARCH_X86 || ARCH_X86_64
-+#endif
- 
- /*
-  RGB15->RGB16 original by Strepto/Astral