4:45 p.m.
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19302
Modified Files:
gnome-mplayer.spec
Added Files:
gnome-mplayer-av.patch gnome-mplayer-libnotify07.patch
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
- Added support for libnotify-0.7 from SVN
- Fixed rawhide build failure
gnome-mplayer-av.patch:
Makefile.am | 2 +-
Makefile.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE gnome-mplayer-av.patch ---
diff -up gnome-mplayer-1.0.0/generic/src/Makefile.am.av
gnome-mplayer-1.0.0/generic/src/Makefile.am
--- gnome-mplayer-1.0.0/generic/src/Makefile.am.av 2011-02-16 23:54:09.000000000 +0100
+++ gnome-mplayer-1.0.0/generic/src/Makefile.am 2011-02-20 17:19:03.000000000 +0100
@@ -97,7 +97,7 @@ libgnome_mplayer_properties_page_so_CFLA
$(GIO_CFLAGS) \
$(AM_CFLAGS)
-libgnome_mplayer_properties_page_so_LDFLAGS = -avoid-version -shared
+libgnome_mplayer_properties_page_so_LDFLAGS = -shared
libgnome_mplayer_properties_page_so_LDADD = \
$(NAUTILUS_LIBS) \
diff -up gnome-mplayer-1.0.0/generic/src/Makefile.in.av
gnome-mplayer-1.0.0/generic/src/Makefile.in
--- gnome-mplayer-1.0.0/generic/src/Makefile.in.av 2011-02-17 23:42:56.000000000 +0100
+++ gnome-mplayer-1.0.0/generic/src/Makefile.in 2011-02-20 17:18:41.000000000 +0100
@@ -387,7 +387,7 @@ gnome_mplayer_LDADD = \
@HAVE_NAUTILUS_TRUE@ $(GIO_CFLAGS) \
@HAVE_NAUTILUS_TRUE@ $(AM_CFLAGS)
-@HAVE_NAUTILUS_TRUE@libgnome_mplayer_properties_page_so_LDFLAGS = -avoid-version -shared
+@HAVE_NAUTILUS_TRUE@libgnome_mplayer_properties_page_so_LDFLAGS = -shared
@HAVE_NAUTILUS_TRUE@libgnome_mplayer_properties_page_so_LDADD = \
@HAVE_NAUTILUS_TRUE@ $(NAUTILUS_LIBS) \
@HAVE_NAUTILUS_TRUE@ $(GTK_LIBS) \
gnome-mplayer-libnotify07.patch:
Makefile.in | 2 +
config.h.in | 3 +
configure | 80 +++++++++++++++++++++++++++++++++++++++++++++
configure.in | 8 ++--
icons/16x16/Makefile.in | 2 +
icons/22x22/Makefile.in | 2 +
icons/24x24/Makefile.in | 2 +
icons/32x32/Makefile.in | 2 +
icons/48x48/Makefile.in | 2 +
icons/Makefile.in | 2 +
icons/scalable/Makefile.in | 2 +
src/Makefile.in | 2 +
src/gui.c | 8 ++++
src/libgmlib/Makefile.in | 2 +
src/libgmtk/Makefile.in | 2 +
15 files changed, 118 insertions(+), 3 deletions(-)
--- NEW FILE gnome-mplayer-libnotify07.patch ---
Index: configure
===================================================================
--- configure (wersja 1788)
+++ configure (wersja 1789)
@@ -612,6 +612,8 @@
GPOD06_LIBS
GPOD06_CFLAGS
NOTIFY_DEFINES
+LIBNOTIFY_07_LIBS
+LIBNOTIFY_07_CFLAGS
NOTIFY_LIBS
NOTIFY_CFLAGS
ALSA_DEFINES
@@ -818,6 +820,8 @@
ALSA_LIBS
NOTIFY_CFLAGS
NOTIFY_LIBS
+LIBNOTIFY_07_CFLAGS
+LIBNOTIFY_07_LIBS
GPOD06_CFLAGS
GPOD06_LIBS
GPOD07_CFLAGS
@@ -1519,6 +1523,10 @@
NOTIFY_CFLAGS
C compiler flags for NOTIFY, overriding pkg-config
NOTIFY_LIBS linker flags for NOTIFY, overriding pkg-config
+ LIBNOTIFY_07_CFLAGS
+ C compiler flags for LIBNOTIFY_07, overriding pkg-config
+ LIBNOTIFY_07_LIBS
+ linker flags for LIBNOTIFY_07, overriding pkg-config
GPOD06_CFLAGS
C compiler flags for GPOD06, overriding pkg-config
GPOD06_LIBS linker flags for GPOD06, overriding pkg-config
@@ -8321,13 +8329,85 @@
$as_echo "#define NOTIFY_ENABLED 1" >>confdefs.h
fi
+ # Check for libnotify >= 0.7
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY_07" >&5
+$as_echo_n "checking for LIBNOTIFY_07... " >&6; }
+if test -n "$LIBNOTIFY_07_CFLAGS"; then
+ pkg_cv_LIBNOTIFY_07_CFLAGS="$LIBNOTIFY_07_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors
\"libnotify >= 0.7\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libnotify >= 0.7") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBNOTIFY_07_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= 0.7"
2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$LIBNOTIFY_07_LIBS"; then
+ pkg_cv_LIBNOTIFY_07_LIBS="$LIBNOTIFY_07_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors
\"libnotify >= 0.7\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libnotify >= 0.7") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBNOTIFY_07_LIBS=`$PKG_CONFIG --libs "libnotify >= 0.7"
2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
fi
+ if test $_pkg_short_errors_supported = yes; then
+ LIBNOTIFY_07_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"libnotify >= 0.7" 2>&1`
+ else
+ LIBNOTIFY_07_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnotify >=
0.7" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBNOTIFY_07_PKG_ERRORS" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Using older libnotify"
>&5
+$as_echo "$as_me: Using older libnotify" >&6;}
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Using older libnotify" >&5
+$as_echo "$as_me: Using older libnotify" >&6;}
+else
+ LIBNOTIFY_07_CFLAGS=$pkg_cv_LIBNOTIFY_07_CFLAGS
+ LIBNOTIFY_07_LIBS=$pkg_cv_LIBNOTIFY_07_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+$as_echo "#define NOTIFY0_7_ENABLED 1" >>confdefs.h
+
+fi
+
+
+
+
+fi
+
+
# Check whether --with-libgpod was given.
if test "${with_libgpod+set}" = set; then :
withval=$with_libgpod;
Index: Makefile.in
===================================================================
--- Makefile.in (wersja 1788)
+++ Makefile.in (wersja 1789)
@@ -203,6 +203,8 @@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
+LIBNOTIFY_07_CFLAGS = @LIBNOTIFY_07_CFLAGS@
+LIBNOTIFY_07_LIBS = @LIBNOTIFY_07_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
Index: src/libgmlib/Makefile.in
===================================================================
--- src/libgmlib/Makefile.in (wersja 1788)
+++ src/libgmlib/Makefile.in (wersja 1789)
@@ -140,6 +140,8 @@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
+LIBNOTIFY_07_CFLAGS = @LIBNOTIFY_07_CFLAGS@
+LIBNOTIFY_07_LIBS = @LIBNOTIFY_07_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
Index: src/Makefile.in
===================================================================
--- src/Makefile.in (wersja 1788)
+++ src/Makefile.in (wersja 1789)
@@ -200,6 +200,8 @@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
+LIBNOTIFY_07_CFLAGS = @LIBNOTIFY_07_CFLAGS@
+LIBNOTIFY_07_LIBS = @LIBNOTIFY_07_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
Index: src/libgmtk/Makefile.in
===================================================================
--- src/libgmtk/Makefile.in (wersja 1788)
+++ src/libgmtk/Makefile.in (wersja 1789)
@@ -138,6 +138,8 @@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
+LIBNOTIFY_07_CFLAGS = @LIBNOTIFY_07_CFLAGS@
+LIBNOTIFY_07_LIBS = @LIBNOTIFY_07_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
Index: src/gui.c
===================================================================
--- src/gui.c (wersja 1788)
+++ src/gui.c (wersja 1789)
@@ -472,13 +472,21 @@
#ifdef NOTIFY_ENABLED
if (show_notification && control_id == 0 &&
!gtk_window_is_active((GtkWindow *) window)) {
notify_init("gnome-mplayer");
+#ifdef NOTIFY0_7_ENABLED
notification =
notify_notification_new(idle->display_name,
idle->media_notification,
+ "gnome-mplayer");
+#else
+ notification =
+ notify_notification_new(idle->display_name,
idle->media_notification,
"gnome-mplayer", NULL);
+#endif
#ifdef GTK2_12_ENABLED
+#if !NOTIFY0_7_ENABLED
if (show_status_icon)
notify_notification_attach_to_status_icon(notification, status_icon);
#endif
+#endif
notify_notification_show(notification, NULL);
notify_uninit();
}
Index: configure.in
===================================================================
--- configure.in (wersja 1788)
+++ configure.in (wersja 1789)
@@ -101,9 +101,11 @@
[with_libnotify=check])
AS_IF([test "x$with_libnotify" != xno],
[PKG_CHECK_MODULES(NOTIFY,[libnotify],[NOTIFY_DEFINES="-DNOTIFY_ENABLED"
AC_DEFINE([NOTIFY_ENABLED],[1],[Define to 1 if you have NOTIFY
support])],AC_MSG_WARN([Compiling without libnotify support]))
- AC_SUBST(NOTIFY_DEFINES)
- AC_SUBST(NOTIFY_CFLAGS)
- AC_SUBST(NOTIFY_LIBS)
+ # Check for libnotify >= 0.7
+ PKG_CHECK_MODULES(LIBNOTIFY_07, [libnotify >= 0.7],
[AC_DEFINE([NOTIFY0_7_ENABLED],[1],[Define to 1 if you have NOTIFY
support])],[AC_MSG_NOTICE([Using older libnotify])])
+ AC_SUBST(NOTIFY_DEFINES)
+ AC_SUBST(NOTIFY_CFLAGS)
+ AC_SUBST(NOTIFY_LIBS)
])
AC_ARG_WITH([libgpod],
Index: config.h.in
===================================================================
--- config.h.in (wersja 1788)
+++ config.h.in (wersja 1789)
@@ -88,6 +88,9 @@
#undef MUSICBRAINZ_ENABLED
/* Define to 1 if you have NOTIFY support */
+#undef NOTIFY0_7_ENABLED
+
+/* Define to 1 if you have NOTIFY support */
#undef NOTIFY_ENABLED
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
Index: icons/48x48/Makefile.in
===================================================================
--- icons/48x48/Makefile.in (wersja 1788)
+++ icons/48x48/Makefile.in (wersja 1789)
@@ -143,6 +143,8 @@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
+LIBNOTIFY_07_CFLAGS = @LIBNOTIFY_07_CFLAGS@
+LIBNOTIFY_07_LIBS = @LIBNOTIFY_07_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
Index: icons/22x22/Makefile.in
===================================================================
--- icons/22x22/Makefile.in (wersja 1788)
+++ icons/22x22/Makefile.in (wersja 1789)
@@ -143,6 +143,8 @@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
+LIBNOTIFY_07_CFLAGS = @LIBNOTIFY_07_CFLAGS@
+LIBNOTIFY_07_LIBS = @LIBNOTIFY_07_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
Index: icons/32x32/Makefile.in
===================================================================
--- icons/32x32/Makefile.in (wersja 1788)
+++ icons/32x32/Makefile.in (wersja 1789)
@@ -143,6 +143,8 @@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
+LIBNOTIFY_07_CFLAGS = @LIBNOTIFY_07_CFLAGS@
+LIBNOTIFY_07_LIBS = @LIBNOTIFY_07_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
Index: icons/Makefile.in
===================================================================
--- icons/Makefile.in (wersja 1788)
+++ icons/Makefile.in (wersja 1789)
@@ -159,6 +159,8 @@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
+LIBNOTIFY_07_CFLAGS = @LIBNOTIFY_07_CFLAGS@
+LIBNOTIFY_07_LIBS = @LIBNOTIFY_07_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
Index: icons/24x24/Makefile.in
===================================================================
--- icons/24x24/Makefile.in (wersja 1788)
+++ icons/24x24/Makefile.in (wersja 1789)
@@ -143,6 +143,8 @@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
+LIBNOTIFY_07_CFLAGS = @LIBNOTIFY_07_CFLAGS@
+LIBNOTIFY_07_LIBS = @LIBNOTIFY_07_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
Index: icons/16x16/Makefile.in
===================================================================
--- icons/16x16/Makefile.in (wersja 1788)
+++ icons/16x16/Makefile.in (wersja 1789)
@@ -143,6 +143,8 @@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
+LIBNOTIFY_07_CFLAGS = @LIBNOTIFY_07_CFLAGS@
+LIBNOTIFY_07_LIBS = @LIBNOTIFY_07_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
Index: icons/scalable/Makefile.in
===================================================================
--- icons/scalable/Makefile.in (wersja 1788)
+++ icons/scalable/Makefile.in (wersja 1789)
@@ -143,6 +143,8 @@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
+LIBNOTIFY_07_CFLAGS = @LIBNOTIFY_07_CFLAGS@
+LIBNOTIFY_07_LIBS = @LIBNOTIFY_07_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
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/devel/gnome-mplayer.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gnome-mplayer.spec 6 Nov 2010 01:16:20 -0000 1.30
+++ gnome-mplayer.spec 20 Feb 2011 16:45:14 -0000 1.31
@@ -1,12 +1,17 @@
+%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
+Patch1: gnome-mplayer-libnotify07.patch
+Patch2: gnome-mplayer-av.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
@@ -56,6 +61,7 @@
This package provides the common files.
+%if %{with minimal}
%package minimal
Summary: An MPlayer GUI, a minimal version
Group: Applications/Multimedia
@@ -69,6 +75,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 +97,20 @@
%setup -qcT
tar -xzf %{SOURCE0}
mv %{name}-%{version} generic
+pushd generic
+%patch0 -p0 -b .vdpau
+%patch1 -p0 -b .libnotify07
+%patch2 -p2 -b .av
+popd
+%if %{with minimal}
tar -xzf %{SOURCE0}
mv %{name}-%{version} minimal
+pushd minimal
+%patch0 -p0 -b .vdpau
+%patch1 -p0 -b .libnotify07
+%patch2 -p2 -b .av
+popd
+%endif
%build
@@ -100,11 +119,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 +136,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,17 +219,25 @@
%{_mandir}/man1/gnome-mplayer.1*
+%if %{with minimal}
%files minimal
%defattr(-,root,root,-)
%{_bindir}/gnome-mplayer-minimal
+%endif
%files nautilus
%defattr(-,root,root,-)
-%{_libdir}/nautilus/extensions-2.0/libgnome-mplayer-properties-page.so*
+%{_libdir}/nautilus/extensions-?.0/libgnome-mplayer-properties-page.so*
%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
+- Added support for libnotify-0.7 from SVN
+- Fixed rawhide build failure
+
* Sat Nov 06 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.0-1
- Updated to 1.0.0
- Dropped upstreamed patch