Index: head/multimedia/gxine/Makefile =================================================================== --- head/multimedia/gxine/Makefile (revision 462567) +++ head/multimedia/gxine/Makefile (revision 462568) @@ -1,65 +1,65 @@ # Created by: Grigori Goronzy # $FreeBSD$ PORTNAME= gxine -PORTVERSION= 0.5.908 -PORTREVISION= 5 +PORTVERSION= 0.5.910 CATEGORIES= multimedia MASTER_SITES= SF/xine/${PORTNAME}/${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Alternative GUI for the Xine media player LICENSE= GPLv2 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 LDFLAGS+= -L${LOCALBASE}/lib -lm OPTIONS_DEFINE= GNOME LIRC WEBPLUGIN OPTIONS_SUB= yes GNOME_BUILD_DEPENDS= gnome-screensaver:x11/gnome-screensaver GNOME_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib GNOME_RUN_DEPENDS= gnome-screensaver:x11/gnome-screensaver GNOME_CONFIGURE_ON= --with-dbus GNOME_CONFIGURE_OFF= --disable-integration-wizard --without-dbus LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc LIRC_CONFIGURE_ON= --enable-lirc LIRC_CONFIGURE_OFF= --disable-lirc WEBPLUGIN_DESC= Build and/or install Web browser plugins WEBPLUGIN_USE= xorg=xaw WEBPLUGIN_USES= webplugin:native WEBPLUGIN_CONFIGURE_OFF= --without-browser-plugin .include .if ${PORT_OPTIONS:MWEBPLUGIN} WEBPLUGIN_DIR= ${PREFIX}/lib/gxine WEBPLUGIN_FILES=gxineplugin.so .endif post-patch: @${REINPLACE_CMD} -e \ '/CFLAGS/s|-I/usr/local/include|| ; \ /CFLAGS/s|-L/usr/local/lib|| ; \ /CPPFLAGS/s|-I/usr/local/include|| ; \ s|XINE_LIST=.*|XINE_LIST=|' ${WRKSRC}/configure @${REINPLACE_CMD} -e \ '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 .include Index: head/multimedia/gxine/distinfo =================================================================== --- head/multimedia/gxine/distinfo (revision 462567) +++ head/multimedia/gxine/distinfo (revision 462568) @@ -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 Index: head/multimedia/gxine/files/patch-src_desktop_integration.c =================================================================== --- head/multimedia/gxine/files/patch-src_desktop_integration.c (revision 462567) +++ head/multimedia/gxine/files/patch-src_desktop_integration.c (nonexistent) @@ -1,20 +0,0 @@ ---- ./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 @@ - - gboolean gxine_vfs_init (void) - { -+#ifndef USE_INTEGRATION_WIZARD -+ return gnome_vfs_available = 0; -+#else - void (*init_func) (void) = NULL; - - if (gnome_vfs_available != -1) -@@ -173,6 +176,7 @@ - #endif - - return gnome_vfs_available = 1; -+#endif - } - - /* Property changes on: head/multimedia/gxine/files/patch-src_desktop_integration.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/gxine/files/patch-src_console_output.c =================================================================== --- head/multimedia/gxine/files/patch-src_console_output.c (revision 462567) +++ head/multimedia/gxine/files/patch-src_console_output.c (nonexistent) @@ -1,162 +0,0 @@ ---- ./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 @@ - #else - /* defines & functions for gxine */ - -+#if defined(__FreeBSD__) -+#include -+#if __FreeBSD_version < 800067 -+ -+/* from src/contrib/cvs/lib/getline.h */ -+#if defined (__GNUC__) || (defined (__STDC__) && __STDC__) -+#define __PROTO(args) args -+#else -+#define __PROTO(args) () -+#endif /* GCC. */ -+ -+#define GETLINE_NO_LIMIT -1 -+ -+int -+ getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream)); -+int -+ getline_safe __PROTO ((char **_lineptr, size_t *_n, FILE *_stream, -+ int limit)); -+int -+ getstr __PROTO ((char **_lineptr, size_t *_n, FILE *_stream, -+ int _terminator, int _offset, int limit)); -+ -+/* getline.h */ -+/* from src/contrib/cvs/lib/getline.c */ -+ -+#include -+#include -+#include -+ -+#define MIN_CHUNK 64 -+ -+int -+getstr (lineptr, n, stream, terminator, offset, limit) -+ char **lineptr; -+ size_t *n; -+ FILE *stream; -+ int terminator; -+ int offset; -+ int limit; -+{ -+ int nchars_avail; /* Allocated but unused chars in *LINEPTR. */ -+ char *read_pos; /* Where we're reading into *LINEPTR. */ -+ int ret; -+ -+ if (!lineptr || !n || !stream) -+ { -+ errno = EINVAL; -+ return -1; -+ } -+ -+ if (!*lineptr) -+ { -+ *n = MIN_CHUNK; -+ *lineptr = malloc (*n); -+ if (!*lineptr) -+ { -+ errno = ENOMEM; -+ return -1; -+ } -+ *lineptr[0] = '\0'; -+ } -+ -+ nchars_avail = *n - offset; -+ read_pos = *lineptr + offset; -+ -+ for (;;) -+ { -+ int save_errno; -+ register int c; -+ -+ if (limit == 0) -+ break; -+ else -+ { -+ c = getc (stream); -+ -+ /* If limit is negative, then we shouldn't pay attention to -+ it, so decrement only if positive. */ -+ if (limit > 0) -+ limit--; -+ } -+ -+ save_errno = errno; -+ -+ /* We always want at least one char left in the buffer, since we -+ always (unless we get an error while reading the first char) -+ NUL-terminate the line buffer. */ -+ -+ assert((*lineptr + *n) == (read_pos + nchars_avail)); -+ if (nchars_avail < 2) -+ { -+ if (*n > MIN_CHUNK) -+ *n *= 2; -+ else -+ *n += MIN_CHUNK; -+ -+ nchars_avail = *n + *lineptr - read_pos; -+ *lineptr = realloc (*lineptr, *n); -+ if (!*lineptr) -+ { -+ errno = ENOMEM; -+ return -1; -+ } -+ read_pos = *n - nchars_avail + *lineptr; -+ assert((*lineptr + *n) == (read_pos + nchars_avail)); -+ } -+ -+ if (ferror (stream)) -+ { -+ /* Might like to return partial line, but there is no -+ place for us to store errno. And we don't want to just -+ lose errno. */ -+ errno = save_errno; -+ return -1; -+ } -+ -+ if (c == EOF) -+ { -+ /* Return partial line, if any. */ -+ if (read_pos == *lineptr) -+ return -1; -+ else -+ break; -+ } -+ -+ *read_pos++ = c; -+ nchars_avail--; -+ -+ if (c == terminator) -+ /* Return the line. */ -+ break; -+ } -+ -+ /* Done - NUL terminate and return the number of chars read. */ -+ *read_pos = '\0'; -+ -+ ret = read_pos - (*lineptr + offset); -+ return ret; -+} -+ -+int -+getline (lineptr, n, stream) -+ char **lineptr; -+ size_t *n; -+ FILE *stream; -+{ -+ return getstr (lineptr, n, stream, '\n', 0, GETLINE_NO_LIMIT); -+} -+ -+/* getline.c */ -+#endif /* __FreeBSD_version */ -+#endif /* defined(__FreeBSD__) */ -+ - # include - # include - # include "log_window.h" Property changes on: head/multimedia/gxine/files/patch-src_console_output.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/gxine/files/patch-src__Makefile.in =================================================================== --- head/multimedia/gxine/files/patch-src__Makefile.in (revision 462567) +++ head/multimedia/gxine/files/patch-src__Makefile.in (revision 462568) @@ -1,27 +1,11 @@ ---- 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 + $(XINERAMA_LIBS) $(XRANDR_LIBS) $(XCB_LIBS) -lm gxine_client_SOURCES = client.c console_output.c gxine_client_CFLAGS = $(AM_CFLAGS) -DGXINE_CLIENT Index: head/multimedia/gxine/files/patch-src__lirc.c =================================================================== --- head/multimedia/gxine/files/patch-src__lirc.c (revision 462567) +++ head/multimedia/gxine/files/patch-src__lirc.c (revision 462568) @@ -1,12 +1,12 @@ ---- 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; } Index: head/multimedia/gxine/files/patch-src_console__output.c =================================================================== --- head/multimedia/gxine/files/patch-src_console__output.c (nonexistent) +++ head/multimedia/gxine/files/patch-src_console__output.c (revision 462568) @@ -0,0 +1,162 @@ +--- 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 */ + ++#if defined(__FreeBSD__) ++#include ++#if __FreeBSD_version < 800067 ++ ++/* from src/contrib/cvs/lib/getline.h */ ++#if defined (__GNUC__) || (defined (__STDC__) && __STDC__) ++#define __PROTO(args) args ++#else ++#define __PROTO(args) () ++#endif /* GCC. */ ++ ++#define GETLINE_NO_LIMIT -1 ++ ++int ++ getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream)); ++int ++ getline_safe __PROTO ((char **_lineptr, size_t *_n, FILE *_stream, ++ int limit)); ++int ++ getstr __PROTO ((char **_lineptr, size_t *_n, FILE *_stream, ++ int _terminator, int _offset, int limit)); ++ ++/* getline.h */ ++/* from src/contrib/cvs/lib/getline.c */ ++ ++#include ++#include ++#include ++ ++#define MIN_CHUNK 64 ++ ++int ++getstr (lineptr, n, stream, terminator, offset, limit) ++ char **lineptr; ++ size_t *n; ++ FILE *stream; ++ int terminator; ++ int offset; ++ int limit; ++{ ++ int nchars_avail; /* Allocated but unused chars in *LINEPTR. */ ++ char *read_pos; /* Where we're reading into *LINEPTR. */ ++ int ret; ++ ++ if (!lineptr || !n || !stream) ++ { ++ errno = EINVAL; ++ return -1; ++ } ++ ++ if (!*lineptr) ++ { ++ *n = MIN_CHUNK; ++ *lineptr = malloc (*n); ++ if (!*lineptr) ++ { ++ errno = ENOMEM; ++ return -1; ++ } ++ *lineptr[0] = '\0'; ++ } ++ ++ nchars_avail = *n - offset; ++ read_pos = *lineptr + offset; ++ ++ for (;;) ++ { ++ int save_errno; ++ register int c; ++ ++ if (limit == 0) ++ break; ++ else ++ { ++ c = getc (stream); ++ ++ /* If limit is negative, then we shouldn't pay attention to ++ it, so decrement only if positive. */ ++ if (limit > 0) ++ limit--; ++ } ++ ++ save_errno = errno; ++ ++ /* We always want at least one char left in the buffer, since we ++ always (unless we get an error while reading the first char) ++ NUL-terminate the line buffer. */ ++ ++ assert((*lineptr + *n) == (read_pos + nchars_avail)); ++ if (nchars_avail < 2) ++ { ++ if (*n > MIN_CHUNK) ++ *n *= 2; ++ else ++ *n += MIN_CHUNK; ++ ++ nchars_avail = *n + *lineptr - read_pos; ++ *lineptr = realloc (*lineptr, *n); ++ if (!*lineptr) ++ { ++ errno = ENOMEM; ++ return -1; ++ } ++ read_pos = *n - nchars_avail + *lineptr; ++ assert((*lineptr + *n) == (read_pos + nchars_avail)); ++ } ++ ++ if (ferror (stream)) ++ { ++ /* Might like to return partial line, but there is no ++ place for us to store errno. And we don't want to just ++ lose errno. */ ++ errno = save_errno; ++ return -1; ++ } ++ ++ if (c == EOF) ++ { ++ /* Return partial line, if any. */ ++ if (read_pos == *lineptr) ++ return -1; ++ else ++ break; ++ } ++ ++ *read_pos++ = c; ++ nchars_avail--; ++ ++ if (c == terminator) ++ /* Return the line. */ ++ break; ++ } ++ ++ /* Done - NUL terminate and return the number of chars read. */ ++ *read_pos = '\0'; ++ ++ ret = read_pos - (*lineptr + offset); ++ return ret; ++} ++ ++int ++getline (lineptr, n, stream) ++ char **lineptr; ++ size_t *n; ++ FILE *stream; ++{ ++ return getstr (lineptr, n, stream, '\n', 0, GETLINE_NO_LIMIT); ++} ++ ++/* getline.c */ ++#endif /* __FreeBSD_version */ ++#endif /* defined(__FreeBSD__) */ ++ + # include + # include + # include "log_window.h" Property changes on: head/multimedia/gxine/files/patch-src_console__output.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/multimedia/gxine/files/patch-src_desktop__integration.c =================================================================== --- head/multimedia/gxine/files/patch-src_desktop__integration.c (nonexistent) +++ head/multimedia/gxine/files/patch-src_desktop__integration.c (revision 462568) @@ -0,0 +1,20 @@ +--- 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) + { ++#ifndef USE_INTEGRATION_WIZARD ++ return gnome_vfs_available = 0; ++#else + void (*init_func) (void) = NULL; + + if (gnome_vfs_available != -1) +@@ -170,6 +173,7 @@ gboolean gxine_vfs_init (void) + #endif + + return gnome_vfs_available = 1; ++#endif + } + + /* Property changes on: head/multimedia/gxine/files/patch-src_desktop__integration.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/multimedia/gxine/pkg-plist =================================================================== --- head/multimedia/gxine/pkg-plist (revision 462567) +++ head/multimedia/gxine/pkg-plist (revision 462568) @@ -1,56 +1,56 @@ 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 %%DATADIR%%/pixmaps/gxine-icon.xpm %%DATADIR%%/pixmaps/nospeaker.png %%DATADIR%%/pixmaps/set-brightness.svg %%DATADIR%%/pixmaps/set-channel.svg %%DATADIR%%/pixmaps/set-contrast.svg %%DATADIR%%/pixmaps/set-hue.svg %%DATADIR%%/pixmaps/set-saturation.svg %%DATADIR%%/pixmaps/set-sharpness.svg %%DATADIR%%/pixmaps/set-sync.svg %%DATADIR%%/pixmaps/set-volume.svg %%DATADIR%%/pixmaps/speaker.png %%DATADIR%%/pixmaps/splash.png %%DATADIR%%/pixmaps/subtitle.svg share/icons/hicolor/64x64/apps/gxine.png share/locale/cs/LC_MESSAGES/gxine.mo share/locale/cs/LC_MESSAGES/gxine.theme.mo share/locale/de/LC_MESSAGES/gxine.mo share/locale/de/LC_MESSAGES/gxine.theme.mo share/locale/es/LC_MESSAGES/gxine.mo share/locale/es/LC_MESSAGES/gxine.theme.mo share/locale/fi/LC_MESSAGES/gxine.mo share/locale/fi/LC_MESSAGES/gxine.theme.mo share/locale/fr/LC_MESSAGES/gxine.mo share/locale/fr/LC_MESSAGES/gxine.theme.mo share/locale/it/LC_MESSAGES/gxine.mo share/locale/it/LC_MESSAGES/gxine.theme.mo share/locale/ja/LC_MESSAGES/gxine.mo share/locale/ja/LC_MESSAGES/gxine.theme.mo share/locale/pl/LC_MESSAGES/gxine.mo share/locale/pl/LC_MESSAGES/gxine.theme.mo share/locale/ru/LC_MESSAGES/gxine.mo share/locale/ru/LC_MESSAGES/gxine.theme.mo share/locale/sv/LC_MESSAGES/gxine.mo share/locale/sv/LC_MESSAGES/gxine.theme.mo share/locale/uk/LC_MESSAGES/gxine.mo share/locale/uk/LC_MESSAGES/gxine.theme.mo share/locale/zh_CN/LC_MESSAGES/gxine.mo share/locale/zh_CN/LC_MESSAGES/gxine.theme.mo share/pixmaps/gxine.png