Attachment #129693 for bug #173743

View | Details | Raw Unified | Return to bug 173743
Collapse All | Expand All

Lines 40-45 Link Here

(-)b/mplayer/Makefile.options (+1 lines)
40	#On i386, gcc runs out of general purpose registers when	40	#On i386, gcc runs out of general purpose registers when
41	#trying to compile a debug version with the default flags.	41	#trying to compile a debug version with the default flags.
42	.if defined(WITH_DEBUG)	42	.if defined(WITH_DEBUG)
		43	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-debug
43	.if ${ARCH} == "i386"	44	.if ${ARCH} == "i386"
44	DEBUG_FLAGS= -g -O -fomit-frame-pointer	45	DEBUG_FLAGS= -g -O -fomit-frame-pointer
45	.endif	46	.endif




--- ffmpeg/libavutil/x86/float_dsp_init.c.orig	2012-06-20 19:20:03.000000000 +0200
+++ ffmpeg/libavutil/x86/float_dsp_init.c	2012-11-20 20:22:20.113766897 +0100
@@ -33,7 +33,7 @@
 
 void ff_float_dsp_init_x86(AVFloatDSPContext *fdsp)
 {
-#if HAVE_YASM
+#if NOTIMPLEMENTED
     int mm_flags = av_get_cpu_flags();
 
     if (mm_flags & AV_CPU_FLAG_SSE && HAVE_SSE) {
--- ffmpeg/libavcodec/x86/fft.c.orig	2012-05-27 19:20:03.000000000 +0200
+++ ffmpeg/libavcodec/x86/fft.c	2012-11-20 20:23:41.033428529 +0100
@@ -45,12 +45,6 @@
         s->fft_calc    = ff_fft_calc_sse;
         s->fft_permutation = FF_FFT_PERM_SWAP_LSBS;
     }
-    if (has_vectors & AV_CPU_FLAG_AVX && HAVE_AVX && s->nbits >= 5) {
-        /* AVX for SB */
-        s->imdct_half      = ff_imdct_half_avx;
-        s->fft_calc        = ff_fft_calc_avx;
-        s->fft_permutation = FF_FFT_PERM_AVX;
-    }
 #endif
 }
 
@@ -63,8 +57,6 @@
         s->dct32 = ff_dct32_float_sse;
     if (has_vectors & AV_CPU_FLAG_SSE2 && HAVE_SSE)
         s->dct32 = ff_dct32_float_sse2;
-    if (has_vectors & AV_CPU_FLAG_AVX && HAVE_AVX)
-        s->dct32 = ff_dct32_float_avx;
 #endif
 }
 #endif




--- configure.orig	2012-07-20 15:11:42.000000000 +0200
+++ configure	2012-10-08 19:16:19.637797462 +0200
@@ -645,7 +645,7 @@
 _iwmmxt=auto
 _mtrr=auto
 _altivec=auto

 _ranlib=ranlib
 _windres=windres
 _cc=cc
@@ -1467,7 +1467,6 @@
 
   *)
     echo "Unknown parameter: $ac_option"

     ;;
 
   esac
@@ -1515,7 +1514,7 @@
   case "$(uname -m 2>&1)" in
       x86_64|amd64|i[3-9]86*|i86pc|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;;
       ia64) host_arch=ia64 ;;
-      macppc|ppc*|Power*) host_arch=ppc ;;
+      macppc|powerpc|ppc*|Power*) host_arch=ppc ;;
       alpha) host_arch=alpha ;;
       sun4*|sparc*) host_arch=sparc ;;
       parisc*|hppa*|9000*) host_arch=hppa ;;
@@ -1555,7 +1554,7 @@
 fi
 
 extra_cflags="-I. -Iffmpeg $extra_cflags"

 _timer=timer-linux.c
 _getch=getch2.c
 
@@ -3601,7 +3600,7 @@
 if linux ; then
   THREAD_CFLAGS=-D_REENTRANT
 elif freebsd || netbsd || openbsd || bsdos ; then

 fi
 if test "$_pthreads" = auto ; then
 cat > $TMPC << EOF
@@ -3611,7 +3610,7 @@
 EOF
 _pthreads=no
 if ! hpux ; then

     # for crosscompilation, we cannot execute the program, be happy if we can link statically
     cc_check $THREAD_CFLAGS $ld_tmp && (tmp_run || test "$ld_static") && ld_pthread="$ld_tmp" && _pthreads=yes && break
   done
@@ -6271,7 +6270,7 @@
 echocheck "libgsm"
 if test "$_libgsm" = auto ; then
   _libgsm=no

 fi
 if test "$_libgsm" = yes ; then
   def_libgsm='#define CONFIG_LIBGSM 1'
@@ -6733,6 +6732,16 @@
   nolibrtmp=no
   def_librtmp='#define CONFIG_LIBRTMP 1'
   inputmodules="librtmp $inputmodules"

 else
   nolibrtmp=yes
   _librtmp=no
@@ -7125,7 +7134,7 @@
 echocheck "mencoder"
 if test "$_mencoder" = no ; then
   # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,

 fi
 echores "$_mencoder"
 
@@ -7463,8 +7472,11 @@
 if test "$_gui" = yes ; then
 
   # Required libraries

     die "The GUI requires libavcodec with PNG support (needs zlib)."
   fi
   test "$_freetype" = no && test "$_bitmap_font" = no &&
@@ -8029,7 +8041,7 @@
 EXESUF      = $_exesuf
 EXESUFS_ALL = .exe

Return to bug 173743

Added Link Here

(-)b/mplayer/files/extra-patch-debug (+35 lines)
1	--- ffmpeg/libavutil/x86/float_dsp_init.c.orig 2012-06-20 19:20:03.000000000 +0200
2	+++ ffmpeg/libavutil/x86/float_dsp_init.c 2012-11-20 20:22:20.113766897 +0100
3	@@ -33,7 +33,7 @@
4
5	void ff_float_dsp_init_x86(AVFloatDSPContext *fdsp)
6	{
7	-#if HAVE_YASM
8	+#if NOTIMPLEMENTED
9	int mm_flags = av_get_cpu_flags();
10
11	if (mm_flags & AV_CPU_FLAG_SSE && HAVE_SSE) {
12	--- ffmpeg/libavcodec/x86/fft.c.orig 2012-05-27 19:20:03.000000000 +0200
13	+++ ffmpeg/libavcodec/x86/fft.c 2012-11-20 20:23:41.033428529 +0100
14	@@ -45,12 +45,6 @@
15	s->fft_calc = ff_fft_calc_sse;
16	s->fft_permutation = FF_FFT_PERM_SWAP_LSBS;
17	}
18	- if (has_vectors & AV_CPU_FLAG_AVX && HAVE_AVX && s->nbits >= 5) {
19	- /* AVX for SB */
20	- s->imdct_half = ff_imdct_half_avx;
21	- s->fft_calc = ff_fft_calc_avx;
22	- s->fft_permutation = FF_FFT_PERM_AVX;
23	- }
24	#endif
25	}
26
27	@@ -63,8 +57,6 @@
28	s->dct32 = ff_dct32_float_sse;
29	if (has_vectors & AV_CPU_FLAG_SSE2 && HAVE_SSE)
30	s->dct32 = ff_dct32_float_sse2;
31	- if (has_vectors & AV_CPU_FLAG_AVX && HAVE_AVX)
32	- s->dct32 = ff_dct32_float_avx;
33	#endif
34	}
35	#endif

Lines 1-6 Link Here

(-)b/mplayer/files/patch-configure (-12 / +21 lines)
1	--- configure.orig 2012-03-15 16:20:02.000000000 +0100	1	--- configure.orig 2012-07-20 15:11:42.000000000 +0200
2	+++ configure 2012-03-22 15:36:16.583006073 +0100	2	+++ configure 2012-10-08 19:16:19.637797462 +0200
3	@@ -637,7 +637,7 @@	3	@@ -645,7 +645,7 @@
4	_iwmmxt=auto	4	_iwmmxt=auto
5	_mtrr=auto	5	_mtrr=auto
6	_altivec=auto	6	_altivec=auto
Lines 9-15 Link Here
9	_ranlib=ranlib	9	_ranlib=ranlib
10	_windres=windres	10	_windres=windres
11	_cc=cc	11	_cc=cc
12	@@ -1455,7 +1455,6 @@	12	@@ -1467,7 +1467,6 @@
13		13
14	*)	14	*)
15	echo "Unknown parameter: $ac_option"	15	echo "Unknown parameter: $ac_option"
Lines 17-23 Link Here
17	;;	17	;;
18		18
19	esac	19	esac
20	@@ -1533,7 +1533,7 @@	20	@@ -1515,7 +1514,7 @@
		21	case "$(uname -m 2>&1)" in
		22	x86_64\|amd64\|i[3-9]86\|i86pc\|x86\|x86pc\|k5\|k6\|k6_2\|k6_3\|k6-2\|k6-3\|pentium\|athlon*\|i586_i686\|i586-i686) host_arch=i386 ;;
		23	ia64) host_arch=ia64 ;;
		24	- macppc\|ppc\|Power) host_arch=ppc ;;
		25	+ macppc\|powerpc\|ppc\|Power) host_arch=ppc ;;
		26	alpha) host_arch=alpha ;;
		27	sun4\|sparc) host_arch=sparc ;;
		28	parisc\|hppa\|9000*) host_arch=hppa ;;
		29	@@ -1555,7 +1554,7 @@
21	fi	30	fi
22		31
23	extra_cflags="-I. -Iffmpeg $extra_cflags"	32	extra_cflags="-I. -Iffmpeg $extra_cflags"
Lines 26-32 Link Here
26	_timer=timer-linux.c	35	_timer=timer-linux.c
27	_getch=getch2.c	36	_getch=getch2.c
28		37
29	@@ -3576,7 +3575,7 @@	38	@@ -3601,7 +3600,7 @@
30	if linux ; then	39	if linux ; then
31	THREAD_CFLAGS=-D_REENTRANT	40	THREAD_CFLAGS=-D_REENTRANT
32	elif freebsd \|\| netbsd \|\| openbsd \|\| bsdos ; then	41	elif freebsd \|\| netbsd \|\| openbsd \|\| bsdos ; then
Lines 35-41 Link Here
35	fi	44	fi
36	if test "$_pthreads" = auto ; then	45	if test "$_pthreads" = auto ; then
37	cat > $TMPC << EOF	46	cat > $TMPC << EOF
38	@@ -3586,7 +3585,7 @@	47	@@ -3611,7 +3610,7 @@
39	EOF	48	EOF
40	_pthreads=no	49	_pthreads=no
41	if ! hpux ; then	50	if ! hpux ; then
Lines 44-50 Link Here
44	# for crosscompilation, we cannot execute the program, be happy if we can link statically	53	# for crosscompilation, we cannot execute the program, be happy if we can link statically
45	cc_check $THREAD_CFLAGS $ld_tmp && (tmp_run \|\| test "$ld_static") && ld_pthread="$ld_tmp" && _pthreads=yes && break	54	cc_check $THREAD_CFLAGS $ld_tmp && (tmp_run \|\| test "$ld_static") && ld_pthread="$ld_tmp" && _pthreads=yes && break
46	done	55	done
47	@@ -6245,7 +6244,7 @@	56	@@ -6271,7 +6270,7 @@
48	echocheck "libgsm"	57	echocheck "libgsm"
49	if test "$_libgsm" = auto ; then	58	if test "$_libgsm" = auto ; then
50	_libgsm=no	59	_libgsm=no
Lines 53-59 Link Here
53	fi	62	fi
54	if test "$_libgsm" = yes ; then	63	if test "$_libgsm" = yes ; then
55	def_libgsm='#define CONFIG_LIBGSM 1'	64	def_libgsm='#define CONFIG_LIBGSM 1'
56	@@ -6705,6 +6704,16 @@	65	@@ -6733,6 +6732,16 @@
57	nolibrtmp=no	66	nolibrtmp=no
58	def_librtmp='#define CONFIG_LIBRTMP 1'	67	def_librtmp='#define CONFIG_LIBRTMP 1'
59	inputmodules="librtmp $inputmodules"	68	inputmodules="librtmp $inputmodules"
Lines 70-76 Link Here
70	else	79	else
71	nolibrtmp=yes	80	nolibrtmp=yes
72	_librtmp=no	81	_librtmp=no
73	@@ -7097,7 +7106,7 @@	82	@@ -7125,7 +7134,7 @@
74	echocheck "mencoder"	83	echocheck "mencoder"
75	if test "$_mencoder" = no ; then	84	if test "$_mencoder" = no ; then
76	# mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,	85	# mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,
Lines 79-85 Link Here
79	fi	88	fi
80	echores "$_mencoder"	89	echores "$_mencoder"
81		90
82	@@ -7435,8 +7444,11 @@	91	@@ -7463,8 +7472,11 @@
83	if test "$_gui" = yes ; then	92	if test "$_gui" = yes ; then
84		93
85	# Required libraries	94	# Required libraries
Lines 93-99 Link Here
93	die "The GUI requires libavcodec with PNG support (needs zlib)."	102	die "The GUI requires libavcodec with PNG support (needs zlib)."
94	fi	103	fi
95	test "$_freetype" = no && test "$_bitmap_font" = no &&	104	test "$_freetype" = no && test "$_bitmap_font" = no &&
96	@@ -8001,7 +8013,7 @@	105	@@ -8029,7 +8041,7 @@
97	EXESUF = $_exesuf	106	EXESUF = $_exesuf
98	EXESUFS_ALL = .exe	107	EXESUFS_ALL = .exe