4:37 p.m.
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18849
Modified Files:
gnome-mplayer.spec
Added Files:
gnome-mplayer-vdpau.patch
Log Message:
* Sun Feb 20 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.0-2
- Fixed intrusive error popup for vdpau (RF #1633)
- Added a conditional for building without the minimal player
gnome-mplayer-vdpau.patch:
thread.c | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE gnome-mplayer-vdpau.patch ---
Index: src/thread.c
===================================================================
--- src/thread.c (wersja 1815)
+++ src/thread.c (wersja 1816)
@@ -187,6 +187,7 @@
if (strstr(mplayer_output->str, "Failed to open") != NULL) {
if (strstr(mplayer_output->str, "LIRC") == NULL &&
strstr(mplayer_output->str, "/dev/rtc") == NULL &&
+ strstr(mplayer_output->str, "VDPAU") == NULL &&
strstr(mplayer_output->str, "registry file") == NULL) {
// error_msg = g_strdup(mplayer_output->str);
if (strstr(mplayer_output->str, "<") == NULL &&
strstr(mplayer_output->str, ">") == NULL
Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-13/gnome-mplayer.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gnome-mplayer.spec 6 Nov 2010 01:16:36 -0000 1.31
+++ gnome-mplayer.spec 20 Feb 2011 16:37:17 -0000 1.32
@@ -1,12 +1,15 @@
+%bcond_without minimal
+
Name: gnome-mplayer
Version: 1.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: An MPlayer GUI, a full-featured binary
Group: Applications/Multimedia
License: GPLv2+
URL: http://kdekorte.googlepages.com/gnomemplayer
Source0: http://gnome-mplayer.googlecode.com/files/%{name}-%{version}.tar.gz
+Patch0: gnome-mplayer-vdpau.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
@@ -56,6 +59,7 @@
This package provides the common files.
+%if %{with minimal}
%package minimal
Summary: An MPlayer GUI, a minimal version
Group: Applications/Multimedia
@@ -69,6 +73,7 @@
multiple instances of GNOME MPlayer from a single command.
This package provides a version with reduced requirements, targeted at users
who want browser plugin functionality only.
+%endif
%package nautilus
@@ -90,8 +95,16 @@
%setup -qcT
tar -xzf %{SOURCE0}
mv %{name}-%{version} generic
+pushd generic
+%patch0 -p0 -b .vdpau
+popd
+%if %{with minimal}
tar -xzf %{SOURCE0}
mv %{name}-%{version} minimal
+pushd minimal
+%patch0 -p0 -b .vdpau
+popd
+%endif
%build
@@ -100,11 +113,13 @@
make %{?_smp_mflags}
popd
+%if %{with minimal}
pushd minimal
%configure --program-suffix=-minimal --without-gio --without-libnotify \
--without-libgpod --without-libmusicbrainz3 --disable-nautilus
make %{?_smp_mflags}
popd
+%endif
%install
@@ -115,10 +130,12 @@
make install DESTDIR=$RPM_BUILD_ROOT
popd
+%if %{with minimal}
pushd minimal
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
popd
+%endif
desktop-file-install --vendor=rpmfusion \
--delete-original --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -196,9 +213,11 @@
%{_mandir}/man1/gnome-mplayer.1*
+%if %{with minimal}
%files minimal
%defattr(-,root,root,-)
%{_bindir}/gnome-mplayer-minimal
+%endif
%files nautilus
@@ -207,6 +226,10 @@
%changelog
+* Sun Feb 20 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.0-2
+- Fixed intrusive error popup for vdpau (RF #1633)
+- Added a conditional for building without the minimal player
+
* Sat Nov 06 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.0-1
- Updated to 1.0.0
- Dropped upstreamed patch