steven mestdagh [2007-04-09, 18:28:38]: > this updates audacious and its plugins to 1.3.2. > please test/comment.
A crash occurs on amd64 when playing a wav file through the playlist, and then pressing the stop button. The problem does not occur with the in tree version. Trace below. If anyone has time to fix the code or enter this bug in audacious bugtracker, go for it. Program received signal SIGABRT, Aborted. [Switching to process 14803, thread 0x44164000] 0x000000004e487e6a in kill () from /usr/lib/libc.so.40.3 (gdb) bt #0 0x000000004e487e6a in kill () from /usr/lib/libc.so.40.3 #1 0x000000004e4ce681 in abort () at /usr/src/lib/libc/stdlib/abort.c:65 #2 0x000000004d93bc6b in g_logv () from /usr/local/lib/libglib-2.0.so.1000.3 #3 0x000000004d93bcf3 in g_log () from /usr/local/lib/libglib-2.0.so.1000.3 #4 0x00000000443a19f3 in g_cond_timed_wait_posix_impl () from /usr/local/lib/libgthread-2.0.so.1000.3 #5 0x0000000059b5e667 in play_loop (arg=0x412ffac0) at wav-sndfile.c:205 #6 0x000000004d94d1d8 in g_static_private_free () from /usr/local/lib/libglib-2.0.so.1000.3 #7 0x000000004d0a634d in _thread_start () at /usr/src/lib/libpthread/uthread/uthread_create.c:244 #8 0x000000000000001f in ?? () Cannot access memory at address 0x41545000 > > Index: audacious/Makefile > =================================================================== > RCS file: /cvs/ports/audio/audacious/Makefile,v > retrieving revision 1.2 > diff -u -r1.2 Makefile > --- audacious/Makefile 24 Jan 2007 13:16:33 -0000 1.2 > +++ audacious/Makefile 9 Apr 2007 08:02:03 -0000 > @@ -4,9 +4,8 @@ > > COMMENT= "GTK+-2 media player based on BMP and XMMS" > > -DISTNAME= audacious-1.2.2 > -PKGNAME= ${DISTNAME}p0 > -SHARED_LIBS= audacious 4.0 > +DISTNAME= audacious-1.3.2 > +SHARED_LIBS= audacious 5.0 > CATEGORIES= audio > > HOMEPAGE= http://audacious-media-player.org/ > @@ -17,7 +16,7 @@ > PERMIT_PACKAGE_CDROM= Yes > PERMIT_PACKAGE_FTP= Yes > > -MASTER_SITES= ${HOMEPAGE}release/ > +MASTER_SITES= http://static.audacious-media-player.org/release/ > EXTRACT_SUFX= .tgz > > USE_X11= Yes > @@ -25,12 +24,13 @@ > > MODULES= devel/gettext > > -WANTLIB= X11 Xext Xrender fontconfig freetype m z c pthread stdc++ \ > +WANTLIB= X11 Xau Xdmcp Xrender fontconfig freetype m z c pthread stdc++ \ > glib-2.0 gthread-2.0 gmodule-2.0 gobject-2.0 gdk_pixbuf-2.0 \ > - gdk-x11-2.0 gtk-x11-2.0 atk-1.0 cairo glitz png \ > + gdk-x11-2.0 gtk-x11-2.0 atk-1.0 cairo glitz png expat \ > pango-1.0 pangocairo-1.0 pangoft2-1.0 xml2 > > -LIB_DEPENDS= glade-2.0.>=0.3::devel/libglade2 > +LIB_DEPENDS= glade-2.0.>=0.3::devel/libglade2 \ > + mcs::devel/mcs > > MAKE_ENV= LIBaudacious_VERSION=${LIBaudacious_VERSION} > > Index: audacious/distinfo > =================================================================== > RCS file: /cvs/ports/audio/audacious/distinfo,v > retrieving revision 1.2 > diff -u -r1.2 distinfo > --- audacious/distinfo 5 Apr 2007 15:37:41 -0000 1.2 > +++ audacious/distinfo 9 Apr 2007 08:02:03 -0000 > @@ -1,5 +1,5 @@ > -MD5 (audacious-1.2.2.tgz) = 53SvvaBCIObhsKm/81BSLg== > -RMD160 (audacious-1.2.2.tgz) = qY+US50w4c20dgxW+0AbANL/dyM= > -SHA1 (audacious-1.2.2.tgz) = R/3ydH5QsNnky6AsxAjIYal4te0= > -SHA256 (audacious-1.2.2.tgz) = MatRZEQnn1AidkvqV8AX+xQKW6PGmy7I32RUKRfTaw8= > -SIZE (audacious-1.2.2.tgz) = 1708499 > +MD5 (audacious-1.3.2.tgz) = t4SjBgSi+dhOnaMQBp9D+Q== > +RMD160 (audacious-1.3.2.tgz) = +PqTPdlZzgIEe9J7Aam4vGyrCLg= > +SHA1 (audacious-1.3.2.tgz) = j8WRLNijrJi5Xm+5zSwjfPanjOg= > +SHA256 (audacious-1.3.2.tgz) = zMihkNbptfYDuuVfxkLdsm+rKFtednBFkrfpXYL+7u8= > +SIZE (audacious-1.3.2.tgz) = 1730554 > Index: audacious/patches/patch-audacious_build_stamp_c > =================================================================== > RCS file: audacious/patches/patch-audacious_build_stamp_c > diff -N audacious/patches/patch-audacious_build_stamp_c > --- audacious/patches/patch-audacious_build_stamp_c 27 Dec 2006 16:46:09 > -0000 1.1.1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,6 +0,0 @@ > -$OpenBSD: patch-audacious_build_stamp_c,v 1.1.1.1 2006/12/27 16:46:09 steven > Exp $ > ---- audacious/build_stamp.c.orig Mon Dec 25 00:36:20 2006 > -+++ audacious/build_stamp.c Mon Dec 25 00:36:47 2006 > -@@ -0,0 +1,2 @@ > -+#include <glib.h> > -+const gchar *svn_stamp = "1.2.2"; > Index: audacious/patches/patch-libaudacious_Makefile > =================================================================== > RCS file: audacious/patches/patch-libaudacious_Makefile > diff -N audacious/patches/patch-libaudacious_Makefile > --- audacious/patches/patch-libaudacious_Makefile 27 Dec 2006 16:46:09 > -0000 1.1.1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,21 +0,0 @@ > -$OpenBSD: patch-libaudacious_Makefile,v 1.1.1.1 2006/12/27 16:46:09 steven > Exp $ > ---- libaudacious/Makefile.orig Mon Nov 6 09:15:43 2006 > -+++ libaudacious/Makefile Mon Dec 25 00:50:03 2006 > -@@ -6,7 +6,7 @@ PICLDFLAGS = $(LIBLDFLAGS) > - beepincludedir = $(includedir)/audacious > - > - OBJECTIVE_LIBS = libaudacious$(SHARED_SUFFIX) > --OBJECTIVE_SONAME_SUFFIX = 4 > -+OBJECTIVE_SONAME_SUFFIX = ${LIBaudacious_VERSION} > - > - LIBADD = \ > - $(GTK_LIBS) \ > -@@ -45,8 +45,3 @@ HEADERS = \ > - include ../mk/objective.mk > - > - install-posthook: > -- @mv ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX) > ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX).4.0.0 > -- @ln -sf ${LIBDIR}/libaudacious$(SHARED_SUFFIX).4.0.0 \ > -- ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX).4 > -- @ln -sf ${LIBDIR}/libaudacious$(SHARED_SUFFIX).4 \ > -- ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX) > Index: audacious/patches/patch-mk_objective_mk > =================================================================== > RCS file: audacious/patches/patch-mk_objective_mk > diff -N audacious/patches/patch-mk_objective_mk > --- audacious/patches/patch-mk_objective_mk 27 Dec 2006 16:46:09 -0000 > 1.1.1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,21 +0,0 @@ > -$OpenBSD: patch-mk_objective_mk,v 1.1.1.1 2006/12/27 16:46:09 steven Exp $ > ---- mk/objective.mk.orig Mon Sep 18 23:08:39 2006 > -+++ mk/objective.mk Mon Dec 25 00:48:24 2006 > -@@ -31,7 +31,7 @@ install: build > - done; \ > - fi > - @if [ "x$(OBJECTIVE_LIBS)" != "x" ]; then \ > -- for i in $(OBJECTIVE_LIBS); do \ > -+ for i in $(OBJECTIVE_LIBS).$(OBJECTIVE_SONAME_SUFFIX); do \ > - printf "%10s %-20s\n" INSTALL $$i; \ > - $(INSTALL) $(INSTALL_OVERRIDE) $$i > $(DESTDIR)/$(LIBDIR)/$$i; \ > - done; \ > -@@ -178,7 +178,7 @@ $(OBJECTIVE_LIBS): $(OBJECTS) > - printf "%10s %-20s\n" LINK $@; \ > - (if [ "x$(SHARED_SUFFIX)" = "x.so" ]; then \ > - (if [ "x$(OBJECTIVE_SONAME_SUFFIX)" != "x" ]; then \ > -- $(CC) $(PICLDFLAGS) -o $@ -Wl,[EMAIL > PROTECTED](OBJECTIVE_SONAME_SUFFIX) $(OBJECTS) $(LDFLAGS) $(LIBADD); \ > -+ $(CC) $(PICLDFLAGS) -o [EMAIL > PROTECTED](OBJECTIVE_SONAME_SUFFIX) $(OBJECTS) $(LDFLAGS) $(LIBADD); \ > - else \ > - $(CC) $(PICLDFLAGS) -o $@ -Wl,-soname=$@ > $(OBJECTS) $(LDFLAGS) $(LIBADD); \ > - fi;) \ > Index: audacious/patches/patch-src_libaudacious_Makefile > =================================================================== > RCS file: audacious/patches/patch-src_libaudacious_Makefile > diff -N audacious/patches/patch-src_libaudacious_Makefile > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ audacious/patches/patch-src_libaudacious_Makefile 9 Apr 2007 08:02:03 > -0000 > @@ -0,0 +1,23 @@ > +$OpenBSD$ > +--- src/libaudacious/Makefile.orig Mon Feb 26 15:14:54 2007 > ++++ src/libaudacious/Makefile Sun Apr 8 11:03:40 2007 > +@@ -3,9 +3,7 @@ include ../../mk/init.mk > + > + PICLDFLAGS = $(LIBLDFLAGS) > + > +-OBJECTIVE_LIBS = libaudacious$(SHARED_SUFFIX) > +-OBJECTIVE_SONAME_SUFFIX = 5 > +-LIBAUDACIOUS_SUFFIX = 5.0.0 > ++OBJECTIVE_LIBS = libaudacious$(SHARED_SUFFIX).${LIBaudacious_VERSION} > + > + LIBADD = \ > + $(GTK_LIBS) \ > +@@ -33,8 +31,3 @@ HEADERS = \ > + include ../../mk/objective.mk > + > + install-posthook: > +- @mv ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX) > ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX).$(LIBAUDACIOUS_SUFFIX) > +- @ln -sf libaudacious$(SHARED_SUFFIX).$(LIBAUDACIOUS_SUFFIX) \ > +- ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX).5 > +- @ln -sf libaudacious$(SHARED_SUFFIX).5 \ > +- ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX) > Index: audacious/pkg/PLIST > =================================================================== > RCS file: /cvs/ports/audio/audacious/pkg/PLIST,v > retrieving revision 1.1.1.1 > diff -u -r1.1.1.1 PLIST > --- audacious/pkg/PLIST 27 Dec 2006 16:46:09 -0000 1.1.1.1 > +++ audacious/pkg/PLIST 9 Apr 2007 08:02:04 -0000 > @@ -4,22 +4,28 @@ > include/audacious/ > include/audacious/beepctrl.h > include/audacious/configdb.h > -include/audacious/dirbrowser.h > include/audacious/formatter.h > +include/audacious/hook.h > +include/audacious/i18n.h > +include/audacious/id3tag.h > include/audacious/input.h > include/audacious/main.h > include/audacious/output.h > include/audacious/playlist.h > include/audacious/playlist_container.h > include/audacious/plugin.h > -include/audacious/prefswin.h > include/audacious/rcfile.h > +include/audacious/strings.h > include/audacious/titlestring.h > +include/audacious/ui_fileinfopopup.h > +include/audacious/ui_preferences.h > include/audacious/util.h > include/audacious/vfs.h > +include/audacious/vfs_buffer.h > +include/audacious/vfs_buffered_file.h > include/audacious/xconvert.h > -include/audacious/xentry.h > -include/audacious/xml_document.h > +lib/audacious/ > +lib/audacious/libaudid3tag.so > @lib lib/libaudacious.so.${LIBaudacious_VERSION} > lib/pkgconfig/audacious.pc > @man man/man1/audacious.1 > @@ -119,9 +125,7 @@ > share/audacious/Skins/TinyPlayer/viscolor.txt > share/audacious/Skins/TinyPlayer/volume.png > share/audacious/glade/ > -share/audacious/glade/addfiles.glade > share/audacious/glade/fileinfo.glade > -share/audacious/glade/fileinfo_popup.glade > share/audacious/glade/prefswin.glade > share/audacious/images/ > share/audacious/images/about-logo.png > @@ -133,7 +137,13 @@ > share/audacious/images/mouse.png > share/audacious/images/playlist.png > share/audacious/images/plugins.png > +share/audacious/ui/ > +share/audacious/ui/equalizer.ui > +share/audacious/ui/mainwin.ui > +share/audacious/ui/playlist.ui > +share/locale/bg/LC_MESSAGES/audacious.mo > share/locale/br/LC_MESSAGES/audacious.mo > +share/locale/ca/LC_MESSAGES/audacious.mo > share/locale/cs/LC_MESSAGES/audacious.mo > share/locale/cy/LC_MESSAGES/audacious.mo > share/locale/de/LC_MESSAGES/audacious.mo > @@ -142,6 +152,7 @@ > share/locale/fi/LC_MESSAGES/audacious.mo > share/locale/fr/LC_MESSAGES/audacious.mo > share/locale/hi/LC_MESSAGES/audacious.mo > +share/locale/hr/LC_MESSAGES/audacious.mo > share/locale/hu/LC_MESSAGES/audacious.mo > share/locale/it/LC_MESSAGES/audacious.mo > share/locale/ja/LC_MESSAGES/audacious.mo > @@ -155,7 +166,10 @@ > share/locale/ro/LC_MESSAGES/audacious.mo > share/locale/ru/LC_MESSAGES/audacious.mo > share/locale/sk/LC_MESSAGES/audacious.mo > +share/locale/sr/LC_MESSAGES/audacious.mo > +share/locale/[EMAIL PROTECTED]/LC_MESSAGES/audacious.mo > share/locale/sv/LC_MESSAGES/audacious.mo > +share/locale/tr/LC_MESSAGES/audacious.mo > share/locale/uk/LC_MESSAGES/audacious.mo > share/locale/zh_CN/LC_MESSAGES/audacious.mo > share/locale/zh_TW/LC_MESSAGES/audacious.mo > Index: audacious-plugins/Makefile > =================================================================== > RCS file: /cvs/ports/audio/audacious-plugins/Makefile,v > retrieving revision 1.2 > diff -u -r1.2 Makefile > --- audacious-plugins/Makefile 24 Jan 2007 13:16:33 -0000 1.2 > +++ audacious-plugins/Makefile 9 Apr 2007 08:02:04 -0000 > @@ -5,10 +5,10 @@ > COMMENT-main= "input and output plugins for audacious" > COMMENT-arts= "arts helper and plugin for audacious" > > -V= 1.2.5 > +V= 1.3.2 > DISTNAME= audacious-plugins-$V > -PKGNAME-main= ${DISTNAME}p0 > -PKGNAME-arts= audacious-arts-$Vp0 > +PKGNAME-main= ${DISTNAME} > +PKGNAME-arts= audacious-arts-$V > CATEGORIES= audio multimedia > > HOMEPAGE= http://audacious-media-player.org/ > @@ -19,7 +19,7 @@ > PERMIT_PACKAGE_CDROM= Yes > PERMIT_PACKAGE_FTP= Yes > > -MASTER_SITES= ${HOMEPAGE}release/ > +MASTER_SITES= http://static.audacious-media-player.org/release/ > EXTRACT_SUFX= .tgz > > MULTI_PACKAGES= -main > @@ -36,12 +36,12 @@ > USE_X11= Yes > NO_REGRESS= Yes > > -WANTLIB= X11 Xext Xrender m z fontconfig freetype iconv intl \ > +WANTLIB= X11 Xau Xdmcp Xrender m z 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 \ > + glib-2.0 gthread-2.0 gmodule-2.0 gobject-2.0 expat \ > gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0 glitz png > > -WANTLIB-main= ${WANTLIB} crypto ssl ossaudio stdc++ ogg usbhid xml2 > +WANTLIB-main= ${WANTLIB} Xext crypto ssl ossaudio stdc++ ogg usbhid > xml2 > WANTLIB-arts= ${WANTLIB} c pthread > > BUILD_DEPENDS= ${RUN_DEPENDS-main} > @@ -49,21 +49,23 @@ > RUN_DEPENDS-main= :audacious->=1.2:audio/audacious > RUN_DEPENDS-arts= ::audio/audacious-plugins,-main > > -LIB_DEPENDS-main= tag.>=6,tag_c.>=1:taglib->=1.4:audio/taglib \ > +LIB_DEPENDS-main= tag.>=6:taglib->=1.4:audio/taglib \ > faad,mp4ff::audio/faad \ > audiofile::devel/libaudiofile \ > curl.>=5::net/curl \ > SDL.>=6::devel/sdl \ > vorbis.>=5,vorbisfile.>=4::audio/libvorbis \ > mpcdec.>=2::audio/libmpcdec \ > - FLAC.>=7::audio/flac \ > + mad::audio/libmad \ > + mp3lame::audio/lame \ > esd.>=2::audio/esound \ > sndfile.>=1::audio/libsndfile > LIB_DEPENDS-arts= artsc.>=1::x11/kde/arts3 > > CONFIGURE_STYLE= gnu > CONFIGURE_ARGS+= --enable-ipv6 \ > - --with-dev-dsp=/dev/audio > + --with-dev-dsp=/dev/audio \ > + --disable-flac > CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ > LDFLAGS="-L${LOCALBASE}/lib" \ > ac_cv_header_altivec_h=no > Index: audacious-plugins/distinfo > =================================================================== > RCS file: /cvs/ports/audio/audacious-plugins/distinfo,v > retrieving revision 1.2 > diff -u -r1.2 distinfo > --- audacious-plugins/distinfo 5 Apr 2007 15:37:41 -0000 1.2 > +++ audacious-plugins/distinfo 9 Apr 2007 08:02:04 -0000 > @@ -1,5 +1,5 @@ > -MD5 (audacious-plugins-1.2.5.tgz) = IddaNQJOgffFgRuvXIIS4A== > -RMD160 (audacious-plugins-1.2.5.tgz) = zhAmSeXPFSObyrWiBNNohp2+hR0= > -SHA1 (audacious-plugins-1.2.5.tgz) = 2qXfIi6YLxpWEVxFXBKJsh9I8mQ= > -SHA256 (audacious-plugins-1.2.5.tgz) = > KdgS25oX71DcONuaw1SrK6MQR4KaDBMWpUkXcyj/tsM= > -SIZE (audacious-plugins-1.2.5.tgz) = 2339867 > +MD5 (audacious-plugins-1.3.2.tgz) = XPzC0C6BEQm2IzznNnInCA== > +RMD160 (audacious-plugins-1.3.2.tgz) = Q/ywM9LefAf06FswH2so8EBnkj0= > +SHA1 (audacious-plugins-1.3.2.tgz) = UcYJnWG322FT+N9vTVxAyabzdMA= > +SHA256 (audacious-plugins-1.3.2.tgz) = > WQumgyaOPygqvp+0e4mobeXlelTLJgCo+apfjULXnsU= > +SIZE (audacious-plugins-1.3.2.tgz) = 2962380 > Index: audacious-plugins/patches/patch-configure > =================================================================== > RCS file: /cvs/ports/audio/audacious-plugins/patches/patch-configure,v > retrieving revision 1.1.1.1 > diff -u -r1.1.1.1 patch-configure > --- audacious-plugins/patches/patch-configure 27 Dec 2006 16:49:25 -0000 > 1.1.1.1 > +++ audacious-plugins/patches/patch-configure 9 Apr 2007 08:02:04 -0000 > @@ -1,12 +1,12 @@ > -$OpenBSD: patch-configure,v 1.1.1.1 2006/12/27 16:49:25 steven Exp $ > ---- configure.orig Tue Dec 26 12:17:53 2006 > -+++ configure Tue Dec 26 12:18:01 2006 > -@@ -4242,7 +4242,7 @@ _ACEOF > - fi; > +$OpenBSD$ > +--- configure.orig Sun Apr 8 20:35:34 2007 > ++++ configure Sun Apr 8 20:35:40 2007 > +@@ -6638,7 +6638,7 @@ fi > > > --INPUT_PLUGINS="tonegen console sexypsf wav cue alac" > -+INPUT_PLUGINS="tonegen console sexypsf wav alac" > - OUTPUT_PLUGINS="disk_writer" > - EFFECT_PLUGINS="audiocompress ladspa voice_removal stereo_plugin > echo_plugin" > + > +-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" > Index: audacious-plugins/patches/patch-src_aac_src_Makefile > =================================================================== > RCS file: > /cvs/ports/audio/audacious-plugins/patches/patch-src_aac_src_Makefile,v > retrieving revision 1.1.1.1 > diff -u -r1.1.1.1 patch-src_aac_src_Makefile > --- audacious-plugins/patches/patch-src_aac_src_Makefile 27 Dec 2006 > 16:49:25 -0000 1.1.1.1 > +++ audacious-plugins/patches/patch-src_aac_src_Makefile 9 Apr 2007 > 08:02:04 -0000 > @@ -1,10 +1,10 @@ > $OpenBSD: patch-src_aac_src_Makefile,v 1.1.1.1 2006/12/27 16:49:25 steven > Exp $ > ---- src/aac/src/Makefile.orig Mon Dec 25 10:11:34 2006 > -+++ src/aac/src/Makefile Mon Dec 25 10:11:51 2006 > +--- 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++ > > Index: audacious-plugins/patches/patch-src_cdaudio_Makefile > =================================================================== > RCS file: > /cvs/ports/audio/audacious-plugins/patches/patch-src_cdaudio_Makefile,v > retrieving revision 1.1.1.1 > diff -u -r1.1.1.1 patch-src_cdaudio_Makefile > --- audacious-plugins/patches/patch-src_cdaudio_Makefile 27 Dec 2006 > 16:49:25 -0000 1.1.1.1 > +++ audacious-plugins/patches/patch-src_cdaudio_Makefile 9 Apr 2007 > 08:02:04 -0000 > @@ -1,10 +1,10 @@ > $OpenBSD: patch-src_cdaudio_Makefile,v 1.1.1.1 2006/12/27 16:49:25 steven > Exp $ > ---- src/cdaudio/Makefile.orig Mon Dec 25 10:31:44 2006 > -+++ src/cdaudio/Makefile Mon Dec 25 10:31:59 2006 > -@@ -10,5 +10,6 @@ SOURCES = cdaudio.c cddb.c cdinfo.c conf > +--- 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) -I../../intl -I../.. -I../.. > + CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) > -I../../intl -I../.. -I../.. > +LDFLAGS += -lossaudio > > include ../../mk/objective.mk > Index: audacious-plugins/pkg/PLIST-main > =================================================================== > RCS file: /cvs/ports/audio/audacious-plugins/pkg/PLIST-main,v > retrieving revision 1.1.1.1 > diff -u -r1.1.1.1 PLIST-main > --- audacious-plugins/pkg/PLIST-main 27 Dec 2006 16:49:25 -0000 1.1.1.1 > +++ audacious-plugins/pkg/PLIST-main 9 Apr 2007 08:02:04 -0000 > @@ -1,44 +1,52 @@ > @comment $OpenBSD: PLIST-main,v 1.1.1.1 2006/12/27 16:49:25 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/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/General/ > lib/audacious/General/libalarm.so > +lib/audacious/General/libcurl.so > lib/audacious/General/libscrobbler.so > lib/audacious/General/libsong_change.so > +lib/audacious/General/libstatusicon.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/libflac.so > +lib/audacious/Input/libmadplug.so > +lib/audacious/Input/libmetronom.so > lib/audacious/Input/libmodplug.so > lib/audacious/Input/libmpc.so > -lib/audacious/Input/libmpg123.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/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/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/ > @@ -49,22 +57,41 @@ > 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 > share/audacious/images/audioscrobbler.png > share/audacious/images/audioscrobbler_badge.png > +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/ja/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 > > Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm > > > Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm