[gxine/f16: 3/5] * Switch to mozjs185.so. Hopefully it has more stable API than mozjs.so from xulrunner. Should fix

Martin Sourada mso at fedoraproject.org
Wed Jan 23 13:11:58 UTC 2013 

commit 92f6af63793691fbbe5db461a2187ebfbfd0512f
Author: Martin Sourada <mso at fedoraproject.org>
Date:   Wed Jan 23 13:58:22 2013 +0100

    * Switch to mozjs185.so. Hopefully it has more stable API than
      mozjs.so from xulrunner. Should fix most js related issues.
    
    A little patches cleanup, mostly synced with upstream.

 gxine-0.5.907-dso.patch     |   34 --------------
 gxine-0.5.907-glib.patch    |   35 +++++++++++++++
 gxine-0.5.907-glibc.patch   |   35 ---------------
 gxine-0.5.907-js.patch      |  103 -------------------------------------------
 gxine-0.5.907-linkage.patch |   16 +++++++
 gxine-0.5.907-lirc.patch    |   18 ++++----
 gxine.spec                  |   24 ++++++----
 7 files changed, 75 insertions(+), 190 deletions(-)
---
diff --git a/gxine-0.5.907-glib.patch b/gxine-0.5.907-glib.patch
new file mode 100644
index 0000000..e08572e
--- /dev/null
+++ b/gxine-0.5.907-glib.patch
@@ -0,0 +1,35 @@
+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"
diff --git a/gxine-0.5.907-linkage.patch b/gxine-0.5.907-linkage.patch
new file mode 100644
index 0000000..815446b
--- /dev/null
+++ b/gxine-0.5.907-linkage.patch
@@ -0,0 +1,16 @@
+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 ---------------------------------------------
+ 
diff --git a/gxine-0.5.907-lirc.patch b/gxine-0.5.907-lirc.patch
index 79deeab..907c4ab 100644
--- a/gxine-0.5.907-lirc.patch
+++ b/gxine-0.5.907-lirc.patch
@@ -1,16 +1,16 @@
-diff -up gxine-0.5.907/configure.lirc gxine-0.5.907/configure
---- gxine-0.5.907/configure.lirc	2012-02-20 20:10:20.000000000 +0100
-+++ gxine-0.5.907/configure	2012-02-22 14:11:53.873870212 +0100
-@@ -18463,10 +18463,10 @@ fi
+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_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=`$as_echo "ac_cv_file_"$llirc/liblirc_client.so"" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for \"$llirc/liblirc_client.so\"" >&5
- $as_echo_n "checking for \"$llirc/liblirc_client.so\"... " >&6; }
++        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]),
diff --git a/gxine.spec b/gxine.spec
index 5568d93..a22c8a7 100644
--- a/gxine.spec
+++ b/gxine.spec
@@ -1,6 +1,6 @@
 Name:           gxine
 Version:        0.5.907
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        GTK frontend for the xine multimedia library
 
 Group:          Applications/Multimedia
@@ -12,11 +12,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch1:         gxine-0.5.902-non-separate-toolbar.patch
 # some multilib issues
 Patch3:         gxine-0.5.907-lirc.patch
-Patch4:         gxine-0.5.907-dso.patch
-Patch5:         gxine-0.5.907-glibc.patch
-Patch6:         gxine-0.5.907-js.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:  gecko-devel
+BuildRequires:  js-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  gtk2-devel
@@ -34,6 +35,9 @@ BuildRequires:  libXtst-devel
 BuildRequires:  libXaw-devel
 BuildRequires:  nspr-devel
 
+# for linkage patch
+BuildRequires:  autoconf
+
 %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
@@ -58,15 +62,14 @@ This plugin allows gxine to be embedded in a web browser.
 
 %patch1 -p1 -b .non-separate-toolbar
 %patch3 -p1 -b .lirc
-%patch4 -p1 -b .dso
-%patch5 -p1 -b .glibc
-%patch6 -p1 -b .js
+%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          \
@@ -132,6 +135,9 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %{_libdir}/mozilla/plugins/gxineplugin.so
 
 %changelog
+* Wed Jan 23 2013 Martin Sourada <mso at fedoraproject.org> - 0.5.907-7
+- Switch build to mozjs185, hopefully it has more stable API
+
 * Fri Aug 10 2012 Martin Sourada <mso at fedoraproject.org> - 0.5.907-6
 - Fix build

More information about the scm-commits mailing list