On Sat, Nov 29, 2008 at 10:35:45PM +0000, Jacob Meuser wrote: > > update to 1.3.6. bug fixes and new features. see $HOMEPAGE for > details. ffmpeg support doesn't work in spite of my attempts; > patches left in but disabled via configure. > > works for me but my ports/packages are not fully up-to-date. I'm > using the latest i386/amd64 snapshot packages.
no one uses audacity? > -- > [email protected] > SDF Public Access UNIX System - http://sdf.lonestar.org > > Index: Makefile > =================================================================== > RCS file: /home2/cvs/OpenBSD/ports/audio/audacity/Makefile,v > retrieving revision 1.18 > diff -u -r1.18 Makefile > --- Makefile 24 Mar 2008 05:31:48 -0000 1.18 > +++ Makefile 29 Nov 2008 22:27:48 -0000 > @@ -2,9 +2,9 @@ > > COMMENT= free audio editor > > -V= 1.3.4 > +V= 1.3.6 > DISTNAME= audacity-src-${V} > -PKGNAME= audacity-${V}p3 > +PKGNAME= audacity-${V} > CATEGORIES= audio > > EXTRACT_SUFX= .tar.bz2 > @@ -21,7 +21,7 @@ > PERMIT_DISTFILES_CDROM= Yes > PERMIT_DISTFILES_FTP= Yes > > -WANTLIB= c m ossaudio pthread stdc++ ogg expat sndfile glib-2.0 \ > +WANTLIB= c m pthread stdc++ ogg expat sndfile glib-2.0 \ > gobject-2.0 gtk-x11-2.0 > > BUILD_DEPENDS= ::archivers/zip > @@ -32,7 +32,8 @@ > id3tag.>=2::audio/libid3tag \ > mad.>=2::audio/libmad \ > portaudio::audio/portaudio-svn \ > - SoundTouch::audio/soundtouch > + SoundTouch::audio/soundtouch \ > + vamp-hostsdk::audio/vamp-plugin-sdk > RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils \ > :shared-mime-info-*:misc/shared-mime-info > > @@ -40,32 +41,41 @@ > USE_GMAKE= Yes > USE_LIBTOOL= Yes > > -WRKDIST= ${WRKDIR}/${DISTNAME}-beta > - > CONFIGURE_STYLE= gnu > CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include > -I${LOCALBASE}/include" \ > CFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ > - LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" > + LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \ > + gl_cv_cc_visibility=no > + > +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} \ > + ${WRKSRC}/lib-src/lib-widget-extra \ > + ${WRKSRC}/lib-src/portsmf \ > + ${WRKSRC}/lib-src/FileDialog \ > + ${WRKSRC}/lib-src/portmixer > > CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ > --enable-unicode \ > - --enable-vamp \ > --enable-ladspa \ > - --with-id3=system \ > - --with-vorbis=system \ > - --with-libflac=system \ > - --with-libmad=system \ > + --enable-nyquist \ > + --with-lib-preferences=system \ > --with-libsndfile=system \ > - --with-libsamplerate=system \ > --with-expat=system \ > - --with-soundtouch=system \ > + --with-libsamplerate=system \ > --without-libresample \ > + --with-libvorbis=system \ > + --with-libmad=system \ > + --with-libflac=system \ > + --with-libid3tag=system \ > + --with-soundtouch=system \ > + --with-libvamp=system \ > --without-libtwolame \ > - --with-nyquist=local \ > - --with-portmixer \ > - --with-portaudio=v19 \ > - --with-pa-include=${LOCALBASE}/include \ > - --with-help > + --without-ffmpeg \ > + --without-redland \ > + --without-slv2 \ > + --without-liblrdf \ > + --with-midi=local \ > + --with-portmixer=local \ > + --with-portaudio=system > > MAKE_FLAGS= CC="${CC}" > > @@ -74,16 +84,15 @@ > # the ongoing development, there's no point in running them > NO_REGRESS= Yes > > -pre-configure: > - @perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},g' \ > - ${WRKSRC}/src/export/ExportMP3.cpp > - @perl -pi -e 's,!!CXXFLAGS!!,${CXXFLAGS},g' \ > - ${WRKSRC}/lib-src/libvamp/Makefile.in \ > - ${WRKSRC}/lib-src/allegro/Makefile.in > - > post-install: > ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps > ${INSTALL_DATA} ${WRKSRC}/images/AudacityLogo.xpm \ > ${PREFIX}/share/pixmaps/audacity.xpm > + ${INSTALL_DATA_DIR} ${PREFIX}/share/applications > + ${INSTALL_DATA} ${WRKSRC}/src/audacity.desktop \ > + ${PREFIX}/share/applications/ > + ${INSTALL_DATA_DIR} ${PREFIX}/share/mime/packages > + ${INSTALL_DATA} ${WRKSRC}/src/audacity.xml \ > + ${PREFIX}/share/mime/packages/ > > .include <bsd.port.mk> > Index: distinfo > =================================================================== > RCS file: /home2/cvs/OpenBSD/ports/audio/audacity/distinfo,v > retrieving revision 1.6 > diff -u -r1.6 distinfo > --- distinfo 8 Dec 2007 11:08:38 -0000 1.6 > +++ distinfo 29 Nov 2008 22:27:48 -0000 > @@ -1,5 +1,5 @@ > -MD5 (audacity-src-1.3.4.tar.bz2) = bErakIX5FrWuFnXqpHVEQg== > -RMD160 (audacity-src-1.3.4.tar.bz2) = dU2B+w5mDWl+fDFcQfKFhJF+Cp4= > -SHA1 (audacity-src-1.3.4.tar.bz2) = UKts8ZVF+Ms4ImuWJS29lY59iMQ= > -SHA256 (audacity-src-1.3.4.tar.bz2) = > EC1g5I4ZKPP9mVohTtm6hykpxjZc9feE8QfzUbQkmfk= > -SIZE (audacity-src-1.3.4.tar.bz2) = 4349381 > +MD5 (audacity-src-1.3.6.tar.bz2) = pZ0wvO3QF8WzrHvOz3oWKA== > +RMD160 (audacity-src-1.3.6.tar.bz2) = 2JGWclya/ouDPtXsqGnTAynjNGM= > +SHA1 (audacity-src-1.3.6.tar.bz2) = 0C7awdr7DG9vsS0pUFxjty+xsRY= > +SHA256 (audacity-src-1.3.6.tar.bz2) = > qSJKtnq74V2fvnZVKHpuX+mKsynYDtfULItYjGWE2j4= > +SIZE (audacity-src-1.3.6.tar.bz2) = 4719800 > Index: patches/patch-configure > =================================================================== > RCS file: /home2/cvs/OpenBSD/ports/audio/audacity/patches/patch-configure,v > retrieving revision 1.9 > diff -u -r1.9 patch-configure > --- patches/patch-configure 8 Dec 2007 11:08:38 -0000 1.9 > +++ patches/patch-configure 29 Nov 2008 22:27:48 -0000 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-configure,v 1.9 2007/12/08 11:08:38 ajacoutot Exp $ > ---- configure.orig Sat Nov 24 12:20:58 2007 > -+++ configure Sat Nov 24 12:26:30 2007 > -@@ -5541,7 +5541,7 @@ if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_new+set > +--- configure.orig Sat Oct 25 05:14:28 2008 > ++++ configure Thu Nov 13 20:06:11 2008 > +@@ -6612,7 +6612,7 @@ if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_new+set > echo $ECHO_N "(cached) $ECHO_C" >&6 > else > ac_check_lib_save_LIBS=$LIBS > @@ -10,7 +10,7 @@ > cat >conftest.$ac_ext <<_ACEOF > /* confdefs.h. */ > _ACEOF > -@@ -5738,7 +5738,7 @@ fi > +@@ -6809,7 +6809,7 @@ fi > > if test "x$lib_found" = "xyes" && test "x$header_found" = "xyes" ; then > LIBFLAC_SYSTEM_AVAILABLE="yes" > @@ -19,33 +19,78 @@ > LIBFLAC_SYSTEM_CPPSYMBOLS="USE_LIBFLAC" > { echo "$as_me:$LINENO: FLAC libraries are available as system > libraries" >&5 > echo "$as_me: FLAC libraries are available as system libraries" >&6;} > -@@ -7025,6 +7025,7 @@ cat >>confdefs.h <<\_ACEOF > - #define USE_PORTAUDIO_V19 1 > - _ACEOF > +@@ -8787,7 +8787,7 @@ fi > + if test "${with_portaudio+set}" = set; then > + withval=$with_portaudio; use_portaudio=$withval > + else > +- use_portaudio="v19" > ++ use_portaudio="system" > + fi > > -+if [ x"no" = x"yes" ] ; then > > - BUILDLIBS="$BUILDLIBS portaudio-v19/lib/libportaudio.a" > - EXTRAOBJS="$EXTRAOBJS ../lib-src/portaudio-v19/lib/libportaudio.a" > -@@ -7419,6 +7420,8 @@ done > +@@ -9316,7 +9316,7 @@ done > ;; > esac > > -+fi > -+ > - else > +-else > ++elif [ "$use_portaudio" = "v18" ] ; then > CXXFLAGS="-I\$(top_srcdir)/lib-src/portaudio/pa_common $CXXFLAGS" > > -@@ -7456,7 +7459,7 @@ _ACEOF > + case "${host_os}" in > +@@ -9336,6 +9336,20 @@ else > + EXTRAOBJS="$EXTRAOBJS ../lib-src/portaudio/pa_unix_oss/portaudio.a" > + ;; > + esac > ++else > ++ # system pa > ++cat >>confdefs.h <<\_ACEOF > ++#define USE_PORTAUDIO_V19 1 > ++_ACEOF > ++ > ++ > ++ # LOCAL_LIBS="$LOCAL_LIBS portaudio-v19/lib/libportaudio.a" > ++ LIBS="$LIBS -lportaudio" > ++ # EXTRAOBJS="$EXTRAOBJS ../lib-src/portaudio-v19/lib/libportaudio.a" > ++ # CXXFLAGS="-I\$(top_srcdir)/lib-src/portaudio-v19/include $CXXFLAGS" > ++ CFLAGS="$CFLAGS -DUSE_PORTAUDIO_V19" > ++ CXXFLAGS="$CXXFLAGS -DUSE_PORTAUDIO_V19" > ++ > + fi > + > > +@@ -9354,7 +9368,7 @@ _ACEOF > subdirs="$subdirs lib-src/portmixer" > > -- ac_configure_args="$ac_configure_args > --with-pa-include=../portaudio-v19/include" > -+ # ac_configure_args="$ac_configure_args > --with-pa-include=../portaudio-v19/include" > - else > + ac_configure_args="$ac_configure_args > --with-pa-include=../portaudio-v19/include" > +- else > ++ elif [ "$use_portaudio" = "v18" ] ; then > > CXXFLAGS="-I\$(top_srcdir)/lib-src/portmixer/px_common $CXXFLAGS" > -@@ -9165,7 +9168,7 @@ echo "$as_me: WARNING: no configuration information is > + case "${host_os}" in > +@@ -9371,6 +9385,13 @@ _ACEOF > + EXTRAOBJS="$EXTRAOBJS > ../lib-src/portmixer/px_unix_oss/portmixer.a" > + ;; > + esac > ++ else > ++ # system pa > ++ CXXFLAGS="-I\$(top_srcdir)/lib-src/portmixer/include $CXXFLAGS" > ++ LOCAL_LIBS="$LOCAL_LIBS portmixer/libportmixer.a" > ++ EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/libportmixer.a" > ++ > ++ subdirs="$subdirs lib-src/portmixer" > + fi > + fi > + > +@@ -9575,7 +9596,7 @@ if [ "x$LIBEXPAT_USE_LOCAL" = "xyes" ]; then > + ac_config_files="$ac_config_files lib-src/expat/Makefile" > + > + fi > +-if [ "$use_portaudio" != "v19" ]; then > ++if [ "$use_portaudio" = "v18" ]; then > + ac_config_files="$ac_config_files lib-src/portaudio/pa_unix_oss/Makefile" > + > + fi > +@@ -10962,7 +10983,7 @@ echo "$as_me: WARNING: no configuration information > is > { echo "$as_me:$LINENO: running $SHELL $ac_sub_configure > $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" > >&5 > echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args > --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} > # The eval makes quoting arguments work. > @@ -54,13 +99,15 @@ > --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" || > { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" > >&5 > echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;} > -@@ -9179,9 +9182,10 @@ fi > +@@ -10976,9 +10997,12 @@ fi > > pa_libs= > if [ "$use_portaudio" = "v19" ] ; then > - pa_libs=`grep 'Libs:' lib-src/portaudio-v19/portaudio-2.0.pc | sed -e > 's/Libs://;s/-L${libdir}//;s/-lportaudio//'` > + # pa_libs=`grep 'Libs:' lib-src/portaudio-v19/portaudio-2.0.pc | sed -e > 's/Libs://;s/-L${libdir}//;s/-lportaudio//'` > + pa_libs="`pkg-config --libs portaudio-2.0`" > ++elif [ "$use_portaudio" = "system" ] ; then > ++ pa_libs="-lportaudio" > fi > -sed -i -e "s/@PA_LIBS@/$pa_libs/" src/Makefile > +perl -pi -e "s...@pa_libs\@#$pa_libs#" src/Makefile > Index: patches/patch-lib-src_allegro_Makefile_in > =================================================================== > RCS file: patches/patch-lib-src_allegro_Makefile_in > diff -N patches/patch-lib-src_allegro_Makefile_in > --- patches/patch-lib-src_allegro_Makefile_in 9 Feb 2008 15:07:19 -0000 > 1.3 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,12 +0,0 @@ > -$OpenBSD: patch-lib-src_allegro_Makefile_in,v 1.3 2008/02/09 15:07:19 > ajacoutot Exp $ > ---- lib-src/allegro/Makefile.in.orig Tue Nov 13 23:01:48 2007 > -+++ lib-src/allegro/Makefile.in Sat Feb 9 14:42:49 2008 > -@@ -4,7 +4,7 @@ CC = @CC@ > - CCC = @CXX@ > - srcd...@srcdir@ > - > --CFLAGS = -g -O > -+CFLAGS = !!CXXFLAGS!! > - CPPOBJ = \ > - allegro.cpp.o \ > - allegrord.cpp.o \ > Index: patches/patch-lib-src_allegro_mfallegro_cpp > =================================================================== > RCS file: patches/patch-lib-src_allegro_mfallegro_cpp > diff -N patches/patch-lib-src_allegro_mfallegro_cpp > --- patches/patch-lib-src_allegro_mfallegro_cpp 6 Jun 2007 09:35:18 > -0000 1.3 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,12 +0,0 @@ > -$OpenBSD: patch-lib-src_allegro_mfallegro_cpp,v 1.3 2007/06/06 09:35:18 > ajacoutot Exp $ > ---- lib-src/allegro/mfallegro.cpp.orig Wed Mar 28 09:13:04 2007 > -+++ lib-src/allegro/mfallegro.cpp Wed Mar 28 09:13:42 2007 > -@@ -121,7 +121,7 @@ void Allegro_midifile_reader::Mf_starttrack() > - void Allegro_midifile_reader::Mf_endtrack() > - { > - tracks.append(track); > -- printf("finished track, length %d number %d\n", track->len, track_num / > 100); > -+ printf("finished track, length %ld number %d\n", track->len, track_num > / 100); > - track_num += 100; > - track = NULL; > - } > Index: patches/patch-lib-src_expat_Makefile_in > =================================================================== > RCS file: patches/patch-lib-src_expat_Makefile_in > diff -N patches/patch-lib-src_expat_Makefile_in > --- patches/patch-lib-src_expat_Makefile_in 12 Oct 2006 14:26:04 -0000 > 1.2 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,12 +0,0 @@ > -$OpenBSD: patch-lib-src_expat_Makefile_in,v 1.2 2006/10/12 14:26:04 alek Exp > $ > ---- lib-src/expat/Makefile.in.orig Sun Nov 27 17:47:28 2005 > -+++ lib-src/expat/Makefile.in Sat Oct 7 16:53:53 2006 > -@@ -1,7 +1,7 @@ > - CC = @CC@ > - srcd...@srcdir@ > - > --override CFLAGS += @CFLAGS@ -Ixmlparse -Ixmltok > -+override CFLAGS += -Ixmlparse -Ixmltok > - > - OBJS = xmlparse/xmlparse.o xmltok/xmlrole.o xmltok/xmltok.o > - > Index: patches/patch-lib-src_libnyquist_Makefile_in > =================================================================== > RCS file: patches/patch-lib-src_libnyquist_Makefile_in > diff -N patches/patch-lib-src_libnyquist_Makefile_in > --- patches/patch-lib-src_libnyquist_Makefile_in 17 Dec 2006 12:12:58 > -0000 1.2 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,12 +0,0 @@ > -$OpenBSD: patch-lib-src_libnyquist_Makefile_in,v 1.2 2006/12/17 12:12:58 > ajacoutot Exp $ > ---- lib-src/libnyquist/Makefile.in.orig Sat Dec 2 11:09:32 2006 > -+++ lib-src/libnyquist/Makefile.in Sat Dec 2 11:10:37 2006 > -@@ -6,7 +6,7 @@ > - INCL = -Inyqsrc -Itran -Ixlisp -Icmt -Isys -Isnd -Ifft > - > - CC = @CC@ > --override CFLAGS += -g -DCMTSTUFF -O2 -DEXT $(INCL) > -+override CFLAGS += -DCMTSTUFF -DEXT $(INCL) > - LN = $(CC) > - LFLAGS = -lm > - > Index: patches/patch-lib-src_libresample_Makefile_in > =================================================================== > RCS file: patches/patch-lib-src_libresample_Makefile_in > diff -N patches/patch-lib-src_libresample_Makefile_in > --- patches/patch-lib-src_libresample_Makefile_in 8 Dec 2007 11:08:38 > -0000 1.5 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,26 +0,0 @@ > -$OpenBSD: patch-lib-src_libresample_Makefile_in,v 1.5 2007/12/08 11:08:38 > ajacoutot Exp $ > ---- lib-src/libresample/Makefile.in.orig Sat Nov 24 12:26:50 2007 > -+++ lib-src/libresample/Makefile.in Sat Nov 24 12:27:32 2007 > -@@ -7,6 +7,7 @@ CC = @CC@ > - CFLAGS = @CFLAGS@ -Wall > - > - LIBS = @LIBS@ -lm > -+LDFLAGS = @LDFLAGS@ > - > - AR = @AR@ > - RANLIB = @RANLIB@ > -@@ -34,12 +35,12 @@ tests/testresample: libresample.a $(srcdir)/tests/test > - tests/compareresample: libresample.a $(srcdir)/tests/compareresample.c > - $(CC) -o tests/compareresample \ > - $(CFLAGS) $(srcdir)/tests/compareresample.c \ > -- libresample.a -lsamplerate $(LIBS) > -+ libresample.a $(LDFLAGS) -lsamplerate $(LIBS) > - > - tests/resample-sndfile: libresample.a $(srcdir)/tests/resample-sndfile.c > - $(CC) -o tests/resample-sndfile \ > - $(CFLAGS) $(srcdir)/tests/resample-sndfile.c \ > -- libresample.a -lsndfile $(LIBS) > -+ libresample.a $(LDFLAGS) -lsndfile $(LIBS) > - > - $(DIRS): > - mkdir $(DIRS) > Index: patches/patch-lib-src_libvamp_Makefile_in > =================================================================== > RCS file: patches/patch-lib-src_libvamp_Makefile_in > diff -N patches/patch-lib-src_libvamp_Makefile_in > --- patches/patch-lib-src_libvamp_Makefile_in 9 Feb 2008 15:07:19 -0000 > 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,12 +0,0 @@ > -$OpenBSD: patch-lib-src_libvamp_Makefile_in,v 1.1 2008/02/09 15:07:19 > ajacoutot Exp $ > ---- lib-src/libvamp/Makefile.in.orig Sat Feb 9 14:10:23 2008 > -+++ lib-src/libvamp/Makefile.in Sat Feb 9 14:13:06 2008 > -@@ -30,7 +30,7 @@ default: sdkstatic > - > - # Compile flags > - # > --CXXFLAGS := $(CXXFLAGS) -O2 -Wall -I. > -+CXXFLAGS = !!CXXFLAGS!! -Wall -I. > - > - # Libraries required for the plugins. > - # (Note that it is desirable to statically link libstdc++ if possible, > Index: patches/patch-lib-src_portmixer_Makefile_in > =================================================================== > RCS file: patches/patch-lib-src_portmixer_Makefile_in > diff -N patches/patch-lib-src_portmixer_Makefile_in > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-lib-src_portmixer_Makefile_in 29 Nov 2008 22:27:48 > -0000 > @@ -0,0 +1,12 @@ > +$OpenBSD$ > +--- lib-src/portmixer/Makefile.in.orig Thu Nov 13 20:23:24 2008 > ++++ lib-src/portmixer/Makefile.in Thu Nov 13 20:23:57 2008 > +@@ -9,7 +9,7 @@ AR = @AR@ > + RANLIB = @RANLIB@ > + > + DEFS += @DEFS@ > +-CFLAGS += @cflags@ > ++CFLAGS += @CFLAGS@ > + CFLAGS += @include@ > + > + all : $(LIBRARY) > Index: patches/patch-src_Audacity_h > =================================================================== > RCS file: patches/patch-src_Audacity_h > diff -N patches/patch-src_Audacity_h > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_Audacity_h 29 Nov 2008 22:27:48 -0000 > @@ -0,0 +1,24 @@ > +$OpenBSD$ > +--- src/Audacity.h.orig Thu Nov 13 18:17:39 2008 > ++++ src/Audacity.h Thu Nov 13 18:24:04 2008 > +@@ -91,8 +91,9 @@ void QuitAudacity(); > + #endif //_MSC_VER > + > + /* The GCC-elf implementation */ > +-#ifdef HAVE_VISIBILITY // this is provided by the configure script, is only > ++#if defined HAVE_VISIBILITY // this is provided by the configure script, is > only > + // enabled for suitable GCC versions > ++#if HAVE_VISIBILITY > + /* The incantation is a bit weird here because it uses ELF symbol stuff. If > we > + * make a symbol "default" it makes it visible (for import or export). > Making it > + * "hidden" means it is invisible outside the shared object. */ > +@@ -103,6 +104,9 @@ void QuitAudacity(); > + #define AUDACITY_DLL_API __attribute__((visibility("default"))) > + #endif > + #endif > ++#else > ++ #define AUDACITY_DLL_API > ++#endif > + #endif > + > + /* The GCC-win32 implementation */ > Index: patches/patch-src_AudioIO_cpp > =================================================================== > RCS file: patches/patch-src_AudioIO_cpp > diff -N patches/patch-src_AudioIO_cpp > --- patches/patch-src_AudioIO_cpp 24 Mar 2008 05:31:48 -0000 1.3 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,30 +0,0 @@ > -$OpenBSD: patch-src_AudioIO_cpp,v 1.3 2008/03/24 05:31:48 jakemsr Exp $ > ---- src/AudioIO.cpp.orig Sun Mar 2 02:32:09 2008 > -+++ src/AudioIO.cpp Sun Mar 2 02:33:50 2008 > -@@ -490,7 +490,7 @@ void AudioIO::HandleDeviceChange() > - if( error ) > - return; > - > -- mPortMixer = Px_OpenMixer(stream, 0); > -+ mPortMixer = Px_OpenMixer(stream, recDeviceNum); > - > - if (!mPortMixer) { > - Pa_CloseStream(stream); > -@@ -1516,7 +1516,7 @@ wxArrayLong AudioIO::GetSupportedCaptureRates(wxString > - > - for (i = 0; i < NumStandardRates; i++) > - { > -- if (Pa_IsFormatSupported(NULL, &pars, StandardRates[i]) == 0) > -+ if (Pa_IsFormatSupported(&pars, NULL, StandardRates[i]) == 0) > - { > - supported.Add(StandardRates[i]); > - } > -@@ -1524,7 +1524,7 @@ wxArrayLong AudioIO::GetSupportedCaptureRates(wxString > - > - if (irate != 0 && supported.Index(irate) == wxNOT_FOUND) > - { > -- if (Pa_IsFormatSupported(NULL, &pars, irate) == 0) > -+ if (Pa_IsFormatSupported(&pars, NULL, irate) == 0) > - { > - supported.Add(irate); > - } > Index: patches/patch-src_Benchmark_cpp > =================================================================== > RCS file: > /home2/cvs/OpenBSD/ports/audio/audacity/patches/patch-src_Benchmark_cpp,v > retrieving revision 1.2 > diff -u -r1.2 patch-src_Benchmark_cpp > --- patches/patch-src_Benchmark_cpp 8 Dec 2007 11:08:38 -0000 1.2 > +++ patches/patch-src_Benchmark_cpp 29 Nov 2008 22:27:48 -0000 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-src_Benchmark_cpp,v 1.2 2007/12/08 11:08:38 ajacoutot Exp $ > ---- src/Benchmark.cpp.orig Sat Nov 24 12:40:02 2007 > -+++ src/Benchmark.cpp Sat Nov 24 12:46:10 2007 > -@@ -531,7 +531,7 @@ void BenchmarkDialog::OnRun( wxCommandEvent &event ) > +--- src/Benchmark.cpp.orig Sat Oct 25 05:14:27 2008 > ++++ src/Benchmark.cpp Thu Nov 13 15:24:26 2008 > +@@ -522,7 +522,7 @@ void BenchmarkDialog::OnRun( wxCommandEvent &event ) > delete tmp; > > delete t; > @@ -10,7 +10,7 @@ > delete[]small1; > delete[]small2; > delete[]block; > -@@ -539,7 +539,7 @@ void BenchmarkDialog::OnRun( wxCommandEvent &event ) > +@@ -530,7 +530,7 @@ void BenchmarkDialog::OnRun( wxCommandEvent &event ) > delete fact; > d->Deref(); > > Index: patches/patch-src_FFmpeg_cpp > =================================================================== > RCS file: patches/patch-src_FFmpeg_cpp > diff -N patches/patch-src_FFmpeg_cpp > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_FFmpeg_cpp 29 Nov 2008 22:27:48 -0000 > @@ -0,0 +1,82 @@ > +$OpenBSD$ > +--- src/FFmpeg.cpp.orig Sat Oct 25 05:14:27 2008 > ++++ src/FFmpeg.cpp Thu Nov 13 22:50:45 2008 > +@@ -209,8 +209,10 @@ class FindFFmpegDialog : public wxDialog (public) > + mPathText = S.AddTextBox(wxT(""), mLibPath.GetFullPath(), 0); > + } > + S.Id(ID_FFMPEG_BROWSE).AddButton(_("Browse..."), wxALIGN_RIGHT); > ++#if 0 > + S.AddVariableText(_("To get a free copy of FFmpeg, click here > -->"), true); > + S.Id(ID_FFMPEG_DLOAD).AddButton(_("Download..."), > wxALIGN_RIGHT); > ++#endif > + } > + S.EndMultiColumn(); > + > +@@ -247,11 +249,13 @@ class FindFFmpegDialog : public wxDialog (public) > + } > + } > + > ++#if 0 > + void OnDownload(wxCommandEvent & event) > + { > + wxString page = > wxT("http://www.audacityteam.org/manual/index.php?title=FAQ:Installation_and_Plug-Ins%23installffmpeg";); > + ::OpenInDefaultBrowser(page); > + } > ++#endif > + > + wxString GetLibPath() > + { > +@@ -273,7 +277,9 @@ class FindFFmpegDialog : public wxDialog (public) > + > + BEGIN_EVENT_TABLE(FindFFmpegDialog, wxDialog) > + EVT_BUTTON(ID_FFMPEG_BROWSE, FindFFmpegDialog::OnBrowse) > ++#if 0 > + EVT_BUTTON(ID_FFMPEG_DLOAD, FindFFmpegDialog::OnDownload) > ++#endif > + END_EVENT_TABLE() > + > + > +@@ -596,7 +602,7 @@ bool FFmpegLibs::InitLibs(wxString libpath_format, boo > + INITDYN(avformat,av_init_packet); > + INITDYN(avformat,av_codec_get_id); > + INITDYN(avformat,av_codec_get_tag); > +- INITDYN(avformat,avformat_version); > ++ // INITDYN(avformat,avformat_version); > + > + INITDYN(avcodec,avcodec_init); > + INITDYN(avcodec,avcodec_find_encoder); > +@@ -632,7 +638,7 @@ bool FFmpegLibs::InitLibs(wxString libpath_format, boo > + INITDYN(avutil,av_malloc); > + INITDYN(avutil,av_freep); > + INITDYN(avutil,av_rescale_q); > +- INITDYN(avutil,avutil_version); > ++ // INITDYN(avutil,avutil_version); > + > + //FFmpeg initialization > + wxLogMessage(wxT("All symbols loaded successfully. Initializing the > library.")); > +@@ -642,19 +648,19 @@ bool FFmpegLibs::InitLibs(wxString libpath_format, boo > + > + wxLogMessage(wxT("Retrieving library version.")); > + int avcver = this->avcodec_version(); > +- int avfver = this->avformat_version(); > +- int avuver = this->avutil_version(); > ++ int avfver = this->avcodec_version(); > ++ int avuver = this->avcodec_version(); > + mAVCodecVersion = wxString::Format(wxT("%d.%d.%d"),avcver >> 16 & 0xFF, > avcver >> 8 & 0xFF, avcver & 0xFF); > + mAVFormatVersion = wxString::Format(wxT("%d.%d.%d"),avfver >> 16 & 0xFF, > avfver >> 8 & 0xFF, avfver & 0xFF); > + mAVUtilVersion = wxString::Format(wxT("%d.%d.%d"),avuver >> 16 & 0xFF, > avuver >> 8 & 0xFF, avuver & 0xFF); > + > + wxLogMessage(wxT("AVCodec version 0x%06x - %s (built against 0x%06x - > %s)"),avcver,mAVCodecVersion.c_str(),LIBAVCODEC_VERSION_INT,wxString::FromUTF8(AV_STRINGIFY(LIBAVCODEC_VERSION)).c_str()); > +- wxLogMessage(wxT("AVFormat version 0x%06x - %s (built against 0x%06x - > %s)"),avfver,mAVFormatVersion.c_str(),LIBAVFORMAT_VERSION_INT,wxString::FromUTF8(AV_STRINGIFY(LIBAVFORMAT_VERSION)).c_str()); > +- wxLogMessage(wxT("AVUtil version 0x%06x - %s (built against 0x%06x - > %s)"),avuver,mAVUtilVersion.c_str(),LIBAVUTIL_VERSION_INT,wxString::FromUTF8(AV_STRINGIFY(LIBAVUTIL_VERSION)).c_str()); > ++ wxLogMessage(wxT("AVFormat version 0x%06x - %s (built against 0x%06x - > %s)"),avfver,mAVFormatVersion.c_str(),LIBAVCODEC_VERSION_INT,wxString::FromUTF8(AV_STRINGIFY(LIBAVCODEC_VERSION)).c_str()); > ++ wxLogMessage(wxT("AVUtil version 0x%06x - %s (built against 0x%06x - > %s)"),avuver,mAVUtilVersion.c_str(),LIBAVCODEC_VERSION_INT,wxString::FromUTF8(AV_STRINGIFY(LIBAVCODEC_VERSION)).c_str()); > + > + int avcverdiff = (avcver >> 16 & 0xFF) - int(LIBAVCODEC_VERSION_MAJOR); > +- int avfverdiff = (avfver >> 16 & 0xFF) - int(LIBAVFORMAT_VERSION_MAJOR); > +- int avuverdiff = (avuver >> 16 & 0xFF) - int(LIBAVUTIL_VERSION_MAJOR); > ++ int avfverdiff = (avfver >> 16 & 0xFF) - int(LIBAVCODEC_VERSION_MAJOR); > ++ int avuverdiff = (avuver >> 16 & 0xFF) - int(LIBAVCODEC_VERSION_MAJOR); > + wxLogMessage(wxT("AVCodec version mismatch is %d"),avcverdiff); > + wxLogMessage(wxT("AVFormat version mismatch is %d"),avfverdiff); > + wxLogMessage(wxT("AVUtil version mismatch is %d"),avuverdiff); > Index: patches/patch-src_FFmpeg_h > =================================================================== > RCS file: patches/patch-src_FFmpeg_h > diff -N patches/patch-src_FFmpeg_h > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_FFmpeg_h 29 Nov 2008 22:27:48 -0000 > @@ -0,0 +1,35 @@ > +$OpenBSD$ > +--- src/FFmpeg.h.orig Sat Oct 25 05:14:27 2008 > ++++ src/FFmpeg.h Thu Nov 13 22:52:01 2008 > +@@ -159,8 +159,8 @@ class FFmpegLibs (public) > + void (*av_log_default_callback) (void* ptr, int > level, const char* fmt, va_list vl); > + void (*av_free) (void *ptr); > + unsigned (*avcodec_version) (void); > +- unsigned (*avformat_version) (void); > +- unsigned (*avutil_version) (void); > ++ //unsigned (*avformat_version) (void); > ++ //unsigned (*avutil_version) (void); > + void (*avcodec_init) (void); > + AVCodec* (*avcodec_find_encoder) (enum CodecID id); > + AVCodec* (*avcodec_find_encoder_by_name) (const char *name); > +@@ -263,17 +263,17 @@ class FFmpegLibs (public) > + #else //__WXMSW__ > + wxString GetLibraryTypeString() > + { > +- return _("Only avformat.so|*avformat*.so*|Dynamically Linked > Libraries (*.so)|*.so|All Files (*)|*"); > ++ return _("libavformat.so.X.Y|libavformat.so*|Dynamically Linked > Libraries (*.so)|*.so|All Files (*)|*"); > + } > + > + wxString GetLibAVFormatPath() > + { > +- return wxT(""); > ++ return wxT(LIBDIR); > + } > + > + wxString GetLibAVFormatName() > + { > +- return (wxT("avformat-") wxT(AV_STRINGIFY(LIBAVFORMAT_VERSION_MAJOR)) > wxT(".dll")); > ++ return (wxT("libavformat.so.0")); > + } > + #endif //__WXMSW__ > + > Index: patches/patch-src_Sequence_cpp > =================================================================== > RCS file: > /home2/cvs/OpenBSD/ports/audio/audacity/patches/patch-src_Sequence_cpp,v > retrieving revision 1.3 > diff -u -r1.3 patch-src_Sequence_cpp > --- patches/patch-src_Sequence_cpp 6 Jun 2007 09:35:18 -0000 1.3 > +++ patches/patch-src_Sequence_cpp 29 Nov 2008 22:27:48 -0000 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-src_Sequence_cpp,v 1.3 2007/06/06 09:35:18 ajacoutot Exp $ > ---- src/Sequence.cpp.orig Wed Mar 28 09:53:34 2007 > -+++ src/Sequence.cpp Wed Mar 28 09:55:16 2007 > -@@ -877,7 +877,8 @@ bool Sequence::Get(samplePtr buffer, sampleFormat form > +--- src/Sequence.cpp.orig Sat Oct 25 05:14:27 2008 > ++++ src/Sequence.cpp Thu Nov 13 15:24:26 2008 > +@@ -893,7 +893,8 @@ bool Sequence::Get(samplePtr buffer, sampleFormat form > sampleCount start, sampleCount len) const > { > if (start < 0 || start > mNumSamples || > @@ -11,7 +11,7 @@ > return false; > int b = FindBlock(start); > > -@@ -911,6 +912,7 @@ bool Sequence::Set(samplePtr buffer, sampleFormat form > +@@ -927,6 +928,7 @@ bool Sequence::Set(samplePtr buffer, sampleFormat form > if (format != mSampleFormat) { > temp = NewSamples(mMaxSamples, mSampleFormat); > wxASSERT(temp); > @@ -19,7 +19,7 @@ > } > > samplePtr silence = NULL; > -@@ -918,6 +920,7 @@ bool Sequence::Set(samplePtr buffer, sampleFormat form > +@@ -934,6 +936,7 @@ bool Sequence::Set(samplePtr buffer, sampleFormat form > silence = NewSamples(mMaxSamples, format); > wxASSERT(silence); > ClearSamples(silence, format, 0, mMaxSamples); > Index: patches/patch-src_audacity_desktop > =================================================================== > RCS file: > /home2/cvs/OpenBSD/ports/audio/audacity/patches/patch-src_audacity_desktop,v > retrieving revision 1.3 > diff -u -r1.3 patch-src_audacity_desktop > --- patches/patch-src_audacity_desktop 8 Dec 2007 11:08:38 -0000 > 1.3 > +++ patches/patch-src_audacity_desktop 29 Nov 2008 22:27:48 -0000 > @@ -1,6 +1,6 @@ > $OpenBSD: patch-src_audacity_desktop,v 1.3 2007/12/08 11:08:38 ajacoutot Exp > $ > ---- src/audacity.desktop.orig Sat Nov 24 12:46:37 2007 > -+++ src/audacity.desktop Sat Nov 24 12:47:05 2007 > +--- src/audacity.desktop.orig Sat Oct 25 05:14:27 2008 > ++++ src/audacity.desktop Sat Nov 29 01:48:41 2008 > @@ -11,7 +11,7 @@ Comment=Record and edit audio files > Comment[de]=Audio-Dateien aufnehmen und bearbeiten > Comment[ru]=???????????? ?? ???????????????????????????? ???????????????? > ???????????? > Index: patches/patch-src_export_ExportMP3_cpp > =================================================================== > RCS file: > /home2/cvs/OpenBSD/ports/audio/audacity/patches/patch-src_export_ExportMP3_cpp,v > retrieving revision 1.6 > diff -u -r1.6 patch-src_export_ExportMP3_cpp > --- patches/patch-src_export_ExportMP3_cpp 8 Dec 2007 11:08:38 -0000 > 1.6 > +++ patches/patch-src_export_ExportMP3_cpp 29 Nov 2008 22:27:48 -0000 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-src_export_ExportMP3_cpp,v 1.6 2007/12/08 11:08:38 ajacoutot > Exp $ > ---- src/export/ExportMP3.cpp.orig Tue Nov 13 23:01:42 2007 > -+++ src/export/ExportMP3.cpp Sat Nov 24 12:19:09 2007 > -@@ -520,8 +520,8 @@ class FindDialog : public wxDialog (public) > +--- src/export/ExportMP3.cpp.orig Wed May 7 14:19:50 2008 > ++++ src/export/ExportMP3.cpp Fri May 9 13:13:16 2008 > +@@ -575,8 +575,8 @@ class FindDialog : public wxDialog (public) > mPathText = S.AddTextBox(wxT(""), mLibPath.GetFullPath(), 0); > } > S.Id(ID_BROWSE).AddButton(_("Browse..."), wxALIGN_RIGHT); > @@ -12,20 +12,11 @@ > } > S.EndMultiColumn(); > > -@@ -1497,7 +1497,7 @@ class LameExporter : public MP3Exporter (public) > - > - wxString GetLibraryPath() > - { > -- return wxT("/usr/lib"); > -+ return wxT("!!LOCALBASE!!/lib"); > - } > - > - wxString GetLibraryName() > -@@ -1507,7 +1507,7 @@ class LameExporter : public MP3Exporter (public) > +@@ -1564,7 +1564,7 @@ class LameExporter : public MP3Exporter (public) > > wxString GetLibraryTypeString() > { > -- return wxString(_("Only libmp3lame.so|libmp3lame.so|Primary Shared > Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*")); > +- return wxString(_("Only libmp3lame.so.0|libmp3lame.so.0|Primary > Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files > (*)|*")); > + return > wxString(_("libmp3lame.so.X.Y|libmp3lame.so.*|libmp3lame.so|Primary Shared > Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*")); > } > > Index: patches/patch-src_prefs_FileFormatPrefs_cpp > =================================================================== > RCS file: patches/patch-src_prefs_FileFormatPrefs_cpp > diff -N patches/patch-src_prefs_FileFormatPrefs_cpp > --- patches/patch-src_prefs_FileFormatPrefs_cpp 8 Dec 2007 11:08:38 > -0000 1.2 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,14 +0,0 @@ > -$OpenBSD: patch-src_prefs_FileFormatPrefs_cpp,v 1.2 2007/12/08 11:08:38 > ajacoutot Exp $ > ---- src/prefs/FileFormatPrefs.cpp.orig Sat Nov 24 12:52:17 2007 > -+++ src/prefs/FileFormatPrefs.cpp Sat Nov 24 12:53:28 2007 > -@@ -110,8 +110,8 @@ void FileFormatPrefs::PopulateOrExchange( ShuttleGui & > - wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL ); > - S.Id( ID_MP3_FIND_BUTTON ).AddButton( _("&Find Library"), > - wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL ); > -- S.Id( ID_MP3_DOWN_BUTTON ).AddButton( _("&Download Free Copy of > LAME"), > -- wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL ); > -+/* S.Id( ID_MP3_DOWN_BUTTON ).AddButton( _("&Download Free Copy of > LAME"), > -+ wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL ); */ > - S.EndHorizontalLay(); > - } > - S.EndStatic(); > Index: pkg/PLIST > =================================================================== > RCS file: /home2/cvs/OpenBSD/ports/audio/audacity/pkg/PLIST,v > retrieving revision 1.8 > diff -u -r1.8 PLIST > --- pkg/PLIST 9 Feb 2008 15:07:19 -0000 1.8 > +++ pkg/PLIST 29 Nov 2008 22:27:48 -0000 > @@ -1,5 +1,5 @@ > @comment $OpenBSD: PLIST,v 1.8 2008/02/09 15:07:19 ajacoutot Exp $ > -bin/audacity > +...@bin bin/audacity > @man man/man1/audacity.1 > share/applications/audacity.desktop > share/audacity/ > @@ -27,6 +27,7 @@ > share/audacity/plug-ins/SilenceMarker.ny > share/audacity/plug-ins/beat.ny > share/audacity/plug-ins/clicktrack.ny > +share/audacity/plug-ins/clipfix.ny > share/audacity/plug-ins/crossfadein.ny > share/audacity/plug-ins/crossfadeout.ny > share/audacity/plug-ins/delay.ny > @@ -36,6 +37,7 @@ > share/audacity/plug-ins/pluck.ny > share/audacity/plug-ins/rissetdrum.ny > share/audacity/plug-ins/tremolo.ny > +share/audacity/plug-ins/vocalremover.ny > share/audacity/plug-ins/vocoder.ny > share/locale/af/ > share/locale/af/LC_MESSAGES/ > @@ -48,6 +50,9 @@ > share/locale/bn/LC_MESSAGES/ > share/locale/bn/LC_MESSAGES/audacity.mo > share/locale/ca/LC_MESSAGES/audacity.mo > +share/locale/cb/ > +share/locale/cb/LC_MESSAGES/ > +share/locale/cb/LC_MESSAGES/audacity.mo > share/locale/cs/LC_MESSAGES/audacity.mo > share/locale/cy/LC_MESSAGES/audacity.mo > share/locale/da/LC_MESSAGES/audacity.mo > @@ -55,10 +60,14 @@ > share/locale/el/LC_MESSAGES/audacity.mo > share/locale/es/LC_MESSAGES/audacity.mo > share/locale/eu/LC_MESSAGES/audacity.mo > +share/locale/fa/ > +share/locale/fa/LC_MESSAGES/ > +share/locale/fa/LC_MESSAGES/audacity.mo > share/locale/fi/LC_MESSAGES/audacity.mo > share/locale/fr/LC_MESSAGES/audacity.mo > share/locale/ga/LC_MESSAGES/audacity.mo > share/locale/gl/LC_MESSAGES/audacity.mo > +share/locale/he/LC_MESSAGES/audacity.mo > share/locale/hu/LC_MESSAGES/audacity.mo > share/locale/it/LC_MESSAGES/audacity.mo > share/locale/ja/LC_MESSAGES/audacity.mo > @@ -79,8 +88,12 @@ > share/locale/sk/LC_MESSAGES/audacity.mo > share/locale/sl/LC_MESSAGES/audacity.mo > share/locale/sv/LC_MESSAGES/audacity.mo > +share/locale/tg/ > +share/locale/tg/LC_MESSAGES/ > +share/locale/tg/LC_MESSAGES/audacity.mo > share/locale/tr/LC_MESSAGES/audacity.mo > share/locale/uk/LC_MESSAGES/audacity.mo > +share/locale/vi/LC_MESSAGES/audacity.mo > share/locale/zh/ > share/locale/zh/LC_MESSAGES/ > share/locale/zh/LC_MESSAGES/audacity.mo -- [email protected] SDF Public Access UNIX System - http://sdf.lonestar.org
