Mercurial > mplayer.hg

changeset 23543:d198ab45f7c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Follow ffmpeg TARGET_ARCH_* -> ARCH_* change. Feel free to revert if you do not like it, but I want to get MPlayer to compile again.
author reimar
date Sat, 16 Jun 2007 15:24:39 +0000
parents 2e13eea875a3
children d69ba003b659
files configure libmpeg2/Makefile libmpeg2/libmpeg-0.4.1.diff mp3lib/Makefile
diffstat 4 files changed, 23 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Sat Jun 16 15:17:00 2007 +0000
+++ b/configure	Sat Jun 16 15:24:39 2007 +0000
@@ -1588,9 +1588,9 @@
 case "$host_arch" in
   i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686)
   _def_arch_x86="#define ARCH_X86 1"
-  _target_arch_x86="TARGET_ARCH_X86 = yes"
+  _target_arch_x86="ARCH_X86 = yes"
   _def_arch="#define ARCH_X86_32 1"
-  _target_arch="TARGET_ARCH_X86_32 = yes"
+  _target_arch="ARCH_X86_32 = yes"
   iproc=486
   proc=i486
 
@@ -1823,7 +1823,7 @@
 
   ia64)
     _def_arch='#define ARCH_IA64 1'
-    _target_arch='TARGET_ARCH_IA64 = yes'
+    _target_arch='ARCH_IA64 = yes'
     iproc='ia64'
     proc=''
     _march=''
@@ -1833,9 +1833,9 @@
 
   x86_64|amd64)
     _def_arch='#define ARCH_X86_64 1'
-    _target_arch='TARGET_ARCH_X86_64 = yes'
+    _target_arch='ARCH_X86_64 = yes'
     _def_arch_x86="#define ARCH_X86 1"
-    _target_arch_x86="TARGET_ARCH_X86 = yes"
+    _target_arch_x86="ARCH_X86 = yes"
     iproc='x86_64'
 
     # gcc >= 3.4.0  doesn't support -mcpu, we have to use -mtune instead
@@ -1912,7 +1912,7 @@
 
   sparc)
     _def_arch='#define ARCH_SPARC 1'
-    _target_arch='TARGET_ARCH_SPARC = yes'
+    _target_arch='ARCH_SPARC = yes'
     iproc='sparc'
     if sunos ; then
 	echocheck "CPU type"
@@ -1937,7 +1937,7 @@
 
   sparc64)
     _def_arch='#define ARCH_SPARC 1'
-    _target_arch='TARGET_ARCH_SPARC = yes'
+    _target_arch='ARCH_SPARC = yes'
     _vis='yes'
     _def_vis='#define HAVE_VIS = yes'
     iproc='sparc'
@@ -1949,7 +1949,7 @@
 
   arm|armv4l|armv5tel)
     _def_arch='#define ARCH_ARMV4L 1'
-    _target_arch='TARGET_ARCH_ARMV4L = yes'
+    _target_arch='ARCH_ARMV4L = yes'
     iproc='arm'
     proc=''
     _march=''
@@ -1960,7 +1960,7 @@
   ppc|powerpc)
     _def_arch='#define ARCH_POWERPC 1'
     _def_dcbzl='#define NO_DCBZL 1'
-    _target_arch='TARGET_ARCH_POWERPC = yes'
+    _target_arch='ARCH_POWERPC = yes'
     iproc='ppc'
     proc=''
     _march=''
@@ -2071,7 +2071,7 @@
 
   alpha)
     _def_arch='#define ARCH_ALPHA 1'
-    _target_arch='TARGET_ARCH_ALPHA = yes'
+    _target_arch='ARCH_ALPHA = yes'
     iproc='alpha'
     _march=''
     
@@ -2122,7 +2122,7 @@
 
   mips)
     _def_arch='#define ARCH_SGI_MIPS 1'
-    _target_arch='TARGET_ARCH_SGI_MIPS = yes'
+    _target_arch='ARCH_SGI_MIPS = yes'
     iproc='sgi-mips'
     proc=''
     _march=''
@@ -2151,7 +2151,7 @@
 
   hppa)
     _def_arch='#define ARCH_PA_RISC 1'
-    _target_arch='TARGET_ARCH_PA_RISC = yes'
+    _target_arch='ARCH_PA_RISC = yes'
     iproc='PA-RISC'
     proc=''
     _march=''
@@ -2161,7 +2161,7 @@
 
   s390)
     _def_arch='#define ARCH_S390 1'
-    _target_arch='TARGET_ARCH_S390 = yes'
+    _target_arch='ARCH_S390 = yes'
     iproc='390'
     proc=''
     _march=''
@@ -2171,7 +2171,7 @@
 
   s390x)
     _def_arch='#define ARCH_S390X 1'
-    _target_arch='TARGET_ARCH_S390X = yes'
+    _target_arch='ARCH_S390X = yes'
     iproc='390x'
     proc=''
     _march=''
@@ -2181,7 +2181,7 @@
 
   vax)
     _def_arch='#define ARCH_VAX 1'
-    _target_arch='TARGET_ARCH_VAX = yes'
+    _target_arch='ARCH_VAX = yes'
     iproc='vax'
     proc=''
     _march=''
@@ -2191,7 +2191,7 @@
 
   generic)
     _def_arch='#define ARCH_GENERIC 1'
-    _target_arch='TARGET_ARCH_GENERIC = yes'
+    _target_arch='ARCH_GENERIC = yes'
     iproc=''
     proc=''
     _march=''
--- a/libmpeg2/Makefile	Sat Jun 16 15:17:00 2007 +0000
+++ b/libmpeg2/Makefile	Sat Jun 16 15:24:39 2007 +0000
@@ -14,7 +14,7 @@
 SRCS_COMMON-$(TARGET_MMX)        += idct_mmx.c motion_comp_mmx.c
 SRCS_COMMON-$(TARGET_ALTIVEC)    += motion_comp_altivec.c idct_altivec.c
 SRCS_COMMON-$(TARGET_VIS)        += motion_comp_vis.c
-SRCS_COMMON-$(TARGET_ARCH_ALPHA) += idct_alpha.c motion_comp_alpha.c
-SRCS_COMMON-$(TARGET_ARCH_ARMV4L) += motion_comp_arm.c motion_comp_iwmmxt.c motion_comp_arm_s.S
+SRCS_COMMON-$(ARCH_ALPHA) += idct_alpha.c motion_comp_alpha.c
+SRCS_COMMON-$(ARCH_ARMV4L) += motion_comp_arm.c motion_comp_iwmmxt.c motion_comp_arm_s.S
 
 include ../mpcommon.mak
--- a/libmpeg2/libmpeg-0.4.1.diff	Sat Jun 16 15:17:00 2007 +0000
+++ b/libmpeg2/libmpeg-0.4.1.diff	Sat Jun 16 15:24:39 2007 +0000
@@ -1072,9 +1072,11 @@
 --- libmpeg2/Makefile	(revision 23253)
 +++ libmpeg2/Makefile	(working copy)
 @@ -15,5 +15,6 @@
+ SRCS_COMMON-$(TARGET_MMX)        += idct_mmx.c motion_comp_mmx.c
  SRCS_COMMON-$(TARGET_ALTIVEC)    += motion_comp_altivec.c idct_altivec.c
  SRCS_COMMON-$(TARGET_VIS)        += motion_comp_vis.c
- SRCS_COMMON-$(TARGET_ARCH_ALPHA) += idct_alpha.c motion_comp_alpha.c
-+SRCS_COMMON-$(TARGET_ARCH_ARMV4L) += motion_comp_arm.c motion_comp_iwmmxt.c motion_comp_arm_s.S
+-SRCS_COMMON-$(TARGET_ARCH_ALPHA) += idct_alpha.c motion_comp_alpha.c
++SRCS_COMMON-$(ARCH_ALPHA)        += idct_alpha.c motion_comp_alpha.c
++SRCS_COMMON-$(ARCH_ARMV4L)       += motion_comp_arm.c motion_comp_iwmmxt.c motion_comp_arm_s.S
  
  include ../mpcommon.mak
--- a/mp3lib/Makefile	Sat Jun 16 15:17:00 2007 +0000
+++ b/mp3lib/Makefile	Sat Jun 16 15:24:39 2007 +0000
@@ -5,7 +5,7 @@
 SRCS_COMMON = sr1.c
 SRCS_COMMON-$(TARGET_MMX)     += decode_MMX.c
 SRCS_COMMON-$(TARGET_SSE)     += dct64_sse.c
-ifeq ($(TARGET_ARCH_X86_32),yes)
+ifeq ($(ARCH_X86_32),yes)
 SRCS_COMMON                   += decode_i586.c
 SRCS_COMMON-$(TARGET_MMX)     += dct64_MMX.c
 SRCS_COMMON-$(TARGET_3DNOW)   += dct36_3dnow.c dct64_3dnow.c