[MPlayer-cvslog] r23563 - in trunk: configure libmpeg2/Makefile libmpeg2/libmpeg-0.4.1.diff mp3lib/Makefile
reimar
subversion at mplayerhq.hu
Sat Jun 16 17:24:40 CEST 2007
Author: reimar
Date: Sat Jun 16 17:24:39 2007
New Revision: 23563
Log:
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.
Modified:
trunk/configure
trunk/libmpeg2/Makefile
trunk/libmpeg2/libmpeg-0.4.1.diff
trunk/mp3lib/Makefile
Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Sat Jun 16 17:24:39 2007
@@ -1588,9 +1588,9 @@ fi
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 @@ EOF
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 @@ EOF
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 @@ EOF
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 @@ EOF
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 @@ EOF
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 @@ EOF
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 @@ EOF
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 @@ EOF
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 @@ EOF
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 @@ EOF
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 @@ EOF
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 @@ EOF
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 @@ EOF
generic)
_def_arch='#define ARCH_GENERIC 1'
- _target_arch='TARGET_ARCH_GENERIC = yes'
+ _target_arch='ARCH_GENERIC = yes'
iproc=''
proc=''
_march=''
Modified: trunk/libmpeg2/Makefile
==============================================================================
--- trunk/libmpeg2/Makefile (original)
+++ trunk/libmpeg2/Makefile Sat Jun 16 17:24:39 2007
@@ -14,7 +14,7 @@ SRCS_COMMON = alloc.c \
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
Modified: trunk/libmpeg2/libmpeg-0.4.1.diff
==============================================================================
--- trunk/libmpeg2/libmpeg-0.4.1.diff (original)
+++ trunk/libmpeg2/libmpeg-0.4.1.diff Sat Jun 16 17:24:39 2007
@@ -1072,9 +1072,11 @@ Index: libmpeg2/Makefile
--- 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
Modified: trunk/mp3lib/Makefile
==============================================================================
--- trunk/mp3lib/Makefile (original)
+++ trunk/mp3lib/Makefile Sat Jun 16 17:24:39 2007
@@ -5,7 +5,7 @@ LIBNAME_COMMON = libmp3.a
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
More information about the MPlayer-cvslog
mailing list