On Mon, Mar 31, 2008 at 07:17:59AM +0000, Jacob Meuser wrote: > On Mon, Mar 31, 2008 at 02:31:23AM +0100, Federico G. Schwindt wrote: > > Hi, > > > > The diffs below updates audacious and audacious-plugins to 1.5.0. > > There are 2 extra diffs (already submitted) that fix the sun output > > plugin and some crash. arts compiles but it's untested. > > Comments, suggestions and OKs welcome. > > here's an updated diff for audacious, with sse2 disabled on i386, > and libsamplerate enabled.
and here's the plugins. arts output was broken (needed -lstdc++ -lm), and I enabled jack output and flac playback. everything seems to be working, except the ladspa plugins. when they're enabled, audacious just plays silence. I tried .wma, .mp3, .pls, .wav and .m4a with varying samplerates/ bitrates on i386 using arts, jack, and audio(4) output. ok by me -- [EMAIL PROTECTED] SDF Public Access UNIX System - http://sdf.lonestar.org Index: Makefile =================================================================== RCS file: /cvs/ports/audio/audacious-plugins/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- Makefile 24 Mar 2008 06:39:55 -0000 1.11 +++ Makefile 31 Mar 2008 10:03:09 -0000 @@ -5,10 +5,11 @@ COMMENT-main= input and output plugins for audacious COMMENT-arts= arts helper and plugin for audacious -V= 1.3.5 +V= 1.5.0 DISTNAME= audacious-plugins-$V -PKGNAME-main= ${DISTNAME}p2 -PKGNAME-arts= audacious-arts-$Vp0 +PKGNAME-main= ${DISTNAME} +PKGNAME-arts= audacious-arts-$V + CATEGORIES= audio multimedia HOMEPAGE= http://audacious-media-player.org/ @@ -19,57 +20,78 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes -MASTER_SITES= http://static.audacious-media-player.org/release/ -EXTRACT_SUFX= .tgz - -MULTI_PACKAGES= -main - -PSEUDO_FLAVORS= no_arts -FLAVOR?= - -.if ${FLAVOR:Mno_arts} -CONFIGURE_ARGS+=--disable-arts -.else -MULTI_PACKAGES+=-arts -.endif +WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ + Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig \ + freetype gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0 glitz \ + gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 iconv \ + intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 png z stdc++ +WANTLIB-main= ${WANTLIB} dbus-1 dbus-glib-1 mowgli ogg ossaudio \ + xml2 samplerate +WANTLIB-arts= ${WANTLIB} c pthread -USE_X11= Yes -NO_REGRESS= Yes +MASTER_SITES= http://distfiles.atheme.org/ -WANTLIB= X11 Xau Xdmcp Xrender Xcursor Xext Xfixes Xi Xinerama Xrandr \ - 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 +EXTRACT_SUFX= .tgz -WANTLIB-main= ${WANTLIB} ossaudio stdc++ ogg xml2 -WANTLIB-arts= ${WANTLIB} Xext c pthread +MULTI_PACKAGES= -main BUILD_DEPENDS= ${RUN_DEPENDS-main} -RUN_DEPENDS-main= :audacious->=1.2:audio/audacious +RUN_DEPENDS-main= :audacious->=1.4:audio/audacious RUN_DEPENDS-arts= ::audio/audacious-plugins,-main -LIB_DEPENDS-main= tag.>=6:taglib->=1.4:audio/taglib \ +LIB_DEPENDS-main= esd.>=2::audio/esound \ faad.>=1,mp4ff::audio/faad \ + FLAC.>=7::audio/flac \ + mp3lame::audio/lame \ + mad::audio/libmad \ + mpcdec.>=2::audio/libmpcdec \ + sndfile.>=2::audio/libsndfile \ + vorbis.>=5,vorbisfile.>=4,vorbisenc::audio/libvorbis \ + tag.>=6:taglib->=1.4:audio/taglib \ audiofile::devel/libaudiofile \ - curl.>=5::net/curl \ SDL.>=6::devel/sdl \ - vorbis.>=5,vorbisfile.>=4::audio/libvorbis \ - mpcdec.>=2::audio/libmpcdec \ - mad::audio/libmad \ - mp3lame::audio/lame \ - esd.>=2::audio/esound \ - sndfile.>=1::audio/libsndfile + curl.>=5::net/curl \ + neon.>=26::net/neon \ + jack::audio/jack LIB_DEPENDS-arts= artsc.>=1::x11/kde/arts3 +USE_X11= Yes +USE_GMAKE= Yes + +PSEUDO_FLAVORS= no_arts +FLAVOR?= + +.if ${FLAVOR:Mno_arts} +CONFIGURE_ARGS+=--disable-arts +.else +MULTI_PACKAGES+=-arts +.endif + CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --enable-ipv6 \ --with-dev-dsp=/dev/audio \ - --disable-flac \ - --disable-jack + --disable-pulse \ + --disable-altivec \ + --disable-lirc \ + --disable-rootvis \ + --disable-adplug \ + --disable-wavpack \ + --disable-sid \ + --disable-alsa \ + --disable-amidiplug \ + --disable-cdaudio \ + --disable-mms \ + --disable-mtp_up \ + --disable-projectm \ + --disable-projectm-1.0 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - ac_cv_header_altivec_h=no + LDFLAGS="-L${LOCALBASE}/lib" + +.if ${MACHINE_ARCH} != "amd64" +CONFIGURE_ARGS+= --disable-sse2 +.endif + +NO_REGRESS= Yes .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/audio/audacious-plugins/distinfo,v retrieving revision 1.4 diff -u -r1.4 distinfo --- distinfo 26 Jun 2007 17:11:39 -0000 1.4 +++ distinfo 31 Mar 2008 10:03:09 -0000 @@ -1,5 +1,5 @@ -MD5 (audacious-plugins-1.3.5.tgz) = /2tZATZzN/gUnhXI+x/flQ== -RMD160 (audacious-plugins-1.3.5.tgz) = U3zSQMVWDVfqYV0yLktmAnRIS+k= -SHA1 (audacious-plugins-1.3.5.tgz) = jp2zarzs33+HkplFtA+0AzLbVyU= -SHA256 (audacious-plugins-1.3.5.tgz) = quctiRNeeYmyFJ1Roe0/ui0rgpPEhS4ta/jqy3kRP3A= -SIZE (audacious-plugins-1.3.5.tgz) = 2983930 +MD5 (audacious-plugins-1.5.0.tgz) = Qsgv//1XrKYSFBvBBrn1Hg== +RMD160 (audacious-plugins-1.5.0.tgz) = CkTN2ZgZuXabWyYNxB1UYnimQDk= +SHA1 (audacious-plugins-1.5.0.tgz) = fNFXsGY2dObCccsDU/uR4Gj5H34= +SHA256 (audacious-plugins-1.5.0.tgz) = VmvIy3OWf4X8CMudbekP1OBm+n+hN2FLPHGpPq2vZVI= +SIZE (audacious-plugins-1.5.0.tgz) = 2961507 Index: patches/patch-buildsys_mk_in =================================================================== RCS file: patches/patch-buildsys_mk_in diff -N patches/patch-buildsys_mk_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-buildsys_mk_in 31 Mar 2008 10:03:09 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- buildsys.mk.in.orig Thu Mar 13 22:22:35 2008 ++++ buildsys.mk.in Sun Mar 23 17:23:07 2008 +@@ -76,7 +76,7 @@ OBJS5 = ${OBJS4:.erl=.beam} + OBJS += ${OBJS5:.m=.o} + DEPS += ${OBJS:.o=.dep} + +-.SILENT: ++#.SILENT: + .SUFFIXES: .beam .c .cc .cxx .d .dep .erl .m + .PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean + Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/audio/audacious-plugins/patches/patch-configure,v retrieving revision 1.4 diff -u -r1.4 patch-configure --- patches/patch-configure 26 Jun 2007 17:11:39 -0000 1.4 +++ patches/patch-configure 31 Mar 2008 10:03:09 -0000 @@ -1,27 +1,48 @@ -$OpenBSD: patch-configure,v 1.4 2007/06/26 17:11:39 steven Exp $ ---- configure.orig Thu Jun 7 17:44:42 2007 -+++ configure Tue Jun 26 16:46:13 2007 -@@ -5357,7 +5357,7 @@ _ACEOF - fi; - - --INPUT_PLUGINS="tonegen console sexypsf wav cue alac metronom vtx" -+INPUT_PLUGINS="tonegen console sexypsf wav alac metronom vtx" - OUTPUT_PLUGINS="disk_writer null" - EFFECT_PLUGINS="audiocompress ladspa voice_removal sndstretch stereo_plugin echo_plugin" - GENERAL_PLUGINS="song_change alarm" -@@ -7015,11 +7015,11 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - echo "$as_me:$LINENO: result: SSE2 yes" >&5 - echo "${ECHO_T}SSE2 yes" >&6 - --cat >>confdefs.h <<\_ACEOF -+#cat >>confdefs.h <<\_ACEOF - #define HAVE_SSE2 1 --_ACEOF -+#_ACEOF +$OpenBSD$ +--- configure.orig Thu Mar 13 15:22:41 2008 ++++ configure Mon Mar 31 02:03:01 2008 +@@ -10354,7 +10354,7 @@ fi + LIBFLAC_LIBS="-L$libdir" + fi -- SIMD_CFLAGS=-msse2 -+# SIMD_CFLAGS=-msse2 +- LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC -lm" ++ LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC -logg -lm" + + if test "x$libFLAC_includes" != "x" ; then + LIBFLAC_CFLAGS="-I$libFLAC_includes" +@@ -11272,7 +11272,7 @@ then + echo "$as_me: WARNING: Could not find jack/jack.h Install jack headers to build bio2jack" >&2;} + JACK_EVERYTHINGOK=no + else +- JACK_CFLAGS="-lpthread -ljack -ldl" ++ JACK_CFLAGS="`pkg-config --cflags jack`" + fi + + { echo "$as_me:$LINENO: checking for jack_activate in -ljack" >&5 +@@ -11281,7 +11281,7 @@ if test "${ac_cv_lib_jack_jack_activate+set}" = set; t + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$as_me: program exited with status $ac_status" >&5 - echo "$as_me: failed program was:" >&5 + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ljack $LIBS" ++LIBS="`pkg-config --libs jack` $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -11337,7 +11337,7 @@ fi + { echo "$as_me:$LINENO: result: $ac_cv_lib_jack_jack_activate" >&5 + echo "${ECHO_T}$ac_cv_lib_jack_jack_activate" >&6; } + if test $ac_cv_lib_jack_jack_activate = yes; then +- JACK_LIBS="-ljack -ldl" ++ JACK_LIBS="`pkg-config --libs jack`" + fi + + if test "${ac_cv_lib_jack_jack_activate}" = "no" +@@ -11571,7 +11571,7 @@ if test "$ARTSC_CONFIG" = "no"; then + no_artsc=yes + else + ARTSC_CFLAGS=`$ARTSC_CONFIG $artsc_config_args --cflags` +- ARTSC_LIBS=`$ARTSC_CONFIG $artsc_config_args --libs` ++ ARTSC_LIBS="`$ARTSC_CONFIG $artsc_config_args --libs` -lstdc++ -lm" + ARTSC_VERSION=`$ARTSC_CONFIG $artsc_config_args --version` + + Index: patches/patch-mk_init_mk =================================================================== RCS file: patches/patch-mk_init_mk diff -N patches/patch-mk_init_mk --- patches/patch-mk_init_mk 27 Dec 2006 16:49:25 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,18 +0,0 @@ -$OpenBSD: patch-mk_init_mk,v 1.1.1.1 2006/12/27 16:49:25 steven Exp $ ---- mk/init.mk.orig Mon Dec 25 09:36:45 2006 -+++ mk/init.mk Mon Dec 25 09:36:56 2006 -@@ -1,5 +1,5 @@ - # Shut up GNU make --.SILENT: -+#.SILENT: - - OBJECTIVE_DIRECTORIES = - OBJECTIVE_LIBS = -@@ -16,5 +16,5 @@ SHOW_CFLAGS ?= $(VERBOSE) - LIBDIR = $(libdir) - BINDIR = $(bindir) - INCLUDEDIR = $(pkgincludedir) --CFLAGS += -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/pkg/xorg/include --CXXFLAGS += -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/pkg/xorg/include -+CFLAGS += -DHAVE_CONFIG_H -+CXXFLAGS += -DHAVE_CONFIG_H Index: patches/patch-src_aac_Makefile =================================================================== RCS file: /cvs/ports/audio/audacious-plugins/patches/patch-src_aac_Makefile,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 patch-src_aac_Makefile --- patches/patch-src_aac_Makefile 27 Dec 2006 16:49:25 -0000 1.1.1.1 +++ patches/patch-src_aac_Makefile 31 Mar 2008 10:03:09 -0000 @@ -1,11 +1,62 @@ -$OpenBSD: patch-src_aac_Makefile,v 1.1.1.1 2006/12/27 16:49:25 steven Exp $ ---- src/aac/Makefile.orig Mon Dec 25 10:09:37 2006 -+++ src/aac/Makefile Mon Dec 25 10:10:53 2006 -@@ -1,6 +1,6 @@ - include ../../mk/rules.mk - include ../../mk/init.mk +$OpenBSD$ +--- src/aac/Makefile.orig Wed Jan 30 03:29:49 2008 ++++ src/aac/Makefile Wed Jan 30 03:32:21 2008 +@@ -3,51 +3,7 @@ PLUGIN = aac${PLUGIN_SUFFIX} + SRCS = libmp4.c \ + mp4_utils.c \ + aac_utils.c \ +- tagging_mp4.c \ +- libfaad2/bits.c \ +- libfaad2/cfft.c \ +- libfaad2/decoder.c \ +- libfaad2/drc.c \ +- libfaad2/drm_dec.c \ +- libfaad2/error.c \ +- libfaad2/filtbank.c \ +- libfaad2/ic_predict.c \ +- libfaad2/is.c \ +- libfaad2/lt_predict.c \ +- libfaad2/mdct.c \ +- libfaad2/mp4.c \ +- libfaad2/ms.c \ +- libfaad2/output.c \ +- libfaad2/pns.c \ +- libfaad2/ps_dec.c \ +- libfaad2/ps_syntax.c \ +- libfaad2/pulse.c \ +- libfaad2/specrec.c \ +- libfaad2/syntax.c \ +- libfaad2/tns.c \ +- libfaad2/hcr.c \ +- libfaad2/huffman.c \ +- libfaad2/rvlc.c \ +- libfaad2/ssr.c \ +- libfaad2/ssr_fb.c \ +- libfaad2/ssr_ipqf.c \ +- libfaad2/common.c \ +- libfaad2/sbr_dct.c \ +- libfaad2/sbr_e_nf.c \ +- libfaad2/sbr_fbt.c \ +- libfaad2/sbr_hfadj.c \ +- libfaad2/sbr_hfgen.c \ +- libfaad2/sbr_huff.c \ +- libfaad2/sbr_qmf.c \ +- libfaad2/sbr_syntax.c \ +- libfaad2/sbr_tf_grid.c \ +- libfaad2/sbr_dec.c \ +- mp4ff/mp4ff.c \ +- mp4ff/mp4atom.c \ +- mp4ff/mp4meta.c \ +- mp4ff/mp4sample.c \ +- mp4ff/mp4util.c \ +- mp4ff/mp4tagupdate.c ++ tagging_mp4.c --SUBDIRS = mp4ff libfaad2 src -+SUBDIRS = src + include ../../buildsys.mk + include ../../extra.mk +@@ -56,4 +12,4 @@ plugindir := ${plugindir}/${INPUT_PLUGIN_DIR} - include ../../mk/objective.mk + CFLAGS += ${PLUGIN_CFLAGS} -fsigned-char + CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../.. -I. -I./include -I./libfaad2 -I./mp4ff -DUSE_TAGGING=1 +-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS} -lm ++LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS} -lm -L$(LOCALBASE)/lib -lfaad -lmp4ff Index: patches/patch-src_aac_libmp4_c =================================================================== RCS file: patches/patch-src_aac_libmp4_c diff -N patches/patch-src_aac_libmp4_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_aac_libmp4_c 31 Mar 2008 10:03:09 -0000 @@ -0,0 +1,52 @@ +$OpenBSD$ +--- src/aac/libmp4.c.orig Wed Jan 30 04:43:44 2008 ++++ src/aac/libmp4.c Wed Jan 30 04:46:43 2008 +@@ -347,13 +347,13 @@ static Tuple *mp4_get_song_tuple_base(char *filename, + gint mp4track= getAACTrack(mp4file); + gint numSamples = mp4ff_num_samples(mp4file, mp4track); + guint framesize = 1024; +- guint samplerate = 0; +- guchar channels = 0; ++ guint32 samplerate = 0; ++ guint8 channels = 0; + gint msDuration; + mp4AudioSpecificConfig mp4ASC; + gchar *tmpval; +- guchar *buffer = NULL; +- guint bufferSize = 0; ++ guint8 *buffer = NULL; ++ guint32 bufferSize = 0; + faacDecHandle decoder; + + if (mp4track == -1) { +@@ -479,10 +479,10 @@ static int my_decode_mp4( InputPlayback *playback, cha + gint mp4track= getAACTrack(mp4file); + faacDecHandle decoder; + mp4AudioSpecificConfig mp4ASC; +- guchar *buffer = NULL; +- guint bufferSize = 0; +- guint samplerate = 0; +- guchar channels = 0; ++ guint8 *buffer = NULL; ++ guint32 bufferSize = 0; ++ guint32 samplerate = 0; ++ guint8 channels = 0; + gulong msDuration; + guint numSamples; + gulong sampleID = 1; +@@ -627,11 +627,11 @@ static int my_decode_mp4( InputPlayback *playback, cha + void my_decode_aac( InputPlayback *playback, char *filename, VFSFile *file ) + { + faacDecHandle decoder = 0; +- guchar streambuffer[BUFFER_SIZE]; ++ guint8 streambuffer[BUFFER_SIZE]; + gulong bufferconsumed = 0; +- gulong samplerate = 0; +- guchar channels = 0; +- gulong buffervalid = 0; ++ guint32 samplerate = 0; ++ guint8 channels = 0; ++ guint32 buffervalid = 0; + gchar *ttemp = NULL, *stemp = NULL; + gchar *temp = g_strdup(filename); + gchar *xmmstitle = NULL; Index: patches/patch-src_aac_src_Makefile =================================================================== RCS file: patches/patch-src_aac_src_Makefile diff -N patches/patch-src_aac_src_Makefile --- patches/patch-src_aac_src_Makefile 1 Jun 2007 18:19:45 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_aac_src_Makefile,v 1.3 2007/06/01 18:19:45 jakemsr Exp $ ---- src/aac/src/Makefile.orig Wed Apr 4 20:38:00 2007 -+++ src/aac/src/Makefile Sun Apr 8 11:28:33 2007 -@@ -8,7 +8,7 @@ CFLAGS += $(PICFLAGS) - # override objective make's LIBDIR - LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR) - LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) --LDFLAGS += ../libfaad2/libfaad.a ../mp4ff/libmp4ff.a -lstdc++ -+LDFLAGS += -L$(LOCALBASE)/lib -lfaad -lmp4ff -lstdc++ - - SOURCES = libmp4.c mp4_utils.c aac_utils.c tagging_mp4.c - Index: patches/patch-src_aac_src_libmp4_c =================================================================== RCS file: patches/patch-src_aac_src_libmp4_c diff -N patches/patch-src_aac_src_libmp4_c --- patches/patch-src_aac_src_libmp4_c 29 Jun 2007 06:05:46 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,52 +0,0 @@ -$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) - gint mp4track= getAACTrack(mp4file); - gint numSamples = mp4ff_num_samples(mp4file, mp4track); - guint framesize = 1024; -- gulong samplerate; -- guchar channels; -+ guint32 samplerate; -+ guint8 channels; - gint msDuration; - mp4AudioSpecificConfig mp4ASC; - gchar *tmpval; -- guchar *buffer = NULL; -- guint bufferSize = 0; -+ guint8 *buffer = NULL; -+ guint32 bufferSize = 0; - faacDecHandle decoder; - - if (mp4track == -1) -@@ -525,10 +525,10 @@ static int my_decode_mp4( InputPlayback *playback, cha - gint mp4track= getAACTrack(mp4file); - faacDecHandle decoder; - mp4AudioSpecificConfig mp4ASC; -- guchar *buffer = NULL; -- guint bufferSize = 0; -- gulong samplerate; -- guchar channels; -+ guint8 *buffer = NULL; -+ guint32 bufferSize = 0; -+ guint32 samplerate; -+ guint8 channels; - gulong msDuration; - gulong numSamples; - gulong sampleID = 1; -@@ -674,11 +674,11 @@ static int my_decode_mp4( InputPlayback *playback, cha - void my_decode_aac( InputPlayback *playback, char *filename, VFSFile *file ) - { - faacDecHandle decoder = 0; -- guchar streambuffer[BUFFER_SIZE]; -+ guint8 streambuffer[BUFFER_SIZE]; - gulong bufferconsumed = 0; -- gulong samplerate = 0; -- guchar channels; -- gulong buffervalid = 0; -+ guint32 samplerate = 0; -+ guint8 channels; -+ guint32 buffervalid = 0; - TitleInput* input; - gchar *ttemp = NULL, *stemp = NULL; - gchar *temp = g_strdup(filename); Index: patches/patch-src_cdaudio_Makefile =================================================================== RCS file: patches/patch-src_cdaudio_Makefile diff -N patches/patch-src_cdaudio_Makefile --- patches/patch-src_cdaudio_Makefile 21 May 2007 11:34:07 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,10 +0,0 @@ -$OpenBSD: patch-src_cdaudio_Makefile,v 1.2 2007/05/21 11:34:07 steven Exp $ ---- src/cdaudio/Makefile.orig Tue Jan 30 17:04:43 2007 -+++ src/cdaudio/Makefile Sun Apr 8 11:19:45 2007 -@@ -11,5 +11,6 @@ SOURCES = cdaudio.c cddb.c cdinfo.c configure.c http.c - OBJECTS = ${SOURCES:.c=.o} - - CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../.. -I../.. -+LDFLAGS += -lossaudio - - include ../../mk/objective.mk Index: patches/patch-src_sun_audio_c =================================================================== RCS file: patches/patch-src_sun_audio_c diff -N patches/patch-src_sun_audio_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_sun_audio_c 31 Mar 2008 10:03:09 -0000 @@ -0,0 +1,18 @@ +$OpenBSD$ +--- src/sun/audio.c.orig Mon Mar 31 02:47:49 2008 ++++ src/sun/audio.c Mon Mar 31 02:48:03 2008 +@@ -122,14 +122,12 @@ static void sun_setformat(AFormat fmt, int rate, int n + + sun = sun_format(fmt); + +- effect.format.sun = sun; + effect.format.xmms = fmt; + effect.frequency = rate; + effect.channels = nch; + effect.bps = sun_bps(sun, rate, nch); + + output.format.sun = sun; +- output.format.xmms = fmt; + output.frequency = rate; + output.channels = nch; + sun_setparams(); Index: pkg/PLIST-arts =================================================================== RCS file: /cvs/ports/audio/audacious-plugins/pkg/PLIST-arts,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 PLIST-arts --- pkg/PLIST-arts 27 Dec 2006 16:49:25 -0000 1.1.1.1 +++ pkg/PLIST-arts 31 Mar 2008 10:03:09 -0000 @@ -1,3 +1,3 @@ @comment $OpenBSD: PLIST-arts,v 1.1.1.1 2006/12/27 16:49:25 steven Exp $ bin/audacious-arts-helper -lib/audacious/Output/libarts.so +lib/audacious/Output/arts.so Index: pkg/PLIST-main =================================================================== RCS file: /cvs/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 31 Mar 2008 10:03:09 -0000 @@ -1,98 +1,105 @@ @comment $OpenBSD: PLIST-main,v 1.2 2007/05/21 11:34:07 steven Exp $ -include/audacious-plugins/ +lib/audacious/ lib/audacious/Container/ -lib/audacious/Container/libm3u.so -lib/audacious/Container/libpls.so -lib/audacious/Container/libstdio.so -lib/audacious/Container/libxspf.so +lib/audacious/Container/m3u.so +lib/audacious/Container/pls.so +lib/audacious/Container/xspf.so lib/audacious/Effect/ -lib/audacious/Effect/libaudiocompress.so -lib/audacious/Effect/libecho.so -lib/audacious/Effect/libladspa.so -lib/audacious/Effect/libsndstretch.so -lib/audacious/Effect/libstereo.so -lib/audacious/Effect/libvoice_removal.so +lib/audacious/Effect/audiocompress.so +lib/audacious/Effect/echo.so +lib/audacious/Effect/ladspa.so +lib/audacious/Effect/sndstretch.so +lib/audacious/Effect/stereo.so +lib/audacious/Effect/voice_removal.so lib/audacious/General/ -lib/audacious/General/libalarm.so -lib/audacious/General/libaosd.so -lib/audacious/General/libcurl.so -lib/audacious/General/libscrobbler.so -lib/audacious/General/libsong_change.so -lib/audacious/General/libstatusicon.so +lib/audacious/General/alarm.so +lib/audacious/General/aosd.so +lib/audacious/General/gnomeshortcuts.so +lib/audacious/General/hotkey.so +lib/audacious/General/scrobbler.so +lib/audacious/General/song_change.so +lib/audacious/General/statusicon.so lib/audacious/Input/ -lib/audacious/Input/libaac.so -lib/audacious/Input/libalac.so -lib/audacious/Input/libcdaudio.so -lib/audacious/Input/libconsole.so -lib/audacious/Input/libmadplug.so -lib/audacious/Input/libmetronom.so -lib/audacious/Input/libmodplug.so -lib/audacious/Input/libmpc.so -lib/audacious/Input/libsexypsf.so -lib/audacious/Input/libtimidity.so -lib/audacious/Input/libtonegen.so -lib/audacious/Input/libtta.so -lib/audacious/Input/libvorbis.so -lib/audacious/Input/libvtx.so -lib/audacious/Input/libwav.so -lib/audacious/Input/libwma.so +lib/audacious/Input/aac.so +lib/audacious/Input/alac.so +lib/audacious/Input/console.so +lib/audacious/Input/cuesheet.so +lib/audacious/Input/demac.so +lib/audacious/Input/flacng.so +lib/audacious/Input/madplug.so +lib/audacious/Input/metronom.so +lib/audacious/Input/modplug.so +lib/audacious/Input/musepack.so +lib/audacious/Input/sexypsf.so +lib/audacious/Input/sndfile.so +lib/audacious/Input/timidity.so +lib/audacious/Input/tonegen.so +lib/audacious/Input/tta.so +lib/audacious/Input/vorbis.so +lib/audacious/Input/vtx.so +lib/audacious/Input/wma.so lib/audacious/Output/ -lib/audacious/Output/libESD.so -lib/audacious/Output/libOSS.so -lib/audacious/Output/libdisk_writer.so -lib/audacious/Output/liblame.so -lib/audacious/Output/libnull.so -lib/audacious/Output/libsun.so +lib/audacious/Output/ESD.so +lib/audacious/Output/OSS.so +lib/audacious/Output/filewriter.so +lib/audacious/Output/jackout.so +lib/audacious/Output/null.so +lib/audacious/Output/sun.so +lib/audacious/Transport/ +lib/audacious/Transport/lastfm.so +lib/audacious/Transport/neon.so +lib/audacious/Transport/stdio.so lib/audacious/Visualization/ -lib/audacious/Visualization/libbscope.so -lib/audacious/Visualization/libparanormal.so -lib/audacious/Visualization/librocklight.so -lib/audacious/Visualization/librovascope.so -lib/audacious/Visualization/libspectrum.so -share/audacious-plugins/ -share/audacious-plugins/paranormal/ -share/audacious-plugins/paranormal/Presets/ -share/audacious-plugins/paranormal/Presets/aerdan_-_bloody_vortex.pnv -share/audacious-plugins/paranormal/Presets/aerdan_-_cloudscape.pnv -share/audacious-plugins/paranormal/Presets/aerdan_-_cloudscape2.pnv -share/audacious-plugins/paranormal/Presets/aerdan_-_dancing_snow.pnv -share/audacious-plugins/paranormal/Presets/aerdan_-_portal_to_hell.pnv -share/audacious-plugins/paranormal/Presets/aerdan_-_telestatic.pnv -share/audacious-plugins/paranormal/Presets/nazca_-_smoke_on_the_water.pnv -share/audacious-plugins/paranormal/Presets/nenolod_-_3d_wave.pnv -share/audacious-plugins/paranormal/Presets/nenolod_-_aquamarine_dream.pnv -share/audacious-plugins/paranormal/Presets/nenolod_-_beatscope.pnv -share/audacious-plugins/paranormal/Presets/nenolod_-_branchscope.pnv -share/audacious-plugins/paranormal/Presets/nenolod_-_bumblebees.pnv -share/audacious-plugins/paranormal/Presets/nenolod_-_cubism.pnv -share/audacious-plugins/paranormal/Presets/nenolod_-_flying_into_pastels.pnv -share/audacious-plugins/paranormal/Presets/nenolod_-_interlaced.pnv -share/audacious-plugins/paranormal/Presets/nenolod_-_kaliedoscope.pnv -share/audacious-plugins/paranormal/Presets/nenolod_-_phosphor_flame.pnv -share/audacious-plugins/paranormal/Presets/nenolod_-_psuedo_starfield.pnv -share/audacious-plugins/paranormal/Presets/nenolod_-_purple_flower.pnv -share/audacious-plugins/paranormal/Presets/nenolod_-_quakingscope.pnv -share/audacious-plugins/paranormal/Presets/nenolod_-_quasar.pnv -share/audacious-plugins/paranormal/Presets/nenolod_-_retroscope.pnv -share/audacious-plugins/paranormal/Presets/nenolod_-_rush.pnv -share/audacious-plugins/paranormal/Presets/nenolod_-_scopefun.pnv -share/audacious-plugins/paranormal/Presets/nenolod_-_simple_yet_pretty.pnv -share/audacious-plugins/paranormal/Presets/nenolod_-_smoke.pnv -share/audacious-plugins/paranormal/Presets/nenolod_-_swarm.pnv -share/audacious-plugins/paranormal/Presets/nenolod_-_technicolour_nightmare.pnv -share/audacious-plugins/paranormal/Presets/nenolod_-_transform_fun.pnv -share/audacious-plugins/paranormal/Presets/nenolod_-_trapped.pnv -share/audacious-plugins/paranormal/Presets/nenolod_-_tunnel_vision.pnv -share/audacious-plugins/paranormal/Presets/nenolod_-_value_replace_fun.pnv -share/audacious-plugins/paranormal/Presets/nenolod_-_worms.pnv -share/audacious-plugins/paranormal/Presets/ticpu_-_colored_beat-o-scope.pnv +lib/audacious/Visualization/blur_scope.so +lib/audacious/Visualization/paranormal.so +lib/audacious/Visualization/rocklight.so +lib/audacious/Visualization/spectrum.so share/audacious/images/audioscrobbler.png share/audacious/images/audioscrobbler_badge.png +share/audacious/paranormal/ +share/audacious/paranormal/Presets/ +share/audacious/paranormal/Presets/aerdan_-_bloody_vortex.pnv +share/audacious/paranormal/Presets/aerdan_-_cloudscape.pnv +share/audacious/paranormal/Presets/aerdan_-_cloudscape2.pnv +share/audacious/paranormal/Presets/aerdan_-_dancing_snow.pnv +share/audacious/paranormal/Presets/aerdan_-_portal_to_hell.pnv +share/audacious/paranormal/Presets/aerdan_-_telestatic.pnv +share/audacious/paranormal/Presets/nazca_-_smoke_on_the_water.pnv +share/audacious/paranormal/Presets/nenolod_-_3d_wave.pnv +share/audacious/paranormal/Presets/nenolod_-_aquamarine_dream.pnv +share/audacious/paranormal/Presets/nenolod_-_beatscope.pnv +share/audacious/paranormal/Presets/nenolod_-_branchscope.pnv +share/audacious/paranormal/Presets/nenolod_-_bumblebees.pnv +share/audacious/paranormal/Presets/nenolod_-_cubism.pnv +share/audacious/paranormal/Presets/nenolod_-_flying_into_pastels.pnv +share/audacious/paranormal/Presets/nenolod_-_interlaced.pnv +share/audacious/paranormal/Presets/nenolod_-_kaliedoscope.pnv +share/audacious/paranormal/Presets/nenolod_-_phosphor_flame.pnv +share/audacious/paranormal/Presets/nenolod_-_psuedo_starfield.pnv +share/audacious/paranormal/Presets/nenolod_-_purple_flower.pnv +share/audacious/paranormal/Presets/nenolod_-_quakingscope.pnv +share/audacious/paranormal/Presets/nenolod_-_quasar.pnv +share/audacious/paranormal/Presets/nenolod_-_retroscope.pnv +share/audacious/paranormal/Presets/nenolod_-_rush.pnv +share/audacious/paranormal/Presets/nenolod_-_scopefun.pnv +share/audacious/paranormal/Presets/nenolod_-_simple_yet_pretty.pnv +share/audacious/paranormal/Presets/nenolod_-_smoke.pnv +share/audacious/paranormal/Presets/nenolod_-_swarm.pnv +share/audacious/paranormal/Presets/nenolod_-_technicolour_nightmare.pnv +share/audacious/paranormal/Presets/nenolod_-_transform_fun.pnv +share/audacious/paranormal/Presets/nenolod_-_trapped.pnv +share/audacious/paranormal/Presets/nenolod_-_tunnel_vision.pnv +share/audacious/paranormal/Presets/nenolod_-_value_replace_fun.pnv +share/audacious/paranormal/Presets/nenolod_-_worms.pnv +share/audacious/paranormal/Presets/ticpu_-_colored_beat-o-scope.pnv share/locale/ca/LC_MESSAGES/audacious-plugins.mo share/locale/cs/LC_MESSAGES/audacious-plugins.mo share/locale/cy/LC_MESSAGES/audacious-plugins.mo share/locale/de/LC_MESSAGES/audacious-plugins.mo +share/locale/et/LC_MESSAGES/audacious-plugins.mo +share/locale/fr/LC_MESSAGES/audacious-plugins.mo share/locale/ja/LC_MESSAGES/audacious-plugins.mo +share/locale/ro/LC_MESSAGES/audacious-plugins.mo share/locale/ru/LC_MESSAGES/audacious-plugins.mo share/locale/sk/LC_MESSAGES/audacious-plugins.mo share/locale/tr/LC_MESSAGES/audacious-plugins.mo
