Some fixes and improvements for the audacious-plugins port..
- sync/re-sort WANTLIBs
- enable GIO support since we have Glib in the dependency path anyway
- simplify one of the Makefile patches a bit
- invert the logic for enabling/disabling the sndio backend
- more appropriate fix for some of the autoconf checks as the LIBS
variable was being polluted very early on breaking most of the
checks using AC_CHECK_LIB as well as remove/fix some improper use
of the AC_CHECK_LIB macro
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/audio/audacious-plugins/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- Makefile 21 Mar 2012 16:13:25 -0000 1.41
+++ Makefile 4 Apr 2012 23:49:19 -0000
@@ -6,7 +6,7 @@ COMMENT = input and output plugins for
V = 3.2
DISTNAME = audacious-plugins-$V
-REVISION = 0
+REVISION = 1
CATEGORIES = audio multimedia
@@ -18,16 +18,14 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB += GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender atk-1.0 audcore audgui cairo cairo-gobject
-WANTLIB += expat fontconfig freetype gdk-3
-WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB += gthread-2.0 gtk-3 m pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pixman-1 png pthread pthread-stubs samplerate xcb
-WANTLIB += xcb-render xcb-shm z ${MODGETTEXT_WANTLIB}
-WANTLIB += FLAC SDL audtag cddb cdio cdio_cdda cue curl
-WANTLIB += dbus-1 dbus-glib-1 faad modplug mp3lame mpg123 neon notify ogg
-WANTLIB += sndfile sndio stdc++ vorbis vorbisenc vorbisfile wavpack xml2
+WANTLIB += FLAC GL SDL X11 Xcomposite Xrender atk-1.0 audcore
+WANTLIB += audgui audtag cairo cairo-gobject cddb cdio cdio_cdda
+WANTLIB += cue curl dbus-1 dbus-glib-1 expat faad fontconfig freetype
+WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-3
+WANTLIB += m modplug mp3lame mpg123 neon notify ogg pango-1.0
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pixman-1 pthread-stubs
+WANTLIB += samplerate sndfile sndio stdc++ vorbis vorbisenc vorbisfile
+WANTLIB += wavpack xcb xcb-render xcb-shm xml2 z
MASTER_SITES = http://distfiles.audacious-media-player.org/
@@ -62,8 +60,8 @@ USE_GMAKE = Yes
CONFIGURE_STYLE = autoconf
AUTOCONF_VERSION = 2.68
-CONFIGURE_ARGS += --enable-ipv6 \
- --enable-sndio \
+CONFIGURE_ARGS += --enable-gio \
+ --enable-ipv6 \
--disable-pulse \
--disable-adplug \
--disable-sid \
@@ -75,7 +73,6 @@ CONFIGURE_ARGS += --enable-ipv6 \
--disable-ffaudio \
--disable-jack \
--disable-bs2b
-
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
Index: patches/patch-configure_ac
===================================================================
RCS file: /home/cvs/ports/audio/audacious-plugins/patches/patch-configure_ac,v
retrieving revision 1.10
diff -u -p -r1.10 patch-configure_ac
--- patches/patch-configure_ac 21 Mar 2012 16:13:25 -0000 1.10
+++ patches/patch-configure_ac 2 Apr 2012 22:11:09 -0000
@@ -1,7 +1,17 @@
$OpenBSD: patch-configure_ac,v 1.10 2012/03/21 16:13:25 dcoppa Exp $
---- configure.ac.orig Fri Jan 20 20:48:30 2012
-+++ configure.ac Wed Mar 21 12:36:48 2012
-@@ -95,7 +95,7 @@ dnl ===============
+--- configure.ac.orig Fri Jan 20 14:48:30 2012
++++ configure.ac Mon Apr 2 18:11:01 2012
+@@ -41,9 +41,6 @@ PKG_CHECK_MODULES(AUDACIOUS, [audacious >= 3.2],
+ [AC_MSG_ERROR([Cannot find Audacious 3.2; have you installed Audacious
yet?])]
+ )
+
+-CPPFLAGS="$CPPFLAGS $AUDACIOUS_CFLAGS"
+-LIBS="$LIBS $AUDACIOUS_LIBS"
+-
+ dnl Default Set of Plugins
+ dnl ======================
+
+@@ -95,7 +92,7 @@ dnl ===============
PTHREAD_LIBS=
PTHREAD_CFLAGS=
@@ -10,43 +20,25 @@ $OpenBSD: patch-configure_ac,v 1.10 2012
[AC_CHECK_LIB(pthreads, pthread_create, PTHREAD_LIBS="-lpthreads",
[AC_CHECK_LIB(pthreadGC2, pthread_create, PTHREAD_LIBS="-lpthreadGC2")]
)]
-@@ -490,7 +490,7 @@ if test x$enable_aac = xyes; then
- AC_CHECK_DECL(NeAACDecInit2,,enable_aac=no,[#include
<neaacdec.h>])
- fi
- if test x$enable_aac = xyes; then
-- AC_CHECK_LIB(faad,NeAACDecInit2,enable_aac=yes,enable_aac=no)
-+ AC_CHECK_LIB(faad -lGL -lXau -lXdmcp -lXxf86vm -ldrm -lxcb
-pthread,NeAACDecInit2,enable_aac=yes,enable_aac=no)
- fi
- fi
-
-@@ -862,7 +862,7 @@ AC_ARG_ENABLE(neon,
-
- if test "x$have_neon" = "xyes"; then
- PKG_CHECK_MODULES(NEON, [neon >= 0.26],
[TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS neon" ], [have_neon="no"])
-- AC_CHECK_LIB([neon], [ne_set_connect_timeout],
[AC_DEFINE(HAVE_NE_SET_CONNECT_TIMEOUT, 1, [Whether we have
ne_set_connect_timeout])], [], [$NEON_LIBS])
-+ AC_CHECK_LIB(neon -pthread, [ne_set_connect_timeout],
[AC_DEFINE(HAVE_NE_SET_CONNECT_TIMEOUT, 1, [Whether we have
ne_set_connect_timeout])], [], [$NEON_LIBS])
- else
- have_neon="no"
- fi
-@@ -969,7 +969,7 @@ AC_ARG_ENABLE(filewriter_mp3,
+@@ -969,7 +966,7 @@ AC_ARG_ENABLE(filewriter_mp3,
)
if test "x$enable_filewriter_mp3" = "xyes"; then
- AC_CHECK_LIB(mp3lame -lm, lame_get_id3v2_tag, [have_lame=yes],
[have_lame=no])
-+ AC_CHECK_LIB(mp3lame -lm -pthread, lame_get_id3v2_tag, [have_lame=yes],
[have_lame=no])
++ AC_CHECK_LIB(mp3lame, lame_get_id3v2_tag, [have_lame=yes], [have_lame=no])
if test "x$have_lame" = "xyes"; then
AC_DEFINE(FILEWRITER_MP3, 1, [Define if MP3 output part should be
built])
FILEWRITER_LIBS="$FILEWRITER_LIBS -lmp3lame"
-@@ -1092,6 +1092,20 @@ if test "x$enable_lyricwiki" = "xyes"; then
+@@ -1092,8 +1089,25 @@ if test "x$enable_lyricwiki" = "xyes"; then
GENERAL_PLUGINS="$GENERAL_PLUGINS lyricwiki"
fi
-+dnl *** sndio
++dnl *** sndio output
+
+AC_ARG_ENABLE(sndio,
-+ [ --enable-sndio enable sndio output plugin (default=disabled)
],
++ [ --disable-sndio disable sndio output plugin (default=enabled)
],
+ [have_sndio=$enableval],
-+ [have_sndio=no]
++ [have_sndio=yes]
+)
+
+if test "x$have_sndio" = "xyes"; then
@@ -57,7 +49,12 @@ $OpenBSD: patch-configure_ac,v 1.10 2012
+
dnl *** End of all plugin checks ***
++CPPFLAGS="$CPPFLAGS $AUDACIOUS_CFLAGS"
++LIBS="$LIBS $AUDACIOUS_LIBS"
++
plugindir=`pkg-config audacious --variable=plugin_dir`
+ AC_SUBST(plugindir)
+
@@ -1163,6 +1177,7 @@ echo " -> FileWriter Vorbis output part: $have_
echo " -> FileWriter FLAC output part: $have_writer_flac"
echo " Null Audio output (null): yes"
Index: patches/patch-src_ladspa_Makefile
===================================================================
RCS file:
/home/cvs/ports/audio/audacious-plugins/patches/patch-src_ladspa_Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_ladspa_Makefile
--- patches/patch-src_ladspa_Makefile 20 Mar 2012 19:10:56 -0000 1.2
+++ patches/patch-src_ladspa_Makefile 2 Apr 2012 21:40:31 -0000
@@ -1,12 +1,9 @@
$OpenBSD: patch-src_ladspa_Makefile,v 1.2 2012/03/20 19:10:56 stsp Exp $
---- src/ladspa/Makefile.orig Fri Jan 20 20:48:30 2012
-+++ src/ladspa/Makefile Sun Feb 5 19:59:48 2012
-@@ -9,7 +9,7 @@ include ../../buildsys.mk
- include ../../extra.mk
+--- src/ladspa/Makefile.orig Fri Jan 20 14:48:30 2012
++++ src/ladspa/Makefile Mon Apr 2 17:40:14 2012
+@@ -12,4 +12,4 @@ plugindir := ${plugindir}/${EFFECT_PLUGIN_DIR}
- plugindir := ${plugindir}/${EFFECT_PLUGIN_DIR}
--
-+LIBS += ${GTK_LIBS} ${GLIB_LIBS}
CPPFLAGS += -I../.. ${PTHREAD_CFLAGS} ${GTK_CFLAGS}
CFLAGS += ${PLUGIN_CFLAGS}
- LIBS += -lm ${PTHREAD_LIBS} ${GTK_LIBS}
+-LIBS += -lm ${PTHREAD_LIBS} ${GTK_LIBS}
++LIBS += -lm ${PTHREAD_LIBS} ${GLIB_LIBS} ${GTK_LIBS}
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/audio/audacious-plugins/pkg/PLIST,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST
--- pkg/PLIST 21 Mar 2012 16:13:25 -0000 1.1
+++ pkg/PLIST 2 Apr 2012 22:24:15 -0000
@@ -56,6 +56,7 @@ lib/audacious/Output/null.so
lib/audacious/Output/sdlout.so
lib/audacious/Output/sndio.so
lib/audacious/Transport/
+lib/audacious/Transport/gio.so
lib/audacious/Transport/neon.so
lib/audacious/Transport/unix-io.so
lib/audacious/Visualization/
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
