Attachment 72994 Details for Bug 105951 – file.diff

[patch] file.diff

file.diff (text/plain), 3.24 KB, created by Rene Ladan on 2006-11-28 15:30:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rene Ladan

Created: 2006-11-28 15:30:18 UTC

Size: 3.24 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/multimedia/xfce4-media/Makefile /usr/home/rene/freebsd/ports/xfce4-media/Makefile
>--- /usr/ports/multimedia/xfce4-media/Makefile	Sat Nov  4 22:01:22 2006
>+++ /usr/home/rene/freebsd/ports/xfce4-media/Makefile	Tue Nov 28 16:09:03 2006
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	xfce4-media
>-PORTVERSION=	0.9.1
>-PORTREVISION=	3
>+PORTVERSION=	0.9.2
> CATEGORIES=	multimedia xfce
> MASTER_SITES=	http://spuriousinterrupt.org/files/xfmedia/
> DISTNAME=	xfmedia-${PORTVERSION}
>@@ -21,7 +20,8 @@
> 		xine.15:${PORTSDIR}/multimedia/libxine \
> 		exo-0.3.0:${PORTSDIR}/x11/libexo
> 
>-OPTIONS=	TAGLIB	"Enable metadata editing"	off
>+OPTIONS=	TAGLIB	"Enable metadata editing"	off \
>+		DBUS	"Enable remote control support" off
> 
> USE_BZIP2=	yes
> USE_GETOPT_LONG=yes
>@@ -43,6 +43,13 @@
> CONFIGURE_ARGS=	--with-taglib
> .else
> CONFIGURE_ARGS=	--without-taglib
>+.endif
>+
>+.if defined(WITH_DBUS)
>+LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
>+CONFIGURE_ARGS+=	--enable-dbus
>+.else
>+CONFIGURE_ARGS+=	--disable-dbus
> .endif
> 
> post-patch:
>diff -ruN --exclude=CVS /usr/ports/multimedia/xfce4-media/distinfo /usr/home/rene/freebsd/ports/xfce4-media/distinfo
>--- /usr/ports/multimedia/xfce4-media/distinfo	Sat Nov  4 22:01:22 2006
>+++ /usr/home/rene/freebsd/ports/xfce4-media/distinfo	Tue Nov 28 11:53:52 2006
>@@ -1,3 +1,3 @@
>-MD5 (xfce4/xfmedia-0.9.1.tar.bz2) = 5ab3d25703d16ab4074dc63e677d0367
>-SHA256 (xfce4/xfmedia-0.9.1.tar.bz2) = f396989b891dc676bec67a777ef217c9b0e7ccf212373a74984c0153aea0b8fa
>-SIZE (xfce4/xfmedia-0.9.1.tar.bz2) = 806692
>+MD5 (xfce4/xfmedia-0.9.2.tar.bz2) = 6eb8bd1f67201f829e0f45e733c02bd5
>+SHA256 (xfce4/xfmedia-0.9.2.tar.bz2) = 451b67541527cde7f96693fa1ef7776eb03ac40edcef3023bfb2c1ebcf3e7e0c
>+SIZE (xfce4/xfmedia-0.9.2.tar.bz2) = 893228
>diff -ruN --exclude=CVS /usr/ports/multimedia/xfce4-media/files/patch-src_remote.c /usr/home/rene/freebsd/ports/xfce4-media/files/patch-src_remote.c
>--- /usr/ports/multimedia/xfce4-media/files/patch-src_remote.c	Sat Nov  4 22:01:22 2006
>+++ /usr/home/rene/freebsd/ports/xfce4-media/files/patch-src_remote.c	Thu Jan  1 01:00:00 1970
>@@ -1,12 +0,0 @@
>---- src/remote.c.orig	2006-04-08 16:24:13.000000000 +0000
>-+++ src/remote.c
>-@@ -489,8 +489,7 @@ xfmedia_remote_init(XfmediaMainwin *mwin
>-     for(i = 0; i < MAX_INSTANCES; i++) {
>-         g_snprintf(name, 64, XFMEDIA_DBUS_SERVICE_FMT, i);
>-         dbus_error_init(&derr);
>--        ret = dbus_bus_request_name(dbus_conn, name,
>--                DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT, &derr);
>-+        ret = dbus_bus_request_name(dbus_conn, name, 0, &derr);
>-         if(ret < 0) {
>-             g_warning("Unable to acquire D-BUS service '%s': %s." \
>-                 "  Remote control interface will not be available.",
>diff -ruN --exclude=CVS /usr/ports/multimedia/xfce4-media/pkg-plist /usr/home/rene/freebsd/ports/xfce4-media/pkg-plist
>--- /usr/ports/multimedia/xfce4-media/pkg-plist	Sat Nov  4 22:01:22 2006
>+++ /usr/home/rene/freebsd/ports/xfce4-media/pkg-plist	Tue Nov 28 16:08:06 2006
>@@ -8,6 +8,7 @@
> include/xfmedia/xfmedia-remote-client.h
> include/xfmedia/xfmedia-remote-common.h
> include/xfmedia/xfmedia-settings.h
>+include/xfmedia/xfmedia-video-window.h
> lib/xfmedia/plugins/xfmedia-infopipe.a
> lib/xfmedia/plugins/xfmedia-infopipe.la
> lib/xfmedia/plugins/xfmedia-infopipe.so
>-

Actions: View | Diff

Attachments on bug 105951: 72994