Author: rathann
Update of /cvs/free/rpms/mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19515
Modified Files:
.cvsignore mplayer-x86_32-compile.patch mplayer.spec sources
Log Message:
- 20081218 snapshot
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 4 Dec 2008 23:37:06 -0000 1.7
+++ .cvsignore 18 Dec 2008 19:32:41 -0000 1.8
@@ -1,2 +1,2 @@
-mplayer-export-2008-12-04.tar.bz2
+mplayer-export-2008-12-18.tar.bz2
Blue-1.7.tar.bz2
mplayer-x86_32-compile.patch:
Index: mplayer-x86_32-compile.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer-x86_32-compile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mplayer-x86_32-compile.patch 4 Dec 2008 23:37:06 -0000 1.2
+++ mplayer-x86_32-compile.patch 18 Dec 2008 19:32:41 -0000 1.3
@@ -1,27 +1,11 @@
-diff -up mplayer-export-2008-12-04/libavcodec/Makefile.compile
mplayer-export-2008-12-04/libavcodec/Makefile
---- mplayer-export-2008-12-04/libavcodec/Makefile.compile 2008-12-02 17:48:05.000000000
+0100
-+++ mplayer-export-2008-12-04/libavcodec/Makefile 2008-12-05 00:20:51.000000000 +0100
-@@ -99,6 +99,11 @@ OBJS-$(CONFIG_H263I_DECODER) +
- OBJS-$(CONFIG_H263_ENCODER) += mpegvideo_enc.o motion_est.o ratecontrol.o
h263.o mpeg12data.o mpegvideo.o error_resilience.o
- OBJS-$(CONFIG_H263P_ENCODER) += mpegvideo_enc.o motion_est.o ratecontrol.o
h263.o mpeg12data.o mpegvideo.o error_resilience.o
- OBJS-$(CONFIG_H264_DECODER) += h264.o h264idct.o h264pred.o h264_parser.o
cabac.o mpegvideo.o error_resilience.o
-+# to "fix" can't find a register in class 'GENERAL_REGS' while
reloading 'asm'
-+# on ix86 in cabac.h
+diff -up mplayer-export-2008-12-18/libavcodec/Makefile.compile
mplayer-export-2008-12-18/libavcodec/Makefile
+--- mplayer-export-2008-12-18/libavcodec/Makefile.compile 2008-12-17 01:54:54.000000000
+0100
++++ mplayer-export-2008-12-18/libavcodec/Makefile 2008-12-18 19:44:49.000000000 +0100
+@@ -505,3 +505,7 @@ include $(SUBDIR)../subdir.mak
+
+ $(SUBDIR)dct-test$(EXESUF): $(SUBDIR)fdctref.o $(SUBDIR)aandcttab.o
+ $(SUBDIR)fft-test$(EXESUF): $(SUBDIR)fdctref.o
+ifeq ($(ARCH_X86_32),yes)
-+h264.o: CFLAGS += -fomit-frame-pointer
++$(SUBDIR)i386/snowdsp_mmx.o: CFLAGS += -fomit-frame-pointer
++$(SUBDIR)h264.o: CFLAGS += -fomit-frame-pointer
+endif
- OBJS-$(CONFIG_H264_ENCODER) += h264enc.o h264dspenc.o
- OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o
- OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o
-@@ -397,6 +402,11 @@ MMX-OBJS-$(CONFIG_ENCODERS) +
- MMX-OBJS-$(CONFIG_FLAC_ENCODER) += i386/flacdsp_mmx.o
- MMX-OBJS-$(CONFIG_GPL) += i386/idct_mmx.o
- MMX-OBJS-$(CONFIG_SNOW_DECODER) += i386/snowdsp_mmx.o
-+# to "fix" can't find a register in class 'GENERAL_REGS' while
reloading 'asm'
-+# on ix86 in snowdsp_mmx.o
-+ifeq ($(ARCH_X86_32),yes)
-+i386/snowdsp_mmx.o: CFLAGS += -fomit-frame-pointer
-+endif
- MMX-OBJS-$(CONFIG_VC1_DECODER) += i386/vc1dsp_mmx.o
- MMX-OBJS-$(CONFIG_VP3_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
- MMX-OBJS-$(CONFIG_VP5_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mplayer.spec 4 Dec 2008 23:37:06 -0000 1.11
+++ mplayer.spec 18 Dec 2008 19:32:41 -0000 1.12
@@ -1,7 +1,7 @@
%define codecdir %{_libdir}/codecs
-%define pre 20081204svn
+%define pre 20081218svn
%define svn 1
-%define svnbuild 2008-12-04
+%define svnbuild 2008-12-18
%define faad2min 1:2.6.1
Name: mplayer
@@ -346,8 +346,8 @@
%changelog
-* Thu Dec 04 2008 Dominik Mierzejewski <rpm at greysector.net> -
1.0-0.104.20081204svn
-- 20081204 snapshot
+* Thu Dec 18 2008 Dominik Mierzejewski <rpm at greysector.net> -
1.0-0.104.20081218svn
+- 20081218 snapshot
- dropped obsolete/upstreamed patches
* Sun Nov 23 2008 Dominik Mierzejewski <rpm at greysector.net> -
1.0-0.103.20080903svn
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 4 Dec 2008 23:37:06 -0000 1.8
+++ sources 18 Dec 2008 19:32:41 -0000 1.9
@@ -1,2 +1,2 @@
e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2
-15f75a17a779247aba1301ece4629920 mplayer-export-2008-12-04.tar.bz2
+a1034c489750f70af6e7696a0cd509c7 mplayer-export-2008-12-18.tar.bz2