Attachment 143645 Details for Bug 190902 – multimedia_gxine.diff

[patch] multimedia_gxine.diff

multimedia_gxine.diff (text/plain), 6.72 KB, created by tkato432 on 2014-06-10 18:52:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-06-10 18:52:38 UTC

Size: 6.72 KB

patch

obsolete

>diff -urN /usr/ports/multimedia/gxine/Makefile multimedia/gxine/Makefile
>--- /usr/ports/multimedia/gxine/Makefile	2014-04-24 00:05:21.000000000 +0900
>+++ multimedia/gxine/Makefile	2014-06-11 00:00:00.000000000 +0900
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/multimedia/gxine/Makefile 351936 2014-04-23 13:25:16Z tijl $
> 
> PORTNAME=	gxine
>-PORTVERSION=	0.5.907
>-PORTREVISION=	7
>+PORTVERSION=	0.5.908
> CATEGORIES=	multimedia
> MASTER_SITES=	SF/xine/${PORTNAME}/${PORTVERSION}
> 
>@@ -16,10 +15,7 @@
> 		libmozjs185.so:${PORTSDIR}/lang/spidermonkey185 \
> 		libxine.so:${PORTSDIR}/multimedia/libxine
> 
>-OPTIONS_DEFINE=	MOZILLA_PLUGIN GNOME LIRC
>-MOZILLA_PLUGIN_DESC=	Mozilla plugin
>-
>-USES=		gmake libtool:keepla pathfix pkgconfig tar:xz
>+USES=		desktop-file-utils gmake libtool pathfix pkgconfig tar:xz
> USE_GNOME=	gtk20
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--without-hal --with-libintl-prefix=${LOCALBASE}
>@@ -28,33 +24,27 @@
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
>+OPTIONS_DEFINE=		GNOME LIRC WEBPLUGIN
>+OPTIONS_SUB=		yes
>+
>+GNOME_BUILD_DEPENDS=	gnome-screensaver:${PORTSDIR}/x11/gnome-screensaver
>+GNOME_LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
>+GNOME_RUN_DEPENDS=	gnome-screensaver:${PORTSDIR}/x11/gnome-screensaver
>+GNOME_CONFIGURE_ON=	--with-dbus
>+GNOME_CONFIGURE_OFF=	--disable-integration-wizard --without-dbus
>+LIRC_LIB_DEPENDS=	liblirc_client.so:${PORTSDIR}/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 <bsd.port.options.mk>
> 
>-.if ${PORT_OPTIONS:MMOZILLA_PLUGIN}
>-USE_XORG+=	xaw
>-USES+=		webplugin:native
>+.if ${PORT_OPTIONS:MWEBPLUGIN}
> WEBPLUGIN_DIR=	${PREFIX}/lib/gxine
> WEBPLUGIN_FILES=gxineplugin.so
>-PLIST_SUB+=	MOZILLA_PLUGIN=""
>-.else
>-CONFIGURE_ARGS+=--without-browser-plugin
>-PLIST_SUB+=	MOZILLA_PLUGIN="@comment "
>-.endif
>-
>-.if ${PORT_OPTIONS:MGNOME}
>-BUILD_DEPENDS+=	gnome-screensaver:${PORTSDIR}/x11/gnome-screensaver
>-LIB_DEPENDS+=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
>-RUN_DEPENDS+=	gnome-screensaver:${PORTSDIR}/x11/gnome-screensaver
>-CONFIGURE_ARGS+=--with-dbus
>-.else
>-CONFIGURE_ARGS+=--disable-integration-wizard --without-dbus
>-.endif
>-
>-.if ${PORT_OPTIONS:MLIRC}
>-LIB_DEPENDS+=	liblirc_client.so:${PORTSDIR}/comms/lirc
>-CONFIGURE_ARGS+=--enable-lirc
>-.else
>-CONFIGURE_ARGS+=--disable-lirc
> .endif
> 
> post-patch:
>@@ -66,4 +56,9 @@
> 	@${REINPLACE_CMD} -e \
> 		's|@MAKE_PNG_TRUE@|#|' ${WRKSRC}/pixmaps/Makefile.in
> 
>+post-install:
>+.if ${PORT_OPTIONS:MWEBPLUGIN}
>+	@${STRIP_CMD} ${STAGEDIR}${WEBPLUGIN_DIR}/${WEBPLUGIN_FILES}
>+.endif
>+
> .include <bsd.port.mk>
>diff -urN /usr/ports/multimedia/gxine/distinfo multimedia/gxine/distinfo
>--- /usr/ports/multimedia/gxine/distinfo	2014-01-23 05:10:51.000000000 +0900
>+++ multimedia/gxine/distinfo	2014-06-11 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (gxine-0.5.907.tar.xz) = b5c925806a35cb23a24a80a39d494cefb529e22c957987741f269a994ab258d5
>-SIZE (gxine-0.5.907.tar.xz) = 910528
>+SHA256 (gxine-0.5.908.tar.xz) = 832e47136ec68a573b22b6cc1c1d57607e78b05712ba9fb8e64464b5201ed9e7
>+SIZE (gxine-0.5.908.tar.xz) = 917780
>diff -urN /usr/ports/multimedia/gxine/files/patch-src__Makefile.in multimedia/gxine/files/patch-src__Makefile.in
>--- /usr/ports/multimedia/gxine/files/patch-src__Makefile.in	2014-01-23 05:10:51.000000000 +0900
>+++ multimedia/gxine/files/patch-src__Makefile.in	2014-06-11 00:00:00.000000000 +0900
>@@ -1,6 +1,6 @@
> --- src/Makefile.in.orig	2012-02-21 04:10:20.000000000 +0900
> +++ src/Makefile.in	2012-05-15 17:11:18.000000000 +0900
>-@@ -330,12 +330,12 @@
>+@@ -405,12 +405,12 @@
>  top_builddir = @top_builddir@
>  top_srcdir = @top_srcdir@
>  GNU_VERBOSITY := $(if $(findstring GNU,$(shell $(MAKE) -v)),0,1)
>@@ -16,3 +16,12 @@
>  	    -DLOCALEDIR=\"$(localedir)\"
>  
>  gxine_SOURCES = \
>+@@ -452,7 +452,7 @@
>+ gxine_LDADD = $(XINE_LIBS) $(GTK2_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
>diff -urN /usr/ports/multimedia/gxine/files/patch-src__console_outout.h multimedia/gxine/files/patch-src__console_outout.h
>--- /usr/ports/multimedia/gxine/files/patch-src__console_outout.h	2014-01-23 05:10:51.000000000 +0900
>+++ multimedia/gxine/files/patch-src__console_outout.h	1970-01-01 09:00:00.000000000 +0900
>@@ -1,11 +0,0 @@
>---- src/console_output.h.orig	2010-04-11 23:46:54.000000000 +0900
>-+++ src/console_output.h	2012-05-15 04:21:37.000000000 +0900
>-@@ -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 -urN /usr/ports/multimedia/gxine/files/patch-src__engine.c multimedia/gxine/files/patch-src__engine.c
>--- /usr/ports/multimedia/gxine/files/patch-src__engine.c	2014-01-23 05:10:51.000000000 +0900
>+++ multimedia/gxine/files/patch-src__engine.c	1970-01-01 09:00:00.000000000 +0900
>@@ -1,11 +0,0 @@
>---- src/engine.c.orig	2011-10-12 07:47:52.000000000 +0900
>-+++ src/engine.c	2012-05-15 04:22:54.000000000 +0900
>-@@ -30,7 +30,7 @@
>- #include <errno.h>
>- #include <unistd.h>
>- 
>--#include <glib/gthread.h>
>-+#include <glib.h>
>- 
>- #include "engine.h"
>- #include "ui.h"
>diff -urN /usr/ports/multimedia/gxine/files/patch-src__main.c multimedia/gxine/files/patch-src__main.c
>--- /usr/ports/multimedia/gxine/files/patch-src__main.c	2014-01-23 05:10:51.000000000 +0900
>+++ multimedia/gxine/files/patch-src__main.c	1970-01-01 09:00:00.000000000 +0900
>@@ -1,10 +0,0 @@
>---- src/main.c.orig	2010-12-05 20:38:44.000000000 +0900
>-+++ src/main.c	2012-05-15 04:23:45.000000000 +0900
>-@@ -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 -urN /usr/ports/multimedia/gxine/pkg-plist multimedia/gxine/pkg-plist
>--- /usr/ports/multimedia/gxine/pkg-plist	2014-04-09 22:57:16.000000000 +0900
>+++ multimedia/gxine/pkg-plist	2014-06-11 00:00:00.000000000 +0900
>@@ -5,9 +5,7 @@
> %%ETCDIR%%/startup
> %%ETCDIR%%/toolbar-fullscreen.xml
> %%ETCDIR%%/toolbar-window.xml
>-%%MOZILLA_PLUGIN%%lib/gxine/gxineplugin.a
>-%%MOZILLA_PLUGIN%%lib/gxine/gxineplugin.la
>-%%MOZILLA_PLUGIN%%lib/gxine/gxineplugin.so
>+%%WEBPLUGIN%%lib/gxine/gxineplugin.so
> man/man1/gxine.1.gz
> man/man1/gxine_client.1.gz
> man/de/man1/gxine.1.gz
>@@ -62,5 +60,5 @@
> @dirrmtry man/es
> @dirrmtry man/de/man1
> @dirrmtry man/de
>-@dirrm lib/gxine
>+%%WEBPLUGIN%%@dirrm lib/gxine
> @dirrm %%ETCDIR%%

Actions: View | Diff

Attachments on bug 190902: 143645