11:37 p.m.
Author: rathann
Update of /cvs/free/rpms/mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9871
Modified Files:
.cvsignore mplayer-x86_32-compile.patch mplayer.spec sources
Removed Files:
mplayer-CVE-2008-3827.patch mplayer-backing-store.patch
mplayer-dvb.patch
Log Message:
* Thu Dec 04 2008 Dominik Mierzejewski <rpm at greysector.net> -
1.0-0.104.20081204svn
- 20081204 snapshot
- dropped obsolete/upstreamed patches
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 10 Sep 2008 19:37:04 -0000 1.6
+++ .cvsignore 4 Dec 2008 23:37:06 -0000 1.7
@@ -1,2 +1,2 @@
-mplayer-export-2008-09-03.tar.bz2
+mplayer-export-2008-12-04.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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mplayer-x86_32-compile.patch 9 Aug 2008 09:32:32 -0000 1.1
+++ mplayer-x86_32-compile.patch 4 Dec 2008 23:37:06 -0000 1.2
@@ -1,10 +1,10 @@
-diff -up mplayer-export-2008-05-31/libavcodec/Makefile.compile
mplayer-export-2008-05-31/libavcodec/Makefile
---- mplayer-export-2008-05-31/libavcodec/Makefile.compile 2008-05-31 16:32:11.000000000
+0200
-+++ mplayer-export-2008-05-31/libavcodec/Makefile 2008-06-11 07:47:18.000000000 +0200
-@@ -91,6 +91,11 @@ OBJS-$(CONFIG_H263I_DECODER) +
+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 golomb.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
+ifeq ($(ARCH_X86_32),yes)
@@ -13,15 +13,15 @@
OBJS-$(CONFIG_H264_ENCODER) += h264enc.o h264dspenc.o
OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o
OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o
-@@ -395,6 +400,11 @@ OBJS-$(CONFIG_ENCODERS) +
- OBJS-$(CONFIG_CAVS_DECODER) += i386/cavsdsp_mmx.o
- OBJS-$(CONFIG_FLAC_ENCODER) += i386/flacdsp_mmx.o
- OBJS-$(CONFIG_SNOW_DECODER) += i386/snowdsp_mmx.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
- OBJS-$(CONFIG_VC1_DECODER) += i386/vc1dsp_mmx.o
- OBJS-$(CONFIG_VP3_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
- OBJS-$(CONFIG_VP5_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
+ 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mplayer.spec 24 Nov 2008 23:19:21 -0000 1.10
+++ mplayer.spec 4 Dec 2008 23:37:06 -0000 1.11
@@ -1,12 +1,12 @@
%define codecdir %{_libdir}/codecs
-%define pre 20080903svn
+%define pre 20081204svn
%define svn 1
-%define svnbuild 2008-09-03
+%define svnbuild 2008-12-04
%define faad2min 1:2.6.1
Name: mplayer
Version: 1.0
-Release: 0.103.%{pre}%{?dist}
+Release: 0.104.%{pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
Group: Applications/Multimedia
@@ -25,12 +25,7 @@
Patch8: %{name}-manlinks.patch
Patch10: %{name}-qcelp.patch
Patch12: %{name}-man-zh_CN.patch
-Patch13: %{name}-CVE-2008-3827.patch
Patch14: %{name}-nodvdcss.patch
-# SVN r27892, r27893, r27897
-Patch15: %{name}-dvb.patch
-# SVN r27849
-Patch16: %{name}-backing-store.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel
@@ -200,10 +195,7 @@
%patch8 -p1 -b .manlinks
%patch10 -p1 -b .qclp
%patch12 -p1 -b .man-zh_CN
-%patch13 -p0 -b .cve
%patch14 -p1 -b .nodvdcss
-%patch15 -p1 -b .dvb
-%patch16 -p1 -b .bs
doconv() {
iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \
@@ -354,6 +346,10 @@
%changelog
+* Thu Dec 04 2008 Dominik Mierzejewski <rpm at greysector.net> -
1.0-0.104.20081204svn
+- 20081204 snapshot
+- dropped obsolete/upstreamed patches
+
* Sun Nov 23 2008 Dominik Mierzejewski <rpm at greysector.net> -
1.0-0.103.20080903svn
- fix broken terminal after using dvb input (bug #117)
- disable backing store (fixes tearing on Xorg Xserver 1.5.x)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 16 Oct 2008 20:03:52 -0000 1.7
+++ sources 4 Dec 2008 23:37:06 -0000 1.8
@@ -1,2 +1,2 @@
e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2
-756a884bb62230cdc7a0736b5c60d723 mplayer-export-2008-09-03.tar.bz2
+15f75a17a779247aba1301ece4629920 mplayer-export-2008-12-04.tar.bz2
--- mplayer-CVE-2008-3827.patch DELETED ---
--- mplayer-backing-store.patch DELETED ---
--- mplayer-dvb.patch DELETED ---