pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/multimedia/gxine gxine: Update to 0.5.910. Fix build.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6a012e0e5b06
branches:  trunk
changeset: 335365:6a012e0e5b06
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue Jun 18 12:38:36 2019 +0000

description:
gxine: Update to 0.5.910. Fix build.

pkgsrc changes:

* Use newer spidermonkey instead of ancient firefox 3.6 xulrunner.
* Use gtk3 by default.

0.5.910: 2017-12-28
        * Improve Gtk3 support. (still not enabled by default, use --with-gtk3).
        * Fix running under Wayland.
        * Improve portability.
        * Improve build system. Require automake 1.11.
        * Fix memory and resource leaks.
0.5.909: 2017-07-18
        * Dust removal. Support for recent glib and gtk+ versions.
        * Require glib 2.32 or later.
        * Require gtk+ 2.18 or later.
        * Portability improvements.
        * Linkage fixes.
        * #include fixes.
        * Fix memory and resource leaks.
        * Initial support for gtk+ 3.
        * Call XInitThreads even with XCB. (Fixes some video output methods.)

0.5.908: 2014-05-10
        * Add input support for xineliboutput.
        * Use libgudev when available (HAL is obsolete).
        * Linkage fixes.
        * GLib #include fixes.
        * Stop g_remove_source() error spew.

0.5.907: 2012-02-21
        * Fix compilation with that nice stable API in libmozjs.
          - There's a jsval change in Firefox 9.
          - Firefox 10 drops JSFloat64 (looks like cleanup).
        * Fix a build failure which occurs when how to retrieve certain HAL
          properties isn't known. (Observed on Debian hurd-i386.)
        * Quiet build (with automake 1.11 or later).
          Also silence inlining complaints (from libmozjs headers).
        * Playlist segmentation fault fix.
        * input_menu() works again.

0.5.906: 2011-08-11
        * Reset pointer shape on stream stop/eject.
        * Use re-entrant versions of xine-lib's XML parser functions
          (if available).
        * gxine.desktop now says that gxine can accept files or URLs.
        * Handle gamma, sharpness and noise reduction controls (if supported
          by the selected video output driver).
        * Add vo_*.available (whether a given control is available).
        * Handle iconisation of the video window by preventing hiding &
          re-showing while the window is iconised.
        * Portability changes (pthreads, console redirection).
        * Czech translation update.
        * More GDK functions over X11:
          - prefer GDK for cursors and setting windows focus
          - prefer X11 for system tray and GTK video window
        * Windows port of GTK video widget.
        * Handle relative paths in m3u playlists.
        * Fix focus grabbing (in the absence of Xinerama).

diffstat:

 multimedia/gxine/Makefile                           |  35 ++++++---
 multimedia/gxine/PLIST                              |   9 ++-
 multimedia/gxine/distinfo                           |  27 ++-----
 multimedia/gxine/patches/patch-aa                   |  33 ---------
 multimedia/gxine/patches/patch-ab                   |  12 ---
 multimedia/gxine/patches/patch-ad                   |  34 ---------
 multimedia/gxine/patches/patch-af                   |  13 ---
 multimedia/gxine/patches/patch-ag                   |  13 ---
 multimedia/gxine/patches/patch-ah                   |  12 ---
 multimedia/gxine/patches/patch-ai                   |  67 -------------------
 multimedia/gxine/patches/patch-aj                   |  15 ----
 multimedia/gxine/patches/patch-ak                   |  73 ++++++++++++--------
 multimedia/gxine/patches/patch-an                   |  27 -------
 multimedia/gxine/patches/patch-aq                   |   4 +-
 multimedia/gxine/patches/patch-ba                   |  13 ---
 multimedia/gxine/patches/patch-bb                   |  38 ----------
 multimedia/gxine/patches/patch-src_console_output_h |  15 ----
 multimedia/gxine/patches/patch-src_engine_c         |  15 ----
 18 files changed, 86 insertions(+), 369 deletions(-)

diffs (truncated from 581 to 300 lines):

diff -r 5bf97318ae86 -r 6a012e0e5b06 multimedia/gxine/Makefile
--- a/multimedia/gxine/Makefile Tue Jun 18 12:37:35 2019 +0000
+++ b/multimedia/gxine/Makefile Tue Jun 18 12:38:36 2019 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.106 2018/11/29 11:21:54 prlw1 Exp $
+# $NetBSD: Makefile,v 1.107 2019/06/18 12:38:36 nia Exp $
 
-DISTNAME=      gxine-0.5.905
-PKGREVISION=   58
+DISTNAME=      gxine-0.5.910
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=xine/}
-EXTRACT_SUFX=  .tar.bz2
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.xine-project.org/home
@@ -13,31 +12,45 @@
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            gmake pkg-config perl:build
+USE_TOOLS+=            msgfmt msgmerge xgettext
+USE_LANGUAGES=         c99
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASE}
 CONFIGURE_ARGS+=       --disable-lirc
+CONFIGURE_ARGS+=       --with-gtk3
+CONFIGURE_ARGS+=       --with-xcb
+CONFIGURE_ARGS+=       --without-browser-plugin
+
+BUILD_DEFS+=           PKG_SYSCONFBASE
 
 BROKEN_GETTEXT_DETECTION=      yes
 PTHREAD_OPTS+=                 require
-# for svg->png icon conversion
-# XXX librsvg>=2.32 doesn't install the "rsvg" tool
-#BUILD_DEPENDS+=               librsvg-[0-9]*:../../graphics/librsvg
+
+# spidermonkey185
+NOT_PAX_MPROTECT_SAFE+=        bin/gxine
 
 EGDIR=                 ${PREFIX}/share/examples/gxine
 PKG_SYSCONFSUBDIR=     gxine
 
-.for f in gtkrc keypad.xml startup toolbar-fullscreen.xml toolbar-window.xml
+.for f in gtk.css gtkrc keypad.xml startup toolbar-fullscreen.xml toolbar-window.xml
 CONF_FILES+=   ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/xulrunner192/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../multimedia/xine-lib/buildlink3.mk"
+.include "../../lang/spidermonkey185/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../x11/libICE/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/libxcb/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+BUILDLINK_TRANSFORM+=  opt:-ldl:${BUILDLINK_LDADD.dl:Q}
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5bf97318ae86 -r 6a012e0e5b06 multimedia/gxine/PLIST
--- a/multimedia/gxine/PLIST    Tue Jun 18 12:37:35 2019 +0000
+++ b/multimedia/gxine/PLIST    Tue Jun 18 12:38:36 2019 +0000
@@ -1,10 +1,14 @@
-@comment $NetBSD: PLIST,v 1.13 2010/11/30 18:21:01 drochner Exp $
+@comment $NetBSD: PLIST,v 1.14 2019/06/18 12:38:36 nia Exp $
 bin/gxine
 bin/gxine_client
-lib/gxine/gxineplugin.la
+man/de/man1/gxine.1
+man/de/man1/gxine_client.1
+man/es/man1/gxine.1
+man/es/man1/gxine_client.1
 man/man1/gxine.1
 man/man1/gxine_client.1
 share/applications/gxine.desktop
+share/examples/gxine/gtk.css
 share/examples/gxine/gtkrc
 share/examples/gxine/keypad.xml
 share/examples/gxine/startup
@@ -19,6 +23,7 @@
 share/gxine/pixmaps/set-contrast.svg
 share/gxine/pixmaps/set-hue.svg
 share/gxine/pixmaps/set-saturation.svg
+share/gxine/pixmaps/set-sharpness.svg
 share/gxine/pixmaps/set-sync.svg
 share/gxine/pixmaps/set-volume.svg
 share/gxine/pixmaps/speaker.png
diff -r 5bf97318ae86 -r 6a012e0e5b06 multimedia/gxine/distinfo
--- a/multimedia/gxine/distinfo Tue Jun 18 12:37:35 2019 +0000
+++ b/multimedia/gxine/distinfo Tue Jun 18 12:38:36 2019 +0000
@@ -1,21 +1,8 @@
-$NetBSD: distinfo,v 1.27 2015/11/03 23:54:26 agc Exp $
+$NetBSD: distinfo,v 1.28 2019/06/18 12:38:36 nia Exp $
 
-SHA1 (gxine-0.5.905.tar.bz2) = dc01b617641d6eac4152259c592f15f31b9d9bf0
-RMD160 (gxine-0.5.905.tar.bz2) = 3dc30ba9f402d20e3ad3f469cc753607ccc3d194
-SHA512 (gxine-0.5.905.tar.bz2) = 744f283866b7fb4a5b834d3e6f2715538ad7a00fedf5819039129b07cfc25a1404e193118b94ebc74881b37b3e73540300992f164c1b30660b3f2cf6e5816747
-Size (gxine-0.5.905.tar.bz2) = 1203720 bytes
-SHA1 (patch-aa) = 168f7149dbffd7b191721a30193c6d58320534fc
-SHA1 (patch-ab) = b2488c6febee6bc41be26ab8a36563fed5105a52
-SHA1 (patch-ad) = 42fa73c04ecbffd900df6f5231519abe38be9852
-SHA1 (patch-af) = 6d58e572729217ae7a9a3ef2a177fb929f3da453
-SHA1 (patch-ag) = 7e7ae5e189e9d315b8993883bd1b51db484f3692
-SHA1 (patch-ah) = 201f42c4043cd2c1e5302d476713080554c02b86
-SHA1 (patch-ai) = 792fabf23d55fac337d6825e5ba28d1a80393ce9
-SHA1 (patch-aj) = 0a9efacd2aa90855bf990944c058028af367c24d
-SHA1 (patch-ak) = d055caed81560d53c922f772dc713bfca8ef5691
-SHA1 (patch-an) = 10789072010e0a2d868a24c21d97f902364f2587
-SHA1 (patch-aq) = 51acfd7107eed0cf73462daa73024ef28964d9eb
-SHA1 (patch-ba) = 7ef029a5bdfa7cf037218ef134b418a2b4f2b03b
-SHA1 (patch-bb) = f4f96102cff0589e3c823b4dd96693668aa16a5f
-SHA1 (patch-src_console_output_h) = 6e0cab99bc57497f52e6d965ffbaa5e18317edbe
-SHA1 (patch-src_engine_c) = 827d08132f8dbe1b88e1d6f8a073643cfdd9ca8c
+SHA1 (gxine-0.5.910.tar.xz) = d3e5569e7534600600fcfb1232916763c6150205
+RMD160 (gxine-0.5.910.tar.xz) = f06d641596b936ae137480c1a8334957ded87d7d
+SHA512 (gxine-0.5.910.tar.xz) = f105060bb0a86215ee7bfb5804795d400f1c79973e3141e8c8e3ecab249d8a6cdd6467a926625a6f89081d7160f192ea63a57f623de46c7634c4cc08431f897d
+Size (gxine-0.5.910.tar.xz) = 931616 bytes
+SHA1 (patch-ak) = 46ab35de6ac6f20b43955a72327806753eff143f
+SHA1 (patch-aq) = df68a399401f989b43d2d3f32026776418428e33
diff -r 5bf97318ae86 -r 6a012e0e5b06 multimedia/gxine/patches/patch-aa
--- a/multimedia/gxine/patches/patch-aa Tue Jun 18 12:37:35 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/05/31 21:33:11 kristerw Exp $
-
---- src/post.c.orig    Tue May 31 23:11:08 2005
-+++ src/post.c Tue May 31 23:12:30 2005
-@@ -81,6 +81,7 @@
-   const xine_post_in_t *in = xine_post_input (plugin, "parameters");
-   const xine_post_api_t *api;
-   const xine_post_api_descr_t *param_desc;
-+  char *params;
- 
-   if (!in)
-     return NULL;
-@@ -88,7 +89,7 @@
-   api = in->data;
-   param_desc = api->get_param_descr ();
- 
--  char *params = malloc (param_desc->struct_size);
-+  params = malloc (param_desc->struct_size);
-   api->get_parameters (plugin, params);
- 
-   for (;;)
-@@ -494,9 +495,10 @@
-   while ((++param)->type != POST_PARAM_TYPE_LAST)
-   {
-     GtkWidget *widget;
-+    gpointer param_p;
-     info->conf_w = realloc (info->conf_w,
-                           (param_count + 2) * sizeof (GtkWidget *));
--    gpointer param_p = info->params + param->offset;
-+    param_p = info->params + param->offset;
-     switch (param->type)
-     {
-     case POST_PARAM_TYPE_INT:
diff -r 5bf97318ae86 -r 6a012e0e5b06 multimedia/gxine/patches/patch-ab
--- a/multimedia/gxine/patches/patch-ab Tue Jun 18 12:37:35 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/10/19 13:26:02 adam Exp $
-
---- src/http.c.orig    2005-03-17 00:55:23.000000000 +0000
-+++ src/http.c
-@@ -28,6 +28,7 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netdb.h>
-+#include <netinet/in.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <string.h>
diff -r 5bf97318ae86 -r 6a012e0e5b06 multimedia/gxine/patches/patch-ad
--- a/multimedia/gxine/patches/patch-ad Tue Jun 18 12:37:35 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2006/05/19 19:09:18 joerg Exp $
-
---- src/menu.c.orig    2006-05-19 17:58:22.000000000 +0000
-+++ src/menu.c
-@@ -255,7 +255,7 @@ void menu_add_items (GtkUIManager *ui, c
-  * Requires a function body, to which is passed int v = radio action value
-  */
- #define JS_CB_R(func) \
--  static always_inline void js_##func##_cb_int (int); \
-+  static void js_##func##_cb_int (int); \
-   static void js_##func##_cb (GtkRadioAction *action, gpointer data) \
-   { \
-     /* \
-@@ -266,17 +266,17 @@ void menu_add_items (GtkUIManager *ui, c
-     */ \
-     js_##func##_cb_int (gtk_radio_action_get_current_value (action)); \
-   } \
--  static always_inline void js_##func##_cb_int (int v)
-+  static void js_##func##_cb_int (int v)
-   /* function body goes here */
- 
- /* Toggle action callback (no Javascript)
-  * Requires a function body, to which is passed gboolean v = toggle state
-  */
- #define JS_CB_T(func) \
--  static always_inline void js_##func##_cb_int (gboolean); \
-+  static void js_##func##_cb_int (gboolean); \
-   static void js_##func##_cb (GtkToggleAction *action, gpointer data) \
-   { js_##func##_cb_int (gtk_toggle_action_get_active (action)); } \
--  static always_inline void js_##func##_cb_int (gboolean v)
-+  static void js_##func##_cb_int (gboolean v)
-   /* function body goes here */
- 
- /* File */
diff -r 5bf97318ae86 -r 6a012e0e5b06 multimedia/gxine/patches/patch-af
--- a/multimedia/gxine/patches/patch-af Tue Jun 18 12:37:35 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.5 2009/04/17 16:51:07 drochner Exp $
-
---- doc/man/Makefile.in.orig   2009-04-01 17:36:48.000000000 +0200
-+++ doc/man/Makefile.in
-@@ -249,7 +249,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = $(MANLINGUAS)
-+SUBDIRS = en
- all: all-recursive
- 
- .SUFFIXES:
diff -r 5bf97318ae86 -r 6a012e0e5b06 multimedia/gxine/patches/patch-ag
--- a/multimedia/gxine/patches/patch-ag Tue Jun 18 12:37:35 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2006/10/17 16:23:47 drochner Exp $
-
---- src/defs.h.orig    2006-08-21 09:14:49.000000000 +0200
-+++ src/defs.h
-@@ -46,7 +46,7 @@
- 
- /* debug logging */
- #ifdef LOG
--#define logprintf(FMT,...) g_print (FMT, ## __VA_ARGS__)
-+#define logprintf(FMT,...) g_print (FMT , ## __VA_ARGS__)
- #define logperror(STR) perror (STR)
- #else
- #define logprintf(FMT,...)
diff -r 5bf97318ae86 -r 6a012e0e5b06 multimedia/gxine/patches/patch-ah
--- a/multimedia/gxine/patches/patch-ah Tue Jun 18 12:37:35 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2006/05/03 12:47:47 drochner Exp $
-
---- src/globals.h.orig 2006-03-03 03:01:16.000000000 +0100
-+++ src/globals.h
-@@ -37,6 +37,7 @@
- #include <gdk/gdk.h>
- #include <glib.h>
- #include <xine.h>
-+#include <pthread.h>
- 
- #include "script_engine.h"
- #include "info_widgets.h"
diff -r 5bf97318ae86 -r 6a012e0e5b06 multimedia/gxine/patches/patch-ai
--- a/multimedia/gxine/patches/patch-ai Tue Jun 18 12:37:35 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-$NetBSD: patch-ai,v 1.5 2009/04/17 16:51:07 drochner Exp $
-
---- src/key_events.c.orig      2009-03-25 17:41:49.000000000 +0100
-+++ src/key_events.c
-@@ -767,6 +767,7 @@ void kb_edit_show (void)
- 
- static void do_edit_binding (void)
- {
-+  char *title;
-   editkey = *lookup_binding (&catch_key_iter);
-   editdesc = editkey.desc;
-   editkey.desc = getdesc (&editkey);
-@@ -775,7 +776,7 @@ static void do_edit_binding (void)
-   gtk_text_buffer_set_text (kb_binding_command_buf, editkey.cmd, -1);
-   gtk_entry_set_text (GTK_ENTRY (kb_binding_key), editkey.keyname);
- 
--  char *title = g_strdup_printf (_("Keybinding: %s"), editkey.desc);
-+  title = g_strdup_printf (_("Keybinding: %s"), editkey.desc);
-   gtk_window_set_title (GTK_WINDOW (kb_binding_edit_dlg), title);
-   free (title);
- 
-@@ -1110,9 +1111,7 @@ static JSBool js_keypad_show (JSContext 
- 
- /* Xine event mapping data */
- 



Home | Main Index | Thread Index | Old Index