aboutsummaryrefslogtreecommitdiff
path: root/multimedia/gxine
diff options
context:
space:
mode:
authorWen Heping <wen@FreeBSD.org>2018-02-22 07:59:28 +0000
committerWen Heping <wen@FreeBSD.org>2018-02-22 07:59:28 +0000
commit377732f9373d42cef34748b3169d51904e117f91 (patch)
tree74c409e17a896d3aa2ee81715f3e9ec9b543b330 /multimedia/gxine
parentdb570fdb0a2f4c94a5f7711a1f0b4b80abfd800d (diff)
downloadports-377732f9373d42cef34748b3169d51904e117f91.tar.gz
ports-377732f9373d42cef34748b3169d51904e117f91.zip
- Update to 0.5.910 [1]
- Regenerate patch with makepatch PR: 226084 [1] Submitted by: w.schwarzenfeld@utanet.at [1]
Notes
Notes: svn path=/head/; revision=462568
Diffstat (limited to 'multimedia/gxine')
-rw-r--r--multimedia/gxine/Makefile10
-rw-r--r--multimedia/gxine/distinfo5
-rw-r--r--multimedia/gxine/files/patch-src__Makefile.in24
-rw-r--r--multimedia/gxine/files/patch-src__lirc.c8
-rw-r--r--multimedia/gxine/files/patch-src_console__output.c (renamed from multimedia/gxine/files/patch-src_console_output.c)6
-rw-r--r--multimedia/gxine/files/patch-src_desktop__integration.c (renamed from multimedia/gxine/files/patch-src_desktop_integration.c)8
-rw-r--r--multimedia/gxine/pkg-plist6
7 files changed, 26 insertions, 41 deletions
diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile
index cb0a26a547b6..16f9bf6e484c 100644
--- a/multimedia/gxine/Makefile
+++ b/multimedia/gxine/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gxine
-PORTVERSION= 0.5.908
-PORTREVISION= 5
+PORTVERSION= 0.5.910
CATEGORIES= multimedia
MASTER_SITES= SF/xine/${PORTNAME}/${PORTVERSION}
@@ -16,10 +15,10 @@ LIB_DEPENDS= libnspr4.so:devel/nspr \
libmozjs185.so:lang/spidermonkey185 \
libxine.so:multimedia/libxine
-USES= desktop-file-utils gmake libtool pathfix pkgconfig tar:xz
-USE_GNOME= gtk20
+USES= desktop-file-utils gettext gmake libtool pathfix pkgconfig tar:xz
+USE_GNOME= gtk30
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --without-hal --with-libintl-prefix=${LOCALBASE}
+CONFIGURE_ARGS= --without-hal --with-libintl-prefix=${LOCALBASE} --with-gtk3
INSTALLS_ICONS= yes
CPPFLAGS+= -I${LOCALBASE}/include
@@ -58,6 +57,7 @@ post-patch:
's|@MAKE_PNG_TRUE@|#|' ${WRKSRC}/pixmaps/Makefile.in
post-install:
+ ${CP} ${WRKSRC}/pixmaps/logo.mpv ${STAGEDIR}${PREFIX}/share/gxine
.if ${PORT_OPTIONS:MWEBPLUGIN}
@${STRIP_CMD} ${STAGEDIR}${WEBPLUGIN_DIR}/${WEBPLUGIN_FILES}
.endif
diff --git a/multimedia/gxine/distinfo b/multimedia/gxine/distinfo
index 30e58f4ac247..444f00677191 100644
--- a/multimedia/gxine/distinfo
+++ b/multimedia/gxine/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gxine-0.5.908.tar.xz) = 832e47136ec68a573b22b6cc1c1d57607e78b05712ba9fb8e64464b5201ed9e7
-SIZE (gxine-0.5.908.tar.xz) = 917780
+TIMESTAMP = 1519264096
+SHA256 (gxine-0.5.910.tar.xz) = 567a0e14bea30e8bb82080173b61b574a6a22ab074f513c535f276780741fe17
+SIZE (gxine-0.5.910.tar.xz) = 931616
diff --git a/multimedia/gxine/files/patch-src__Makefile.in b/multimedia/gxine/files/patch-src__Makefile.in
index 6e4224203e91..72663e4b6632 100644
--- a/multimedia/gxine/files/patch-src__Makefile.in
+++ b/multimedia/gxine/files/patch-src__Makefile.in
@@ -1,23 +1,7 @@
---- src/Makefile.in.orig 2012-02-21 04:10:20.000000000 +0900
-+++ src/Makefile.in 2012-05-15 17:11:18.000000000 +0900
-@@ -405,12 +405,12 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- GNU_VERBOSITY := $(if $(findstring GNU,$(shell $(MAKE) -v)),0,1)
--INCLUDES = -I../include -I$(top_srcdir)/include -I$(includedir) \
-- -I$(top_builddir)/pixmaps $(LIRC_INCLUDE)
-+INCLUDES = -I../include -I$(top_srcdir)/include \
-+ -I$(top_builddir)/pixmaps $(JS_CFLAGS) $(LIRC_INCLUDE)
-
- AM_CFLAGS = $(GNU99) $(XINE_CFLAGS) $(X_CFLAGS) \
- $(GTK2_CFLAGS) $(GTHREAD2_CFLAGS) \
-- $(HAL_CFLAGS) $(UDEV_CFLAGS) $(DBUS_CFLAGS) $(JS_CFLAGS) \
-+ $(HAL_CFLAGS) $(UDEV_CFLAGS) $(DBUS_CFLAGS) $(NSPR_CFLAGS) \
- -DLOCALEDIR=\"$(localedir)\"
-
- gxine_SOURCES = \
-@@ -452,7 +452,7 @@
- gxine_LDADD = $(XINE_LIBS) $(GTK2_LIBS) $(GTHREAD2_LIBS) \
+--- src/Makefile.in.orig 2018-02-22 07:47:00 UTC
++++ src/Makefile.in
+@@ -470,7 +470,7 @@ gxine_SOURCES = \
+ gxine_LDADD = $(XINE_LIBS) $(GTK2_LIBS) $(GTK3_LIBS) $(GTHREAD2_LIBS) \
$(JS_LIBS) $(HAL_LIBS) $(UDEV_LIBS) $(DBUS_LIBS) $(LIRC_LIBS) \
$(X_LIBS) $(X_EXTRA_LIBS) $(XEXT_LIBS) $(XTEST_LIBS) \
- $(XINERAMA_LIBS) $(XRANDR_LIBS) $(XCB_LIBS) -ldl -lm
diff --git a/multimedia/gxine/files/patch-src__lirc.c b/multimedia/gxine/files/patch-src__lirc.c
index 33b93253db3c..c2d2b04ce118 100644
--- a/multimedia/gxine/files/patch-src__lirc.c
+++ b/multimedia/gxine/files/patch-src__lirc.c
@@ -1,11 +1,11 @@
---- src/lirc.c.orig 2011-08-07 20:20:33.000000000 +0900
-+++ src/lirc.c 2012-05-15 03:54:41.000000000 +0900
-@@ -223,8 +223,8 @@
+--- src/lirc.c.orig 2017-12-27 17:41:32 UTC
++++ src/lirc.c
+@@ -226,8 +226,8 @@ static JSBool js_reload_lirc (JSContext *cx, uintN arg
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);
+ JS_SET_RVAL (cx, vp, gxine_lirc_thread_created ? JSVAL_TRUE : JSVAL_FALSE);
+#endif
return JS_TRUE;
}
diff --git a/multimedia/gxine/files/patch-src_console_output.c b/multimedia/gxine/files/patch-src_console__output.c
index 3704eedddd7a..b845624c74ca 100644
--- a/multimedia/gxine/files/patch-src_console_output.c
+++ b/multimedia/gxine/files/patch-src_console__output.c
@@ -1,6 +1,6 @@
---- ./src/console_output.c.orig 2008-06-12 04:48:13.000000000 +0400
-+++ ./src/console_output.c 2009-03-20 16:18:03.000000000 +0300
-@@ -44,6 +44,159 @@
+--- src/console_output.c.orig 2017-12-27 17:41:32 UTC
++++ src/console_output.c
+@@ -45,6 +45,159 @@ static void console_push (const char *s, uint8_t e) {}
#else
/* defines & functions for gxine */
diff --git a/multimedia/gxine/files/patch-src_desktop_integration.c b/multimedia/gxine/files/patch-src_desktop__integration.c
index 40b110dda350..1f370888f8e9 100644
--- a/multimedia/gxine/files/patch-src_desktop_integration.c
+++ b/multimedia/gxine/files/patch-src_desktop__integration.c
@@ -1,6 +1,6 @@
---- ./src/desktop_integration.c.orig 2008-05-23 22:42:20.000000000 +0400
-+++ ./src/desktop_integration.c 2008-06-15 20:21:03.000000000 +0400
-@@ -123,6 +123,9 @@
+--- src/desktop_integration.c.orig 2017-12-27 17:41:32 UTC
++++ src/desktop_integration.c
+@@ -120,6 +120,9 @@ static void *get_func (const char *name)
gboolean gxine_vfs_init (void)
{
@@ -10,7 +10,7 @@
void (*init_func) (void) = NULL;
if (gnome_vfs_available != -1)
-@@ -173,6 +176,7 @@
+@@ -170,6 +173,7 @@ gboolean gxine_vfs_init (void)
#endif
return gnome_vfs_available = 1;
diff --git a/multimedia/gxine/pkg-plist b/multimedia/gxine/pkg-plist
index 0ea8013b17a5..d0a19cdfc0d2 100644
--- a/multimedia/gxine/pkg-plist
+++ b/multimedia/gxine/pkg-plist
@@ -1,17 +1,17 @@
bin/gxine
bin/gxine_client
+%%ETCDIR%%/gtk.css
%%ETCDIR%%/gtkrc
%%ETCDIR%%/keypad.xml
%%ETCDIR%%/startup
%%ETCDIR%%/toolbar-fullscreen.xml
%%ETCDIR%%/toolbar-window.xml
-%%WEBPLUGIN%%lib/gxine/gxineplugin.so
-man/man1/gxine.1.gz
-man/man1/gxine_client.1.gz
man/de/man1/gxine.1.gz
man/de/man1/gxine_client.1.gz
man/es/man1/gxine.1.gz
man/es/man1/gxine_client.1.gz
+man/man1/gxine.1.gz
+man/man1/gxine_client.1.gz
share/applications/gxine.desktop
%%DATADIR%%/logo.mpv
%%DATADIR%%/mediamarks