aboutsummaryrefslogtreecommitdiffstats
path: root/multimedia
diff options
context:
space:
mode:
authoroliver <oliver@FreeBSD.org>2007-03-10 01:01:51 +0800
committeroliver <oliver@FreeBSD.org>2007-03-10 01:01:51 +0800
commitd5bd47dff67ae3ad05a7d9cc6c71950a6c964818 (patch)
tree1ec5619989b22db95fc550b5fcec06709764c68f /multimedia
parent6ab19a708ae71e784cbbcc954bd749ea4ca71dd9 (diff)
downloadfreebsd-ports-graphics-d5bd47dff67ae3ad05a7d9cc6c71950a6c964818.tar.gz
freebsd-ports-graphics-d5bd47dff67ae3ad05a7d9cc6c71950a6c964818.tar.zst
freebsd-ports-graphics-d5bd47dff67ae3ad05a7d9cc6c71950a6c964818.zip
enable flac when VORBIS is selected
PR: 110129 Submitted by: Roland Smith <rsmith@xs4all.nl>
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/audacious-plugins/Makefile22
-rw-r--r--multimedia/audacious-plugins/pkg-plist2
2 files changed, 9 insertions, 15 deletions
diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index c0cb912f92b..f01f40788cb 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -23,8 +23,7 @@ USE_LDCONFIG= yes
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
CFLAGS="-I${LOCALBASE}/include"
CONFIGURE_ARGS= --disable-evdevplug --disable-alsa --disable-amidiplug \
- --disable-pulse --disable-coreaudio --disable-projectm \
- --disable-flac
+ --disable-pulse --disable-coreaudio --disable-projectm
WANT_GNOME= yes
WANT_SDL= yes
@@ -34,8 +33,6 @@ PORTDOCS= AUTHORS ChangeLog NEWS
# PULSE "Enable PulseAudio output plugin" off \
# COREAUDIO "Enable CoreAudio output plugin" off \
# PROJECTM "Enable projectM vis plugin" off \
-# to old ports:
-# FLAC "Enable flac input plugin" off \
OPTIONS= ESOUND "Enable Esound output output" off \
MP3 "Enable mp3 plugin" on \
@@ -135,18 +132,11 @@ PLIST_SUB+= ADPLUGPLUGIN="@comment "
.if !defined(WITHOUT_VORBIS)
LIB_DEPENDS+= vorbis.3:${PORTSDIR}/audio/libvorbis
+CONFIGURE_ARGS+=--enable-vorbis --enable-flac # it uses an internal flac-lib copy
PLIST_SUB+= VORBISPLUGIN=""
-#.if !defined(WITHOUT_FLAC)
-#LIB_DEPENDS+= FLAC.7:${PORTSDIR}/audio/flac
-#CONFIGURE_ARGS+=--enable-flac
-#PLIST_SUB+= FLACPLUGIN=""
-#.else
-#CONFIGURE_ARGS+=--disable-flac
-#PLIST_SUB+= FLACPLUGIN="@comment "
-#.endif
.else
-CONFIGURE_ARGS+=--disable-vorbis #--disable-flac
-PLIST_SUB+= VORBISPLUGIN="@comment " #FLACPLUGIN="@comment "
+CONFIGURE_ARGS+=--disable-vorbis --disable-flac
+PLIST_SUB+= VORBISPLUGIN="@comment "
.endif
.if !defined(WITHOUT_WAVPACK)
@@ -303,6 +293,10 @@ PLIST_SUB+= NLS="@comment "
.endif
+post-patch:
+ @${REINPLACE_CMD} -e 's|-I\.\./\.\./\.\.$$|& -I\.\./libflac|' \
+ ${WRKSRC}/src/flac/plugin_common/Makefile
+
post-install:
.if defined(WITH_GNOME)
@${ECHO_MSG} ""
diff --git a/multimedia/audacious-plugins/pkg-plist b/multimedia/audacious-plugins/pkg-plist
index dce6b8577ee..cf6dd15d906 100644
--- a/multimedia/audacious-plugins/pkg-plist
+++ b/multimedia/audacious-plugins/pkg-plist
@@ -21,7 +21,7 @@ lib/audacious/Input/libalac.so
lib/audacious/Input/libcdaudio.so
lib/audacious/Input/libconsole.so
lib/audacious/Input/libcuesheet.so
-@comment %%FLACPLUGIN%%lib/audacious/Input/libflac.so
+%%VORBISPLUGIN%%lib/audacious/Input/libflac.so
%%MP3PLUGIN%%lib/audacious/Input/libmadplug.so
lib/audacious/Input/libmetronom.so
%%MODPLUG%%lib/audacious/Input/libmodplug.so