From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Dec 7 23:00:21 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 62FFF16A47B for ; Thu, 7 Dec 2006 23:00:21 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6563143CAC for ; Thu, 7 Dec 2006 22:59:26 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kB7N0KjU002386 for ; Thu, 7 Dec 2006 23:00:20 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kB7N0KuE002385; Thu, 7 Dec 2006 23:00:20 GMT (envelope-from gnats) Resent-Date: Thu, 7 Dec 2006 23:00:20 GMT Resent-Message-Id: <200612072300.kB7N0KuE002385@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "José G. Juanino" Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6860816A407 for ; Thu, 7 Dec 2006 22:54:07 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [69.147.83.33]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1E6E043CAC for ; Thu, 7 Dec 2006 22:53:13 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id kB7Ms753055804 for ; Thu, 7 Dec 2006 22:54:07 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id kB7Ms731055802; Thu, 7 Dec 2006 22:54:07 GMT (envelope-from nobody) Message-Id: <200612072254.kB7Ms731055802@www.freebsd.org> Date: Thu, 7 Dec 2006 22:54:07 GMT From: "José G. Juanino" To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.0 Cc: Subject: ports/106463: [patch] Feature request: please add audacious support for audio/gkrellmms2 port X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2006 23:00:21 -0000 >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 -.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 ++#elif USE_AUDACIOUS ++#include + #else + #include + #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 ++#elif USE_AUDACIOUS ++#include + #else + #include + #endif >Release-Note: >Audit-Trail: >Unformatted: