CVS commit: pkgsrc/multimedia/gxine

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/multimedia/gxine
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Tue, 18 Jun 2019 12:38:36 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jun 18 12:38:36 UTC 2019

Modified Files:
        pkgsrc/multimedia/gxine: Makefile PLIST distinfo
        pkgsrc/multimedia/gxine/patches: patch-ak patch-aq
Removed Files:
        pkgsrc/multimedia/gxine/patches: patch-aa patch-ab patch-ad patch-af
            patch-ag patch-ah patch-ai patch-aj patch-an patch-ba patch-bb
            patch-src_console_output_h patch-src_engine_c

Log Message:
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).


To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 pkgsrc/multimedia/gxine/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/multimedia/gxine/PLIST
cvs rdiff -u -r1.27 -r1.28 pkgsrc/multimedia/gxine/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/multimedia/gxine/patches/patch-aa \
    pkgsrc/multimedia/gxine/patches/patch-ag
cvs rdiff -u -r1.2 -r0 pkgsrc/multimedia/gxine/patches/patch-ab \
    pkgsrc/multimedia/gxine/patches/patch-ah \
    pkgsrc/multimedia/gxine/patches/patch-an \
    pkgsrc/multimedia/gxine/patches/patch-bb
cvs rdiff -u -r1.6 -r0 pkgsrc/multimedia/gxine/patches/patch-ad
cvs rdiff -u -r1.5 -r0 pkgsrc/multimedia/gxine/patches/patch-af \
    pkgsrc/multimedia/gxine/patches/patch-ai
cvs rdiff -u -r1.1 -r0 pkgsrc/multimedia/gxine/patches/patch-aj \
    pkgsrc/multimedia/gxine/patches/patch-ba \
    pkgsrc/multimedia/gxine/patches/patch-src_console_output_h \
    pkgsrc/multimedia/gxine/patches/patch-src_engine_c
cvs rdiff -u -r1.11 -r1.12 pkgsrc/multimedia/gxine/patches/patch-ak
cvs rdiff -u -r1.3 -r1.4 pkgsrc/multimedia/gxine/patches/patch-aq

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/gxine/Makefile
diff -u pkgsrc/multimedia/gxine/Makefile:1.106 pkgsrc/multimedia/gxine/Makefile:1.107
--- pkgsrc/multimedia/gxine/Makefile:1.106      Thu Nov 29 11:21:54 2018
+++ pkgsrc/multimedia/gxine/Makefile    Tue Jun 18 12:38:36 2019
@@ -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 @@ COMMENT=    Gtk-based media player
 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"

Index: pkgsrc/multimedia/gxine/PLIST
diff -u pkgsrc/multimedia/gxine/PLIST:1.13 pkgsrc/multimedia/gxine/PLIST:1.14
--- pkgsrc/multimedia/gxine/PLIST:1.13  Tue Nov 30 18:21:01 2010
+++ pkgsrc/multimedia/gxine/PLIST       Tue Jun 18 12:38:36 2019
@@ -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-channel.svg
 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

Index: pkgsrc/multimedia/gxine/distinfo
diff -u pkgsrc/multimedia/gxine/distinfo:1.27 pkgsrc/multimedia/gxine/distinfo:1.28
--- pkgsrc/multimedia/gxine/distinfo:1.27       Tue Nov  3 23:54:26 2015
+++ pkgsrc/multimedia/gxine/distinfo    Tue Jun 18 12:38:36 2019
@@ -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

Index: pkgsrc/multimedia/gxine/patches/patch-ak
diff -u pkgsrc/multimedia/gxine/patches/patch-ak:1.11 pkgsrc/multimedia/gxine/patches/patch-ak:1.12
--- pkgsrc/multimedia/gxine/patches/patch-ak:1.11       Tue Jan 19 20:33:26 2010
+++ pkgsrc/multimedia/gxine/patches/patch-ak    Tue Jun 18 12:38:36 2019
@@ -1,32 +1,49 @@
-$NetBSD: patch-ak,v 1.11 2010/01/19 20:33:26 drochner Exp $
+$NetBSD: patch-ak,v 1.12 2019/06/18 12:38:36 nia Exp $
 
---- configure.orig     2010-01-01 01:02:28.000000000 +0000
+Disable logo demuxer detection, it doesn't work and stops
+us from building. In practice, not having it isn't a problem.
+
+--- configure.orig     2017-12-27 19:53:11.000000000 +0000
 +++ configure
-@@ -11614,7 +11614,7 @@ $as_echo "$ac_cv_always_inline" >&6; }
-     fi
- 
- cat >>confdefs.h <<_ACEOF
--#define always_inline $always_inline
-+#define gxine_always_inline $always_inline
- _ACEOF
+@@ -19817,39 +19817,8 @@ else
+   withval=auto
+ fi
  
+-LOGO_FORMAT=''
+-logo_sub=''
+-while test "$LOGO_FORMAT" = ''; do
+-  echo "$as_me:$LINENO: trying type=$withval" >&5
+-  if test "$withval" = auto; then
+-    # preferred is last
+-    if test "$HAVE_IMAGE" = yes; then withval=image; fi
+-    if test "$HAVE_MPEG" = yes; then withval=mpeg; fi
+-    # handle missing-demuxer case
+-    if test "$withval" = auto; then
+-      as_fn_error $? "no available demuxer for the logo image - rebuild/reinstall xine-lib?" "$LINENO" 5
+-    fi
+-  fi
+-  case "$withval" in
+-    image)
+-      if test "$HAVE_IMAGE" = no; then
+-        logo_sub="$withval"
+-        withval=auto
+-      else
+-        LOGO_FORMAT=jpg
+-      fi
+-      ;;
+-    mpeg)
+-      if test "$HAVE_MPEG" = no; then
+-        logo_sub="$withval"
+-        withval=auto
+-      else
+-        LOGO_FORMAT=mpv
+-      fi
+-      ;;
+-  esac
+-done
+-
++LOGO_FORMAT='mpv'
++logo_sub='mpeg'
  
-@@ -16578,14 +16578,14 @@ case $host in
-     LDFLAGS="$LDFLAGS -L/usr/local/lib"
-     ;;
-   *)
--   THREAD_LIBS="-lpthread"
--    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
--$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
-+   THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+$as_echo_n "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... " >&6; }
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
+ cat >>confdefs.h <<_ACEOF
+ #define LOGO_FORMAT "$LOGO_FORMAT"

Index: pkgsrc/multimedia/gxine/patches/patch-aq
diff -u pkgsrc/multimedia/gxine/patches/patch-aq:1.3 pkgsrc/multimedia/gxine/patches/patch-aq:1.4
--- pkgsrc/multimedia/gxine/patches/patch-aq:1.3        Fri Apr 17 16:51:07 2009
+++ pkgsrc/multimedia/gxine/patches/patch-aq    Tue Jun 18 12:38:36 2019
@@ -1,4 +1,6 @@
-$NetBSD: patch-aq,v 1.3 2009/04/17 16:51:07 drochner Exp $
+$NetBSD: patch-aq,v 1.4 2019/06/18 12:38:36 nia Exp $
+
+Install config files to the examples directory.
 
 --- misc/Makefile.in.orig      2009-04-01 17:36:49.000000000 +0200
 +++ misc/Makefile.in

Prev by Date: CVS commit: pkgsrc/security/zoneminder
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/security/zoneminder
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index