rpms/mplayer/devel mplayer-backing-store.patch, NONE, 1.1 mplayer-dvb.patch, NONE, 1.1 mplayer.spec, 1.8, 1.9

[Dominik Mierzejewski]

Author: rathann

Update of /cvs/free/rpms/mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4483

Modified Files:
	mplayer.spec 
Added Files:
	mplayer-backing-store.patch mplayer-dvb.patch 
Log Message:
* 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)
- disable samba support by default, too much dependency bloat (bug #147)
- add missing Requires for hicolor icon dirs to -gui
- drop provides and obsoletes for mplayer-mencoder (last seen for FC4)


mplayer-backing-store.patch:

--- NEW FILE mplayer-backing-store.patch ---
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 =

mplayer-dvb.patch:

--- NEW FILE mplayer-dvb.patch ---
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)
 	{


Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mplayer.spec	28 Oct 2008 22:27:25 -0000	1.8
+++ mplayer.spec	24 Nov 2008 23:16:03 -0000	1.9
@@ -27,6 +27,10 @@
 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
@@ -59,7 +63,6 @@
 BuildRequires:  libdvdnav-devel >= 4.1.3-0.4
 BuildRequires:  libjpeg-devel
 BuildRequires:  libmpcdec-devel
-BuildRequires:  libsmbclient-devel
 BuildRequires:  libtheora-devel
 BuildRequires:  libvorbis-devel
 BuildRequires:  lirc-devel
@@ -78,6 +81,7 @@
 %{?_with_libmad:BuildRequires:  libmad-devel}
 %{?_with_nemesi:BuildRequires:  libnemesi-devel >= 0.6.3}
 %{?_with_openal:BuildRequires: openal-devel}
+%{?_with_samba:BuildRequires: libsmbclient-devel}
 %{?_with_svgalib:BuildRequires: svgalib-devel}
 %{?_with_xmms:BuildRequires: xmms-devel}
 %if %{svn}
@@ -99,6 +103,7 @@
 OpenGL, SVGAlib, fbdev, AAlib, DirectFB etc. There are also nice
 antialiased shaded subtitles and OSD.
 Non-default rpmbuild options:
+--with samba:   Enable Samba (smb://) support
 --with xmms:    Enable XMMS input plugin support
 --with amr:     Enable AMR support
 --with libmad:  Enable libmad support
@@ -114,6 +119,7 @@
 Summary:        GUI for MPlayer
 Group:          Applications/Multimedia
 Requires:       mplayer = %{version}-%{release}
+Requires:       hicolor-icon-theme
 
 %description    gui
 This package contains a GUI for MPlayer and a default skin for it.
@@ -122,8 +128,6 @@
 Summary:        MPlayer movie encoder
 Group:          Applications/Multimedia
 Requires:       mplayer = %{version}-%{release}
-Provides:       mplayer-mencoder = %{version}-%{release}
-Obsoletes:      mplayer-mencoder < 1.0-0.36
 
 %description -n mencoder
 This package contains the MPlayer movie encoder. 
@@ -158,6 +162,7 @@
     --disable-dvdread-internal \\\
     --disable-libdvdcss-internal \\\
     %{!?_with_nemesi:--disable-nemesi} \\\
+    %{!?_with_samba:--disable-smb} \\\
     \\\
     --disable-faac-lavc \\\
     --disable-mp3lame-lavc \\\
@@ -197,6 +202,8 @@
 %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 && \
@@ -347,6 +354,13 @@
 
 
 %changelog
+* 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)
+- disable samba support by default, too much dependency bloat (bug #147)
+- add missing Requires for hicolor icon dirs to -gui
+- drop provides and obsoletes for mplayer-mencoder (last seen for FC4)
+
 * Tue Oct 28 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.102.20080903svn
 - rework the build system
 - rebuild for new libcaca