packages: gxine/gxine-desktop.patch, gxine/gxine.spec, gxine/gxine-link.pat...

qboosh qboosh at pld-linux.org
Sun Feb 20 08:30:21 CET 2011 

Author: qboosh                       Date: Sun Feb 20 07:30:21 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated from 4-year old 0.5.11 to 0.5.905
- updated desktop patch
- added link patch (avoid -lnsl etc.)
- added --with-gudev to use udev instead of hal

---- Files affected:
packages/gxine:
   gxine-desktop.patch (1.8 -> 1.9) , gxine.spec (1.34 -> 1.35) , gxine-link.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gxine/gxine-desktop.patch
diff -u packages/gxine/gxine-desktop.patch:1.8 packages/gxine/gxine-desktop.patch:1.9
--- packages/gxine/gxine-desktop.patch:1.8	Sun Dec 17 09:58:22 2006
+++ packages/gxine/gxine-desktop.patch	Sun Feb 20 08:30:16 2011
@@ -1,9 +1,13 @@
---- gxine-0.5.9/gxine.desktop.orig	2006-12-17 09:22:32.000000000 +0100
-+++ gxine-0.5.9/gxine.desktop	2006-12-17 09:44:03.000000000 +0100
-@@ -4,11 +4,12 @@
- Name=gxine
- GenericName=Video Player
+--- gxine-0.5.905/gxine.desktop.in.orig	2009-12-19 17:10:03.000000000 +0100
++++ gxine-0.5.905/gxine.desktop.in	2011-02-19 20:42:05.602975068 +0100
+@@ -5,14 +5,16 @@
+ GenericName[ca]=Reproductor de peŀlícules
+ GenericName[de]=Video-Player
+ GenericName[es]=Reproductor de películas
++GenericName[pl]=Odtwarzacz filmów
  Comment=Watch videos or TV and listen to audio in a variety of formats
+ Comment[ca]=Reproduïu vídeos i cançons
+ Comment[es]=Reproduce vídeos y canciones
 +Comment[pl]=Odwarzanie filmów i piosenek, oglądanie telewizji cyfrowej
  Exec=gxine
  X-MultipleArgs=true
@@ -12,6 +16,12 @@
  Type=Application
  StartupNotify=true
 -Categories=AudioVideo;GTK;Player;TV;
--MimeType=video/mpeg;video/msvideo;video/quicktime;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;application/x-ogg;application/ogg;audio/x-mp3;audio/x-mpeg;video/x-mpeg;video/x-fli;audio/x-wav;audio/x-mpegurl;audio/x-scpls;audio/x-ms-asx;application/vnd.rn-realmedia;audio/x-real-audio;audio/x-pn-realaudio;application/x-flac;audio/x-flac;application/x-shockwave-flash;audio/mpeg;audio/x-ms-asf;audio/x-m4a;audio/x-ms-wax;video/dv;video/x-anim;video/x-flc;misc/ultravox;application/x-matroska;audio/vnd.rn-realaudio;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-wav;audio/x-pn-windows-acm;image/vnd.rn-realpix;video/vnd.rn-realvideo
-+Categories=GTK;AudioVideo;Player;
-+MimeType=video/mpeg;video/msvideo;video/quicktime;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;application/x-ogg;application/ogg;audio/x-mp3;audio/x-mpeg;video/x-mpeg;video/x-fli;audio/x-wav;audio/x-mpegurl;audio/x-scpls;audio/x-ms-asx;application/vnd.rn-realmedia;audio/x-real-audio;audio/x-pn-realaudio;application/x-flac;audio/x-flac;application/x-shockwave-flash;audio/mpeg;audio/x-ms-asf;audio/x-m4a;audio/x-ms-wax;video/dv;video/x-anim;video/x-flc;misc/ultravox;application/x-matroska;audio/vnd.rn-realaudio;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-wav;audio/x-pn-windows-acm;image/vnd.rn-realpix;video/vnd.rn-realvideo;
++Categories=AudioVideo;GTK;Player;
+ MimeType=x-content/video-dvd;x-content/audio-cdda;x-content/video-vcd;x-content/video-svcd;
+\ Brak znaku nowej linii na koñcu pliku
+--- gxine-0.5.905/mime.extra.orig	2009-12-19 17:10:04.000000000 +0100
++++ gxine-0.5.905/mime.extra	2011-02-20 07:23:13.558973392 +0100
+@@ -1,3 +0,0 @@
+-x-content/video-dvd
+-x-content/video-svcd
+-x-content/video-vcd

================================================================
Index: packages/gxine/gxine.spec
diff -u packages/gxine/gxine.spec:1.34 packages/gxine/gxine.spec:1.35
--- packages/gxine/gxine.spec:1.34	Fri Nov  7 21:52:42 2008
+++ packages/gxine/gxine.spec	Sun Feb 20 08:30:16 2011
@@ -7,30 +7,40 @@
 Summary(de.UTF-8):	GTK+ basierende grafische Oberfläche für die xine-Bibliotheken
 Summary(pl.UTF-8):	Oparty na GTK+ graficzny interfejs do bibliotek XINE
 Name:		gxine
-Version:	0.5.11
-Release:	5
-License:	GPL
+Version:	0.5.905
+Release:	1
+License:	GPL v2+
 Group:		X11/Applications/Multimedia
-Source0:	http://dl.sourceforge.net/xine/%{name}-%{version}.tar.bz2
-# Source0-md5:	b210d1f6e3eab3ff496c1db9e09dbcd0
+Source0:	http://downloads.sourceforge.net/xine/%{name}-%{version}.tar.bz2
+# Source0-md5:	3c9092f1c5c8dc85e95ca327cdcc77af
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-plugindir.patch
-URL:		http://xine.sourceforge.net/
+Patch2:		%{name}-link.patch
+URL:		http://www.xine-project.org/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	dbus-glib-devel >= 0.35
-BuildRequires:	gtk+2-devel >= 1:2.6.0
+BuildRequires:	glib2-devel >= 1:2.10.0
+BuildRequires:	gtk+2-devel >= 2:2.8.0
 BuildRequires:	js-devel
 BuildRequires:	libtool
+BuildRequires:	libxcb-devel >= 1.0
 %{?with_lirc:BuildRequires:	lirc-devel}
 BuildRequires:	nspr-devel
-BuildRequires:	pango-devel >= 1.12.0
+BuildRequires:	pango-devel >= 1:1.12.0
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.357
-BuildRequires:	xine-lib-devel >= 2:1.0.1
+BuildRequires:	udev-glib-devel
+BuildRequires:	xine-lib-devel >= 2:1.1.8
 BuildRequires:	xorg-lib-libXaw-devel
+BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXinerama-devel
-Requires:	xine-lib >= 2:1.0.1
+BuildRequires:	xorg-lib-libXrandr-devel
+BuildRequires:	xorg-lib-libXtst-devel
+Requires:	glib2 >= 1:2.10.0
+Requires:	gtk+2 >= 2:2.8.0
+Requires:	pango >= 1:1.12.0
+Requires:	xine-lib >= 2:1.1.8
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -75,6 +85,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -84,8 +95,9 @@
 %{__automake}
 %configure \
 	GSSCMD=/usr/bin/gnome-screensaver-command \
+	XSSCMD=/usr/bin/xscreensaver \
 	%{!?with_lirc:--disable-lirc} \
-	--disable-static \
+	--with-gudev \
 	--with-plugindir=%{_browserpluginsdir} \
 	--with-spidermonkey=/usr/include/js
 
@@ -95,10 +107,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	Applicationsdir=%{_desktopdir}
+	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_browserpluginsdir}/*.la
+%{__rm} $RPM_BUILD_ROOT%{_browserpluginsdir}/*.la
 
 %find_lang %{name} --all-name
 
@@ -115,16 +126,25 @@
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README TODO
-%attr(755,root,root) %{_bindir}/gxine*
+%doc AUTHORS BUGS ChangeLog README TODO
+%lang(cs) %doc README.cs
+%lang(de) %doc README.de
+%attr(755,root,root) %{_bindir}/gxine
+%attr(755,root,root) %{_bindir}/gxine_client
 %{_datadir}/gxine
 %dir %{_sysconfdir}/gxine
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gxine/*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gxine/gtkrc
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gxine/startup
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gxine/*.xml
 %{_desktopdir}/gxine.desktop
-%{_iconsdir}/hicolor/*/*/*.png
+%{_iconsdir}/hicolor/*/apps/gxine.png
 %{_pixmapsdir}/gxine.png
-%{_mandir}/man1/*
-%lang(de) %{_mandir}/de/man1/*
+%{_mandir}/man1/gxine.1*
+%{_mandir}/man1/gxine_client.1*
+%lang(de) %{_mandir}/de/man1/gxine.1*
+%lang(de) %{_mandir}/de/man1/gxine_client.1*
+%lang(es) %{_mandir}/es/man1/gxine.1*
+%lang(es) %{_mandir}/es/man1/gxine_client.1*
 
 %files -n browser-plugin-gxine
 %defattr(644,root,root,755)
@@ -136,6 +156,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.35  2011/02/20 07:30:16  qboosh
+- updated from 4-year old 0.5.11 to 0.5.905
+- updated desktop patch
+- added link patch (avoid -lnsl etc.)
+- added --with-gudev to use udev instead of hal
+
 Revision 1.34  2008/11/07 20:52:42  arekm
 - release 5
 

================================================================
Index: packages/gxine/gxine-link.patch
diff -u /dev/null packages/gxine/gxine-link.patch:1.1
--- /dev/null	Sun Feb 20 08:30:21 2011
+++ packages/gxine/gxine-link.patch	Sun Feb 20 08:30:16 2011
@@ -0,0 +1,13 @@
+--- gxine-0.5.905/configure.ac.orig	2011-02-19 21:36:51.226973392 +0100
++++ gxine-0.5.905/configure.ac	2011-02-20 07:38:03.234976745 +0100
+@@ -84,8 +84,8 @@
+ 
+ dnl Test for socket and network support library
+ NET_LIBS=""
+-AC_CHECK_LIB(socket, socket, NET_LIBS="-lsocket $NET_LIBS",)
+-AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",)
++AC_CHECK_FUNC(socket, [], [AC_CHECK_LIB(socket, socket, NET_LIBS="-lsocket $NET_LIBS",)])
++AC_CHECK_FUNC(gethostbyname, [], [AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",)])
+ AC_SUBST(NET_LIBS)
+ 
+ dnl ---------------------------------------------
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gxine/gxine-desktop.patch?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gxine/gxine.spec?r1=1.34&r2=1.35&f=u

More information about the pld-cvs-commit mailing list