Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump.git;a=commitdiff;h=8ef0803404a8e72a2b1c63430f8689abb643337b
commit 8ef0803404a8e72a2b1c63430f8689abb643337b Author: Marius Cirsta <mcir...@frugalware.org> Date: Sun Sep 2 21:15:25 2012 +0000 gxine-0.5.907-1-x86_64 * rebuilt with new xine-lib * version bump diff --git a/source/xmultimedia-extra/gxine/FrugalBuild b/source/xmultimedia-extra/gxine/FrugalBuild index aada8f1..1bb8a05 100644 --- a/source/xmultimedia-extra/gxine/FrugalBuild +++ b/source/xmultimedia-extra/gxine/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Priyank Gosalia <priyan...@gmail.com> pkgname=gxine -pkgver=0.5.905 -pkgrel=4 +pkgver=0.5.907 +pkgrel=1 pkgdesc="A GTK+ based frontend to Xine." _F_sourceforge_dirname="xine" _F_sourceforge_ext=".tar.bz2" @@ -11,14 +11,18 @@ _F_gnome_iconcache="y" Finclude sourceforge gnome-scriptlet url="http://xinehq.de/"; depends=('gtk+2>=2.16.1' 'xulrunner>=1.8.1.3-3' 'libxaw' \ - 'xine-lib>=1.1.19-6' 'dbus-glib') + 'xine-lib>=1.2.1-1' 'dbus-glib') makedepends=('nspr>=4.8.7' 'spidermonkey') groups=('xmultimedia-extra') archs=('i686' 'x86_64') -Fconfopts="${Fconfopts[@]} --disable-integration-wizard --with-x --disable-mozjs \ - --disable-dependency-tracking --enable-watchdog --disable-lirc \ - --with-spidermonkey=/usr/include/js" -sha1sums=('dc01b617641d6eac4152259c592f15f31b9d9bf0') +source=(${source[@]} gxine-0.5.907-glibc.patch gxine-0.5.907-lirc.patch gxine-0.5.906-endif.patch gxine-0.5.902-non-separate-toolbar.patch) +Fconfopts="${Fconfopts[@]} --disable-mozjs --disable-lirc --with-spidermonkey=/usr/include/js \ + --with-gudev --without-hal" +sha1sums=('52e3658da65a297f86a388b286db30307ab1a585' \ + 'e8a89ecd8985dec6ea001350af49f81016d673a4' \ + 'a753d9d07d8f8a475018d0603b207a3ccc6a69be' \ + '0c48cf0457f21dea9bdc70bed62421cd6bbdebfb' \ + 'b2078c0ec0b4f5979fb9c3db198bab8b355fce58') build() { diff --git a/source/xmultimedia-extra/gxine/gxine-0.5.902-non-separate-toolbar.patch b/source/xmultimedia-extra/gxine/gxine-0.5.902-non-separate-toolbar.patch new file mode 100644 index 0000000..33e2426 --- /dev/null +++ b/source/xmultimedia-extra/gxine/gxine-0.5.902-non-separate-toolbar.patch @@ -0,0 +1,16 @@ +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), diff --git a/source/xmultimedia-extra/gxine/gxine-0.5.906-endif.patch b/source/xmultimedia-extra/gxine/gxine-0.5.906-endif.patch new file mode 100644 index 0000000..40c4a8a --- /dev/null +++ b/source/xmultimedia-extra/gxine/gxine-0.5.906-endif.patch @@ -0,0 +1,14 @@ +lirc.c:227:3: error: âgxine_lirc_threadâ undeclared (first use in this function) + +--- src/lirc.c ++++ src/lirc.c +@@ -223,8 +223,8 @@ + if (gxine_lirc_thread_created) + pthread_join (gxine_lirc_thread, NULL); + gxine_lirc_start (); +-#endif + JS_SET_RVAL (cx, vp, gxine_lirc_thread ? JSVAL_TRUE : JSVAL_FALSE); ++#endif + return JS_TRUE; + } + diff --git a/source/xmultimedia-extra/gxine/gxine-0.5.907-glibc.patch b/source/xmultimedia-extra/gxine/gxine-0.5.907-glibc.patch new file mode 100644 index 0000000..cda8135 --- /dev/null +++ b/source/xmultimedia-extra/gxine/gxine-0.5.907-glibc.patch @@ -0,0 +1,35 @@ +diff -up gxine-0.5.907/src/console_output.h.glibc gxine-0.5.907/src/console_output.h +--- gxine-0.5.907/src/console_output.h.glibc 2010-04-11 16:46:54.000000000 +0200 ++++ gxine-0.5.907/src/console_output.h 2012-02-23 00:52:00.158725579 +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.glibc gxine-0.5.907/src/engine.c +--- gxine-0.5.907/src/engine.c.glibc 2011-10-12 00:47:52.000000000 +0200 ++++ gxine-0.5.907/src/engine.c 2012-02-23 00:50:04.560170759 +0100 +@@ -30,8 +30,6 @@ + #include <errno.h> + #include <unistd.h> + +-#include <glib/gthread.h> +- + #include "engine.h" + #include "ui.h" + #include "utils.h" +diff -up gxine-0.5.907/src/main.c.glibc gxine-0.5.907/src/main.c +--- gxine-0.5.907/src/main.c.glibc 2010-12-05 12:38:44.000000000 +0100 ++++ gxine-0.5.907/src/main.c 2012-02-23 00:50:23.126938644 +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/source/xmultimedia-extra/gxine/gxine-0.5.907-lirc.patch b/source/xmultimedia-extra/gxine/gxine-0.5.907-lirc.patch new file mode 100644 index 0000000..79deeab --- /dev/null +++ b/source/xmultimedia-extra/gxine/gxine-0.5.907-lirc.patch @@ -0,0 +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 + + 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); 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; }
_______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
