[packages/gxine] - updated to 0.5.910

qboosh qboosh at pld-linux.org
Wed Apr 17 19:37:02 CEST 2024 

commit 6163f6b9a500616522bd97dc399294e6add243fe
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Apr 17 19:16:15 2024 +0200

    - updated to 0.5.910

 gxine-desktop.patch   | 15 ++++++++-------
 gxine-plugindir.patch | 10 +++++-----
 gxine-xtst.patch      | 21 +++++++++++++++++++++
 gxine.spec            | 48 ++++++++++++++++++++++++++++++++----------------
 4 files changed, 66 insertions(+), 28 deletions(-)
---
diff --git a/gxine.spec b/gxine.spec
index 3e2ddec..9b2cdf8 100644
--- a/gxine.spec
+++ b/gxine.spec
@@ -1,45 +1,56 @@
 #
 # Conditional build:
-%bcond_without	lirc	# without LIRC support
+%bcond_without	lirc	# LIRC support
+%bcond_with	gtk3	# GTK+ 3 instead of GTK+ 2 (builds, but many deprecations)
+%bcond_without	xtst	# screensaver defeating via XTest
 #
 Summary:	GTK+ based GUI for xine-libraries
 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.908
-Release:	2
+Version:	0.5.910
+Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Multimedia
-Source0:	http://downloads.sourceforge.net/xine/%{name}-%{version}.tar.xz
-# Source0-md5:	a49618d8d1fdad9e7d15aee4cc5fd15f
+Source0:	https://downloads.sourceforge.net/xine/%{name}-%{version}.tar.xz
+# Source0-md5:	33f507b1014e928799dc2fe1c755fda6
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-plugindir.patch
 Patch2:		%{name}-link.patch
+Patch3:		%{name}-xtst.patch
 URL:		http://www.xine-project.org/
-BuildRequires:	autoconf >= 2.59
-BuildRequires:	automake >= 1:1.9
+# advpng
+BuildRequires:	advancecomp
+BuildRequires:	autoconf >= 2.62
+BuildRequires:	automake >= 1:1.11
 BuildRequires:	dbus-glib-devel >= 0.35
-BuildRequires:	glib2-devel >= 1:2.10.0
-BuildRequires:	gtk+2-devel >= 2:2.8.0
+BuildRequires:	gettext-tools
+BuildRequires:	glib2-devel >= 1:2.32.0
+%{!?with_gtk3:BuildRequires:	gtk+2-devel >= 2:2.18.0}
+%{?with_gtk3:BuildRequires:	gtk+3-devel >= 3.0.0}
 BuildRequires:	js187-devel
+# rsvg tool
+BuildRequires:	librsvg
 BuildRequires:	libtool
 BuildRequires:	libxcb-devel >= 1.0
 %{?with_lirc:BuildRequires:	lirc-devel}
 BuildRequires:	nspr-devel
+BuildRequires:	optipng
 BuildRequires:	pango-devel >= 1:1.12.0
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.357
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	udev-glib-devel
 BuildRequires:	xine-lib-devel >= 2:1.1.8
+BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXaw-devel
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXinerama-devel
 BuildRequires:	xorg-lib-libXrandr-devel
-BuildRequires:	xorg-lib-libXtst-devel
+%{?with_xtst:BuildRequires:	xorg-lib-libXtst-devel}
 BuildRequires:	xz
-Requires:	glib2 >= 1:2.10.0
-Requires:	gtk+2 >= 2:2.8.0
+Requires:	glib2 >= 1:2.32.0
+%{!?with_gtk3:Requires:	gtk+2 >= 2:2.18.0}
 Requires:	pango >= 1:1.12.0
 Requires:	xine-lib >= 2:1.1.8
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -74,7 +85,7 @@ Group:		X11/Applications/Multimedia
 Requires(post,postun):	browser-plugins >= 2.0
 Requires:	%{name} = %{version}-%{release}
 Requires:	browser-plugins(%{_target_base_arch})
-Obsoletes:	mozilla-plugin-gxine
+Obsoletes:	mozilla-plugin-gxine < 0.5.10
 
 %description -n browser-plugin-gxine
 gxine as browser plugin.
@@ -87,6 +98,7 @@ gxine jako wtyczka przeglądarki.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__gettextize}
@@ -95,18 +107,21 @@ gxine jako wtyczka przeglądarki.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+# libxine uses protected symbols which require PIC references
+CFLAGS="%{rpmcflags} -fPIC"
 %configure \
 	GSSCMD=/usr/bin/gnome-screensaver-command \
 	XSSCMD=/usr/bin/xscreensaver \
+	%{?with_xtst:--enable-defeat-screensaver-via-xtest} \
 	%{!?with_lirc:--disable-lirc} \
+	--disable-silent-rules \
+	%{?with_gtk3:--with-gtk3} \
 	--with-gudev \
 	--without-hal \
 	--with-plugindir=%{_browserpluginsdir} \
 	--with-spidermonkey=/usr/include/js
 
-# need to use V= because of misc/Makefile.quiet
-%{__make} \
-	V=1
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -139,6 +154,7 @@ fi
 %attr(755,root,root) %{_bindir}/gxine_client
 %{_datadir}/gxine
 %dir %{_sysconfdir}/gxine
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gxine/gtk.css
 %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
diff --git a/gxine-desktop.patch b/gxine-desktop.patch
index d776c5c..d0e7cae 100644
--- a/gxine-desktop.patch
+++ b/gxine-desktop.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- gxine-0.5.910/gxine.desktop.in.orig	2024-04-16 22:27:22.781103406 +0200
++++ gxine-0.5.910/gxine.desktop.in	2024-04-16 22:28:29.517408531 +0200
+@@ -5,14 +5,16 @@ GenericName=Video Player
  GenericName[ca]=Reproductor de peŀlícules
  GenericName[de]=Video-Player
  GenericName[es]=Reproductor de películas
@@ -15,10 +15,11 @@
  Terminal=false
  Type=Application
  StartupNotify=true
--Categories=AudioVideo;GTK;Player;TV;
-+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
+-Categories=AudioVideo;Video;GTK;Player;TV;
+-MimeType=x-content/video-dvd;x-content/audio-cdda;x-content/video-vcd;x-content/video-svcd;
+\ No newline at end of file
++Categories=AudioVideo;Video;GTK;Player;
++MimeType=x-content/video-dvd;x-content/audio-cdda;x-content/video-vcd;x-content/video-svcd;
 --- 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 @@
diff --git a/gxine-plugindir.patch b/gxine-plugindir.patch
index 492f812..ccb7e27 100644
--- a/gxine-plugindir.patch
+++ b/gxine-plugindir.patch
@@ -1,8 +1,8 @@
---- gxine-0.3.3/configure.ac.orig	2003-04-08 16:32:36.000000000 +0200
-+++ gxine-0.3.3/configure.ac	2004-04-12 23:40:01.406346816 +0200
-@@ -129,7 +129,10 @@
-    exec_prefix='${prefix}'
- fi
+--- gxine-0.5.910/configure.ac.orig	2024-04-16 22:28:59.967243570 +0200
++++ gxine-0.5.910/configure.ac	2024-04-17 06:24:41.395954723 +0200
+@@ -641,7 +641,10 @@ AM_CONDITIONAL(HAVE_OPTIPNG, [test "x$OP
+ AM_CONDITIONAL(HAVE_ADVPNG, [test "x$ADVPNG" != x])
+ 
  
 -GXINE_PLUGINDIR="$libdir/gxine"
 +AC_ARG_WITH([plugindir],
diff --git a/gxine-xtst.patch b/gxine-xtst.patch
new file mode 100644
index 0000000..dcc8fed
--- /dev/null
+++ b/gxine-xtst.patch
@@ -0,0 +1,21 @@
+--- gxine-0.5.910/src/gtkvideo.c.orig	2017-12-27 18:41:32.000000000 +0100
++++ gxine-0.5.910/src/gtkvideo.c	2024-04-17 19:09:04.740824991 +0200
+@@ -502,14 +502,14 @@ static gboolean key_snoop_cb (GtkWidget
+   if (e->type == GDK_KEY_PRESS)
+     switch (e->keyval)
+     {
+-    case GDK_Shift_L: shift |= 1; break;
+-    case GDK_Shift_R: shift |= 2; break;
++    case XK_Shift_L: shift |= 1; break;
++    case XK_Shift_R: shift |= 2; break;
+     }
+   else
+     switch (e->keyval)
+     {
+-    case GDK_Shift_L: shift &= ~1; break;
+-    case GDK_Shift_R: shift &= ~2; break;
++    case XK_Shift_L: shift &= ~1; break;
++    case XK_Shift_R: shift &= ~2; break;
+     }
+   return FALSE;
+ }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gxine.git/commitdiff/6163f6b9a500616522bd97dc399294e6add243fe

More information about the pld-cvs-commit mailing list