From f94e237d5a32316d0dd99bdde38f6f4beee51db0 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Thu, 4 Dec 2008 23:37:06 +0000 Subject: [PATCH] * Thu Dec 04 2008 Dominik Mierzejewski - 1.0-0.104.20081204svn - 20081204 snapshot - dropped obsolete/upstreamed patches --- .gitignore | 2 +- mplayer-CVE-2008-3827.patch | 28 --------------------------- mplayer-backing-store.patch | 21 -------------------- mplayer-dvb.patch | 37 ------------------------------------ mplayer-x86_32-compile.patch | 24 +++++++++++------------ mplayer.spec | 18 +++++++----------- sources | 2 +- 7 files changed, 21 insertions(+), 111 deletions(-) delete mode 100644 mplayer-CVE-2008-3827.patch delete mode 100644 mplayer-backing-store.patch delete mode 100644 mplayer-dvb.patch diff --git a/.gitignore b/.gitignore index ba9a0d4..83138ae 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -mplayer-export-2008-09-03.tar.bz2 +mplayer-export-2008-12-04.tar.bz2 Blue-1.7.tar.bz2 diff --git a/mplayer-CVE-2008-3827.patch b/mplayer-CVE-2008-3827.patch deleted file mode 100644 index 3816add..0000000 --- a/mplayer-CVE-2008-3827.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: libmpdemux/demux_real.c -=================================================================== ---- libmpdemux/demux_real.c (revision 27674) -+++ libmpdemux/demux_real.c (revision 27675) -@@ -947,6 +947,7 @@ - // last fragment! - if(dp_hdr->len!=vpkg_length-vpkg_offset) - mp_msg(MSGT_DEMUX,MSGL_V,"warning! assembled.len=%d frag.len=%d total.len=%d \n",dp->len,vpkg_offset,vpkg_length-vpkg_offset); -+ if (vpkg_offset > dp->len - sizeof(dp_hdr_t) - dp_hdr->len) vpkg_offset = dp->len - sizeof(dp_hdr_t) - dp_hdr->len; - stream_read(demuxer->stream, dp_data+dp_hdr->len, vpkg_offset); - if((dp_data[dp_hdr->len]&0x20) && (sh_video->format==0x30335652)) --dp_hdr->chunks; else - dp_hdr->len+=vpkg_offset; -@@ -970,6 +971,7 @@ - // non-last fragment: - if(dp_hdr->len!=vpkg_offset) - mp_msg(MSGT_DEMUX,MSGL_V,"warning! assembled.len=%d offset=%d frag.len=%d total.len=%d \n",dp->len,vpkg_offset,len,vpkg_length); -+ if (len > dp->len - sizeof(dp_hdr_t) - dp_hdr->len) len = dp->len - sizeof(dp_hdr_t) - dp_hdr->len; - stream_read(demuxer->stream, dp_data+dp_hdr->len, len); - if((dp_data[dp_hdr->len]&0x20) && (sh_video->format==0x30335652)) --dp_hdr->chunks; else - dp_hdr->len+=len; -@@ -992,6 +994,7 @@ - extra[0]=1; extra[1]=0; // offset of the first chunk - if(0x00==(vpkg_header&0xc0)){ - // first fragment: -+ if (len > dp->len - sizeof(dp_hdr_t)) len = dp->len - sizeof(dp_hdr_t); - dp_hdr->len=len; - stream_read(demuxer->stream, dp_data, len); - ds->asf_packet=dp; diff --git a/mplayer-backing-store.patch b/mplayer-backing-store.patch deleted file mode 100644 index da534a8..0000000 --- a/mplayer-backing-store.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up mplayer-export-2008-09-03/libvo/x11_common.c.bs mplayer-export-2008-09-03/libvo/x11_common.c ---- mplayer-export-2008-09-03/libvo/x11_common.c.bs 2008-08-04 08:16:23.000000000 +0200 -+++ mplayer-export-2008-09-03/libvo/x11_common.c 2008-11-23 21:39:27.000000000 +0100 -@@ -1250,7 +1250,7 @@ Window vo_x11_create_smooth_window(Displ - unsigned int width, unsigned int height, - int depth, Colormap col_map) - { -- unsigned long xswamask = CWBackingStore | CWBorderPixel; -+ unsigned long xswamask = CWBorderPixel; - XSetWindowAttributes xswa; - Window ret_win; - -@@ -1261,7 +1261,7 @@ Window vo_x11_create_smooth_window(Displ - } - xswa.background_pixel = 0; - xswa.border_pixel = 0; -- xswa.backing_store = Always; -+ xswa.backing_store = NotUseful; - xswa.bit_gravity = StaticGravity; - - ret_win = diff --git a/mplayer-dvb.patch b/mplayer-dvb.patch deleted file mode 100644 index 87cc945..0000000 --- a/mplayer-dvb.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -up mplayer-export-2008-09-03/stream/dvb_tune.c.dvb mplayer-export-2008-09-03/stream/dvb_tune.c ---- mplayer-export-2008-09-03/stream/dvb_tune.c.dvb 2008-08-14 17:54:53.000000000 +0200 -+++ mplayer-export-2008-09-03/stream/dvb_tune.c 2008-11-23 21:33:29.000000000 +0100 -@@ -114,9 +114,7 @@ int dvb_open_devices(dvb_priv_t *priv, i - mp_msg(MSGT_DEMUX, MSGL_ERR, "ERROR OPENING FRONTEND DEVICE %s: ERRNO %d\n", frontend_dev, errno); - return 0; - } --#ifdef CONFIG_DVB_HEAD -- priv->sec_fd=0; --#else -+#ifndef CONFIG_DVB_HEAD - priv->sec_fd = open(sec_dev, O_RDWR); - if(priv->sec_fd < 0) - { -diff -up mplayer-export-2008-09-03/stream/stream_dvb.c.dvb mplayer-export-2008-09-03/stream/stream_dvb.c ---- mplayer-export-2008-09-03/stream/stream_dvb.c.dvb 2008-08-14 17:54:53.000000000 +0200 -+++ mplayer-export-2008-09-03/stream/stream_dvb.c 2008-11-23 21:33:29.000000000 +0100 -@@ -611,9 +611,10 @@ static void dvbin_close(stream_t *stream - close(priv->dvr_fd); - - close(priv->fe_fd); --#ifdef CONFIG_DVB -+#ifndef CONFIG_DVB_HEAD - close(priv->sec_fd); - #endif -+ priv->fe_fd = priv->sec_fd = priv->dvr_fd = -1; - - priv->is_on = 0; - dvb_free_config(priv->config); -@@ -685,6 +686,7 @@ static int dvb_open(stream_t *stream, in - return STREAM_ERROR; - - priv = (dvb_priv_t *)stream->priv; -+ priv->fe_fd = priv->sec_fd = priv->dvr_fd = -1; - priv->config = dvb_get_config(); - if(priv->config == NULL) - { diff --git a/mplayer-x86_32-compile.patch b/mplayer-x86_32-compile.patch index 79ef66d..fece13d 100644 --- a/mplayer-x86_32-compile.patch +++ b/mplayer-x86_32-compile.patch @@ -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 @@ diff -up mplayer-export-2008-05-31/libavcodec/Makefile.compile mplayer-export-20 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 diff --git a/mplayer.spec b/mplayer.spec index 557b9f7..6ba929f 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -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 @@ Patch5: %{name}-x86_32-compile.patch 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 @@ MPlayer documentation in various languages. %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 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Dec 04 2008 Dominik Mierzejewski - 1.0-0.104.20081204svn +- 20081204 snapshot +- dropped obsolete/upstreamed patches + * Sun Nov 23 2008 Dominik Mierzejewski - 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) diff --git a/sources b/sources index e906d81..6b1d8b6 100644 --- a/sources +++ b/sources @@ -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