rpms/minitube/F-13 .cvsignore, 1.4, 1.5 minitube.spec, 1.4, 1.5 sources, 1.4, 1.5
by Magnus Tuominen
Author: magnu5
Update of /cvs/free/rpms/minitube/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25634
Modified Files:
.cvsignore minitube.spec sources
Log Message:
* Fri Feb 11 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4-1
- version bump
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/minitube/F-13/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 14 Dec 2010 15:35:34 -0000 1.4
+++ .cvsignore 21 Feb 2011 13:02:28 -0000 1.5
@@ -1 +1 @@
-minitube-1.3.tar.gz
+minitube-1.4.tar.gz
Index: minitube.spec
===================================================================
RCS file: /cvs/free/rpms/minitube/F-13/minitube.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- minitube.spec 14 Dec 2010 15:35:34 -0000 1.4
+++ minitube.spec 21 Feb 2011 13:02:28 -0000 1.5
@@ -1,5 +1,5 @@
Name: minitube
-Version: 1.3
+Version: 1.4
Release: 1%{?dist}
Summary: A YouTube desktop client
@@ -118,6 +118,7 @@
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/512x512/apps/%{name}.png
+%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
@@ -129,6 +130,9 @@
%dir %{_datadir}/%{name}/locale
%changelog
+* Fri Feb 11 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4-1
+- version bump
+
* Mon Dec 13 2010 Magnus Tuominen <magnus.tuominen(a)gmai.com> - 1.3-1
- version 1.3
- rename macedonian language code to mk_MK.ts
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minitube/F-13/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 14 Dec 2010 15:35:34 -0000 1.4
+++ sources 21 Feb 2011 13:02:28 -0000 1.5
@@ -1 +1 @@
-961de6f4a1bb88dce48eaa0a864954c6 minitube-1.3.tar.gz
+3091dd589722680941bfc64ce0778354 minitube-1.4.tar.gz
13 years, 2 months
rpms/minitube/F-14 .cvsignore, 1.4, 1.5 minitube.spec, 1.5, 1.6 sources, 1.4, 1.5
by Magnus Tuominen
Author: magnu5
Update of /cvs/free/rpms/minitube/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25129
Modified Files:
.cvsignore minitube.spec sources
Log Message:
* Fri Feb 11 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4-1
- version bump
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/minitube/F-14/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 14 Dec 2010 15:34:00 -0000 1.4
+++ .cvsignore 21 Feb 2011 12:58:56 -0000 1.5
@@ -1 +1 @@
-minitube-1.3.tar.gz
+minitube-1.4.tar.gz
Index: minitube.spec
===================================================================
RCS file: /cvs/free/rpms/minitube/F-14/minitube.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- minitube.spec 14 Dec 2010 15:34:00 -0000 1.5
+++ minitube.spec 21 Feb 2011 12:58:56 -0000 1.6
@@ -1,5 +1,5 @@
Name: minitube
-Version: 1.3
+Version: 1.4
Release: 1%{?dist}
Summary: A YouTube desktop client
@@ -118,6 +118,7 @@
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/512x512/apps/%{name}.png
+%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
@@ -129,6 +130,9 @@
%dir %{_datadir}/%{name}/locale
%changelog
+* Fri Feb 11 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4-1
+- version bump
+
* Mon Dec 13 2010 Magnus Tuominen <magnus.tuominen(a)gmai.com> - 1.3-1
- version 1.3
- rename macedonian language code to mk_MK.ts
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minitube/F-14/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 14 Dec 2010 15:34:00 -0000 1.4
+++ sources 21 Feb 2011 12:58:56 -0000 1.5
@@ -1 +1 @@
-961de6f4a1bb88dce48eaa0a864954c6 minitube-1.3.tar.gz
+3091dd589722680941bfc64ce0778354 minitube-1.4.tar.gz
13 years, 2 months
rpms/minitube/devel .cvsignore, 1.4, 1.5 minitube.spec, 1.5, 1.6 sources, 1.4, 1.5
by Magnus Tuominen
Author: magnu5
Update of /cvs/free/rpms/minitube/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24075
Modified Files:
.cvsignore minitube.spec sources
Log Message:
* Fri Feb 11 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4-1
- version bump
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/minitube/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 14 Dec 2010 15:32:33 -0000 1.4
+++ .cvsignore 21 Feb 2011 12:44:05 -0000 1.5
@@ -1 +1 @@
-minitube-1.3.tar.gz
+minitube-1.4.tar.gz
Index: minitube.spec
===================================================================
RCS file: /cvs/free/rpms/minitube/devel/minitube.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- minitube.spec 14 Dec 2010 15:32:33 -0000 1.5
+++ minitube.spec 21 Feb 2011 12:44:05 -0000 1.6
@@ -1,5 +1,5 @@
Name: minitube
-Version: 1.3
+Version: 1.4
Release: 1%{?dist}
Summary: A YouTube desktop client
@@ -118,6 +118,7 @@
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/512x512/apps/%{name}.png
+%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
@@ -129,6 +130,9 @@
%dir %{_datadir}/%{name}/locale
%changelog
+* Fri Feb 11 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4-1
+- version bump
+
* Mon Dec 13 2010 Magnus Tuominen <magnus.tuominen(a)gmai.com> - 1.3-1
- version 1.3
- rename macedonian language code to mk_MK.ts
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minitube/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 14 Dec 2010 15:32:33 -0000 1.4
+++ sources 21 Feb 2011 12:44:05 -0000 1.5
@@ -1 +1 @@
-961de6f4a1bb88dce48eaa0a864954c6 minitube-1.3.tar.gz
+3091dd589722680941bfc64ce0778354 minitube-1.4.tar.gz
13 years, 2 months
rpms/desmume/F-13 .cvsignore, 1.8, 1.9 desmume.spec, 1.13, 1.14 sources, 1.8, 1.9
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/desmume/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26858
Modified Files:
.cvsignore desmume.spec sources
Log Message:
* Sun Feb 06 2011 Andrea Musuruane <musuruan(a)gmail.com> 0.9.7-1
- Updated to upstream version 0.9.7
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/desmume/F-13/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 6 Jun 2010 13:46:42 -0000 1.8
+++ .cvsignore 20 Feb 2011 18:35:09 -0000 1.9
@@ -1 +1 @@
-desmume-0.9.6-1.tar.gz
+desmume-0.9.7.tar.gz
Index: desmume.spec
===================================================================
RCS file: /cvs/free/rpms/desmume/F-13/desmume.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- desmume.spec 6 Jun 2010 13:46:42 -0000 1.13
+++ desmume.spec 20 Feb 2011 18:35:09 -0000 1.14
@@ -1,12 +1,12 @@
Name: desmume
-Version: 0.9.6
+Version: 0.9.7
Release: 1%{?dist}
Summary: A Nintendo DS emulator
Group: Applications/Emulators
License: GPLv2+
URL: http://desmume.org/
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-1.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0: %{name}-0.9-dontlookinbuilddir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -174,6 +174,9 @@
%changelog
+* Sun Feb 06 2011 Andrea Musuruane <musuruan(a)gmail.com> 0.9.7-1
+- Updated to upstream version 0.9.7
+
* Sun Jun 06 2010 Andrea Musuruane <musuruan(a)gmail.com> 0.9.6-1
- Updated to upstream version 0.9.6-1
- Fixed Source0 URL
Index: sources
===================================================================
RCS file: /cvs/free/rpms/desmume/F-13/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 6 Jun 2010 13:46:42 -0000 1.8
+++ sources 20 Feb 2011 18:35:09 -0000 1.9
@@ -1 +1 @@
-a4f8e98d586a2363d78e9d26dc330fe4 desmume-0.9.6-1.tar.gz
+c33440e6a02c44248871ec2eec6a3760 desmume-0.9.7.tar.gz
13 years, 2 months
rpms/desmume/F-14 .cvsignore, 1.8, 1.9 desmume.spec, 1.13, 1.14 sources, 1.8, 1.9
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/desmume/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26652
Modified Files:
.cvsignore desmume.spec sources
Log Message:
* Sun Feb 06 2011 Andrea Musuruane <musuruan(a)gmail.com> 0.9.7-1
- Updated to upstream version 0.9.7
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/desmume/F-14/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 6 Jun 2010 13:45:49 -0000 1.8
+++ .cvsignore 20 Feb 2011 18:34:44 -0000 1.9
@@ -1 +1 @@
-desmume-0.9.6-1.tar.gz
+desmume-0.9.7.tar.gz
Index: desmume.spec
===================================================================
RCS file: /cvs/free/rpms/desmume/F-14/desmume.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- desmume.spec 6 Jun 2010 13:45:49 -0000 1.13
+++ desmume.spec 20 Feb 2011 18:34:44 -0000 1.14
@@ -1,12 +1,12 @@
Name: desmume
-Version: 0.9.6
+Version: 0.9.7
Release: 1%{?dist}
Summary: A Nintendo DS emulator
Group: Applications/Emulators
License: GPLv2+
URL: http://desmume.org/
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-1.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0: %{name}-0.9-dontlookinbuilddir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -174,6 +174,9 @@
%changelog
+* Sun Feb 06 2011 Andrea Musuruane <musuruan(a)gmail.com> 0.9.7-1
+- Updated to upstream version 0.9.7
+
* Sun Jun 06 2010 Andrea Musuruane <musuruan(a)gmail.com> 0.9.6-1
- Updated to upstream version 0.9.6-1
- Fixed Source0 URL
Index: sources
===================================================================
RCS file: /cvs/free/rpms/desmume/F-14/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 6 Jun 2010 13:45:49 -0000 1.8
+++ sources 20 Feb 2011 18:34:44 -0000 1.9
@@ -1 +1 @@
-a4f8e98d586a2363d78e9d26dc330fe4 desmume-0.9.6-1.tar.gz
+c33440e6a02c44248871ec2eec6a3760 desmume-0.9.7.tar.gz
13 years, 2 months
rpms/desmume/devel .cvsignore, 1.8, 1.9 desmume.spec, 1.13, 1.14 sources, 1.8, 1.9
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/desmume/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26543
Modified Files:
.cvsignore desmume.spec sources
Log Message:
* Sun Feb 06 2011 Andrea Musuruane <musuruan(a)gmail.com> 0.9.7-1
- Updated to upstream version 0.9.7
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/desmume/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 6 Jun 2010 13:45:49 -0000 1.8
+++ .cvsignore 20 Feb 2011 18:34:17 -0000 1.9
@@ -1 +1 @@
-desmume-0.9.6-1.tar.gz
+desmume-0.9.7.tar.gz
Index: desmume.spec
===================================================================
RCS file: /cvs/free/rpms/desmume/devel/desmume.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- desmume.spec 6 Jun 2010 13:45:49 -0000 1.13
+++ desmume.spec 20 Feb 2011 18:34:17 -0000 1.14
@@ -1,12 +1,12 @@
Name: desmume
-Version: 0.9.6
+Version: 0.9.7
Release: 1%{?dist}
Summary: A Nintendo DS emulator
Group: Applications/Emulators
License: GPLv2+
URL: http://desmume.org/
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-1.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0: %{name}-0.9-dontlookinbuilddir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -174,6 +174,9 @@
%changelog
+* Sun Feb 06 2011 Andrea Musuruane <musuruan(a)gmail.com> 0.9.7-1
+- Updated to upstream version 0.9.7
+
* Sun Jun 06 2010 Andrea Musuruane <musuruan(a)gmail.com> 0.9.6-1
- Updated to upstream version 0.9.6-1
- Fixed Source0 URL
Index: sources
===================================================================
RCS file: /cvs/free/rpms/desmume/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 6 Jun 2010 13:45:49 -0000 1.8
+++ sources 20 Feb 2011 18:34:17 -0000 1.9
@@ -1 +1 @@
-a4f8e98d586a2363d78e9d26dc330fe4 desmume-0.9.6-1.tar.gz
+c33440e6a02c44248871ec2eec6a3760 desmume-0.9.7.tar.gz
13 years, 2 months
rpms/gnome-mplayer/devel gnome-mplayer-av.patch, NONE, 1.1 gnome-mplayer-libnotify07.patch, NONE, 1.1 gnome-mplayer-vdpau.patch, NONE, 1.1 gnome-mplayer.spec, 1.30, 1.31
by Julian Sikorski
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
13 years, 2 months
rpms/gnome-mplayer/F-13 gnome-mplayer-vdpau.patch, NONE, 1.1 gnome-mplayer.spec, 1.31, 1.32
by Julian Sikorski
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
13 years, 2 months
rpms/gnome-mplayer/F-14 gnome-mplayer-vdpau.patch, NONE, 1.1 gnome-mplayer.spec, 1.30, 1.31
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18743
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-14/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:29 -0000 1.30
+++ gnome-mplayer.spec 20 Feb 2011 16:37:05 -0000 1.31
@@ -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
13 years, 2 months
rpms/freetype-freeworld/devel freetype-2.4.4-auto-autohint.patch, NONE, 1.1 freetype-freeworld.spec, 1.13, 1.14 freetype-2.1.10-enable-ft2-bci.patch, 1.1, NONE
by Kevin Kofler
Author: kkofler
Update of /cvs/free/rpms/freetype-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv604/devel
Modified Files:
freetype-freeworld.spec
Added Files:
freetype-2.4.4-auto-autohint.patch
Removed Files:
freetype-2.1.10-enable-ft2-bci.patch
Log Message:
* Sun Feb 20 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.4.4-2
- Update the description to reflect that the bytecode interpreter was reenabled
in the stock Fedora freetype, hopefully this time for good (see rh#612395).
- Drop conditionals (again), always build the bytecode interpreter (now also in
Fedora) and subpixel rendering (as that's the only reason to build
freetype-freeworld at all)
- Fall back to autohinting if a TTF/OTF doesn't contain any bytecode (rh#547532,
patch backported from upstream git, also in Fedora freetype)
freetype-2.4.4-auto-autohint.patch:
ftobjs.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
--- NEW FILE freetype-2.4.4-auto-autohint.patch ---
>From ff8095077ce454246edb93c5bc672edb2b2c8f25 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <kevin.kofler(a)chello.at>
Date: Sat, 19 Feb 2011 23:09:26 +0100
Subject: [PATCH] Fall back to autohinting if a TTF/OTF doesn't contain any bytecode.
This is Savannah patch #7471.
* src/base/ftobjs.c (FT_Load_Glyph): Implement it.
---
src/base/ftobjs.c | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 6b01f43..708055f 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -4,8 +4,7 @@
/* */
/* The FreeType private base classes (body). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, */
-/* 2010 by */
+/* Copyright 1996-2011 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -561,6 +560,7 @@
FT_Library library;
FT_Bool autohint = FALSE;
FT_Module hinter;
+ TT_Face ttface = (TT_Face)face;
if ( !face || !face->size || !face->glyph )
@@ -601,7 +601,8 @@
* - Then, auto-hint if FT_LOAD_FORCE_AUTOHINT is set or if we don't
* have a native font hinter.
*
- * - Otherwise, auto-hint for LIGHT hinting mode.
+ * - Otherwise, auto-hint for LIGHT hinting mode or if there isn't
+ * any hinting bytecode in the TrueType/OpenType font.
*
* - Exception: The font is `tricky' and requires the native hinter to
* load properly.
@@ -626,8 +627,10 @@
FT_Render_Mode mode = FT_LOAD_TARGET_MODE( load_flags );
- if ( mode == FT_RENDER_MODE_LIGHT ||
- face->internal->ignore_unpatented_hinter )
+ if ( mode == FT_RENDER_MODE_LIGHT ||
+ face->internal->ignore_unpatented_hinter ||
+ ( FT_IS_SFNT( face ) &&
+ ttface->max_profile.maxSizeOfInstructions == 0 ) )
autohint = TRUE;
}
}
@@ -1869,7 +1872,7 @@
" is already checked and"
" no font is found\n", i ));
continue;
- }
+ }
if ( errors[i] )
{
@@ -4151,7 +4154,7 @@
FT_Renderer renderer = FT_RENDERER( module );
- if ( renderer->clazz->glyph_format == FT_GLYPH_FORMAT_OUTLINE &&
+ if ( renderer->clazz->glyph_format == FT_GLYPH_FORMAT_OUTLINE &&
renderer->raster )
renderer->clazz->raster_class->raster_done( renderer->raster );
}
--
1.7.4
Index: freetype-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/freetype-freeworld/devel/freetype-freeworld.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- freetype-freeworld.spec 2 Dec 2010 17:20:09 -0000 1.13
+++ freetype-freeworld.spec 20 Feb 2011 14:35:30 -0000 1.14
@@ -1,18 +1,12 @@
-# Enable patented bytecode interpreter and patented subpixel rendering.
-# Setting to 1 disables them.
-%define without_bytecode_interpreter 0
-%define without_subpixel_rendering 0
-
Summary: A free and portable font rendering engine
Name: freetype-freeworld
Version: 2.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
License: FTL or GPLv2+
Group: System Environment/Libraries
URL: http://www.freetype.org
Source: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.ta...
-Patch20: freetype-2.1.10-enable-ft2-bci.patch
Patch21: freetype-2.3.0-enable-spr.patch
# Enable otvalid and gxvalid modules
@@ -21,14 +15,17 @@
# Security patch
Patch89: freetype-2.4.2-CVE-2010-3311.patch
+# Backport from upstream git:
+# Fall back to autohinting if a TTF/OTF doesn't contain any bytecode.
+# Submitted by Kevin Kofler based on a patch from infinality.net, edited and
+# committed by Werner Lemberg.
+# Should be in the next upstream release.
+Patch90: freetype-2.4.4-auto-autohint.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-%if !0%{?without_bytecode_interpreter}
Provides: freetype-bytecode
-%endif
-%if !0%{?without_subpixel_rendering}
Provides: freetype-subpixel
-%endif
Requires: /etc/ld.so.conf.d
BuildRequires: libX11-devel
@@ -41,26 +38,19 @@
individual glyphs. FreeType is not a font server or a complete
text-rendering library.
-This version is compiled with the patented subpixel rendering and the formerly
-patented bytecode interpreter (which is still disabled in the stock Fedora
-packages for technical reasons) enabled. It transparently overrides the system
-library using ld.so.conf.d.
+This version is compiled with the patented subpixel rendering enabled.
+It transparently overrides the system library using ld.so.conf.d.
%prep
%setup -q -n freetype-%{version}
-%if 0%{without_bytecode_interpreter}
-%patch20 -p1 -R -b .enable-ft2-bci
-%endif
-
-%if !0%{without_subpixel_rendering}
%patch21 -p1 -b .enable-spr
-%endif
%patch46 -p1 -b .enable-valid
%patch89 -p1 -b .CVE-2010-3311
+%patch90 -p1 -b .auto-autohint
%build
@@ -105,6 +95,15 @@
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%changelog
+* Sun Feb 20 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.4.4-2
+- Update the description to reflect that the bytecode interpreter was reenabled
+ in the stock Fedora freetype, hopefully this time for good (see rh#612395).
+- Drop conditionals (again), always build the bytecode interpreter (now also in
+ Fedora) and subpixel rendering (as that's the only reason to build
+ freetype-freeworld at all)
+- Fall back to autohinting if a TTF/OTF doesn't contain any bytecode (rh#547532,
+ patch backported from upstream git, also in Fedora freetype)
+
* Thu Dec 02 2010 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.4.4-1
- Update to 2.4.4 (matches Fedora freetype)
- Drop freetype-2.4.3-CVE-2010-3855.patch (fixed upstream)
--- freetype-2.1.10-enable-ft2-bci.patch DELETED ---
13 years, 2 months