Enable speex, mod, cdda, and cddb support, now that all related

libraries have been imported.  These all appear to work correctly,
except that CD audio playback has some occassional gaps, but
jakemsr@ reports that other libcdio users have similar issues.

OK jakemsr@
This commit is contained in:
jeremy 2010-11-07 00:50:22 +00:00
parent 37da804a39
commit 1952f8e4f2

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.21 2010/10/24 21:00:29 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.22 2010/11/07 00:50:22 jeremy Exp $
COMMENT= advanced music player COMMENT= advanced music player
DISTNAME= aqualung-0.9beta11 DISTNAME= aqualung-0.9beta11
REVISION= 2 REVISION= 3
CATEGORIES= audio CATEGORIES= audio
HOMEPAGE= http://aqualung.factorial.hu/ HOMEPAGE= http://aqualung.factorial.hu/
@ -25,7 +25,8 @@ WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
vorbisenc vorbisfile xcb xcb-render xcb-shm z \ vorbisenc vorbisfile xcb xcb-render xcb-shm z \
gtk-x11-2.0 gdk-x11-2.0 gdk_pixbuf-2.0 xml2 lua mac mad \ gtk-x11-2.0 gdk-x11-2.0 gdk_pixbuf-2.0 xml2 lua mac mad \
mpcdec FLAC avcodec avformat avutil jack wavpack \ mpcdec FLAC avcodec avformat avutil jack wavpack \
lrdf GL Xxf86vm drm lrdf GL Xxf86vm drm oggz speex cddb cdio cdio_cdda \
cdio_paranoia modplug
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aqualung/} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aqualung/}
@ -33,15 +34,20 @@ MODULES= devel/gettext
LIB_DEPENDS= ::audio/flac \ LIB_DEPENDS= ::audio/flac \
::audio/jack \ ::audio/jack \
::audio/libcdio \
::audio/libcddb \
::audio/libmad \ ::audio/libmad \
::audio/libmodplug \
::audio/libmpcdec \ ::audio/libmpcdec \
::audio/mac \ ::audio/mac \
::audio/speex \
::audio/wavpack \ ::audio/wavpack \
::graphics/ffmpeg \ ::graphics/ffmpeg \
::lang/lua \ ::lang/lua \
::multimedia/oggz \
::textproc/liblrdf \
::textproc/libxml \ ::textproc/libxml \
::x11/gtk+2 \ ::x11/gtk+2
::textproc/liblrdf
RUN_DEPENDS= ::devel/desktop-file-utils RUN_DEPENDS= ::devel/desktop-file-utils
@ -52,11 +58,10 @@ CONFIGURE_ENV= LDFLAGS="-pthread -L${LOCALBASE}/lib -L${X11BASE}/lib" \
-DPTHREAD_MIN_PRIORITY=0 -DPTHREAD_MAX_PRIORITY=31 \ -DPTHREAD_MIN_PRIORITY=0 -DPTHREAD_MAX_PRIORITY=31 \
-I${LOCALBASE}/include" -I${LOCALBASE}/include"
# cddb, ifp (requires lib*) - no package # ifp (requires libifp) - no package
# cdda (requires libcdio) - no package CONFIGURE_ARGS= --with-cdda \
# mod (requires libmodplug) - no package --with-cddb \
# speex (requires liboggz) - no package --with-flac \
CONFIGURE_ARGS= --with-flac \
--with-jack \ --with-jack \
--with-ladspa \ --with-ladspa \
--with-lame \ --with-lame \
@ -64,23 +69,22 @@ CONFIGURE_ARGS= --with-flac \
--with-loop \ --with-loop \
--with-lua \ --with-lua \
--with-mac \ --with-mac \
--with-mod \
--with-mpc \ --with-mpc \
--with-mpeg \ --with-mpeg \
--with-ogg \ --with-ogg \
--with-podcast \ --with-podcast \
--with-sndfile \ --with-sndfile \
--with-sndio \ --with-sndio \
--with-speex \
--with-src \ --with-src \
--with-systray \ --with-systray \
--with-vorbisenc \ --with-vorbisenc \
--with-wavpack \ --with-wavpack \
--without-alsa \ --without-alsa \
--without-cdda \
--without-cddb \
--without-ifp \ --without-ifp \
--without-mod \
--without-oss \ --without-oss \
--without-speex --without-pulse
post-install: post-install:
mv ${PREFIX}/share/aqualung/doc ${PREFIX}/share/doc/aqualung mv ${PREFIX}/share/aqualung/doc ${PREFIX}/share/doc/aqualung