NEW: audacity-1.2.4

classic Classic list List threaded Threaded
15 messages Options
Reply | Threaded
Open this post in threaded view
|

NEW: audacity-1.2.4

Antoine Jacoutot
Hi...

Here is a new audacity port.
Tested under macppc/current.

As usual, please test and comment/report.
Thanks !

--
Antoine

pkg/DESCR
Audacity is a free audio editor. You can record sounds, play sounds,
import and export WAV, AIFF, Ogg Vorbis, and MP3 files, and more. Use it
to edit your sounds using Cut, Copy and Paste (with unlimited Undo), mix
tracks together, or apply effects to your recordings. It also has a
built-in amplitude envelope editor, a customizable spectrogram mode and a
frequency analysis window for audio analysis applications. Built-in
effects include Echo, Change Tempo, and Noise Removal, and it also
supports VST and LADSPA plug-in effects.

audacity.tar.gz (10K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: NEW: audacity-1.2.4

steven mestdagh
On Wed, Nov 30, 2005 at 10:48:47PM +0100, Antoine Jacoutot wrote:
> Hi...
>
> Here is a new audacity port.
> Tested under macppc/current.
>
> As usual, please test and comment/report.
> Thanks !

looks nice, but it dumps core on sparc64 upon selecting help->contents
in the menu.

Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm

Reply | Threaded
Open this post in threaded view
|

Re: NEW: audacity-1.2.4

Antoine Jacoutot
On Sat, 3 Dec 2005, steven mestdagh wrote:

> looks nice, but it dumps core on sparc64 upon selecting help->contents
> in the menu.

Yes, this is a known problem. It did the same with the older version. As I
don't have any sparc64 around, I can not reproduce the problem and
certainly can not fix it.
If anyone wants to have a look at this issue, I would appreciate... I've
been using this port (an older version) for a while now without problems
(under i386 and macppc).

Thanks !

Antoine

Reply | Threaded
Open this post in threaded view
|

Re: NEW: audacity-1.2.4

Rik Burt
In reply to this post by Antoine Jacoutot
Antoine Jacoutot wrote:

> Hi...
>
> Here is a new audacity port.
> Tested under macppc/current.  

Builds and installs fine on i386.  I was able to make some cool new
ringtones for my phone.

Rik

Reply | Threaded
Open this post in threaded view
|

Re: NEW: audacity-1.2.4

Aleksander Piotrowski
In reply to this post by Antoine Jacoutot
Antoine Jacoutot <[hidden email]> wrote:

> Yes, this is a known problem. It did the same with the older version. As I
> don't have any sparc64 around, I can not reproduce the problem and
> certainly can not fix it.
> If anyone wants to have a look at this issue, I would appreciate... I've
> been using this port (an older version) for a while now without problems
> (under i386 and macppc).

Please try attached diff.  Put it into x11/wxWidgets/patches and
rebuild+reinstall wxWidgets.

Don't forget to test other ports that use wxWidgets.

Alek
--
Człowiek bardzo przypomina zabawkę - wirującego bąka, puszczanego w ruch
pociągnięciem sznurka. Kręci się i kręci, coraz wolniej i wolniej. Już ma
upaść, lecz wciąż, jakby wbrew naturze, robi kolejne obroty.
 -- Ewa Białołęcka, Tkacz Iluzji

patch-src_unix_utilsx11_cpp (412 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: NEW: audacity-1.2.4

Matthias Kilian
In reply to this post by Antoine Jacoutot
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.

Ciao,
        Kili

Reply | Threaded
Open this post in threaded view
|

Re: NEW: audacity-1.2.4

Antoine Jacoutot
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.

Antoine

Reply | Threaded
Open this post in threaded view
|

Re: NEW: audacity-1.2.4

Antoine Jacoutot
In reply to this post by Aleksander Piotrowski
Selon Aleksander Piotrowski <[hidden email]>:

> Please try attached diff.  Put it into x11/wxWidgets/patches and
> rebuild+reinstall wxWidgets.
>
> Don't forget to test other ports that use wxWidgets.

It works great under amd64/current.
Tested with audacity and xchm.

Antoine

Reply | Threaded
Open this post in threaded view
|

Re: NEW: audacity-1.2.4

Antoine Jacoutot
In reply to this post by Aleksander Piotrowski
On Mon, 5 Dec 2005, steven mestdagh wrote:

>> Please try attached diff.  Put it into x11/wxWidgets/patches and
>> rebuild+reinstall wxWidgets.

OK, the diff works fine under macppc and amd64.
I think it can be commited.

:)

Antoine

Reply | Threaded
Open this post in threaded view
|

Re: NEW: audacity-1.2.4

Chris Kuethe
In reply to this post by Antoine Jacoutot
On 11/30/05, Antoine Jacoutot <[hidden email]> wrote:
> Hi...
>
> Here is a new audacity port.
> Tested under macppc/current.
>
> As usual, please test and comment/report.
> Thanks !

I'm not much of an audiomonkey, but at least breaking up a few large
mp3 files in preparation for dumping them to CD worked for me on
i386/current (haven't tried with rthreads yet, though)

CK

--
GDB has a 'break' feature; why doesn't it have 'fix' too?

Reply | Threaded
Open this post in threaded view
|

Re: NEW: audacity-1.2.4

Jacob Meuser
In reply to this post by Aleksander Piotrowski
On Sun, Dec 04, 2005 at 06:25:41PM +0100, Aleksander Piotrowski wrote:

> Antoine Jacoutot <[hidden email]> wrote:
>
> > Yes, this is a known problem. It did the same with the older version. As I
> > don't have any sparc64 around, I can not reproduce the problem and
> > certainly can not fix it.
> > If anyone wants to have a look at this issue, I would appreciate... I've
> > been using this port (an older version) for a while now without problems
> > (under i386 and macppc).
>
> Please try attached diff.  Put it into x11/wxWidgets/patches and
> rebuild+reinstall wxWidgets.

with that patch, audacity works on amd64.  tested just about every
action and effect.  very nice to be able to use this on my fast box :)

> Don't forget to test other ports that use wxWidgets.

net/amule seems to be working.

x11/vlc still has issues with the file browser showing garbage
filenames, but I did play part of a DVD with it.

I always get this on vlc startup:

puff:~% vlc
VLC media player 0.8.2 Janus
vlc:/usr/local/lib/libwx_gtk2.so.2.4: undefined symbol 'pango_x_get_context'

and once I even got a coredump, here is the bt:

#0  0x000000005046493e in wcsrtombs () from /usr/lib/libc.so.38.4
#1  0x000000007b817008 in wxWC2MB(char*, wchar_t const*, unsigned long) ()
   from /usr/local/lib/libwx_gtk2.so.2.4
#2  0x000000007b7e78a2 in wxMBConv::WC2MB(char*, wchar_t const*, unsigned long) const ()
   from /usr/local/lib/libwx_gtk2.so.2.4
#3  0x000000007b7ebc74 in wxString::wxString(wchar_t const*, wxMBConv&, unsigned long) ()
   from /usr/local/lib/libwx_gtk2.so.2.4
#4  0x000000007b7ec245 in wxString::operator=(wchar_t const*) ()
   from /usr/local/lib/libwx_gtk2.so.2.4
#5  0x000000007b81b2f1 in wxDirData::Read(wxString*) ()
   from /usr/local/lib/libwx_gtk2.so.2.4
#6  0x000000007b81b88f in wxDir::GetNext(wxString*) const ()
   from /usr/local/lib/libwx_gtk2.so.2.4
#7  0x000000007b6575e4 in wxFileCtrl::UpdateFiles() ()
   from /usr/local/lib/libwx_gtk2.so.2.4
#8  0x000000007b658628 in wxFileCtrl::GoToDir(wxString const&) ()
   from /usr/local/lib/libwx_gtk2.so.2.4
#9  0x000000007b660677 in wxFileDialog::ShowModal() ()
   from /usr/local/lib/libwx_gtk2.so.2.4
#10 0x000000007af94549 in wxvlc::OpenDialog::OnFileBrowse(wxCommandEvent&) ()
   from /usr/local/lib/vlc/gui/libwxwindows_plugin.so
#11 0x000000007b76e7c3 in wxEvtHandler::SearchEventTable(wxEventTable&, wxEvent&) ()
   from /usr/local/lib/libwx_gtk2.so.2.4
#12 0x000000007b76e5e5 in wxEvtHandler::ProcessEvent(wxEvent&) ()
   from /usr/local/lib/libwx_gtk2.so.2.4
#13 0x000000007b76e69f in wxEvtHandler::ProcessEvent(wxEvent&) ()
   from /usr/local/lib/libwx_gtk2.so.2.4
#14 0x000000007b76e69f in wxEvtHandler::ProcessEvent(wxEvent&) ()
   from /usr/local/lib/libwx_gtk2.so.2.4
#15 0x000000007b76e69f in wxEvtHandler::ProcessEvent(wxEvent&) ()
   from /usr/local/lib/libwx_gtk2.so.2.4
#16 0x000000007b76e69f in wxEvtHandler::ProcessEvent(wxEvent&) ()
   from /usr/local/lib/libwx_gtk2.so.2.4
#17 0x000000007b6ea8c5 in wxBrushRefData::~wxBrushRefData() ()
   from /usr/local/lib/libwx_gtk2.so.2.4
#18 0x00000000452acd2d in g_cclosure_marshal_VOID__VOID ()
   from /usr/local/lib/libgobject-2.0.so.800.3
#19 0x000000004529c7a4 in g_closure_invoke ()
   from /usr/local/lib/libgobject-2.0.so.800.3
#20 0x00000000452ac886 in g_signal_emit_by_name ()
   from /usr/local/lib/libgobject-2.0.so.800.3
#21 0x00000000452ab858 in g_signal_emit_valist ()
   from /usr/local/lib/libgobject-2.0.so.800.3
#22 0x00000000452abb63 in g_signal_emit ()
   from /usr/local/lib/libgobject-2.0.so.800.3
#23 0x00000000479a35bc in gtk_button_clicked ()
   from /usr/local/lib/libgtk-x11-2.0.so.800.8
#24 0x00000000479a4266 in gtk_button_get_relief ()
   from /usr/local/lib/libgtk-x11-2.0.so.800.8
#25 0x00000000452acd2d in g_cclosure_marshal_VOID__VOID ()
   from /usr/local/lib/libgobject-2.0.so.800.3
#26 0x000000004529ca40 in g_cclosure_new_swap ()
   from /usr/local/lib/libgobject-2.0.so.800.3
#27 0x000000004529c7a4 in g_closure_invoke ()
   from /usr/local/lib/libgobject-2.0.so.800.3
#28 0x00000000452ac116 in g_signal_emit_by_name ()
   from /usr/local/lib/libgobject-2.0.so.800.3
#29 0x00000000452ab858 in g_signal_emit_valist ()
   from /usr/local/lib/libgobject-2.0.so.800.3
#30 0x00000000452abb63 in g_signal_emit ()
   from /usr/local/lib/libgobject-2.0.so.800.3
#31 0x00000000479a355c in gtk_button_released ()
   from /usr/local/lib/libgtk-x11-2.0.so.800.8
#32 0x00000000479a40a9 in gtk_button_get_relief ()
   from /usr/local/lib/libgtk-x11-2.0.so.800.8
#33 0x0000000047a52ad5 in gtk_marshal_VOID__UINT_STRING ()
   from /usr/local/lib/libgtk-x11-2.0.so.800.8
#34 0x000000004529ca40 in g_cclosure_new_swap ()
   from /usr/local/lib/libgobject-2.0.so.800.3
#35 0x000000004529c7a4 in g_closure_invoke ()
   from /usr/local/lib/libgobject-2.0.so.800.3
#36 0x00000000452ac307 in g_signal_emit_by_name ()
   from /usr/local/lib/libgobject-2.0.so.800.3
#37 0x00000000452ab627 in g_signal_emit_valist ()
   from /usr/local/lib/libgobject-2.0.so.800.3
#38 0x00000000452abb63 in g_signal_emit ()
   from /usr/local/lib/libgobject-2.0.so.800.3
#39 0x0000000047b29211 in gtk_widget_send_expose ()
   from /usr/local/lib/libgtk-x11-2.0.so.800.8
#40 0x0000000047a515f5 in gtk_propagate_event ()
   from /usr/local/lib/libgtk-x11-2.0.so.800.8
#41 0x0000000047a5079e in gtk_main_do_event ()
   from /usr/local/lib/libgtk-x11-2.0.so.800.8
#42 0x000000004fbfb99c in gdk_x11_register_standard_event_type ()
   from /usr/local/lib/libgdk-x11-2.0.so.800.8
#43 0x00000000486f9ca3 in g_main_depth ()
   from /usr/local/lib/libglib-2.0.so.800.3
#44 0x00000000486fac88 in g_main_context_dispatch ()
   from /usr/local/lib/libglib-2.0.so.800.3
#45 0x00000000486faf6b in g_main_context_dispatch ()
   from /usr/local/lib/libglib-2.0.so.800.3
#46 0x00000000486fb479 in g_main_loop_run ()
   from /usr/local/lib/libglib-2.0.so.800.3
#47 0x0000000047a4ffe1 in gtk_main ()
   from /usr/local/lib/libgtk-x11-2.0.so.800.8
#48 0x000000007b6e4d19 in wxApp::MainLoop() ()
   from /usr/local/lib/libwx_gtk2.so.2.4
#49 0x000000007b7380f6 in wxAppBase::OnRun() ()
   from /usr/local/lib/libwx_gtk2.so.2.4
#50 0x000000007b6e53ae in wxEntry(int, char**) ()
   from /usr/local/lib/libwx_gtk2.so.2.4
#51 0x000000007af716e4 in Init(intf_thread_t*) ()
   from /usr/local/lib/vlc/gui/libwxwindows_plugin.so
#52 0x000000000040fed1 in ?? ()
#53 0x000000000040fbdb in ?? ()
#54 0x000000000040da03 in ?? ()
#55 0x0000000000405b98 in ?? ()
#56 0x000000000040591b in ?? ()
#57 0x0000000000000000 in ?? ()
#58 0x0000000000000001 in ?? ()
#59 0x00007f7fffff03b0 in ?? ()
#60 0x0000000000000000 in ?? ()
#61 0x00007f7fffff03b4 in ?? ()
#62 0x00007f7fffff043e in ?? ()
#63 0x00007f7fffff0451 in ?? ()


--
<[hidden email]>

Reply | Threaded
Open this post in threaded view
|

Re: NEW: audacity-1.2.4

Aleksander Piotrowski
Jacob Meuser <[hidden email]> wrote:

> I always get this on vlc startup:
>
> puff:~% vlc
> VLC media player 0.8.2 Janus
> vlc:/usr/local/lib/libwx_gtk2.so.2.4: undefined symbol 'pango_x_get_context'
>
> and once I even got a coredump, here is the bt:
>
> #0  0x000000005046493e in wcsrtombs () from /usr/lib/libc.so.38.4
> #1  0x000000007b817008 in wxWC2MB(char*, wchar_t const*, unsigned long) ()
>    from /usr/local/lib/libwx_gtk2.so.2.4
> #2  0x000000007b7e78a2 in wxMBConv::WC2MB(char*, wchar_t const*, unsigned long) const ()
>    from /usr/local/lib/libwx_gtk2.so.2.4
> #3  0x000000007b7ebc74 in wxString::wxString(wchar_t const*, wxMBConv&, unsigned long) ()
>    from /usr/local/lib/libwx_gtk2.so.2.4
[...]

Looks like something different than audacity issue ...

Alek
--
- Dlaczego ,,przemyt narkotyk?w jest karany ?mierci?''? - pyta retorycznie
mecenas Alejandro [...] - Amerykanie w?ciekali si? strasznie, ?e niekt?rzy
ludzie z tej cz?ci ?wiata uparli si? sprzedawa? im narkotyki, kt?rych tak
bardzo chc?.
- No, przykro mi. Co jeszcze mog? powiedzie?. Kutasy z nas.
 -- Neal Stephenson, Cryptonomicon

Reply | Threaded
Open this post in threaded view
|

Re: NEW: audacity-1.2.4

Jacob Meuser
On Tue, Dec 06, 2005 at 12:53:15PM +0100, Aleksander Piotrowski wrote:

> Jacob Meuser <[hidden email]> wrote:
>
> > I always get this on vlc startup:
> >
> > puff:~% vlc
> > VLC media player 0.8.2 Janus
> > vlc:/usr/local/lib/libwx_gtk2.so.2.4: undefined symbol 'pango_x_get_context'
> >
> > and once I even got a coredump, here is the bt:
> >
> > #0  0x000000005046493e in wcsrtombs () from /usr/lib/libc.so.38.4
> > #1  0x000000007b817008 in wxWC2MB(char*, wchar_t const*, unsigned long) ()
> >    from /usr/local/lib/libwx_gtk2.so.2.4
> > #2  0x000000007b7e78a2 in wxMBConv::WC2MB(char*, wchar_t const*, unsigned long) const ()
> >    from /usr/local/lib/libwx_gtk2.so.2.4
> > #3  0x000000007b7ebc74 in wxString::wxString(wchar_t const*, wxMBConv&, unsigned long) ()
> >    from /usr/local/lib/libwx_gtk2.so.2.4
> [...]
>
> Looks like something different than audacity issue ...

yes.  just proof that I did check other wxWidgets programs :)

--
<[hidden email]>

Reply | Threaded
Open this post in threaded view
|

Re: NEW: audacity-1.2.4

Jacob Meuser
In reply to this post by Antoine Jacoutot
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?

--
<[hidden email]>

diff -uNr audacity/Makefile /src/OpenBSD/ports/mystuff/audio/audacity/Makefile
--- audacity/Makefile Wed Nov 30 13:43:05 2005
+++ /src/OpenBSD/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 /src/OpenBSD/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
+++ /src/OpenBSD/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_soundtouch_configure /src/OpenBSD/ports/mystuff/audio/audacity/patches/patch-lib-src_soundtouch_configure
--- audacity/patches/patch-lib-src_soundtouch_configure Thu Oct  6 07:49:15 2005
+++ /src/OpenBSD/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 /src/OpenBSD/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
+++ /src/OpenBSD/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 /src/OpenBSD/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
+++ /src/OpenBSD/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 /src/OpenBSD/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
+++ /src/OpenBSD/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 /src/OpenBSD/ports/mystuff/audio/audacity/patches/patch-src_Makefile_in
--- audacity/patches/patch-src_Makefile_in Thu Oct  6 07:49:15 2005
+++ /src/OpenBSD/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

Reply | Threaded
Open this post in threaded view
|

Re: NEW: audacity-1.2.4

Jacob Meuser
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.

--
<[hidden email]>

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