9:03 p.m.
Author: xavierb
Update of /cvs/free/rpms/gxine/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17378/devel
Modified Files:
.cvsignore sources
Added Files:
gxine-0.5.902-non-separate-toolbar.patch
gxine-0.5.907-glib.patch gxine-0.5.907-linkage.patch
gxine-0.5.907-lirc.patch gxine.spec
Log Message:
Import package from Fedora.
gxine-0.5.902-non-separate-toolbar.patch:
ui.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE gxine-0.5.902-non-separate-toolbar.patch ---
diff -up gxine-0.5.902/src/ui.c.non-separate-toolbar gxine-0.5.902/src/ui.c
--- gxine-0.5.902/src/ui.c.non-separate-toolbar 2008-02-25 18:14:46.000000000 +0100
+++ gxine-0.5.902/src/ui.c 2008-04-22 22:57:14.000000000 +0200
@@ -838,10 +838,10 @@ void ui_preferences_register (xine_t *th
NULL, 0, NULL, NULL);
xine_config_register_bool
- (this, "gui.windowed_mode.separate_toolbar", CONFIG_VERSION_ATLEAST (0, 6,
0),
+ (this, "gui.windowed_mode.separate_toolbar", 0,
_("In windowed mode, whether the toolbar is in a separate window"), NULL,
0, NULL, NULL);
- config_update_default ("gui.windowed_mode.separate_toolbar", 1);
+ config_update_default ("gui.windowed_mode.separate_toolbar", 0);
xine_config_register_bool
(this, "gui.windowed_mode.unblank", CONFIG_VERSION_ATLEAST (0, 6, 0),
gxine-0.5.907-glib.patch:
console_output.h | 2 +-
engine.c | 2 +-
main.c | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
--- NEW FILE gxine-0.5.907-glib.patch ---
diff -up gxine-0.5.907/src/console_output.h.glib gxine-0.5.907/src/console_output.h
--- gxine-0.5.907/src/console_output.h.glib 2010-04-11 16:46:54.000000000 +0200
+++ gxine-0.5.907/src/console_output.h 2013-01-23 13:46:22.864922759 +0100
@@ -21,7 +21,7 @@
#ifndef GXINE_CONSOLE_OUTPUT_H
#define GXINE_CONSOLE_OUTPUT_H
-#include <glib/gmessages.h>
+#include <glib.h>
void console_output_init (void);
diff -up gxine-0.5.907/src/engine.c.glib gxine-0.5.907/src/engine.c
--- gxine-0.5.907/src/engine.c.glib 2011-10-12 00:47:52.000000000 +0200
+++ gxine-0.5.907/src/engine.c 2013-01-23 13:46:53.274542587 +0100
@@ -30,7 +30,7 @@
#include <errno.h>
#include <unistd.h>
-#include <glib/gthread.h>
+#include <glib.h>
#include "engine.h"
#include "ui.h"
diff -up gxine-0.5.907/src/main.c.glib gxine-0.5.907/src/main.c
--- gxine-0.5.907/src/main.c.glib 2010-12-05 12:38:44.000000000 +0100
+++ gxine-0.5.907/src/main.c 2013-01-23 13:48:24.172406207 +0100
@@ -46,7 +46,6 @@
#include <gdk/gdk.h>
#include <gdk/gdkkeysyms.h>
#include <glib.h>
-#include <glib/gmessages.h>
#include "desktop_integration.h"
#include "engine.h"
gxine-0.5.907-linkage.patch:
configure.ac | 6 ++++++
1 file changed, 6 insertions(+)
--- NEW FILE gxine-0.5.907-linkage.patch ---
diff -up gxine-0.5.907/configure.ac.linkage gxine-0.5.907/configure.ac
--- gxine-0.5.907/configure.ac.linkage 2012-02-21 21:14:07.000000000 +0100
+++ gxine-0.5.907/configure.ac 2013-01-23 13:32:37.122245963 +0100
@@ -75,6 +75,12 @@ dnl ------------------------------------
AM_GNU_GETTEXT([external])
dnl ---------------------------------------------
+dnl libm, libdl
+dnl ---------------------------------------------
+AC_CHECK_LIB(m, round, [], [], [-lm])
+AC_CHECK_LIB(dl, dlsym, [], [], [-ldl])
+
+dnl ---------------------------------------------
dnl Checks for X11 and Xcb
dnl ---------------------------------------------
gxine-0.5.907-lirc.patch:
lirc.m4 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE gxine-0.5.907-lirc.patch ---
diff -up gxine-0.5.907/m4/lirc.m4.lirc gxine-0.5.907/m4/lirc.m4
--- gxine-0.5.907/m4/lirc.m4.lirc 2010-12-05 12:38:44.000000000 +0100
+++ gxine-0.5.907/m4/lirc.m4 2013-01-23 13:41:06.534877429 +0100
@@ -20,10 +20,10 @@ AC_DEFUN([AC_CHECK_LIRC],
if test "$found_lirc" = no -a x"$cross_compiling" != xyes; 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} /lib /usr/lib /usr/local/lib; do
AC_CHECK_FILE(["$llirc/liblirc_client.so"],
[LIRC_LIBS="$llirc/liblirc_client.so"]
AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client)
installed]),
--- NEW FILE gxine.spec ---
Name: gxine
Version: 0.5.907
Release: 10%{?dist}
Summary: GTK frontend for the xine multimedia library
License: GPLv2+
URL: http://www.xine-project.org/home
Source0: http://downloads.sourceforge.net/xine/%{name}-%{version}.tar.xz
Patch1: gxine-0.5.902-non-separate-toolbar.patch
# some multilib issues
Patch3: gxine-0.5.907-lirc.patch
# fix linkage (hg 2275)
Patch4: gxine-0.5.907-linkage.patch
# including individual glib headers no longer supported (hg 2276)
Patch5: gxine-0.5.907-glib.patch
BuildRequires: js-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: gtk2-devel
Buildrequires: xine-lib-devel
# for dbus support
BuildRequires: dbus-glib-devel
# for gudev support (device detection)
BuildRequires: libgudev1-devel
# for LIRC support
BuildRequires: lirc-devel
# for XTest support
BuildRequires: libXtst-devel
# for mozplugin
BuildRequires: libXaw-devel
BuildRequires: nspr-devel
# for linkage patch
BuildRequires: libtool
%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: mozilla-filesystem
%description mozplugin
This plugin allows gxine to be embedded in a web browser.
%prep
%setup -q
%patch1 -p1 -b .non-separate-toolbar
%patch3 -p1 -b .lirc
%patch4 -p1 -b .linkage
%patch5 -p1 -b .glib
%{__sed} -i 's/Name=gxine/Name=GXine/' gxine.desktop.in
autoreconf -if
%build
%configure --with-dbus --with-logo-format=image --with-gudev \
--with-browser-plugin --disable-integration-wizard \
--enable-watchdog --disable-own-playlist-parsers \
--disable-deprecated
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
%make_install
# 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/
%find_lang %{name} --all-name
desktop-file-install --delete-original \
--dir %{buildroot}%{_datadir}/applications \
--mode 0644 \
%{buildroot}%{_datadir}/applications/%{name}.desktop
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f %{name}.lang
%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*
%lang(es) %{_mandir}/es/man1/gxine*.1*
%{_datadir}/gxine/
%{_datadir}/pixmaps/gxine.png
%{_datadir}/icons/*/*/apps/gxine.png
%{_datadir}/applications/*gxine.desktop
%files mozplugin
%doc COPYING
%{_libdir}/mozilla/plugins/gxineplugin.so
%changelog
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.5.907-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Wed Apr 24 2013 Jon Ciesla <limburgher(a)gmail.com> - 0.5.907-9
- Drop desktop vendor tag.
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.5.907-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Wed Jan 23 2013 Martin Sourada <mso(a)fedoraproject.org> - 0.5.907-7
- Switch build to mozjs185, hopefully it has more stable API
- SPEC clean-up
* Fri Aug 10 2012 Martin Sourada <mso(a)fedoraproject.org> - 0.5.907-6
- Fix build
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.5.907-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Fri Mar 02 2012 Martin Sourada <mso(a)fedoraproject.org> - 0.5.907-4
- Fix directories ownership -- on EPEL own
%%{_libdir}/mozilla/plugins, on Fedora require mozilla-filesystem
* Fri Mar 02 2012 Martin Sourada <mso(a)fedoraproject.org> - 0.5.907-3
- Fix build on EPEL, switch to gecko-devel
* Thu Feb 23 2012 Martin Sourada <mso(a)fedoraproject.org> - 0.5.907-2
- Try to fix build with newer glibc
* Wed Feb 22 2012 Martin Sourada <mso(a)fedoraproject.org> - 0.5.907-1
- Update to 0.5.907
- Drop .desktop and JS patches -- fixed upstream.
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.5.905-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Tue Apr 19 2011 Martin Stransky <stransky(a)redhat.com> - 0.5.905-6
- Added a fix for js 1.8.5
* Wed Feb 09 2011 Martin Sourada <mso(a)fedoraproject.org> - 0.5.905-5
- Use libjs instead of libmozjs -- gxine does not build against xulrunner-2
- Use gudev instead of HAL for device detection
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.5.905-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Sat Feb 13 2010 Martin Sourada <mso(a)fedoraproject.org> - 0.5.905-3
- Fix build on devel
- http://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking
* Sun Jan 10 2010 Martin Sourada <mso(a)fedoraproject.org> - 0.5.905-2
- Fix source URL
* Fri Jan 01 2010 Martin Sourada <mso(a)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(a)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(a)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(a)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(a)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(a)gmail.com> - 0.5.903-1
- new upstream version
* Tue Apr 22 2008 Martin Sourada <martin.sourada(a)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(a)gmail.com> - 0.5.11-17
- add patch to support x.y.z.w version strings in xine-lib
* Fri Feb 08 2008 Martin Sourada <martin.sourada(a)gmail.com> - 0.5.11-16
- rebuild for gcc 4.3
* Fri Dec 21 2007 Martin Sourada <martin.sourada(a)seznam.cz> - 0.5.11-15
- rebuild for new xulrunner
* Mon Dec 10 2007 Martin Sourada <martin.sourada(a)seznam.cz> - 0.5.11-14
- xulrunner not available on F-8 (use js)
- js and lirc not available on EL-5 (use firefox-js and drop lirc support)
* Mon Dec 10 2007 Martin Sourada <martin.sourada(a)seznam.cz> - 0.5.11-13
- spec cleanup
- prepare for EPEL
* Wed Nov 21 2007 Martin Sourada <martin.sourada(a)seznam.cz> - 0.5.11-12
- --rpath hack hopefully no longer needed
- build against new xulrunner
* Thu Nov 15 2007 Martin Sourada <martin.sourada(a)seznam.cz> - 0.5.11-11
- add --rpath to xulruner dir, so that libmozjs.so loads correctly
- enable xulrunner's libmozjs.so
* Wed Nov 14 2007 Martin Sourada <martin.sourada(a)seznam.cz> - 0.5.11-10
- Add desktop-file-utils BR
* Wed Nov 14 2007 Martin Sourada <martin.sourada(a)seznam.cz> - 0.5.11-9
- Clean up the BRs, prepare for usage of mozjs from xulrunner
* Tue Oct 09 2007 Martin Sourada <martin.sourada(a)seznam.cz> - 0.5.11-8
- Register file handler properly (rhbz #321471)
* Tue Aug 21 2007 Martin Sourada <martin.sourada(a)seznam.cz> - 0.5.11-7
- Rebuild
* Thu Aug 09 2007 Martin Sourada <martin.sourada(a)seznam.cz> - 0.5.11-6
- Update License: field to GPLv2+
* Fri Jul 06 2007 Martin Sourada <martin.sourada(a)seznam.cz> - 0.5.11-5
- Change the name displayed in menu to GXine Video Player
* Wed May 16 2007 Martin Sourada <martin.sourada(a)seznam.cz> - 0.5.11-4
- rebuild to include ppc64 arch
* Sun Mar 25 2007 Martin Sourada <martin.sourada(a)seznam.cz> - 0.5.11-3
- fix rpmlint warning
* Wed Mar 14 2007 Martin Sourada <martin.sourada(a)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(a)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(a)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(a)seznam.cz> - 0.5.10-4
- replace R: firefox with R: %%{_libdir}/mozilla/plugins
* Wed Jan 17 2007 Martin Sourada <martin.sourada(a)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(a)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(a)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(a)seznam.cz> - 0.5.9-2
- Rebuild
* Sun Dec 17 2006 Martin Sourada <martin.sourada(a)seznam.cz> - 0.5.9-1.1
- Add BR dbus-devel
* Sat Dec 16 2006 Michel Salim <michel.salim(a)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(a)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(a)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(a)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(a)c100c.com> - 0.5.8-1
- Updated to 0.5.8
* Tue Sep 19 2006 Mola Pahnadayan <mola(a)c100c.com> - 0.5.7-1
- write new spec file
- Updated to release 0.5.7
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gxine/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 23 Oct 2013 20:16:41 -0000 1.1
+++ .cvsignore 23 Oct 2013 21:03:41 -0000 1.2
@@ -0,0 +1 @@
+gxine-0.5.907.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gxine/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 23 Oct 2013 20:16:41 -0000 1.1
+++ sources 23 Oct 2013 21:03:43 -0000 1.2
@@ -0,0 +1 @@
+da83ba0e0e8794465b60419009029d2c gxine-0.5.907.tar.xz