diff options
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/audacious-crossfade/Makefile | 4 | ||||
| -rw-r--r-- | audio/audacious-dumb/Makefile | 2 | ||||
| -rw-r--r-- | audio/audacious-dumb/distinfo | 6 | ||||
| -rw-r--r-- | audio/audacious-dumb/files/patch-Makefile | 10 | ||||
| -rw-r--r-- | audio/audacious-mac/Makefile | 5 | ||||
| -rw-r--r-- | audio/audacious-mac/distinfo | 6 | ||||
| -rw-r--r-- | audio/audacious-mac/files/patch-src-common.h | 8 | ||||
| -rw-r--r-- | audio/audacious-mac/files/patch-src-fileinfo.cpp | 11 | ||||
| -rw-r--r-- | audio/audacious-mac/files/patch-src-mac.cpp | 19 | ||||
| -rw-r--r-- | audio/audacious-mac/files/url2filename.cpp | 57 |
10 files changed, 16 insertions, 112 deletions
diff --git a/audio/audacious-crossfade/Makefile b/audio/audacious-crossfade/Makefile index 531dff7bbc94..6c5af8ab76fb 100644 --- a/audio/audacious-crossfade/Makefile +++ b/audio/audacious-crossfade/Makefile @@ -6,8 +6,8 @@ # APP= audacious -LIB_DEPENDS= audacious.5:${PORTSDIR}/multimedia/audacious -BUILD_DEPENDS= ${LOCALBASE}/lib/audacious/General/libalarm.so:${PORTSDIR}/multimedia/audacious-plugins +LIB_DEPENDS= audclient.1:${PORTSDIR}/multimedia/audacious +BUILD_DEPENDS= ${LOCALBASE}/lib/audacious/General/alarm.so:${PORTSDIR}/multimedia/audacious-plugins CPPFLAGS+= -I${LOCALBASE}/include/glib-2.0 -I${LOCALBASE}/include/gtk-2.0 \ -I${LOCALBASE}/include/cairo -I${LOCALBASE}/include/pango-1.0 \ -I${LOCALBASE}/include/atk-1.0 diff --git a/audio/audacious-dumb/Makefile b/audio/audacious-dumb/Makefile index 1a8c9f2f090a..8d0d3c88a40b 100644 --- a/audio/audacious-dumb/Makefile +++ b/audio/audacious-dumb/Makefile @@ -6,7 +6,7 @@ # PORTNAME= audacious-dumb -PORTVERSION= 0.42 +PORTVERSION= 0.56 CATEGORIES= audio MASTER_SITES= http://www.netswarm.net/misc/ \ http://critical.ch/distfiles/ \ diff --git a/audio/audacious-dumb/distinfo b/audio/audacious-dumb/distinfo index 53f259dc4a71..bca93e30393f 100644 --- a/audio/audacious-dumb/distinfo +++ b/audio/audacious-dumb/distinfo @@ -1,3 +1,3 @@ -MD5 (audacious-dumb-0.42.tar.gz) = 66adaf700fc6d01f2137ff2ff19297ff -SHA256 (audacious-dumb-0.42.tar.gz) = 29e53a22a6c907e01a669a40be97f7cd39c8a0efa267e93b1defb45bb793ec53 -SIZE (audacious-dumb-0.42.tar.gz) = 21599 +MD5 (audacious-dumb-0.56.tar.gz) = cb8af12661523304c7e1d2455af42ca6 +SHA256 (audacious-dumb-0.56.tar.gz) = cb30bb991284b929e235f24fc41df9720522288e90c5735fd97c1d3f6ab27750 +SIZE (audacious-dumb-0.56.tar.gz) = 22633 diff --git a/audio/audacious-dumb/files/patch-Makefile b/audio/audacious-dumb/files/patch-Makefile index da90b90183e3..98832e186b01 100644 --- a/audio/audacious-dumb/files/patch-Makefile +++ b/audio/audacious-dumb/files/patch-Makefile @@ -1,15 +1,15 @@ ---- ./Makefile.orig Wed Feb 28 13:01:40 2007 -+++ ./Makefile Wed May 30 10:34:31 2007 +--- Makefile.orig 2007-10-28 19:36:45.000000000 +0100 ++++ Makefile 2007-11-28 15:07:03.000000000 +0100 @@ -7,7 +7,7 @@ CC ?= gcc CFLAGS ?= -O2 -pipe -CFLAGS += -Wall -fPIC -DPIC -I/usr/local/include +CFLAGS += -Wall -fPIC -DPIC -I$(LOCALBASE)/include - AUDACIOUSCFLAGS = $(shell pkg-config 'audacious >= 1.3' --cflags || echo "old") + AUDACIOUSCFLAGS = $(shell pkg-config 'audacious >= 1.4' --cflags || echo "old") ifeq ($(AUDACIOUSCFLAGS),old) -@@ -16,6 +16,8 @@ +@@ -17,6 +17,8 @@ CFLAGS += $(AUDACIOUSCFLAGS) endif @@ -18,7 +18,7 @@ DUMBLIBS := -ldumb -L/usr/local/lib AUDACIOUSLIBS := $(shell pkg-config audacious --libs) -@@ -24,13 +26,9 @@ +@@ -25,13 +27,9 @@ OBJECTS := $(SOURCES:%.c=$(OBJDIR)/%.o) all: $(PLUGIN_FILE) diff --git a/audio/audacious-mac/Makefile b/audio/audacious-mac/Makefile index 700e44de5079..ec5eb192966e 100644 --- a/audio/audacious-mac/Makefile +++ b/audio/audacious-mac/Makefile @@ -6,14 +6,14 @@ # PORTNAME= audacious-mac -PORTVERSION= 0.2.0 +PORTVERSION= 0.3.10 CATEGORIES= audio MASTER_SITES= http://www.netswarm.net/misc/ MAINTAINER= buganini@gmail.com COMMENT= Audacious plugin that support the Monkey's Audio lossless formats -LIB_DEPENDS= audacious:${PORTSDIR}/multimedia/audacious \ +LIB_DEPENDS= audclient.1:${PORTSDIR}/multimedia/audacious \ mac.2:${PORTSDIR}/audio/mac USE_GMAKE= yes @@ -22,6 +22,5 @@ CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include/" post-patch: @${REINPLACE_CMD} -e 's|CXXFLAGS = @CXXFLAGS@|CXXFLAGS = @CXXFLAGS@ -lmac|' ${WRKSRC}/src/Makefile.in - ${CP} ${PATCHDIR}/url2filename.cpp ${WRKSRC}/src/ .include <bsd.port.mk> diff --git a/audio/audacious-mac/distinfo b/audio/audacious-mac/distinfo index d958f8ee49bd..f3418adcf85c 100644 --- a/audio/audacious-mac/distinfo +++ b/audio/audacious-mac/distinfo @@ -1,3 +1,3 @@ -MD5 (audacious-mac-0.2.0.tar.gz) = ec997e0a3721717bf4b78d80e38dcb77 -SHA256 (audacious-mac-0.2.0.tar.gz) = e85f33bc50671d9e6a64563dbf4ec36b164a3d3db2130ad75b99195f67d5af84 -SIZE (audacious-mac-0.2.0.tar.gz) = 319835 +MD5 (audacious-mac-0.3.10.tar.gz) = 94cb1a1dd73ca9a90c2c2cf4cea95361 +SHA256 (audacious-mac-0.3.10.tar.gz) = 1ead27cae4126a03789a8891d1fbfa058a94e590d744d00ee34400ed1a9f9cf9 +SIZE (audacious-mac-0.3.10.tar.gz) = 323358 diff --git a/audio/audacious-mac/files/patch-src-common.h b/audio/audacious-mac/files/patch-src-common.h deleted file mode 100644 index 62fac9317716..000000000000 --- a/audio/audacious-mac/files/patch-src-common.h +++ /dev/null @@ -1,8 +0,0 @@ ---- src/common.h Sat Apr 9 20:06:20 2005 -+++ src/common.h Sun Jun 24 06:03:13 2007 -@@ -3,3 +3,5 @@ - #include <libintl.h> - - #define _(String) gettext (String) -+ -+#include "url2filename.cpp" diff --git a/audio/audacious-mac/files/patch-src-fileinfo.cpp b/audio/audacious-mac/files/patch-src-fileinfo.cpp deleted file mode 100644 index a7849c28f477..000000000000 --- a/audio/audacious-mac/files/patch-src-fileinfo.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/fileinfo.cpp Fri Apr 15 16:56:44 2005 -+++ src/fileinfo.cpp Sun Jun 24 06:02:55 2007 -@@ -778,7 +778,7 @@ - void mac_file_info_box(char *filename) - { - char *title; -- -+ url2filename(filename); - int nRetVal; - wchar_t *pUTF16Name; - diff --git a/audio/audacious-mac/files/patch-src-mac.cpp b/audio/audacious-mac/files/patch-src-mac.cpp deleted file mode 100644 index aa86059c575e..000000000000 --- a/audio/audacious-mac/files/patch-src-mac.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- src/mac.cpp Thu Feb 1 02:46:26 2007 -+++ src/mac.cpp Sun Jun 24 06:02:16 2007 -@@ -146,7 +146,7 @@ - - static int decompress_init(InputPlayback *playback) - { -- char *filename = playback->filename; -+ char *filename = url2filename(playback->filename); - - int nRetVal; - -@@ -386,6 +386,7 @@ - - void mac_get_song_info(char *filename, char **title, int *length) - { -+ url2filename(filename); - int nRetVal = 0; - - if (filename == NULL) diff --git a/audio/audacious-mac/files/url2filename.cpp b/audio/audacious-mac/files/url2filename.cpp deleted file mode 100644 index 060987481306..000000000000 --- a/audio/audacious-mac/files/url2filename.cpp +++ /dev/null @@ -1,57 +0,0 @@ -/* -Under Gnome, drag file into the playlist will pass a URL as filename (like file:///tmp/url%20encoded.ape) -The plugin cannot cope with URL originally, and this is the patch. - --buganini@gmail.com -*/ - -#include "string.h" - -static char *url2filename(char *url){ - unsigned char *rpt,*wpt; - char flag=0; - unsigned char table[128]={0}; - - if(strncmp(url,"file://",7)!=0){ - return url; - } - table[(unsigned char)'0']=0; - table[(unsigned char)'1']=1; - table[(unsigned char)'2']=2; - table[(unsigned char)'3']=3; - table[(unsigned char)'4']=4; - table[(unsigned char)'5']=5; - table[(unsigned char)'6']=6; - table[(unsigned char)'7']=7; - table[(unsigned char)'8']=8; - table[(unsigned char)'9']=9; - table[(unsigned char)'a']=table[(unsigned char)'A']=10; - table[(unsigned char)'b']=table[(unsigned char)'B']=11; - table[(unsigned char)'c']=table[(unsigned char)'C']=12; - table[(unsigned char)'d']=table[(unsigned char)'D']=13; - table[(unsigned char)'e']=table[(unsigned char)'E']=14; - table[(unsigned char)'f']=table[(unsigned char)'F']=15; - - rpt=wpt=(unsigned char*)url; - rpt+=7; - while(*rpt!=0){ - if(flag==0){ - if(*rpt=='%'){ - flag=1; - }else{ - *wpt=*rpt; - ++wpt; - } - }else if(flag==1){ - *wpt=table[*rpt]<<4; - flag=2; - }else if(flag==2){ - *wpt|=table[*rpt]; - ++wpt; - flag=0; - } - ++rpt; - } - *wpt=0; - return url; -} |