rpms/gxine/FC-6 gxine-0.5.11-keep-wnd-state.patch, NONE, 1.1 gxine-0.5.8-lirc.patch, NONE, 1.1 gxine.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Martin Sourada (mso)
fedora-extras-commits at redhat.com
Mon Mar 26 18:12:21 UTC 2007
Author: mso
Update of /cvs/extras/rpms/gxine/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13806/FC-6
Modified Files:
.cvsignore sources
Added Files:
gxine-0.5.11-keep-wnd-state.patch gxine-0.5.8-lirc.patch
gxine.spec
Log Message:
auto-import gxine-0.5.11-3 on branch FC-6 from gxine-0.5.11-3.src.rpm
gxine-0.5.11-keep-wnd-state.patch:
--- NEW FILE gxine-0.5.11-keep-wnd-state.patch ---
--- 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:
--- NEW FILE gxine-0.5.8-lirc.patch ---
--- 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; }
--- NEW FILE gxine.spec ---
Name: gxine
Version: 0.5.11
Release: 3%{?dist}
Summary: GTK frontend for the xine multimedia library
Group: Applications/Multimedia
License: GPL
URL: http://xinehq.de/
Source0: http://superb-west.dl.sourceforge.net/sourceforge/xine/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: gxine-0.5.8-lirc.patch
Patch1: gxine-0.5.11-keep-wnd-state.patch
BuildRequires: gtk2-devel
BuildRequires: xine-lib-devel
BuildRequires: gettext
BuildRequires: js-devel
# Optional dependencies
BuildRequires: libXtst-devel
BuildRequires: libXext-devel
BuildRequires: lirc-devel
BuildRequires: libXinerama-devel
BuildRequires: dbus-glib-devel
BuildRequires: gnome-screensaver
BuildRequires: dbus-devel
# For Mozilla plugin
BuildRequires: libXaw-devel
BuildRequires: nspr-devel
%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
what formats are supported, please refer to the libxine documentation.
gxine is a gtk based gui for this xine-library alternate to xine-ui.
%package mozplugin
Summary: Mozilla plugin for gxine
Group: Applications/Internet
Requires: %{name} = %{version}-%{release}
Requires: %{_libdir}/mozilla/plugins
%description mozplugin
This plugin allows gxine to be embedded in a web browser.
%prep
%setup -q
%patch0 -p1 -b .lirc
%patch1 -p1 -b .keep-wnd-state
%build
%configure --with-dbus --with-logo-format=image
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
#%{__install} -Dp -m0755 %{SOURCE1} %{buildroot}%{_datadir}/gxine/
#%{__rm} -rf %{buildroot}%{_datadir}/gxine/logo.mpv
# Remove .las
%{__rm} %{buildroot}%{_libdir}/gxine/*.la
# 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
# %find_lang %{name} --all-name
/usr/lib/rpm/find-lang.sh %{buildroot} %{name} --all-name
desktop-file-install --vendor="fedora" --delete-original \
--dir %{buildroot}%{_datadir}/applications \
--mode 0644 \
%{buildroot}%{_datadir}/applications/%{name}.desktop
%clean
rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%postun
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%dir %{_sysconfdir}/gxine/
%config(noreplace) %{_sysconfdir}/gxine/gtkrc
%config(noreplace) %{_sysconfdir}/gxine/keypad.xml
%config(noreplace) %{_sysconfdir}/gxine/startup
%config(noreplace) %{_sysconfdir}/gxine/toolbar*.xml
%{_bindir}/gxine*
%{_mandir}/man1/gxine*.1*
%lang(de) %{_mandir}/de/man1/gxine*.1*
%{_datadir}/gxine/
%{_datadir}/pixmaps/gxine.png
%{_datadir}/icons/*/*/apps/gxine.png
%{_datadir}/applications/fedora-gxine.desktop
%files mozplugin
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/mozilla/plugins/gxineplugin.so
%changelog
* Sun Mar 25 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.5.11-3
- fix rpmlint warning
* Wed Mar 14 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.5.11-2
- add patch to keep track of window state (backport from 0.6.0 branch)
* Thu Feb 01 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.5.11-1
- Bump to new (bugfix) release
- Removed stream end crash patch - fixed in upstream
* Wed Jan 24 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.5.10-5
- Stream end crash when modal dialog opened patch: see upstream bz #1643093
* Thu Jan 18 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.5.10-4
- replace R: firefox with R: %%{_libdir}/mozilla/plugins
* Wed Jan 17 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.5.10-3
- fix BR: gettext instead of gettext-devel
- add R: firefox to mozplugin subpackage
* Thu Jan 11 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.5.10-2
- fix url
- fix require in mozplugin subpackage
- install desktop file correctly
* Thu Jan 11 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.5.10-1
- Update to upstream release 0.5.10
- Remove screensaver patch (it was approved by upstream)
* Thu Dec 28 2006 Martin Sourada <martin.sourada at seznam.cz> - 0.5.9-2
- Rebuild
* Sun Dec 17 2006 Martin Sourada <martin.sourada at seznam.cz> - 0.5.9-1.1
- Add BR dbus-devel
* Sat Dec 16 2006 Michel Salim <michel.salim at gmail.com> - 0.5.9-1
- Update to upstream release 0.5.9
- Drop logo.ogg, gxine now includes a JPEG logo
* Sat Dec 16 2006 Michel Salim <michel.salim at gmail.com> - 0.5.8-4
- Fix gnome-screensaver DBUS call
- Separate mozplugin subpackage (from Martin Sourada)
- Add missing BuildRequires
* Tue Nov 7 2006 Mola Pahnadayan <mola at c100c.com> - 0.5.8-3
- Add libXinerama-devel , lirc-devel >= 0.8.1 in build requires
- Fix find_lang
ambiguous
* Tue Oct 31 2006 Mola Pahnadayan <mola at c100c.com> - 0.5.8-2
- rm non-free logo
- add patch to install free-logo
- uses %%find_lang
* Tue Oct 31 2006 Mola Pahnadayan <mola at c100c.com> - 0.5.8-1
- Updated to 0.5.8
* Tue Sep 19 2006 Mola Pahnadayan <mola at c100c.com> - 0.5.7-1
- write new spec file
- Updated to release 0.5.7
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gxine/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 25 Mar 2007 20:00:11 -0000 1.1
+++ .cvsignore 26 Mar 2007 18:11:48 -0000 1.2
@@ -0,0 +1 @@
+gxine-0.5.11.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gxine/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 25 Mar 2007 20:00:11 -0000 1.1
+++ sources 26 Mar 2007 18:11:48 -0000 1.2
@@ -0,0 +1 @@
+b210d1f6e3eab3ff496c1db9e09dbcd0 gxine-0.5.11.tar.bz2
More information about the scm-commits
mailing list