On Tue, Dec 11, 2007 at 08:42:03AM +0000, Jacob Meuser wrote: > > makes artsd and sun output plugins work much better. > > still some issues though: > * when using the artsd plugin, changing the volume when play > back is not active hangs audacious. > * when using the sun plugin, balance control only decreases volume. > > also, libsidplay gets picked up if it's installed, so add it as > a dependency. > > OK?
ping -- [EMAIL PROTECTED] SDF Public Access UNIX System - http://sdf.lonestar.org Index: Makefile =================================================================== RCS file: /home/cvs/OpenBSD/ports/audio/audacious-plugins/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- Makefile 13 Nov 2007 12:44:22 -0000 1.10 +++ Makefile 11 Dec 2007 08:34:47 -0000 @@ -7,8 +7,8 @@ V= 1.3.5 DISTNAME= audacious-plugins-$V -PKGNAME-main= ${DISTNAME}p2 -PKGNAME-arts= audacious-arts-$Vp0 +PKGNAME-main= ${DISTNAME}p3 +PKGNAME-arts= audacious-arts-$Vp1 CATEGORIES= audio multimedia HOMEPAGE= http://audacious-media-player.org/ @@ -40,9 +40,10 @@ Xcomposite Xdamage m z expat fontconfig freetype iconv intl \ pango-1.0 pangocairo-1.0 pangoft2-1.0 atk-1.0 cairo \ glib-2.0 gthread-2.0 gmodule-2.0 gobject-2.0 \ - gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0 glitz png + gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0 glitz png \ + stdc++ -WANTLIB-main= ${WANTLIB} ossaudio stdc++ ogg xml2 +WANTLIB-main= ${WANTLIB} ossaudio ogg xml2 WANTLIB-arts= ${WANTLIB} Xext c pthread BUILD_DEPENDS= ${RUN_DEPENDS-main} @@ -60,7 +61,8 @@ mad::audio/libmad \ mp3lame::audio/lame \ esd.>=2::audio/esound \ - sndfile.>=1::audio/libsndfile + sndfile.>=1::audio/libsndfile \ + sidplay.>=2::audio/libsidplay LIB_DEPENDS-arts= artsc.>=1::x11/kde/arts3 CONFIGURE_STYLE= gnu Index: patches/patch-src_aac_src_libmp4_c =================================================================== RCS file: /home/cvs/OpenBSD/ports/audio/audacious-plugins/patches/patch-src_aac_src_libmp4_c,v retrieving revision 1.1 diff -u -r1.1 patch-src_aac_src_libmp4_c --- patches/patch-src_aac_src_libmp4_c 29 Jun 2007 06:05:46 -0000 1.1 +++ patches/patch-src_aac_src_libmp4_c 11 Dec 2007 08:34:47 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_aac_src_libmp4_c,v 1.1 2007/06/29 06:05:46 jakemsr Exp $ ---- src/aac/src/libmp4.c.orig Thu May 31 17:12:45 2007 -+++ src/aac/src/libmp4.c Thu May 31 17:20:57 2007 -@@ -388,13 +388,13 @@ static TitleInput *mp4_get_song_tuple(char *fn) +--- src/aac/src/libmp4.c.orig Thu Jun 7 07:50:21 2007 ++++ src/aac/src/libmp4.c Mon Dec 10 21:32:47 2007 +@@ -391,13 +391,13 @@ static TitleInput *mp4_get_song_tuple(char *fn) gint mp4track= getAACTrack(mp4file); gint numSamples = mp4ff_num_samples(mp4file, mp4track); guint framesize = 1024; @@ -19,7 +19,7 @@ faacDecHandle decoder; if (mp4track == -1) -@@ -525,10 +525,10 @@ static int my_decode_mp4( InputPlayback *playback, cha +@@ -528,10 +528,10 @@ static int my_decode_mp4( InputPlayback *playback, cha gint mp4track= getAACTrack(mp4file); faacDecHandle decoder; mp4AudioSpecificConfig mp4ASC; @@ -34,7 +34,7 @@ gulong msDuration; gulong numSamples; gulong sampleID = 1; -@@ -674,11 +674,11 @@ static int my_decode_mp4( InputPlayback *playback, cha +@@ -678,11 +678,11 @@ static int my_decode_mp4( InputPlayback *playback, cha void my_decode_aac( InputPlayback *playback, char *filename, VFSFile *file ) { faacDecHandle decoder = 0; Index: patches/patch-src_arts_arts_helper_Makefile =================================================================== RCS file: patches/patch-src_arts_arts_helper_Makefile diff -N patches/patch-src_arts_arts_helper_Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_arts_arts_helper_Makefile 11 Dec 2007 08:34:47 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- src/arts/arts_helper/Makefile.orig Mon Dec 10 21:40:09 2007 ++++ src/arts/arts_helper/Makefile Mon Dec 10 21:44:19 2007 +@@ -6,7 +6,7 @@ SOURCES = arts_helper.c + OBJECTIVE_BINS = audacious-arts-helper + + LDFLAGS = -Wl,-export-dynamic +-LIBADD = $(ARTSC_LIBS) ++LIBADD = $(ARTSC_LIBS) -lstdc++ -lm + + CFLAGS += $(ARTSC_CFLAGS) -I../../../intl -I../../.. + Index: patches/patch-src_sun_sun_h =================================================================== RCS file: patches/patch-src_sun_sun_h diff -N patches/patch-src_sun_sun_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_sun_sun_h 11 Dec 2007 08:34:47 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- src/sun/sun.h.orig Mon Dec 10 23:01:11 2007 ++++ src/sun/sun.h Mon Dec 10 23:04:22 2007 +@@ -82,7 +82,7 @@ + + struct sun_format { + char name[16]; +- union { ++ struct { + AFormat xmms; + gint sun; + } format; Index: pkg/PLIST-main =================================================================== RCS file: /home/cvs/OpenBSD/ports/audio/audacious-plugins/pkg/PLIST-main,v retrieving revision 1.2 diff -u -r1.2 PLIST-main --- pkg/PLIST-main 21 May 2007 11:34:07 -0000 1.2 +++ pkg/PLIST-main 11 Dec 2007 08:34:47 -0000 @@ -29,6 +29,7 @@ lib/audacious/Input/libmodplug.so lib/audacious/Input/libmpc.so lib/audacious/Input/libsexypsf.so +lib/audacious/Input/libsid.so lib/audacious/Input/libtimidity.so lib/audacious/Input/libtonegen.so lib/audacious/Input/libtta.so
