aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--multimedia/Makefile1
-rw-r--r--multimedia/audacious-plugins/Makefile72
-rw-r--r--multimedia/audacious-plugins/distinfo6
-rw-r--r--multimedia/audacious-plugins/pkg-descr7
-rw-r--r--multimedia/audacious-plugins/pkg-message2
-rw-r--r--multimedia/audacious-plugins/pkg-plist101
6 files changed, 42 insertions, 147 deletions
diff --git a/multimedia/Makefile b/multimedia/Makefile
index ac8758325b19..1ae1e9dbf8d9 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -5,6 +5,7 @@
SUBDIR += acidrip
SUBDIR += audacious
+ SUBDIR += audacious-plugins
SUBDIR += avidemux2
SUBDIR += avifile
SUBDIR += avinfo
diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index bb3ab40fac60..bfa63cb43e81 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -5,45 +5,30 @@
# $FreeBSD$
#
-PORTNAME= audacious
-PORTVERSION= 1.1.2
+PORTNAME= audacious-plugins
+PORTVERSION= 1.2.5
CATEGORIES= multimedia audio
-MASTER_SITES= http://audacious-media-player.org/release/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= novel
-DISTNAME= audacious-${PORTVERSION}
+MASTER_SITES= http://audacious-media-player.org/release/
EXTRACT_SUFX=.tgz
-MAINTAINER= redchrom@gmail.com
-COMMENT= A media player based on BMP and XMMS
+MAINTAINER= oliver@FreeBSD.org
+COMMENT= Plugins needed for audacious
-LIB_DEPENDS= sndfile:${PORTSDIR}/audio/libsndfile \
- musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
+BUILD_DEPENDS= audacious:${PORTSDIR}/multimedia/audacious
+LIB_DEPENDS= sndfile:${PORTSDIR}/audio/libsndfile \
curl.3:${PORTSDIR}/ftp/curl \
tag.5:${PORTSDIR}/audio/taglib
-BROKEN= Incomplete pkg-plist
-
USE_GNOME= gtk20 libglade2
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -lstdc++" \
- INPUT_PLUGINS="${INPUT_PLUGINS}" \
- OUTPUT_PLUGINS="${OUTPUT_PLUGINS}" \
- VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}"
+CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
+ CFLAGS="-I${LOCALBASE}/include"
CONFIGURE_ARGS= --disable-jack --disable-adplug --disable-lirc \
---disable-alsa --disable-amidiplug --disable-arts --disable-wma
-
-MAN1= audacious.1
-
-PORTDOCS= README AUTHORS ChangeLog NEWS
+ --disable-alsa --disable-amidiplug --disable-arts --disable-wma
-INPUT_PLUGINS= cdaudio mpg123 wav tonegen wma console \
- sexypsf aac timidity
-OUTPUT_PLUGINS= OSS disk_writer
-VISUALIZATION_PLUGINS= blur_scope
+PORTDOCS= AUTHORS ChangeLog NEWS
OPTIONS= VORBIS "Enable Ogg Vorbis input" on \
MODPLUG "Enable modplug input" off \
@@ -51,18 +36,12 @@ OPTIONS= VORBIS "Enable Ogg Vorbis input" on \
SID "Enable sid input" off \
MPC "Enable mpc input" off \
ESOUND "Enable Esound output" off \
- GNOME "Build with gnomevfs/gconf support" off \
- NLS "Native Language Support" on
+ GNOME "Build with gnomevfs/gconf support" off
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 500000
-BROKEN="Does not build"
-.endif
-
.if !defined(WITHOUT_VORBIS)
LIB_DEPENDS+= vorbis.3:${PORTSDIR}/audio/libvorbis
-INPUT_PLUGINS+= vorbis
PLIST_SUB+= VORBISPLUGIN=""
.else
CONFIGURE_ARGS+= --disable-vorbis
@@ -70,7 +49,6 @@ PLIST_SUB+= VORBISPLUGIN="@comment "
.endif
.if !defined(WITHOUT_MODPLUG)
-INPUT_PLUGINS+= modplug
PLIST_SUB+= MODPLUG=""
LIB_DEPENDS+= modplug.0:${PORTSDIR}/audio/libmodplug
.else
@@ -79,7 +57,6 @@ CONFIGURE_ARGS+= --disable-modplug
.endif
.if defined(WITH_FLAC)
-INPUT_PLUGINS+= flac
PLIST_SUB+= FLACPLUGIN=""
LIB_DEPENDS+= FLAC.7:${PORTSDIR}/audio/flac
.else
@@ -88,7 +65,6 @@ CONFIGURE_ARGS+= --disable-flac
.endif
.if !defined(WITHOUT_SID)
-INPUT_PLUGINS+= sid
PLIST_SUB+= SIDPLUGIN=""
LIB_DEPENDS+= sidplay.1:${PORTSDIR}/audio/libsidplay
.else
@@ -97,7 +73,6 @@ CONFIGURE_ARGS+= --disable-sid
.endif
.if !defined(WITHOUT_MPC)
-INPUT_PLUGINS+= musepack
PLIST_SUB+= MPCPLUGIN=""
LIB_DEPENDS+= mpcdec.4:${PORTSDIR}/audio/libmpcdec \
tag.5:${PORTSDIR}/audio/taglib
@@ -108,7 +83,6 @@ CONFIGURE_ARGS+= --disable-musepack
.if defined(WITH_ESOUND)
USE_GNOME+= esound
-OUTPUT_PLUGINS+= esd
PLIST_SUB+= ESDPLUGIN=""
.if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-esound
@@ -125,21 +99,19 @@ USE_GNOME+= gnomevfs2
CONFIGURE_ARGS+= --enable-gnome-vfs --enable-gconf
.endif
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
-CONFIGURE_ARGS+= --enable-nls
-PLIST_SUB+= NLS=""
-.else
-CONFIGURE_ARGS+= --disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
-
+.if ${OSVERSION} < 500000
post-patch:
- @${REINPLACE_CMD} -e 's|(LIBDIR)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
- ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} -e 's|-Wno-nonnull ||g' ${WRKSRC}/src/sexypsf/Makefile
+ @${REINPLACE_CMD} -e 's|stdint\.h|inttypes\.h|g' \
+ ${WRKSRC}/src/alac/plugin.c ${WRKSRC}/src/alac/alac.c \
+ ${WRKSRC}/src/alac/stream.h ${WRKSRC}/src/alac/demux.c \
+ ${WRKSRC}/src/alac/demux.h ${WRKSRC}/src/alac/stream.c \
+ ${WRKSRC}/src/aac/mp4ff/mp4ff_int_types.h
+ @${REINPLACE_CMD} -e 's| going = 1|int &|' \
+ ${WRKSRC}/src/scrobbler/xmms_scrobbler.c
+.endif
post-install:
- @${CAT} ${PKGMESSAGE}
.if defined(WITH_GNOME)
@${ECHO_MSG} ""
@${ECHO_MSG} "You have installed audacious with gconf support."
diff --git a/multimedia/audacious-plugins/distinfo b/multimedia/audacious-plugins/distinfo
index 9e5bc59bcbd1..0516ac6cbced 100644
--- a/multimedia/audacious-plugins/distinfo
+++ b/multimedia/audacious-plugins/distinfo
@@ -1,3 +1,3 @@
-MD5 (audacious-1.1.2.tgz) = 14aba1f9c42a48afeeb6ce5dcaf180c6
-SHA256 (audacious-1.1.2.tgz) = 54f8f9e10e9a20a0a77e9d063708cd4bd572576ea9b36b9b1bb3ea3cbeaa1a81
-SIZE (audacious-1.1.2.tgz) = 3394364
+MD5 (audacious-plugins-1.2.5.tgz) = 21d75a35024e81f7c5811baf5c8212e0
+SHA256 (audacious-plugins-1.2.5.tgz) = 29d812db9a17ef50dc38db9ac354ab2ba31047829a0c1316a549177328ffb6c3
+SIZE (audacious-plugins-1.2.5.tgz) = 2339867
diff --git a/multimedia/audacious-plugins/pkg-descr b/multimedia/audacious-plugins/pkg-descr
index 16c885cd90e5..d51daa04cb2f 100644
--- a/multimedia/audacious-plugins/pkg-descr
+++ b/multimedia/audacious-plugins/pkg-descr
@@ -1,5 +1,4 @@
-Audacious is a fork of beep-media-player 0.9.7.1.
-The primary goals of this fork are keeping ideology of original BMP
-and merging miscellaneous plugins into Audacious
+Audacious Plugins are the input, output, visualization and effect plugins
+needed for Audacious
-WWW: http://audacious-media-player.org
+WWW: http://audacious-media-player.org/
diff --git a/multimedia/audacious-plugins/pkg-message b/multimedia/audacious-plugins/pkg-message
deleted file mode 100644
index d3a0b0cf6d5c..000000000000
--- a/multimedia/audacious-plugins/pkg-message
+++ /dev/null
@@ -1,2 +0,0 @@
-audacious supports Gzipped and uncompressed skins. If you would like to use
-Zip format skins you will need to ensure archivers/unzip is installed.
diff --git a/multimedia/audacious-plugins/pkg-plist b/multimedia/audacious-plugins/pkg-plist
index 3ecd72af0071..f021f9ac4d8d 100644
--- a/multimedia/audacious-plugins/pkg-plist
+++ b/multimedia/audacious-plugins/pkg-plist
@@ -1,25 +1,16 @@
-bin/audacious
-bin/audtool
-include/audacious/beepctrl.h
-include/audacious/configdb.h
-include/audacious/configfile.h
-include/audacious/dirbrowser.h
-include/audacious/formatter.h
-include/audacious/plugin.h
-include/audacious/rcfile.h
-include/audacious/titlestring.h
-include/audacious/util.h
-include/audacious/vfs.h
-include/audacious/input.h
-include/audacious/output.h
-include/audacious/xml_document.h
-include/audacious/prefswin.h
+lib/audacious/Container/libm3u.so
+lib/audacious/Container/libpls.so
+lib/audacious/Container/libxspf.so
lib/audacious/Effect/libaudiocompress.so
lib/audacious/Effect/libladspa.so
+lib/audacious/Effect/libecho.so
lib/audacious/Effect/libstereo.so
lib/audacious/Effect/libvoice_removal.so
+lib/audacious/General/libalarm.so
lib/audacious/General/libsong_change.so
lib/audacious/General/libscrobbler.so
+lib/audacious/Input/libcuesheet.so
+lib/audacious/Input/libalac.so
lib/audacious/Input/libcdaudio.so
lib/audacious/Input/libconsole.so
lib/audacious/Input/libmpg123.so
@@ -36,82 +27,16 @@ lib/audacious/Input/libwav.so
lib/audacious/Output/libOSS.so
%%ESDPLUGIN%%lib/audacious/Output/libESD.so
lib/audacious/Output/libdisk_writer.so
+lib/audacious/Output/libnull.so
lib/audacious/Visualization/libbscope.so
-lib/libaudacious.so
-lib/libaudacious.so.3
-lib/libaudacious.so.3.0.0
-libdata/pkgconfig/audacious.pc
-share/applications/audacious.desktop
-share/pixmaps/audacious.png
-%%DATADIR%%/Skins/Default/balance.png
-%%DATADIR%%/Skins/Default/cbuttons.png
-%%DATADIR%%/Skins/Default/eq_ex.png
-%%DATADIR%%/Skins/Default/eqmain.png
-%%DATADIR%%/Skins/Default/main.png
-%%DATADIR%%/Skins/Default/monoster.png
-%%DATADIR%%/Skins/Default/nums_ex.png
-%%DATADIR%%/Skins/Default/playpaus.png
-%%DATADIR%%/Skins/Default/pledit.png
-%%DATADIR%%/Skins/Default/pledit.txt
-%%DATADIR%%/Skins/Default/posbar.png
-%%DATADIR%%/Skins/Default/shufrep.png
-%%DATADIR%%/Skins/Default/skin.hints
-%%DATADIR%%/Skins/Default/text.png
-%%DATADIR%%/Skins/Default/titlebar.png
-%%DATADIR%%/Skins/Default/viscolor.txt
-%%DATADIR%%/Skins/Default/volume.png
-%%DATADIR%%/glade/addfiles.glade
-%%DATADIR%%/glade/prefswin.glade
-%%DATADIR%%/glade/fileinfo.glade
-%%DATADIR%%/glade/fileinfo_popup.glade
-%%DATADIR%%/images/about-logo.png
-%%DATADIR%%/images/appearance.png
-%%DATADIR%%/images/eq.png
-%%DATADIR%%/images/mouse.png
-%%DATADIR%%/images/playlist.png
-%%DATADIR%%/images/plugins.png
-%%DATADIR%%/images/audio.png
-%%DATADIR%%/images/audioscrobbler.png
-%%DATADIR%%/images/audioscrobbler_badge.png
-%%DATADIR%%/images/connectivity.png
-%%NLS%%share/locale/br/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/cy/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/de/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/el/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/es/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/hi/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/it/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/ka/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/mk/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/audacious.mo
-@dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/glade
-@dirrm %%DATADIR%%/Skins/Default
-@dirrm %%DATADIR%%/Skins
-@dirrm %%DATADIR%%
+lib/audacious/Visualization/libspectrum.so
+share/audacious/images/audioscrobbler.png
+share/audacious/images/audioscrobbler_badge.png
+@dirrm include/audacious-plugins
+@dirrm lib/audacious/Container
@dirrm lib/audacious/Visualization
@dirrm lib/audacious/Output
@dirrm lib/audacious/Input
@dirrm lib/audacious/General
@dirrm lib/audacious/Effect
@dirrm lib/audacious
-@dirrm include/audacious
-@dirrmtry share/applications
-%%NLS%%@dirrmtry share/locale/br/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/br