[gxine/el6: 15/15] Merge branch 'master' into el6
Martin Sourada
mso at fedoraproject.org
Fri Mar 2 07:01:37 UTC 2012
commit 91bf6717697c9464de5f559f60d748de55742c2a
Merge: 7f01913 e052f73
Author: Martin Sourada <mso at fedoraproject.org>
Date: Fri Mar 2 07:59:49 2012 +0100
Merge branch 'master' into el6
Conflicts:
.gitignore
gxine.spec
sources
Update to fedora version.
.gitignore | 2 +-
gxine-0.5.11-keep-wnd-state.patch | 57 ----------------------------
gxine-0.5.11-xine-version-check.patch | 18 ---------
gxine-0.5.8-lirc.patch | 15 -------
gxine-0.5.907-dso.patch | 34 +++++++++++++++++
gxine-0.5.907-glibc.patch | 35 +++++++++++++++++
gxine-0.5.907-lirc.patch | 16 ++++++++
gxine.spec | 66 +++++++++++++++++----------------
sources | 2 +-
9 files changed, 121 insertions(+), 124 deletions(-)
---
diff --cc .gitignore
index 8369f5c,5e5773a..e229cb1
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
- gxine-0.5.11.tar.bz2
-gxine-0.5.905.tar.bz2
+ /gxine-0.5.907.tar.xz
diff --cc gxine.spec
index 0a0321c,6feb7b2..ed0101b
--- a/gxine.spec
+++ b/gxine.spec
@@@ -1,9 -1,6 +1,7 @@@
- %define gecko_stable_ver 1.9
- %define xul_mozjs_path %{_libdir}/xulrunner-%{gecko_stable_ver}
+
Name: gxine
- Version: 0.5.11
- Release: 20%{?dist}
+ Version: 0.5.907
+ Release: 2%{?dist}
Summary: GTK frontend for the xine multimedia library
Group: Applications/Multimedia
@@@ -26,19 -23,16 +24,19 @@@ Buildrequires: xine-lib-deve
# for dbus support
BuildRequires: dbus-glib-devel
- BuildRequires: dbus-devel
- # for LIRC support (available only for fedora)
+ # for gudev support (device detection)
+ BuildRequires: libgudev1-devel
-# for LIRC support (not available only for fedora)
+%if 0%{?fedora}
++# for LIRC support (available only for 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
@@@ -49,9 -43,7 +47,6 @@@ gxine is a gtk based gui for this xine-
Summary: Mozilla plugin for gxine
Group: Applications/Internet
Requires: %{name} = %{version}-%{release}
- %if 0%{?use_xulrunner_js}
- Requires: xulrunner
- %endif
-Requires: mozilla-filesystem
%description mozplugin
This plugin allows gxine to be embedded in a web browser.
@@@ -59,17 -51,24 +54,24 @@@
%prep
%setup -q
- %patch0 -p1 -b .lirc
- %patch1 -p1 -b .keep-wnd-state
- %patch2 -p1 -b .xine-version-check
- %patch3 -p1 -b .xul-1.9.1-buildfix
+ %patch1 -p1 -b .non-separate-toolbar
+ %patch3 -p1 -b .lirc
+ %patch4 -p1 -b .dso
+ %patch5 -p1 -b .glibc
+
-%{__sed} -i 's/Name=gxine/Name=GXine/' gxine.desktop.in
++%{__sed} -i 's/Name=gxine/Name=GXine Video Player/' gxine.desktop.in
- %{__sed} -i 's/Name=gxine/Name=GXine Video Player/' gxine.desktop
- %{__sed} -i 's/Exec=gxine/Exec=gxine %U/' gxine.desktop
+ # I'm not sure why we have different name for it in Fedora but it is
+ # javascript from mozilla... So patching configure to detect it.
+ %{__sed} -i 's/mozilla-js/libjs/' ./configure
%build
- %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
+
+
+ %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}
@@@ -130,20 -126,69 +128,24 @@@ touch --no-create %{_datadir}/icons/hic
%{_libdir}/mozilla/plugins/gxineplugin.so
%changelog
+ * Thu Feb 23 2012 Martin Sourada <mso at fedoraproject.org> - 0.5.907-2
+ - Try to fix build with newer glibc
++- Merge with Fedoras
+
-* Wed Feb 22 2012 Martin Sourada <mso at 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 at lists.fedoraproject.org> - 0.5.905-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Apr 19 2011 Martin Stransky <stransky at redhat.com> - 0.5.905-6
-- Added a fix for js 1.8.5
-
-* Wed Feb 09 2011 Martin Sourada <mso at 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 at lists.fedoraproject.org> - 0.5.905-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Sat Feb 13 2010 Martin Sourada <mso at fedoraproject.org> - 0.5.905-3
-- Fix build on devel
-- http://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking
-
-* 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
+* Mon Jul 19 2010 Martin Sourada <mso at fedoraproject.org> - 0.5.11-20
+- try to fix the build
-* 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
+* Mon Jul 19 2010 Martin Sourada <mso at fedoraproject.org> - 0.5.11-19
+- workaround broken xine-lib version check
-* 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
More information about the scm-commits
mailing list