Date: Thu, 7 Dec 2006 22:54:07 GMT From: "José G. Juanino"<jjuanino@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/106463: [patch] Feature request: please add audacious support for audio/gkrellmms2 port Message-ID: <200612072254.kB7Ms731055802@www.freebsd.org> Resent-Message-ID: <200612072300.kB7N0KuE002385@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 106463
>Category: ports
>Synopsis: [patch] Feature request: please add audacious support for audio/gkrellmms2 port
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Dec 07 23:00:19 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: José G. Juanino
>Release: 6.1-RELEASE-p10
>Organization:
>Environment:
FreeBSD gauss.sanabria.es 6.1-RELEASE-p10 FreeBSD 6.1-RELEASE-p10 #1: Sat Dec 2 17:30:16 CET 2006 root@gauss.sanabria.es:/export/freebsd/obj/export/freebsd/src/sys/MK2006Dic02 i386
>Description:
Hi
I send a patch in order to support audacious player in audio/gkrellmms2
port (actually, only xmms and bmp are supported).
You have to apply the patch by the following way:
$ cd /usr/ports/audio/gkrellmms2
$ patch -p1 < audaciousGkrellmms2.txt
Regards
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -uNr gkrellmms2/Makefile gkrellmms2.patched/Makefile
--- gkrellmms2/Makefile Mon Jun 19 14:27:02 2006
+++ gkrellmms2.patched/Makefile Thu Dec 7 23:43:26 2006
@@ -35,21 +35,29 @@
enable_nls=1
OPTIONS= BEEP_MEDIA_PLAYER "Use beep" off \
+ AUDACIOUS "Use Audacious" off \
XMMS "Use XMMS" on
.include <bsd.port.pre.mk>
-.if !defined(WITH_BEEP_MEDIA_PLAYER) && !defined(WITH_XMMS)
-.if defined(WITHOUT_BEEP_MEDIA_PLAYER) && defined(WITHOUT_XMMS)
-BROKEN= You need to select beep or XMMS. Run 'make config' again!
+.if !defined(WITH_BEEP_MEDIA_PLAYER) && !defined(WITH_XMMS) && !defined(WITH_AUDACIOUS)
+.if defined(WITHOUT_BEEP_MEDIA_PLAYER) && defined(WITHOUT_XMMS) && defined(WITHOUT_AUDACIOUS)
+BROKEN= You need to select beep, XMMS or audacious. Run 'make config' again!
.endif
-WITH_XMMS= yes
.elif defined(WITH_BEEP_MEDIA_PLAYER) && defined(WITH_XMMS)
BROKEN= beep and XMMS are mutually exclusive. Run 'make config' again!
+.elif defined(WITH_BEEP_MEDIA_PLAYER) && defined(WITH_AUDACIOUS)
+BROKEN= beep and audacious are mutually exclusive. Run 'make config' again!
+.elif defined(WITH_XMMS) && defined(WITH_AUDACIOUS)
+BROKEN= XMMS and audacious are mutually exclusive. Run 'make config' again!
.endif
+WITH_XMMS= yes
.if defined(WITH_BEEP_MEDIA_PLAYER)
LIB_DEPENDS= beep.2:${PORTSDIR}/multimedia/beep-media-player
MAKE_ENV+= USE_BMP=yes
+.elif defined(WITH_AUDACIOUS)
+LIB_DEPENDS= audacious.3:${PORTSDIR}/multimedia/audacious
+MAKE_ENV+= USE_AUDACIOUS=yes
.elif defined(WITH_XMMS)
LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
.endif
diff -uNr gkrellmms2/files/patch-audacious.patch gkrellmms2.patched/files/patch-audacious.patch
--- gkrellmms2/files/patch-audacious.patch Thu Jan 1 01:00:00 1970
+++ gkrellmms2.patched/files/patch-audacious.patch Thu Dec 7 23:43:36 2006
@@ -0,0 +1,66 @@
+diff -u Makefile.orig Makefile
+--- Makefile.orig Thu Dec 7 22:52:37 2006
++++ Makefile Thu Dec 7 22:46:38 2006
+@@ -12,9 +12,15 @@
+ XMMS_INCLUDE ?= `pkg-config bmp --cflags`
+ XMMS_LIB ?= `pkg-config bmp --libs`
+ else
++ifdef USE_AUDACIOUS
++ XMMS_INCLUDE ?= `pkg-config audacious --cflags`
++ XMMS_LIB ?= `pkg-config audacious --libs`
++else
+ XMMS_INCLUDE ?= `xmms-config --cflags`
+ XMMS_LIB ?= `xmms-config --libs`
+ endif
++endif
++
+
+ PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins
+
+@@ -24,6 +30,10 @@
+
+ ifdef USE_BMP
+ FLAGS += -DUSE_BMP
++else
++ifdef USE_AUDACIOUS
++ FLAGS += -DUSE_AUDACIOUS
++endif
+ endif
+
+ LOCALEDIR ?= /usr/share/locale
+diff -u gkrellmms.c.orig gkrellmms.c
+--- gkrellmms.c.orig Fri Jan 21 18:02:17 2005
++++ gkrellmms.c Thu Dec 7 22:31:50 2006
+@@ -1040,6 +1040,8 @@
+ draw_time = 1;
+ #ifdef USE_BMP
+ xmms_exec_command = g_strdup("beep-media-player");
++#elif USE_AUDACIOUS
++ xmms_exec_command = g_strdup("audacious");
+ #else
+ xmms_exec_command = g_strdup("xmms");
+ #endif
+diff -u gkrellmms.h.orig gkrellmms.h
+--- gkrellmms.h.orig Fri Jan 21 18:02:17 2005
++++ gkrellmms.h Thu Dec 7 22:33:04 2006
+@@ -27,6 +27,8 @@
+
+ #ifdef USE_BMP
+ #include <bmp/beepctrl.h>
++#elif USE_AUDACIOUS
++#include <audacious/beepctrl.h>
+ #else
+ #include <xmms/xmmsctrl.h>
+ #endif
+diff -u playlist.h.orig playlist.h
+--- playlist.h.orig Fri Jan 21 18:02:17 2005
++++ playlist.h Thu Dec 7 22:33:27 2006
+@@ -26,6 +26,8 @@
+
+ #ifdef USE_BMP
+ #include <bmp/beepctrl.h>
++#elif USE_AUDACIOUS
++#include <audacious/beepctrl.h>
+ #else
+ #include <xmms/xmmsctrl.h>
+ #endif
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200612072254.kB7Ms731055802>