On Wed, Apr 20, 2011 at 4:39 PM, Antoine Jacoutot <ajacou...@bsdfrog.org> wrote:
> On Wed, 20 Apr 2011, David Coppa wrote:
>
>> On Wed, 20 Apr 2011, Pascal Stumpf wrote:
>>
>> > On Wed, Apr 20, 2011 at 12:27:42PM +0200, David Coppa wrote:
>> > > It's set up as SHARED_ONLY, I think because there aren't consumers for
>> > > those libraries atm.
>> > There will be if the audacious flavour goes in, so it's probably wise to
>> > do that beforehand. (And kill unneeded groff here too.)
>> >
>> > conky's WANTLIB will then need aud{gui,core} added ofc.
>
> Please refrain touching audacious-plugins for a day, I have a big
> libnotify update which is coming soon and there are many ports
> impacted (wantlib and friends) and it would really help me not to have
> to merge conflicts everywhere ;)
>
>
> Thanks.
Updated diff.
Switch audacious to PFRAG.shared, so the upcoming conky update can use
its libraries.
Fix WANTLIB for audacious-plugins accordingly.
Looking for OKs...
Cheers!
David
Index: audacious/Makefile
===================================================================
RCS file: /cvs/ports/audio/audacious/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- audacious/Makefile 2 Mar 2011 14:07:09 -0000 1.24
+++ audacious/Makefile 21 Apr 2011 10:14:53 -0000
@@ -1,12 +1,15 @@
# $OpenBSD: Makefile,v 1.24 2011/03/02 14:07:09 shadchin Exp $
-SHARED_ONLY = Yes
-
COMMENT = gtk+2 media player based on BMP and XMMS
DISTNAME = audacious-2.4.4
-SHARED_LIBS = audclient 1.1 # 2.0
+REVISION = 0
+
+SHARED_LIBS = audclient 1.1 # 2.0
+SHARED_LIBS += audcore 0.0 # 1.0
+SHARED_LIBS += audgui 0.0 # 1.0
+SHARED_LIBS += audtag 0.0 # 1.0
CATEGORIES = audio multimedia
@@ -43,12 +46,15 @@ LIB_DEPENDS = devel/libexecinfo \
x11/dbus \
x11/gtk+2
-MAKE_ENV = LIBaudclient_VERSION=${LIBaudclient_VERSION}
+MAKE_ENV = LIBaudclient_VERSION=${LIBaudclient_VERSION} \
+ LIBaudcore_VERSION=${LIBaudcore_VERSION} \
+ LIBaudgui_VERSION=${LIBaudgui_VERSION} \
+ LIBaudtag_VERSION=${LIBaudtag_VERSION}
-USE_GROFF = Yes
USE_GMAKE = Yes
-AUTOCONF_VERSION = 2.61
+# Should be 2.68
+AUTOCONF_VERSION = 2.67
CONFIGURE_STYLE = autoconf
Index: audacious/patches/patch-src_libaudcore_Makefile
===================================================================
RCS file: /cvs/ports/audio/audacious/patches/patch-src_libaudcore_Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_libaudcore_Makefile
--- audacious/patches/patch-src_libaudcore_Makefile 19 Dec 2010
18:17:55 -0000 1.1
+++ audacious/patches/patch-src_libaudcore_Makefile 21 Apr 2011 10:14:53
-0000
@@ -1,6 +1,12 @@
$OpenBSD: patch-src_libaudcore_Makefile,v 1.1 2010/12/19 18:17:55
shadchin Exp $
---- src/libaudcore/Makefile.orig Sat Dec 4 15:54:33 2010
-+++ src/libaudcore/Makefile Sat Dec 4 15:54:46 2010
+--- src/libaudcore/Makefile.orig Tue Feb 22 18:29:02 2011
++++ src/libaudcore/Makefile Wed Apr 20 13:38:18 2011
+@@ -1,4 +1,4 @@
+-LIB = ${LIB_PREFIX}audcore${LIB_SUFFIX}
++LIB = ${LIB_PREFIX}audcore${LIB_SUFFIX}.${LIBaudcore_VERSION}
+ LIB_MAJOR = 1
+ LIB_MINOR = 0
+
@@ -43,4 +43,4 @@ includesubdir = libaudcore
CPPFLAGS += -DHAVE_CONFIG_H ${LIB_CPPFLAGS} ${CFLAGS} -I.. -I../..
CFLAGS += ${LIB_CFLAGS} ${GLIB_CFLAGS} ${MOWGLI_CFLAGS}
Index: audacious/patches/patch-src_libaudgui_Makefile
===================================================================
RCS file: audacious/patches/patch-src_libaudgui_Makefile
diff -N audacious/patches/patch-src_libaudgui_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ audacious/patches/patch-src_libaudgui_Makefile 21 Apr 2011 10:14:53
-0000
@@ -0,0 +1,9 @@
+$OpenBSD$
+--- src/libaudgui/Makefile.orig Wed Apr 20 13:38:32 2011
++++ src/libaudgui/Makefile Wed Apr 20 13:39:06 2011
+@@ -1,4 +1,4 @@
+-LIB = ${LIB_PREFIX}audgui${LIB_SUFFIX}
++LIB = ${LIB_PREFIX}audgui${LIB_SUFFIX}.${LIBaudgui_VERSION}
+ LIB_MAJOR = 1
+ LIB_MINOR = 0
+
Index: audacious/patches/patch-src_libaudtag_Makefile
===================================================================
RCS file: audacious/patches/patch-src_libaudtag_Makefile
diff -N audacious/patches/patch-src_libaudtag_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ audacious/patches/patch-src_libaudtag_Makefile 21 Apr 2011 10:14:53
-0000
@@ -0,0 +1,9 @@
+$OpenBSD$
+--- src/libaudtag/Makefile.orig Wed Apr 20 15:44:10 2011
++++ src/libaudtag/Makefile Wed Apr 20 15:45:26 2011
+@@ -1,4 +1,4 @@
+-LIB = ${LIB_PREFIX}audtag${LIB_SUFFIX}
++LIB = ${LIB_PREFIX}audtag${LIB_SUFFIX}.${LIBaudtag_VERSION}
+ LIB_MAJOR = 1
+ LIB_MINOR = 0
+
Index: audacious/pkg/PFRAG.shared
===================================================================
RCS file: audacious/pkg/PFRAG.shared
diff -N audacious/pkg/PFRAG.shared
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ audacious/pkg/PFRAG.shared 21 Apr 2011 10:14:53 -0000
@@ -0,0 +1,5 @@
+@comment $OpenBSD$
+@lib lib/libaudclient.so.${LIBaudclient_VERSION}
+@lib lib/libaudcore.so.${LIBaudcore_VERSION}
+@lib lib/libaudgui.so.${LIBaudgui_VERSION}
+@lib lib/libaudtag.so.${LIBaudtag_VERSION}
Index: audacious/pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/audacious/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- audacious/pkg/PLIST 19 Dec 2010 18:17:55 -0000 1.9
+++ audacious/pkg/PLIST 21 Apr 2011 10:14:53 -0000
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.9 2010/12/19 18:17:55 shadchin Exp $
+%%SHARED%%
@bin bin/audacious2
@bin bin/audtool2
include/audacious/
@@ -47,10 +48,6 @@ include/libaudcore/vfs_buffered_file.h
include/libaudgui/
include/libaudgui/libaudgui-gtk.h
include/libaudgui/libaudgui.h
-@lib lib/libaudclient.so.${LIBaudclient_VERSION}
-lib/libaudcore.so
-lib/libaudgui.so
-lib/libaudtag.so
lib/pkgconfig/audacious.pc
lib/pkgconfig/audclient.pc
@man man/man1/audacious2.1
Index: audacious-plugins/Makefile
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- audacious-plugins/Makefile 21 Apr 2011 07:04:56 -0000 1.30
+++ audacious-plugins/Makefile 21 Apr 2011 10:14:53 -0000
@@ -8,8 +8,8 @@ COMMENT-jack = jack plugin for audaciou
V = 2.4.4
DISTNAME = audacious-plugins-$V
PKGNAME-main = ${DISTNAME}
-REVISION-main = 2
-REVISION-jack= 0
+REVISION-main = 3
+REVISION-jack= 1
PKGNAME-jack = audacious-jack-$V
CATEGORIES = audio multimedia
@@ -23,14 +23,15 @@ PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB = GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
- Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 cairo dbus-1 \
- dbus-glib-1 drm expat fontconfig freetype gdk-x11-2.0 \
- gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 \
- gthread-2.0 gtk-x11-2.0 m mcs mowgli pango-1.0 \
- pangocairo-1.0 pangoft2-1.0 pixman-1 png pthread-stubs \
- samplerate xcb xcb-render xcb-shm z ${MODGETTEXT_WANTLIB}
-WANTLIB-main = ${WANTLIB} FLAC SDL avcodec avformat avutil bz2 cddb \
- cdio cdio_cdda cue curl faac faad gsm mp3lame neon \
+ Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 audcore \
+ audgui cairo dbus-1 dbus-glib-1 drm expat fontconfig \
+ freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 \
+ gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 m mcs \
+ mowgli pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 \
+ png pthread-stubs samplerate xcb xcb-render xcb-shm z \
+ ${MODGETTEXT_WANTLIB}
+WANTLIB-main = ${WANTLIB} FLAC SDL audtag avcodec avformat avutil bz2 \
+ cddb cdio cdio_cdda cue curl faac faad gsm mp3lame neon \
notify ogg orc-0.4 schroedinger-1.0 sndfile sndio speex \
stdc++ theoradec theoraenc vorbis vorbisenc vorbisfile \
vpx wavpack x264 xml2
@@ -85,7 +86,8 @@ MULTI_PACKAGES += -jack
USE_GMAKE = Yes
-AUTOCONF_VERSION = 2.61
+# Should be 2.68
+AUTOCONF_VERSION = 2.67
CONFIGURE_STYLE = autoconf
CONFIGURE_ARGS += --enable-ipv6 \
audacious_shared.diff
Description: Binary data
