diff -urN /usr/ports/audio/glame/Makefile audio/glame/Makefile --- /usr/ports/audio/glame/Makefile Sun Dec 12 08:39:50 2004 +++ audio/glame/Makefile Tue Mar 29 23:49:40 2005 @@ -6,7 +6,7 @@ # PORTNAME= glame -PORTVERSION= 1.0.3 +PORTVERSION= 2.0.1 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,19 +15,24 @@ COMMENT= A powerful, fast, stable, and easily extensible sound editor for GNOME BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa -LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \ - vorbis.3:${PORTSDIR}/audio/libvorbis +LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame \ + mad.2:${PORTSDIR}/audio/libmad \ + vorbis.3:${PORTSDIR}/audio/libvorbis \ + guile.15:${PORTSDIR}/lang/guile USE_X_PREFIX= yes -USE_GNOME= gnomehack gnomeprefix gnometarget libglade +USE_GNOME= gnomehack gnomeprefix gnometarget libgnomeui +USE_GCC= 3.4 USE_LIBLTDL= yes USE_GMAKE= yes -USE_LIBTOOL_VER= 15 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib -lltdl ${PTHREAD_LIBS}" \ +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ MAKEINFO="makeinfo --no-split" INFO= glame glame-dev + +CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib -lltdl post-extract: @cd ${WRKSRC}/doc && ${RM} -f *.info* diff -urN /usr/ports/audio/glame/distinfo audio/glame/distinfo --- /usr/ports/audio/glame/distinfo Sun Dec 12 08:39:50 2004 +++ audio/glame/distinfo Tue Mar 29 23:10:37 2005 @@ -1,2 +1,2 @@ -MD5 (glame-1.0.3.tar.gz) = 9dc47b94f1d3c64eff36d5e61375ff78 -SIZE (glame-1.0.3.tar.gz) = 1638755 +MD5 (glame-2.0.1.tar.gz) = b18e93e8f5d2ed9cd56c4e8088a58f18 +SIZE (glame-2.0.1.tar.gz) = 1662524 diff -urN /usr/ports/audio/glame/files/patch-ltmain.sh audio/glame/files/patch-ltmain.sh --- /usr/ports/audio/glame/files/patch-ltmain.sh Thu Jan 1 09:00:00 1970 +++ audio/glame/files/patch-ltmain.sh Thu Mar 24 00:44:53 2005 @@ -0,0 +1,10 @@ +--- ltmain.sh.orig Mon Jan 10 01:27:24 2005 ++++ ltmain.sh Thu Mar 24 00:44:43 2005 +@@ -1253,6 +1253,7 @@ + ;; + + -avoid-version) ++ build_old_libs=no + avoid_version=yes + continue + ;; diff -urN /usr/ports/audio/glame/files/patch-src::hash::glsignal.c audio/glame/files/patch-src::hash::glsignal.c --- /usr/ports/audio/glame/files/patch-src::hash::glsignal.c Sun Dec 12 08:39:50 2004 +++ audio/glame/files/patch-src::hash::glsignal.c Thu Jan 1 09:00:00 1970 @@ -1,14 +0,0 @@ ---- src/hash/glsignal.c.orig Sat Oct 23 22:14:22 2004 -+++ src/hash/glsignal.c Sat Dec 11 21:30:33 2004 -@@ -63,7 +63,11 @@ - - glame_list_foreach(&dest->handlers, glsig_handler_t, list, h) { - va_list vac; -+#if defined(__FreeBSD__) && defined(__GNUC__) && (__GNUC__ < 3) -+ vac = va; -+#else - va_copy(vac, va); -+#endif - _glsig_handler_exec(h, sig, vac); - va_end(vac); - } diff -urN /usr/ports/audio/glame/files/patch-swapfile.c audio/glame/files/patch-swapfile.c --- /usr/ports/audio/glame/files/patch-swapfile.c Thu Dec 5 05:34:24 2002 +++ audio/glame/files/patch-swapfile.c Tue Mar 29 23:11:32 2005 @@ -1,13 +1,16 @@ ---- src/swapfile/swapfile_fs.c.orig Fri Dec 6 07:35:22 2002 -+++ src/swapfile/swapfile_fs.c Fri Dec 6 07:41:02 2002 -@@ -44,6 +44,10 @@ +--- src/swapfile/swapfile_fs.c.orig Sat Oct 23 22:09:29 2004 ++++ src/swapfile/swapfile_fs.c Tue Mar 29 23:11:17 2005 +@@ -44,8 +44,12 @@ #define DEBUG 1 #endif +-#include +#if __FreeBSD__ >= 5 +#define __BSD_VISIBLE 1 +#endif + - #include #include ++#include #include + #include + #include diff -urN /usr/ports/audio/glame/pkg-descr audio/glame/pkg-descr --- /usr/ports/audio/glame/pkg-descr Wed Sep 27 02:37:39 2000 +++ audio/glame/pkg-descr Tue Mar 29 23:43:44 2005 @@ -2,17 +2,4 @@ a powerful, fast, stable, and easily extensible sound editor for GNOME desktop. -Current Status (as of version 0.2.0): -========================================== -- usable filternetwork GUI - src/gui/glame -- usable console UI - src/cglame -- the glame midlayer which supports - * plugins - * scripting (using guile) -- the filternetwork backend which supports - * threading, i.e. pipelined processing of all data - * feedback inside the network does work - * zero-copy operation inside and between filters -- the swapfile backing store - WWW: http://glame.sourceforge.net/ diff -urN /usr/ports/audio/glame/pkg-plist audio/glame/pkg-plist --- /usr/ports/audio/glame/pkg-plist Wed Aug 27 09:23:31 2003 +++ audio/glame/pkg-plist Tue Mar 29 23:46:16 2005 @@ -1,12 +1,23 @@ bin/cglame bin/glame bin/glame-convert.sh +lib/glame/audio_io_esd.la lib/glame/audio_io_esd.so +lib/glame/audio_io_oss.la lib/glame/audio_io_oss.so +lib/glame/debug.la lib/glame/debug.so +lib/glame/file_mp3_out.la +lib/glame/file_mp3_out.so +lib/glame/file_oggvorbis_out.la +lib/glame/file_oggvorbis_out.so +lib/glame/mixer.la lib/glame/mixer.so +lib/glame/normalize.la lib/glame/normalize.so +lib/glame/resample.la lib/glame/resample.so +lib/glame/tutorial.la lib/glame/tutorial.so share/gnome/apps/Multimedia/glame.desktop share/gnome/glame/default-accels @@ -36,6 +47,7 @@ share/gnome/glame/pixmaps/pan.png share/gnome/glame/pixmaps/ping.png share/gnome/glame/pixmaps/pipe.png +share/gnome/glame/pixmaps/play-button.png share/gnome/glame/pixmaps/play.png share/gnome/glame/pixmaps/prod.png share/gnome/glame/pixmaps/pulse.png @@ -47,6 +59,7 @@ share/gnome/glame/pixmaps/select_none.png share/gnome/glame/pixmaps/sine.png share/gnome/glame/pixmaps/statistics.png +share/gnome/glame/pixmaps/stop-button.png share/gnome/glame/pixmaps/sum.png share/gnome/glame/pixmaps/volume_adjust.png share/gnome/glame/pixmaps/zoom_in.png @@ -58,10 +71,8 @@ share/gnome/glame/scripts/read_mp3.scm share/gnome/glame/scripts/resample.scm share/gnome/glame/scripts/write_mp3.scm -share/locale/da/LC_MESSAGES/glame.mo share/locale/de/LC_MESSAGES/glame.mo share/locale/fr/LC_MESSAGES/glame.mo -share/locale/it/LC_MESSAGES/glame.mo @dirrm share/gnome/glame/scripts @dirrm share/gnome/glame/pixmaps @dirrm share/gnome/glame