[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: NEW: audacity-1.2.4



On Sat, Dec 17, 2005 at 11:21:32PM -0800, Jacob Meuser wrote:
> On Mon, Dec 05, 2005 at 12:16:43AM +0100, Antoine Jacoutot wrote:
> > On Sun, 4 Dec 2005, Matthias Kilian wrote:
> > 
> > >On Wed, Nov 30, 2005 at 10:48:47PM +0100, Antoine Jacoutot wrote:
> > >>Here is a new audacity port.
> > >
> > >O.k. on zaurus (allthough a little bit slow).
> > >
> > >Tested: audio import, audio playback (which isn't seamless due to
> > >limited cpu and memory), help browser.
> > 
> > Wow, cool a feedback on zaurus.
> > Thanks, I'm happy it works fine.
> 
> below is some Makefile cleanup, debug fprintf removal, and
> update-patches sync.
> 
> anything else holding this back?  OK to import with the following?

it looks like with the recent changes to the system headers,
sys/types.h needs to be included before soundcard.h, or else
u_int64_t, etc, will not be defined when machine/endian.h
is processed.

new diff below.

probably either sys/types.h should be included in soundcard.h,
or SYNOPSIS in ossaudio(3) should be modified to let people know
that sys/types.h should be included before soundcard.h.

-- 
<jakemsr_(_at_)_jakemsr_(_dot_)_com>

diff -uNr audacity/Makefile /usr/ports/mystuff/audio/audacity/Makefile
--- audacity/Makefile	Wed Nov 30 13:43:05 2005
+++ /usr/ports/mystuff/audio/audacity/Makefile	Sat Dec 17 22:50:34 2005
@@ -2,10 +2,10 @@
 
 COMMENT=	"free audio editor"
 
-DISTNAME=	audacity-src-${VERSION}
-VERSION=	1.2.4
-PKGNAME=	audacity-${VERSION}
+DISTNAME=	audacity-src-1.2.4
+PKGNAME=	${DISTNAME:S/-src//}
 CATEGORIES=     audio
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=audacity/}
 
 HOMEPAGE=	http://audacity.sourceforge.net/
@@ -21,10 +21,10 @@
 WANTLIB=	c m ossaudio pthread stdc++ \
 		FLAC++.3.2 ogg.5.2 vorbisenc.2.0
 
-BUILD_DEPENDS=	:zip-*:archivers/zip
-LIB_DEPENDS=	wx_gtk.2.4:wxWidgets-gtk-2.4.2:x11/wxWidgets/gtk \
-		sndfile.1.11::audio/libsndfile \
-		samplerate.1.1::audio/libsamplerate \
+BUILD_DEPENDS=	::archivers/zip
+LIB_DEPENDS=	wx_gtk.2.4::x11/wxWidgets/gtk \
+		sndfile.1::audio/libsndfile \
+		samplerate.1::audio/libsamplerate \
 		FLAC.4::audio/flac \
 		vorbis.0,vorbisfile.1::audio/libvorbis \
 		id3tag.2::audio/libid3tag \
@@ -37,7 +37,8 @@
 CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
 			CFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
-			WXCONFIG=${LOCALBASE}/bin/wxgtk-2.4-config
+			WXCONFIG="${LOCALBASE}/bin/wxgtk-2.4-config"
+
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 			--with-id3=system \
 			--with-vorbis=system \
diff -uNr audacity/patches/patch-lib-src_portaudio_pa_unix_oss_pa_unix_oss_c /usr/ports/mystuff/audio/audacity/patches/patch-lib-src_portaudio_pa_unix_oss_pa_unix_oss_c
--- audacity/patches/patch-lib-src_portaudio_pa_unix_oss_pa_unix_oss_c	Thu Oct  6 07:49:15 2005
+++ /usr/ports/mystuff/audio/audacity/patches/patch-lib-src_portaudio_pa_unix_oss_pa_unix_oss_c	Sat Dec 17 22:51:18 2005
@@ -28,7 +28,7 @@
      /* Set format, channels, and rate in this order to keep OSS happy. */
      /* Set data format. FIXME - handle more native formats. */
      tmp = AFMT_S16_NE;
-@@ -271,18 +276,56 @@ PaError Pa_SetupDeviceFormat( int devHan
+@@ -271,18 +276,52 @@ PaError Pa_SetupDeviceFormat( int devHan
             return paHostError;
          }
      }
@@ -39,7 +39,6 @@
 +
 +    switch(input) {
 +    case 2:
-+        fprintf(stderr, "Setting to full-duplex mode for OpenBSD\n");
 +        audio_if.record.open = 1;
 +        audio_if.record.pause = 0;
 +        audio_if.play.open = 1;
@@ -47,19 +46,16 @@
 +        break;
 +
 +    case 1:
-+        fprintf(stderr, "Setting to record mode for OpenBSD\n");
 +        audio_if.record.open = 1;
 +        audio_if.record.pause = 0;
 +        break;
 +
 +    case 0:
-+        fprintf(stderr, "Setting to play mode for OpenBSD\n");
 +        audio_if.play.open = 1;
 +        audio_if.play.pause = 0;
 +        break;
 +
 +    default:
-+       fprintf(stderr, "Unknown mode for OpenBSD\n");
 +       break;
 +    }
 +
diff -uNr audacity/patches/patch-lib-src_portmixer_px_unix_oss_px_unix_oss_c /usr/ports/mystuff/audio/audacity/patches/patch-lib-src_portmixer_px_unix_oss_px_unix_oss_c
--- audacity/patches/patch-lib-src_portmixer_px_unix_oss_px_unix_oss_c	Thu Oct  6 07:49:15 2005
+++ /usr/ports/mystuff/audio/audacity/patches/patch-lib-src_portmixer_px_unix_oss_px_unix_oss_c	Sun Dec 18 15:00:59 2005
@@ -1,12 +1,28 @@
 $OpenBSD$
---- lib-src/portmixer/px_unix_oss/px_unix_oss.c.orig	Thu Nov 18 07:17:35 2004
-+++ lib-src/portmixer/px_unix_oss/px_unix_oss.c	Tue Jan 11 08:56:46 2005
-@@ -38,7 +38,7 @@
- #ifdef __linux__
- #include <linux/soundcard.h>
- #else
+--- lib-src/portmixer/px_unix_oss/px_unix_oss.c.orig	Sat Nov 26 18:33:39 2005
++++ lib-src/portmixer/px_unix_oss/px_unix_oss.c	Sun Dec 18 14:55:55 2005
+@@ -35,11 +35,6 @@
+  *
+  */
+ 
+-#ifdef __linux__
+-#include <linux/soundcard.h>
+-#else
 -#include <machine/soundcard.h> /* JH20010905 */
-+#include <soundcard.h> /* JH20010905 */
- #endif
+-#endif
  
  #include <stdio.h>
+ #include <stdlib.h>
+@@ -48,6 +43,12 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
++
++#ifdef __linux__
++#include <linux/soundcard.h>
++#else
++#include <soundcard.h> /* JH20010905 */
++#endif
+ 
+ #include "portaudio.h"
+ #include "portmixer.h"
diff -uNr audacity/patches/patch-lib-src_portmixer_px_unix_oss_px_unix_oss_c.orig /usr/ports/mystuff/audio/audacity/patches/patch-lib-src_portmixer_px_unix_oss_px_unix_oss_c.orig
--- audacity/patches/patch-lib-src_portmixer_px_unix_oss_px_unix_oss_c.orig	Wed Dec 31 16:00:00 1969
+++ /usr/ports/mystuff/audio/audacity/patches/patch-lib-src_portmixer_px_unix_oss_px_unix_oss_c.orig	Thu Oct  6 07:49:15 2005
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- lib-src/portmixer/px_unix_oss/px_unix_oss.c.orig	Thu Nov 18 07:17:35 2004
++++ lib-src/portmixer/px_unix_oss/px_unix_oss.c	Tue Jan 11 08:56:46 2005
+@@ -38,7 +38,7 @@
+ #ifdef __linux__
+ #include <linux/soundcard.h>
+ #else
+-#include <machine/soundcard.h> /* JH20010905 */
++#include <soundcard.h> /* JH20010905 */
+ #endif
+ 
+ #include <stdio.h>
diff -uNr audacity/patches/patch-lib-src_soundtouch_configure /usr/ports/mystuff/audio/audacity/patches/patch-lib-src_soundtouch_configure
--- audacity/patches/patch-lib-src_soundtouch_configure	Thu Oct  6 07:49:15 2005
+++ /usr/ports/mystuff/audio/audacity/patches/patch-lib-src_soundtouch_configure	Sat Dec 17 23:14:33 2005
@@ -1,7 +1,7 @@
 $OpenBSD$
---- lib-src/soundtouch/configure.orig	Tue Jan 11 20:14:09 2005
-+++ lib-src/soundtouch/configure	Tue Jan 11 20:15:00 2005
-@@ -1934,7 +1934,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+--- lib-src/soundtouch/configure.orig	Sat Nov 26 18:33:39 2005
++++ lib-src/soundtouch/configure	Sat Dec 17 23:14:27 2005
+@@ -1938,7 +1938,8 @@ fi
  
  
  
diff -uNr audacity/patches/patch-lib-src_soundtouch_source_SoundTouch_Makefile_in /usr/ports/mystuff/audio/audacity/patches/patch-lib-src_soundtouch_source_SoundTouch_Makefile_in
--- audacity/patches/patch-lib-src_soundtouch_source_SoundTouch_Makefile_in	Thu Oct  6 07:49:15 2005
+++ /usr/ports/mystuff/audio/audacity/patches/patch-lib-src_soundtouch_source_SoundTouch_Makefile_in	Sat Dec 17 23:14:33 2005
@@ -1,7 +1,7 @@
 $OpenBSD$
---- lib-src/soundtouch/source/SoundTouch/Makefile.in.orig	Wed Nov 17 22:17:35 2004
-+++ lib-src/soundtouch/source/SoundTouch/Makefile.in	Tue Jan 11 20:12:59 2005
-@@ -143,7 +143,8 @@ libSoundTouch_la_SOURCES = AAFilter.cpp 
+--- lib-src/soundtouch/source/SoundTouch/Makefile.in.orig	Sat Nov 26 18:33:39 2005
++++ lib-src/soundtouch/source/SoundTouch/Makefile.in	Sat Dec 17 23:14:27 2005
+@@ -151,7 +151,8 @@ libSoundTouch_la_SOURCES = AAFilter.cpp 
  
  # ??? test for -fcheck-new in configure.ac
  # other compiler flags to add
diff -uNr audacity/patches/patch-lib-src_soundtouch_source_example_SoundStretch_Makefile_in /usr/ports/mystuff/audio/audacity/patches/patch-lib-src_soundtouch_source_example_SoundStretch_Makefile_in
--- audacity/patches/patch-lib-src_soundtouch_source_example_SoundStretch_Makefile_in	Thu Oct  6 07:49:15 2005
+++ /usr/ports/mystuff/audio/audacity/patches/patch-lib-src_soundtouch_source_example_SoundStretch_Makefile_in	Sat Dec 17 23:14:33 2005
@@ -1,7 +1,7 @@
 $OpenBSD$
---- lib-src/soundtouch/source/example/SoundStretch/Makefile.in.orig	Tue Jan 11 20:34:11 2005
-+++ lib-src/soundtouch/source/example/SoundStretch/Makefile.in	Tue Jan 11 20:35:24 2005
-@@ -145,7 +145,7 @@ soundstretch_LDADD = ../../SoundTouch/li
+--- lib-src/soundtouch/source/example/SoundStretch/Makefile.in.orig	Sat Nov 26 18:33:39 2005
++++ lib-src/soundtouch/source/example/SoundStretch/Makefile.in	Sat Dec 17 23:14:27 2005
+@@ -153,7 +153,7 @@ soundstretch_LDADD = ../../SoundTouch/li
  
  soundstretch_LDFLAGS = -s
  
diff -uNr audacity/patches/patch-lib-src_soundtouch_source_example_bpm_Makefile_in /usr/ports/mystuff/audio/audacity/patches/patch-lib-src_soundtouch_source_example_bpm_Makefile_in
--- audacity/patches/patch-lib-src_soundtouch_source_example_bpm_Makefile_in	Thu Oct  6 07:49:15 2005
+++ /usr/ports/mystuff/audio/audacity/patches/patch-lib-src_soundtouch_source_example_bpm_Makefile_in	Sat Dec 17 23:14:33 2005
@@ -1,7 +1,7 @@
 $OpenBSD$
---- lib-src/soundtouch/source/example/bpm/Makefile.in.orig	Tue Jan 11 20:35:42 2005
-+++ lib-src/soundtouch/source/example/bpm/Makefile.in	Tue Jan 11 20:35:55 2005
-@@ -141,7 +141,7 @@ lib_LTLIBRARIES = libBPM.la
+--- lib-src/soundtouch/source/example/bpm/Makefile.in.orig	Sat Nov 26 18:33:40 2005
++++ lib-src/soundtouch/source/example/bpm/Makefile.in	Sat Dec 17 23:14:27 2005
+@@ -149,7 +149,7 @@ lib_LTLIBRARIES = libBPM.la
  libBPM_la_SOURCES = BPMDetect.cpp PeakFinder.cpp
  
  # other compiler flags to add
diff -uNr audacity/patches/patch-src_Makefile_in /usr/ports/mystuff/audio/audacity/patches/patch-src_Makefile_in
--- audacity/patches/patch-src_Makefile_in	Thu Oct  6 07:49:15 2005
+++ /usr/ports/mystuff/audio/audacity/patches/patch-src_Makefile_in	Sat Dec 17 23:14:31 2005
@@ -1,6 +1,6 @@
 $OpenBSD$
---- src/Makefile.in.orig	Thu Nov 18 07:17:30 2004
-+++ src/Makefile.in	Tue Jan 11 08:56:46 2005
+--- src/Makefile.in.orig	Sat Nov 26 18:33:31 2005
++++ src/Makefile.in	Sat Dec 17 23:14:27 2005
 @@ -28,8 +28,9 @@ PRECOMP_CFLAGS = @PRECOMP_CFLAGS@
  
  EXTRAOBJS = @EXTRAOBJS@
@@ -12,7 +12,7 @@
  
  ########################################
  # ALL OBJECT FILES
-@@ -177,7 +178,7 @@ libaudacity.a: $(DIRS) $(LIBAUDACITY_OBJ
+@@ -179,7 +180,7 @@ libaudacity.a: $(DIRS) $(LIBAUDACITY_OBJ
  	ar rcs libaudacity.a $(LIBAUDACITY_OBJS)
  
  ../audacity: $(DIRS) $(OBJS) $(EXTRAOBJS) $(OPTOBJS) libaudacity.a Makefile



Visit your host, monkey.org