Attachment #152714 for bug #197415

View | Details | Raw Unified | Return to bug 197415
Collapse All | Expand All




# $FreeBSD: head/audio/aqualung/Makefile 374303 2014-12-08 16:48:38Z tijl $

PORTNAME=	aqualung
DISTVERSION=	1.0-rc1
PORTREVISION=	22
CATEGORIES=	audio
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
 		http://wickedmachine.net/mirror/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Music player with rich features

LICENSE=	GPLv2 # (or later)

LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
		libmp3lame.so:${PORTSDIR}/audio/lame \
		libcddb.so:${PORTSDIR}/audio/libcddb \
		libspeex.so:${PORTSDIR}/audio/speex \
		libmad.so:${PORTSDIR}/audio/libmad \
		libmodplug.so:${PORTSDIR}/audio/libmodplug \
		liboggz.so:${PORTSDIR}/audio/liboggz \
		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
		libsndfile.so:${PORTSDIR}/audio/libsndfile \
		libvorbis.so:${PORTSDIR}/audio/libvorbis \
		libmac.so:${PORTSDIR}/audio/mac \
		libmpcdec.so:${PORTSDIR}/audio/musepack \
		libspeex.so:${PORTSDIR}/audio/speex \
		libcdio.so:${PORTSDIR}/sysutils/libcdio \
		libmp3lame.so:${PORTSDIR}/audio/lame \
		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
		libwavpack.so:${PORTSDIR}/audio/wavpack \
		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
		libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia \
		liblrdf.so:${PORTSDIR}/textproc/liblrdf

USES=		gettext lua:51 pkgconfig
USE_GNOME=	gtk20 libxml2 libxslt
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-alsa=no --with-ifp=no

CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib

DESKTOP_ENTRIES="Aqualung" "" "${DATADIR}/general.png" "aqualung" \
		"Audio;AudioVideo;GTK;" ""

OPTIONS_DEFINE=		DOCS JACK PULSEAUDIO

JACK_CONFIGURE_OFF=	--with-jack=no
JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
JACK_CONFIGURE_ON=	--with-jack=yes
JACK_CONFIGURE_OFF=	--with-jack=no
PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
PULSEAUDIO_LIB_DEPENDS=		libpulse.so:${PORTSDIR}/audio/pulseaudio
PULSEAUDIO_CONFIGURE_ON=	--with-pulse=yes
PULSEAUDIO_CONFIGURE_OFF=	--with-pulse=no
post-patch:
	@${REINPLACE_CMD} -e '/^docdir/s!=.*!= ${DOCSDIR}!'\
		${WRKSRC}/doc/Makefile.in
#	@${REINPLACE_CMD} -e 's/libcdio_paranoia/libcdda_paranoia/g'\
#		${WRKSRC}/configure
	@${ECHO_CMD} "#include <sys/stat.h>" >> ${WRKSRC}/src/common.h
	@${ECHO_CMD} "#include <sys/types.h>" >> ${WRKSRC}/src/common.h

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)audio/aqualung/distinfo (-2 / +2 lines)
1	SHA256 (aqualung-0.9beta11.tar.gz) = 315eae4539c1039978d38bd7bc8ef965f3e9dc518c7eb6f4e9da52a9bf332ddd	1	SHA256 (aqualung-1.0-rc1.tar.gz) = 4b6c7e8a38af9f03fb042f8133cce834f87d7f5489caf2a85e9d2d1e428ae24b
2	SIZE (aqualung-0.9beta11.tar.gz) = 1584700	2	SIZE (aqualung-1.0-rc1.tar.gz) = 1939271




--- configure.orig	2010-02-01 00:30:18.000000000 +0800
+++ configure	2012-08-19 21:26:55.000000000 +0800
@@ -10920,6 +10920,7 @@
 			{ $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 		        lrdf_LIBS=`pkg-config --libs lrdf`
+		        lrdf_CFLAGS=`pkg-config --cflags lrdf`
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_LADSPA 1
@@ -11801,7 +11802,7 @@
 
 CFLAGS="$CFLAGS $BUILD_CFLAGS -Wall $PLATFORM_CFLAGS $AQUALUNG_SKINDIR $AQUALUNG_LOCALEDIR $AQUALUNG_DATADIR -D_GNU_SOURCE"
 CXXFLAGS="$CFLAGS"
-CPPFLAGS="$gtk_CFLAGS $glib_CFLAGS $xml_CFLAGS $alsa_CFLAGS $jack_CFLAGS $cdda_CFLAGS $pulse_CFLAGS"
+CPPFLAGS="$gtk_CFLAGS $glib_CFLAGS $xml_CFLAGS $alsa_CFLAGS $jack_CFLAGS $cdda_CFLAGS $pulse_CFLAGS $lrdf_CFLAGS"
 LIBS="decoder/libdecoder.a encoder/libencoder.a $gtk_LIBS $glib_LIBS $xml_LIBS $jack_LIBS $lrdf_LIBS $src_LIBS $alsa_LIBS $sndio_LIBS $oss_LIBS $sndfile_LIBS $flac_LIBS $ogg_LIBS $wavpack_LIBS $speex_LIBS $mad_LIBS $mod_LIBS $mpc_LIBS $mac_LIBS $lavc_LIBS $vorbisenc_LIBS $lame_LIBS $cdda_LIBS $cddb_LIBS $ifp_LIBS $PLATFORM_LIBS $z_LIBS $bz2_LIBS $lua_LIBS $pulse_LIBS"
 
 

Lines 1-11 Link Here

(-)audio/aqualung/files/patch-src__playlist.c (-11 lines)
1	--- ./src/playlist.c.orig Mon Feb 5 00:46:43 2007
2	+++ ./src/playlist.c Mon Feb 5 00:47:06 2007
3	@@ -51,6 +51,8 @@
4	#include "playlist.h"
5	#include "ifp_device.h"
6
7	+#include <strfunc.h>
8	+
9	extern options_t options;
10
11	extern void assign_audio_fc_filters(GtkFileChooser *fc);

Lines 1-4 Link Here

(-)audio/aqualung/pkg-descr (-1 / +1 lines)
1	Aqualung is a music player. It plays audio files from your filesystem	1	Aqualung is a music player. It plays audio files from your filesystem
2	and has the feature of inserting no gaps between adjacent tracks.	2	and has the feature of inserting no gaps between adjacent tracks.
3		3
4	WWW: http://aqualung.sourceforge.net/	4	WWW: http://aqualung.factorial.hu/




%%DATADIR%%/skin/woody/wood6.png
%%DATADIR%%/tab-close.png
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/split.sh
%%PORTDOCS%%%%DOCSDIR%%/aqualung-doc.css
%%PORTDOCS%%%%DOCSDIR%%/aqualung-doc.dtd
%%PORTDOCS%%%%DOCSDIR%%/aqualung-doc.xml

%%PORTDOCS%%%%DOCSDIR%%/aqualung-xhtml-view.xsl
%%PORTDOCS%%%%DOCSDIR%%/aqualung-xhtml.xsl
%%PORTDOCS%%%%DOCSDIR%%/external.eps
%%PORTDOCS%%%%DOCSDIR%%/timer.eps
%%PORTDOCS%%%%DOCSDIR%%/external.png
%%PORTDOCS%%%%DOCSDIR%%/jack.png
%%PORTDOCS%%%%DOCSDIR%%/main.png
%%PORTDOCS%%%%DOCSDIR%%/playlist.png
%%PORTDOCS%%%%DOCSDIR%%/settings.png
%%PORTDOCS%%%%DOCSDIR%%/split.sh
%%PORTDOCS%%%%DOCSDIR%%/store.png
%%PORTDOCS%%%%DOCSDIR%%/systray.png
%%PORTDOCS%%%%DOCSDIR%%/timer.eps
%%PORTDOCS%%%%DOCSDIR%%/timer.png
share/locale/de/LC_MESSAGES/aqualung.mo
share/locale/es/LC_MESSAGES/aqualung.mo
share/locale/fr/LC_MESSAGES/aqualung.mo
share/locale/hu/LC_MESSAGES/aqualung.mo
share/locale/it/LC_MESSAGES/aqualung.mo
share/locale/ja/LC_MESSAGES/aqualung.mo
share/locale/nl/LC_MESSAGES/aqualung.mo
share/locale/pl/LC_MESSAGES/aqualung.mo
share/locale/ru/LC_MESSAGES/aqualung.mo
share/locale/sv/LC_MESSAGES/aqualung.mo
share/locale/uk/LC_MESSAGES/aqualung.mo
share/locale/zh/LC_MESSAGES/aqualung.mo

Return to bug 197415

Lines 2-60 Link Here

(-)audio/aqualung/Makefile (-37 / +28 lines)
2	# $FreeBSD: head/audio/aqualung/Makefile 374303 2014-12-08 16:48:38Z tijl $	2	# $FreeBSD: head/audio/aqualung/Makefile 374303 2014-12-08 16:48:38Z tijl $
3		3
4	PORTNAME= aqualung	4	PORTNAME= aqualung
5	DISTVERSION= 0.9beta11	5	DISTVERSION= 1.0-rc1
6	PORTREVISION= 22
7	CATEGORIES= audio	6	CATEGORIES= audio
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} \	7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
9	http://wickedmachine.net/mirror/
10		8
11	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
12	COMMENT= Music player with rich features	10	COMMENT= Music player with rich features
13		11
14	LIB_DEPENDS= libsamplerate.so:${PORTSDIR}/audio/libsamplerate \	12	LICENSE= GPLv2 # (or later)
15	libsndfile.so:${PORTSDIR}/audio/libsndfile \	13
16	libFLAC.so:${PORTSDIR}/audio/flac \	14	LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac \
17	libvorbis.so:${PORTSDIR}/audio/libvorbis \	15	libmp3lame.so:${PORTSDIR}/audio/lame \
18	liboggz.so:${PORTSDIR}/audio/liboggz \	16	libcddb.so:${PORTSDIR}/audio/libcddb \
19	libspeex.so:${PORTSDIR}/audio/speex \
20	libmad.so:${PORTSDIR}/audio/libmad \	17	libmad.so:${PORTSDIR}/audio/libmad \
21	libmodplug.so:${PORTSDIR}/audio/libmodplug \	18	libmodplug.so:${PORTSDIR}/audio/libmodplug \
22	libmpcdec.so:${PORTSDIR}/audio/musepack \	19	liboggz.so:${PORTSDIR}/audio/liboggz \
		20	libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
		21	libsndfile.so:${PORTSDIR}/audio/libsndfile \
		22	libvorbis.so:${PORTSDIR}/audio/libvorbis \
23	libmac.so:${PORTSDIR}/audio/mac \	23	libmac.so:${PORTSDIR}/audio/mac \
24	libtag.so:${PORTSDIR}/audio/taglib \	24	libmpcdec.so:${PORTSDIR}/audio/musepack \
25	liblrdf.so:${PORTSDIR}/textproc/liblrdf \	25	libspeex.so:${PORTSDIR}/audio/speex \
26	libcdio.so:${PORTSDIR}/sysutils/libcdio \
27	libmp3lame.so:${PORTSDIR}/audio/lame \
28	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
29	libwavpack.so:${PORTSDIR}/audio/wavpack \	26	libwavpack.so:${PORTSDIR}/audio/wavpack \
30	libxslt.so:${PORTSDIR}/textproc/libxslt \	27	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
31	libcddb.so:${PORTSDIR}/audio/libcddb \	28	libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia \
32	libstrfunc.so:${PORTSDIR}/devel/libstrfunc	29	liblrdf.so:${PORTSDIR}/textproc/liblrdf
33		30
34	USES= gmake pkgconfig gettext compiler:nestedfct	31	USES= gettext lua:51 pkgconfig
35	USE_GNOME= gtk20 libxml2	32	USE_GNOME= gtk20 libxml2 libxslt
36	GNU_CONFIGURE= yes	33	GNU_CONFIGURE= yes
37	CONFIGURE_ARGS= --program-transform-name="" --with-alsa=no --with-ifp=no \	34	CONFIGURE_ARGS= --with-alsa=no --with-ifp=no
38	--with-cdda=no	35
39	CPPFLAGS+= -I${LOCALBASE}/include	36	CPPFLAGS+= -I${LOCALBASE}/include
40	LDFLAGS+= -L${LOCALBASE}/lib -lstrfunc	37	LDFLAGS+= -L${LOCALBASE}/lib
41		38
42	OPTIONS_DEFINE= JACK PULSEAUDIO DOCS	39	DESKTOP_ENTRIES="Aqualung" "" "${DATADIR}/general.png" "aqualung" \
		40	"Audio;AudioVideo;GTK;" ""
		41
		42	OPTIONS_DEFINE= DOCS JACK PULSEAUDIO
43		43
44	JACK_CONFIGURE_OFF= --with-jack=no
45	JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack	44	JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack
46	JACK_CONFIGURE_ON= --with-jack=yes	45	JACK_CONFIGURE_ON= --with-jack=yes
47		46	JACK_CONFIGURE_OFF= --with-jack=no
48	PULSEAUDIO_CONFIGURE_OFF= --with-pulse=no	47	PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio
49	PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio
50	PULSEAUDIO_CONFIGURE_ON= --with-pulse=yes	48	PULSEAUDIO_CONFIGURE_ON= --with-pulse=yes
51		49	PULSEAUDIO_CONFIGURE_OFF= --with-pulse=no
52	post-patch:
53	@${REINPLACE_CMD} -e '/^docdir/s!=.*!= ${DOCSDIR}!'\
54	${WRKSRC}/doc/Makefile.in
55	# @${REINPLACE_CMD} -e 's/libcdio_paranoia/libcdda_paranoia/g'\
56	# ${WRKSRC}/configure
57	@${ECHO_CMD} "#include <sys/stat.h>" >> ${WRKSRC}/src/common.h
58	@${ECHO_CMD} "#include <sys/types.h>" >> ${WRKSRC}/src/common.h
59		50
60	.include <bsd.port.mk>	51	.include <bsd.port.mk>

Lines 1-19 Link Here

(-)audio/aqualung/files/patch-configure (-19 lines)
1	--- configure.orig 2010-02-01 00:30:18.000000000 +0800
2	+++ configure 2012-08-19 21:26:55.000000000 +0800
3	@@ -10920,6 +10920,7 @@
4	{ $as_echo "$as_me:$LINENO: result: yes" >&5
5	$as_echo "yes" >&6; }
6	lrdf_LIBS=`pkg-config --libs lrdf`
7	+ lrdf_CFLAGS=`pkg-config --cflags lrdf`
8
9	cat >>confdefs.h <<\_ACEOF
10	#define HAVE_LADSPA 1
11	@@ -11801,7 +11802,7 @@
12
13	CFLAGS="$CFLAGS $BUILD_CFLAGS -Wall $PLATFORM_CFLAGS $AQUALUNG_SKINDIR $AQUALUNG_LOCALEDIR $AQUALUNG_DATADIR -D_GNU_SOURCE"
14	CXXFLAGS="$CFLAGS"
15	-CPPFLAGS="$gtk_CFLAGS $glib_CFLAGS $xml_CFLAGS $alsa_CFLAGS $jack_CFLAGS $cdda_CFLAGS $pulse_CFLAGS"
16	+CPPFLAGS="$gtk_CFLAGS $glib_CFLAGS $xml_CFLAGS $alsa_CFLAGS $jack_CFLAGS $cdda_CFLAGS $pulse_CFLAGS $lrdf_CFLAGS"
17	LIBS="decoder/libdecoder.a encoder/libencoder.a $gtk_LIBS $glib_LIBS $xml_LIBS $jack_LIBS $lrdf_LIBS $src_LIBS $alsa_LIBS $sndio_LIBS $oss_LIBS $sndfile_LIBS $flac_LIBS $ogg_LIBS $wavpack_LIBS $speex_LIBS $mad_LIBS $mod_LIBS $mpc_LIBS $mac_LIBS $lavc_LIBS $vorbisenc_LIBS $lame_LIBS $cdda_LIBS $cddb_LIBS $ifp_LIBS $PLATFORM_LIBS $z_LIBS $bz2_LIBS $lua_LIBS $pulse_LIBS"
18
19

Lines 131-137 Link Here

(-)audio/aqualung/pkg-plist (-2 / +6 lines)
131	%%DATADIR%%/skin/woody/wood6.png	131	%%DATADIR%%/skin/woody/wood6.png
132	%%DATADIR%%/tab-close.png	132	%%DATADIR%%/tab-close.png
133	%%PORTDOCS%%%%DOCSDIR%%/README	133	%%PORTDOCS%%%%DOCSDIR%%/README
134	%%PORTDOCS%%%%DOCSDIR%%/split.sh
135	%%PORTDOCS%%%%DOCSDIR%%/aqualung-doc.css	134	%%PORTDOCS%%%%DOCSDIR%%/aqualung-doc.css
136	%%PORTDOCS%%%%DOCSDIR%%/aqualung-doc.dtd	135	%%PORTDOCS%%%%DOCSDIR%%/aqualung-doc.dtd
137	%%PORTDOCS%%%%DOCSDIR%%/aqualung-doc.xml	136	%%PORTDOCS%%%%DOCSDIR%%/aqualung-doc.xml
Lines 141-160 Link Here
141	%%PORTDOCS%%%%DOCSDIR%%/aqualung-xhtml-view.xsl	140	%%PORTDOCS%%%%DOCSDIR%%/aqualung-xhtml-view.xsl
142	%%PORTDOCS%%%%DOCSDIR%%/aqualung-xhtml.xsl	141	%%PORTDOCS%%%%DOCSDIR%%/aqualung-xhtml.xsl
143	%%PORTDOCS%%%%DOCSDIR%%/external.eps	142	%%PORTDOCS%%%%DOCSDIR%%/external.eps
144	%%PORTDOCS%%%%DOCSDIR%%/timer.eps
145	%%PORTDOCS%%%%DOCSDIR%%/external.png	143	%%PORTDOCS%%%%DOCSDIR%%/external.png
146	%%PORTDOCS%%%%DOCSDIR%%/jack.png	144	%%PORTDOCS%%%%DOCSDIR%%/jack.png
147	%%PORTDOCS%%%%DOCSDIR%%/main.png	145	%%PORTDOCS%%%%DOCSDIR%%/main.png
148	%%PORTDOCS%%%%DOCSDIR%%/playlist.png	146	%%PORTDOCS%%%%DOCSDIR%%/playlist.png
149	%%PORTDOCS%%%%DOCSDIR%%/settings.png	147	%%PORTDOCS%%%%DOCSDIR%%/settings.png
		148	%%PORTDOCS%%%%DOCSDIR%%/split.sh
150	%%PORTDOCS%%%%DOCSDIR%%/store.png	149	%%PORTDOCS%%%%DOCSDIR%%/store.png
151	%%PORTDOCS%%%%DOCSDIR%%/systray.png	150	%%PORTDOCS%%%%DOCSDIR%%/systray.png
		151	%%PORTDOCS%%%%DOCSDIR%%/timer.eps
152	%%PORTDOCS%%%%DOCSDIR%%/timer.png	152	%%PORTDOCS%%%%DOCSDIR%%/timer.png
153	share/locale/de/LC_MESSAGES/aqualung.mo	153	share/locale/de/LC_MESSAGES/aqualung.mo
		154	share/locale/es/LC_MESSAGES/aqualung.mo
154	share/locale/fr/LC_MESSAGES/aqualung.mo	155	share/locale/fr/LC_MESSAGES/aqualung.mo
155	share/locale/hu/LC_MESSAGES/aqualung.mo	156	share/locale/hu/LC_MESSAGES/aqualung.mo
156	share/locale/it/LC_MESSAGES/aqualung.mo	157	share/locale/it/LC_MESSAGES/aqualung.mo
157	share/locale/ja/LC_MESSAGES/aqualung.mo	158	share/locale/ja/LC_MESSAGES/aqualung.mo
		159	share/locale/nl/LC_MESSAGES/aqualung.mo
		160	share/locale/pl/LC_MESSAGES/aqualung.mo
158	share/locale/ru/LC_MESSAGES/aqualung.mo	161	share/locale/ru/LC_MESSAGES/aqualung.mo
159	share/locale/sv/LC_MESSAGES/aqualung.mo	162	share/locale/sv/LC_MESSAGES/aqualung.mo
160	share/locale/uk/LC_MESSAGES/aqualung.mo	163	share/locale/uk/LC_MESSAGES/aqualung.mo
		164	share/locale/zh/LC_MESSAGES/aqualung.mo