rpms/gxine/EL-6 gxine-0.5.11-keep-wnd-state.patch, 1.2, 1.3 gxine-0.5.8-lirc.patch, 1.2, 1.3 .cvsignore, 1.5, 1.6 gxine.spec, 1.31, 1.32 sources, 1.5, 1.6 gxine-0.5.902-non-separate-toolbar.patch, 1.1, NONE gxine-0.5.905-desktop.patch, 1.1, NONE gxine-0.5.905-lirc.patch, 1.1, NONE
Martin Sourada
mso at fedoraproject.org
Mon Jul 19 18:32:20 UTC 2010
Author: mso
Update of /cvs/pkgs/rpms/gxine/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16557
Modified Files:
.cvsignore gxine.spec sources
Added Files:
gxine-0.5.11-keep-wnd-state.patch gxine-0.5.8-lirc.patch
Removed Files:
gxine-0.5.902-non-separate-toolbar.patch
gxine-0.5.905-desktop.patch gxine-0.5.905-lirc.patch
Log Message:
sync with epel5 instead of fedora. I still don't trust the releases included
in fedora enough to push them to epel.
gxine-0.5.11-keep-wnd-state.patch:
noskin_window.c | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
Index: gxine-0.5.11-keep-wnd-state.patch
===================================================================
RCS file: gxine-0.5.11-keep-wnd-state.patch
diff -N gxine-0.5.11-keep-wnd-state.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gxine-0.5.11-keep-wnd-state.patch 19 Jul 2010 18:32:20 -0000 1.3
@@ -0,0 +1,57 @@
+--- gxine-0.5.11/src/noskin_window.c.keep-wnd-state 2007-03-14 16:12:26.000000000 +0100
++++ gxine-0.5.11/src/noskin_window.c 2007-03-14 16:12:34.000000000 +0100
+@@ -59,8 +59,9 @@
+ static GtkTooltips *tips;
+ static int have_video = -1, have_audio = -1;
+ static struct app_prop_s {
+- gboolean sticky, fs, real_sticky;
+-} app_prop = { FALSE, FALSE, FALSE };
++ gboolean sticky, fs, real_sticky, shaded;
++ signed char position; /* <0 = bellow, >0 = above */
++} app_prop = { FALSE, FALSE, FALSE, 0 };
+
+ static GtkWidget *fs_toolbar, *wm_toolbar = NULL;
+ static Atom opacity_lock;
+@@ -459,7 +460,8 @@
+ gtk_window_unstick (window);
+
+ /* restore handling wrt window stack */
+- gtk_window_set_keep_above (window, FALSE);
++ gtk_window_set_keep_below (window, app_prop.position < 0);
++ gtk_window_set_keep_above (window, app_prop.position > 0);
+
+ /* reshow the toolbar (if needed) */
+ if (!wm_toolbar)
+@@ -530,6 +532,13 @@
+ gdk_x11_get_xatom_by_name_for_display (d, "_NET_WM_STATE_STICKY");
+ Atom fs =
+ gdk_x11_get_xatom_by_name_for_display (d, "_NET_WM_STATE_FULLSCREEN");
++ Atom shaded =
++ gdk_x11_get_xatom_by_name_for_display (d, "_NET_WM_STATE_SHADED");
++ Atom above =
++ gdk_x11_get_xatom_by_name_for_display (d, "_NET_WM_STATE_ABOVE");
++ Atom below =
++ gdk_x11_get_xatom_by_name_for_display (d, "_NET_WM_STATE_BELOW");
++
+ Atom *atoms = (Atom *) prop;
+ unsigned long i;
+ for (i = 0; i < items; ++i)
+@@ -537,9 +546,18 @@
+ new_prop.real_sticky = TRUE;
+ else if (atoms[i] == fs)
+ new_prop.fs = TRUE;
++ else if (atoms[i] == shaded)
++ new_prop.shaded = TRUE;
++ else if (atoms[i] == above)
++ ++new_prop.position;
++ else if (atoms[i] == below)
++ --new_prop.position;
+
+ XFree (prop);
+
++ if (gtk_video_is_fullscreen ((GtkVideo *)gtv))
++ new_prop.position = app_prop.position; /* will be on top regardless */
++
+ if (new_prop.real_sticky)
+ {
+ /* sticky only if "sticky" property set & window on all desktops */
gxine-0.5.8-lirc.patch:
configure | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: gxine-0.5.8-lirc.patch
===================================================================
RCS file: gxine-0.5.8-lirc.patch
diff -N gxine-0.5.8-lirc.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gxine-0.5.8-lirc.patch 19 Jul 2010 18:32:20 -0000 1.3
@@ -0,0 +1,15 @@
+--- gxine-0.5.8/configure.lirc 2006-10-07 16:14:04.000000000 -0400
++++ gxine-0.5.8/configure 2006-11-14 22:23:30.000000000 -0500
+@@ -29781,10 +29781,10 @@
+ if test "$have_lirc" = "yes"; then
+
+ if test x"$LIRC_PREFIX" != "x"; then
+- lirc_libprefix="$LIRC_PREFIX/lib"
++ lirc_libprefix="$LIRC_PREFIX/${libdir}"
+ LIRC_INCLUDE="-I$LIRC_PREFIX/include"
+ fi
+- for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do
++ for llirc in $lirc_libprefix ${libdir}; do
+ as_ac_File=`echo "ac_cv_file_"$llirc/liblirc_client.so"" | $as_tr_sh`
+ { echo "$as_me:$LINENO: checking for \"$llirc/liblirc_client.so\"" >&5
+ echo $ECHO_N "checking for \"$llirc/liblirc_client.so\"... $ECHO_C" >&6; }
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gxine/EL-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 1 Jan 2010 20:57:49 -0000 1.5
+++ .cvsignore 19 Jul 2010 18:32:20 -0000 1.6
@@ -1 +1 @@
-gxine-0.5.905.tar.bz2
+gxine-0.5.11.tar.bz2
Index: gxine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gxine/EL-6/gxine.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- gxine.spec 10 Jan 2010 20:56:41 -0000 1.31
+++ gxine.spec 19 Jul 2010 18:32:20 -0000 1.32
@@ -1,20 +1,22 @@
+%define gecko_stable_ver 1.9
+%define xul_mozjs_path %{_libdir}/xulrunner-%{gecko_stable_ver}
+
Name: gxine
-Version: 0.5.905
-Release: 2%{?dist}
+Version: 0.5.11
+Release: 17%{?dist}
Summary: GTK frontend for the xine multimedia library
Group: Applications/Multimedia
License: GPLv2+
URL: http://xinehq.de/
-Source0: http://downloads.sourceforge.net/xine/%{name}-%{version}.tar.bz2
+Source0: http://superb-west.dl.sourceforge.net/sourceforge/xine/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1: gxine-0.5.902-non-separate-toolbar.patch
-Patch2: gxine-0.5.905-desktop.patch
-# some multilib issues
-Patch3: gxine-0.5.905-lirc.patch
+Patch0: gxine-0.5.8-lirc.patch
+Patch1: gxine-0.5.11-keep-wnd-state.patch
+
-BuildRequires: gecko-devel
+BuildRequires: gecko-devel >= %{gecko_stable_ver}
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: gtk2-devel
@@ -22,16 +24,19 @@ Buildrequires: xine-lib-devel
# for dbus support
BuildRequires: dbus-glib-devel
-# for hal support
-BuildRequires: hal-devel
-# for LIRC support (not available only for fedora)
+BuildRequires: dbus-devel
+# for LIRC support (available only for fedora)
+%if 0%{?fedora}
BuildRequires: lirc-devel
+%endif
# for XTest support
BuildRequires: libXtst-devel
# for mozplugin
BuildRequires: libXaw-devel
BuildRequires: nspr-devel
+Requires: gecko-libs >= %{gecko_stable_ver}
+
%description
gxine is a fully-featured free audio/video player for unix-like systems which
uses libxine for audio/video decoding and playback. For more informations on
@@ -42,7 +47,9 @@ gxine is a gtk based gui for this xine-l
Summary: Mozilla plugin for gxine
Group: Applications/Internet
Requires: %{name} = %{version}-%{release}
-Requires: mozilla-filesystem
+%if 0%{?use_xulrunner_js}
+Requires: xulrunner
+%endif
%description mozplugin
This plugin allows gxine to be embedded in a web browser.
@@ -50,18 +57,15 @@ This plugin allows gxine to be embedded
%prep
%setup -q
-%patch1 -p1 -b .non-separate-toolbar
-%patch2 -p1 -b .desktop
-%patch3 -p1 -b .lirc
+%patch0 -p1 -b .lirc
+%patch1 -p1 -b .keep-wnd-state
-%{__sed} -i 's/Name=gxine/Name=GXine Video Player/' gxine.desktop.in
-%{__sed} -i 's/Exec=gxine/Exec=gxine %U/' gxine.desktop.in
+%{__sed} -i 's/Name=gxine/Name=GXine Video Player/' gxine.desktop
+%{__sed} -i 's/Exec=gxine/Exec=gxine %U/' gxine.desktop
%build
-%configure --with-dbus --with-hal --with-logo-format=image \
- --with-browser-plugin --disable-integration-wizard \
- --enable-watchdog --disable-own-playlist-parsers \
- --disable-deprecated
+%configure --with-dbus --with-logo-format=image --with-browser-plugin --disable-integration-wizard
+%{__sed} -i 's at LDFLAGS = -Wl,--as-needed at LDFLAGS = -Wl,--as-needed,--rpath=%{xul_mozjs_path}@' src/Makefile
make %{?_smp_mflags}
@@ -76,8 +80,12 @@ make install DESTDIR=$RPM_BUILD_ROOT
# Move Mozilla plugin
mkdir -p %{buildroot}%{_libdir}/mozilla/plugins/
mv %{buildroot}%{_libdir}/gxine/gxineplugin.so %{buildroot}%{_libdir}/mozilla/plugins/
-
+# Not supported yet - check bz #213041
+%if 0%{?fedora} >= 8
%find_lang %{name} --all-name
+%else
+/usr/lib/rpm/find-lang.sh %{buildroot} %{name} --all-name
+%endif
desktop-file-install --vendor="fedora" --delete-original \
--dir %{buildroot}%{_datadir}/applications \
@@ -107,7 +115,6 @@ touch --no-create %{_datadir}/icons/hico
%{_bindir}/gxine*
%{_mandir}/man1/gxine*.1*
%lang(de) %{_mandir}/de/man1/gxine*.1*
-%lang(es) %{_mandir}/es/man1/gxine*.1*
%{_datadir}/gxine/
%{_datadir}/pixmaps/gxine.png
%{_datadir}/icons/*/*/apps/gxine.png
@@ -119,45 +126,14 @@ touch --no-create %{_datadir}/icons/hico
%{_libdir}/mozilla/plugins/gxineplugin.so
%changelog
-* Sun Jan 10 2010 Martin Sourada <mso at fedoraproject.org> - 0.5.905-2
-- Fix source URL
-
-* Fri Jan 01 2010 Martin Sourada <mso at fedoraproject.org> - 0.5.905-1
-- 0.5.905
-- Should fix sigsegv on exit
-- Reenable lirc support (detection fixed upstream)
-
-* Sun Oct 25 2009 Martin Sourada <mso at fedoraproject.org> - 0.5.904-1
-- 0.5.904
-- Disable lirc support (./configure does not find fedora's lirc)
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.903-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.903-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sat Jul 19 2008 Martin Sourada <martin.sourada at gmail.com> - 0.5.903-2
-- rebuild for new xulrunner
-- drop dist checks to keep the spec cleaner
-- drop versioned dependency on gecko-libs
-
-* Sun Jun 15 2008 Martin Sourada <martin.sourada at gmail.com> - 0.5.903-1
-- new upstream version
-
-* Tue Apr 22 2008 Martin Sourada <martin.sourada at gmail.com> - 0.5.902-1
-- new upstream version
-- drop xine-lib version patch - fixed in upstream
-- drop keep track of window state patch - fixed in upstream
-- add BR: hal
-- customize configure options
-- do not use spearate toolbar by default
-
-* Sat Feb 09 2008 Martin Sourada <martin.sourada at gmail.com> - 0.5.11-17
-- add patch to support x.y.z.w version strings in xine-lib
+* Tue Sep 09 2008 Martin Sourada <mso at fedoraproject.org> - 0.5.11-17
+- use correct xulrunner (build)require
+- rebuild (-16 release blocks xulrunner update)
+- add dbus-devel BR (broken dbus-glib-devel deps)
+- add --rpath to LDFLAGS, so that it finds libmozjs.so correctly
-* Fri Feb 08 2008 Martin Sourada <martin.sourada at gmail.com> - 0.5.11-16
-- rebuild for gcc 4.3
+* Thu Jul 17 2008 Martin Sourada <martin.sourada at gmail.com> - 0.5.11-16
+- rebuild for xulrunner in EPEL 5
* Fri Dec 21 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.5.11-15
- rebuild for new xulrunner
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gxine/EL-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 1 Jan 2010 20:57:50 -0000 1.5
+++ sources 19 Jul 2010 18:32:20 -0000 1.6
@@ -1 +1 @@
-3c9092f1c5c8dc85e95ca327cdcc77af gxine-0.5.905.tar.bz2
+b210d1f6e3eab3ff496c1db9e09dbcd0 gxine-0.5.11.tar.bz2
--- gxine-0.5.902-non-separate-toolbar.patch DELETED ---
--- gxine-0.5.905-desktop.patch DELETED ---
--- gxine-0.5.905-lirc.patch DELETED ---
More information about the scm-commits
mailing list