cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to audacity-1.3.7

Browse Source
This commit is contained in:
jakemsr 2009-03-14 03:49:43 +00:00
parent 73a650a44c
commit 32ba9cc461
17 changed files with 147 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
audio/audacity/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.19 2009/01/11 09:29:36 jakemsr Exp $
# $OpenBSD: Makefile,v 1.20 2009/03/14 03:49:43 jakemsr Exp $
COMMENT= free audio editor
V= 1.3.6
DISTNAME= audacity-src-${V}
V= 1.3.7
DISTNAME= audacity-minsrc-${V}
PKGNAME= audacity-${V}
CATEGORIES= audio
@ -21,8 +21,8 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m pthread stdc++ ogg expat sndfile glib-2.0 \
gobject-2.0 gtk-x11-2.0
WANTLIB= c expat glib-2.0 gobject-2.0 gtk-x11-2.0 \
m ogg pthread sndfile sndio stdc++
BUILD_DEPENDS= ::archivers/zip
LIB_DEPENDS= wx_base_xml,wx_base_odbc,wx_gtk2_aui,wx_gtk2_html,wx_gtk2_adv,wx_gtk2_xrc,wx_base_net,wx_gtk2_dbgrid,wx_gtk2_qa,wx_base,wx_gtk2_core,wx_gtk2_richtext:wxWidgets-gtk2->=2.8.6:x11/wxWidgets \
@ -33,7 +33,7 @@ LIB_DEPENDS= wx_base_xml,wx_base_odbc,wx_gtk2_aui,wx_gtk2_html,wx_gtk2_adv,wx_gt
mad.>=2::audio/libmad \
portaudio::audio/portaudio-svn \
SoundTouch::audio/soundtouch \
vamp-hostsdk::audio/vamp-plugin-sdk
vamp-hostsdk.>=1::audio/vamp-plugin-sdk
RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils \
:shared-mime-info-*:misc/shared-mime-info
@ -78,6 +78,7 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--with-portaudio=system
MAKE_FLAGS= CC="${CC}"
WRKDIST= ${WRKDIR}/audacity-src-${V}
# Regression tests are in the source tarball but as of 2007, they have
# not been updated for 3 years ; as they're completely out-of-sync with

10
audio/audacity/distinfo
View File

@ -1,5 +1,5 @@
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
MD5 (audacity-minsrc-1.3.7.tar.bz2) = fcvNjtQXQT/YJNRGABBY2Q==
RMD160 (audacity-minsrc-1.3.7.tar.bz2) = sWB4m5cQnjBub94Z88+XRTp0eSU=
SHA1 (audacity-minsrc-1.3.7.tar.bz2) = ukppa7lQgAxpDsgBOKqEgB4E81o=
SHA256 (audacity-minsrc-1.3.7.tar.bz2) = 4ARJFv/g1tj5In/B49lz4Rs37diQBaEQ6/9ILvMB1NU=
SIZE (audacity-minsrc-1.3.7.tar.bz2) = 5386329

8
audio/audacity/patches/patch-Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.3 2007/06/06 09:35:18 ajacoutot Exp $
--- Makefile.in.orig Mon Mar 26 10:56:29 2007
+++ Makefile.in Thu Mar 29 23:39:34 2007
@@ -29,17 +29,11 @@ install: audacity $(EXTRAINSTALLTARGETS)
$OpenBSD: patch-Makefile_in,v 1.4 2009/03/14 03:49:43 jakemsr Exp $
--- Makefile.in.orig Tue Jan 27 12:52:00 2009
+++ Makefile.in Tue Feb 10 03:21:24 2009
@@ -30,17 +30,11 @@ install: audacity $(EXTRAINSTALLTARGETS)
$(INSTALL) -d $(DESTDIR)$(BINDIR)
$(INSTALL) -m 755 audacity $(DESTDIR)$(BINDIR)/$(AUDACITY_NAME)

56
audio/audacity/patches/patch-configure
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-configure,v 1.10 2009/01/11 09:29:36 jakemsr Exp $
--- 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
$OpenBSD: patch-configure,v 1.11 2009/03/14 03:49:43 jakemsr Exp $
--- configure.orig Tue Jan 27 12:50:59 2009
+++ configure Mon Mar 9 01:17:51 2009
@@ -6809,7 +6809,7 @@ if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_new+set
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lFLAC -lFLAC++ -lFLAC $LIBS"
@ -10,16 +10,16 @@ $OpenBSD: patch-configure,v 1.10 2009/01/11 09:29:36 jakemsr Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -6809,7 +6809,7 @@ fi
@@ -7012,7 +7012,7 @@ fi
if test "x$lib_found" = "xyes" && test "x$header_found" = "xyes" ; then
LIBFLAC_SYSTEM_AVAILABLE="yes"
- LIBFLAC_SYSTEM_LIBS="-lFLAC++ -lFLAC"
+ LIBFLAC_SYSTEM_LIBS="-lFLAC++ -lFLAC -logg"
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;}
@@ -8787,7 +8787,7 @@ fi
{ $as_echo "$as_me:$LINENO: FLAC libraries are available as system libraries" >&5
$as_echo "$as_me: FLAC libraries are available as system libraries" >&6;}
@@ -8742,7 +8742,7 @@ fi
if test "${with_portaudio+set}" = set; then
withval=$with_portaudio; use_portaudio=$withval
else
@ -28,7 +28,7 @@ $OpenBSD: patch-configure,v 1.10 2009/01/11 09:29:36 jakemsr Exp $
fi
@@ -9316,7 +9316,7 @@ done
@@ -9290,7 +9290,7 @@ done
;;
esac
@ -37,7 +37,7 @@ $OpenBSD: patch-configure,v 1.10 2009/01/11 09:29:36 jakemsr Exp $
CXXFLAGS="-I\$(top_srcdir)/lib-src/portaudio/pa_common $CXXFLAGS"
case "${host_os}" in
@@ -9336,6 +9336,20 @@ else
@@ -9310,6 +9310,18 @@ else
EXTRAOBJS="$EXTRAOBJS ../lib-src/portaudio/pa_unix_oss/portaudio.a"
;;
esac
@ -52,13 +52,11 @@ $OpenBSD: patch-configure,v 1.10 2009/01/11 09:29:36 jakemsr Exp $
+ 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
@@ -9328,7 +9340,7 @@ _ACEOF
subdirs="$subdirs lib-src/portmixer"
ac_configure_args="$ac_configure_args --with-pa-include=../portaudio-v19/include"
@ -67,7 +65,7 @@ $OpenBSD: patch-configure,v 1.10 2009/01/11 09:29:36 jakemsr Exp $
CXXFLAGS="-I\$(top_srcdir)/lib-src/portmixer/px_common $CXXFLAGS"
case "${host_os}" in
@@ -9371,6 +9385,13 @@ _ACEOF
@@ -9345,6 +9357,13 @@ _ACEOF
EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/px_unix_oss/portmixer.a"
;;
esac
@ -81,7 +79,7 @@ $OpenBSD: patch-configure,v 1.10 2009/01/11 09:29:36 jakemsr Exp $
fi
fi
@@ -9575,7 +9596,7 @@ if [ "x$LIBEXPAT_USE_LOCAL" = "xyes" ]; then
@@ -9536,7 +9555,7 @@ if [ "x$LIBEXPAT_USE_LOCAL" = "xyes" ]; then
ac_config_files="$ac_config_files lib-src/expat/Makefile"
fi
@ -90,16 +88,16 @@ $OpenBSD: patch-configure,v 1.10 2009/01/11 09:29:36 jakemsr Exp $
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;}
@@ -10970,7 +10989,7 @@ $as_echo "$as_me: WARNING: no configuration informatio
{ $as_echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
$as_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.
- eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
+ eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args CFLAGS='"$CFLAGS"' CXXFLAGS='"$CXXFLAGS"' LDFLAGS='"$LDFLAGS"' \
--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;}
@@ -10976,9 +10997,12 @@ fi
{ { $as_echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
$as_echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
@@ -10988,9 +11007,12 @@ fi
pa_libs=
if [ "$use_portaudio" = "v19" ] ; then
@ -107,10 +105,22 @@ $OpenBSD: patch-configure,v 1.10 2009/01/11 09:29:36 jakemsr Exp $
+ # 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"
+ pa_libs="`pkg-config --libs portaudio-2.0`"
fi
-sed -i -e "s/@PA_LIBS@/$pa_libs/" src/Makefile
+perl -pi -e "s#\@PA_LIBS\@#$pa_libs#" src/Makefile
echo ""
echo "Finished configure:"
@@ -11031,8 +11053,10 @@ case "${host_os}" in
*)
if [ "$use_portaudio" = "v19" ] ; then
echo "portaudio: v19"
- else
+ elif [ "$use_portaudio" = "v18" ] ; then
echo "portaudio: v18 (OSS only)"
+ else
+ echo "portaudio: system"
fi
;;
esac

12
audio/audacity/patches/patch-lib-src_portmixer_configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib-src_portmixer_configure,v 1.2 2007/12/08 11:08:38 ajacoutot Exp $
--- lib-src/portmixer/configure.orig Tue Nov 13 23:02:42 2007
+++ lib-src/portmixer/configure Sat Nov 24 12:19:06 2007
@@ -3379,6 +3379,11 @@ fi
$OpenBSD: patch-lib-src_portmixer_configure,v 1.3 2009/03/14 03:49:43 jakemsr Exp $
--- lib-src/portmixer/configure.orig Tue Jan 27 12:51:44 2009
+++ lib-src/portmixer/configure Tue Feb 10 03:21:25 2009
@@ -3466,6 +3466,11 @@ fi
#
# Make sure the support is there
#
@ -13,7 +13,7 @@ $OpenBSD: patch-lib-src_portmixer_configure,v 1.2 2007/12/08 11:08:38 ajacoutot
have_support=yes
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -3513,6 +3518,9 @@ echo "$as_me: error: \"Your version of portaudio does
@@ -3600,6 +3605,9 @@ $as_echo "$as_me: error: \"Your version of portaudio d
{ (exit 1); exit 1; }; };
fi
@ -23,7 +23,7 @@ $OpenBSD: patch-lib-src_portmixer_configure,v 1.2 2007/12/08 11:08:38 ajacoutot
#
#
#
@@ -4003,7 +4011,7 @@ else
@@ -4100,7 +4108,7 @@ else
have_coreaudio=no
fi

11
audio/audacity/patches/patch-lib-src_portmixer_px_tests_Makefile
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-lib-src_portmixer_px_tests_Makefile,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
--- lib-src/portmixer/px_tests/Makefile.orig Tue Jan 11 20:41:32 2005
+++ lib-src/portmixer/px_tests/Makefile Tue Jan 11 20:41:51 2005
@@ -1,6 +1,6 @@
all: px_test
-CFLAGS = -g -Wall -O -I../../portaudio/pa_common -I../px_common
+CFLAGS = -Wall -I../../portaudio/pa_common -I../px_common
px_test: px_test.o px_unix_oss.o ../px_common/portmixer.h
gcc -g -o px_test px_test.o px_unix_oss.o -lm \

12
audio/audacity/patches/patch-lib-src_portmixer_px_unix_oss_Makefile
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-lib-src_portmixer_px_unix_oss_Makefile,v 1.2 2006/10/12 14:26:04 alek Exp $
--- lib-src/portmixer/px_unix_oss/Makefile.orig Sun Nov 27 17:47:29 2005
+++ lib-src/portmixer/px_unix_oss/Makefile Sat Oct 7 17:21:25 2006
@@ -2,7 +2,7 @@
CC = gcc
-CFLAGS = -g -I../px_common -I../../portaudio/pa_common
+CFLAGS = -I../px_common -I../../portaudio/pa_common
PASRC = px_unix_oss.c
PAINC = ../px_common/portmixer.h
PAOBJ = px_unix_oss.o

8
audio/audacity/patches/patch-locale_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-locale_Makefile_in,v 1.3 2007/12/08 11:08:38 ajacoutot Exp $
--- locale/Makefile.in.orig Sat Nov 24 12:36:07 2007
+++ locale/Makefile.in Sat Nov 24 12:37:04 2007
@@ -94,8 +94,8 @@ FORCE:
$OpenBSD: patch-locale_Makefile_in,v 1.4 2009/03/14 03:49:43 jakemsr Exp $
--- locale/Makefile.in.orig Tue Jan 27 12:52:01 2009
+++ locale/Makefile.in Tue Feb 10 03:21:35 2009
@@ -96,8 +96,8 @@ FORCE:
install: allmo
linguas='$(LINGUAS)'; for lang in $$linguas ; do \

10
audio/audacity/patches/patch-src_Audacity_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_Audacity_h,v 1.1 2009/01/11 09:29:36 jakemsr Exp $
--- 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();
$OpenBSD: patch-src_Audacity_h,v 1.2 2009/03/14 03:49:43 jakemsr Exp $
--- src/Audacity.h.orig Tue Jan 27 12:50:58 2009
+++ src/Audacity.h Tue Feb 10 03:21:35 2009
@@ -89,8 +89,9 @@ void QuitAudacity();
#endif //_MSC_VER
/* The GCC-elf implementation */
@ -12,7 +12,7 @@ $OpenBSD: patch-src_Audacity_h,v 1.1 2009/01/11 09:29:36 jakemsr Exp $
/* 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();
@@ -101,6 +102,9 @@ void QuitAudacity();
#define AUDACITY_DLL_API __attribute__((visibility("default")))
#endif
#endif

20
audio/audacity/patches/patch-src_AudioIO_cpp Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-src_AudioIO_cpp,v 1.5 2009/03/14 03:49:43 jakemsr Exp $
--- src/AudioIO.cpp.orig Mon Mar 9 01:08:36 2009
+++ src/AudioIO.cpp Mon Mar 9 01:14:48 2009
@@ -2053,7 +2053,6 @@ wxString AudioIO::GetDeviceInfo()
s << wxT("Cannot check mutual sample rates without both devices.") << e;
return o.GetString();
}
-
#if defined(USE_PORTMIXER)
if (supportedSampleRates.GetCount() > 0)
{
@@ -2201,7 +2200,7 @@ wxString AudioIO::GetDeviceInfo()
Px_CloseMixer(PortMixer);
#endif
- } //end of massive if statement if a valid sample rate has been found
+ // } //end of massive if statement if a valid sample rate has been found
return o.GetString();
}

38
audio/audacity/patches/patch-src_FFmpeg_cpp
View File

@ -1,18 +1,7 @@
$OpenBSD: patch-src_FFmpeg_cpp,v 1.1 2009/01/11 09:29:36 jakemsr Exp $
--- 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)
$OpenBSD: patch-src_FFmpeg_cpp,v 1.2 2009/03/14 03:49:43 jakemsr Exp $
--- src/FFmpeg.cpp.orig Tue Jan 27 12:50:58 2009
+++ src/FFmpeg.cpp Tue Feb 10 03:21:35 2009
@@ -249,11 +249,13 @@ class FindFFmpegDialog : public wxDialog (public)
}
}
@ -26,7 +15,7 @@ $OpenBSD: patch-src_FFmpeg_cpp,v 1.1 2009/01/11 09:29:36 jakemsr Exp $
wxString GetLibPath()
{
@@ -273,7 +277,9 @@ class FindFFmpegDialog : public wxDialog (public)
@@ -275,7 +277,9 @@ class FindFFmpegDialog : public wxDialog (public)
BEGIN_EVENT_TABLE(FindFFmpegDialog, wxDialog)
EVT_BUTTON(ID_FFMPEG_BROWSE, FindFFmpegDialog::OnBrowse)
@ -36,25 +25,16 @@ $OpenBSD: patch-src_FFmpeg_cpp,v 1.1 2009/01/11 09:29:36 jakemsr Exp $
END_EVENT_TABLE()
@@ -596,7 +602,7 @@ bool FFmpegLibs::InitLibs(wxString libpath_format, boo
@@ -565,7 +569,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
INITDYN(codec,avcodec_init);
INITDYN(codec,avcodec_find_encoder);
@@ -611,19 +615,19 @@ bool FFmpegLibs::InitLibs(wxString libpath_format, boo
wxLogMessage(wxT("Retrieving library version."));
int avcver = this->avcodec_version();

29
audio/audacity/patches/patch-src_FFmpeg_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_FFmpeg_h,v 1.1 2009/01/11 09:29:36 jakemsr Exp $
--- 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)
$OpenBSD: patch-src_FFmpeg_h,v 1.2 2009/03/14 03:49:43 jakemsr Exp $
--- src/FFmpeg.h.orig Tue Jan 27 12:50:59 2009
+++ src/FFmpeg.h Tue Feb 10 03:21:35 2009
@@ -151,8 +151,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);
@ -12,24 +12,3 @@ $OpenBSD: patch-src_FFmpeg_h,v 1.1 2009/01/11 09:29:36 jakemsr Exp $
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__

12
audio/audacity/patches/patch-src_Sequence_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_Sequence_cpp,v 1.4 2009/01/11 09:29:36 jakemsr Exp $
--- 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
$OpenBSD: patch-src_Sequence_cpp,v 1.5 2009/03/14 03:49:43 jakemsr Exp $
--- src/Sequence.cpp.orig Tue Jan 27 12:50:58 2009
+++ src/Sequence.cpp Tue Feb 10 03:21:35 2009
@@ -952,7 +952,8 @@ bool Sequence::Get(samplePtr buffer, sampleFormat form
sampleCount start, sampleCount len) const
{
if (start < 0 || start > mNumSamples ||
@ -11,7 +11,7 @@ $OpenBSD: patch-src_Sequence_cpp,v 1.4 2009/01/11 09:29:36 jakemsr Exp $
return false;
int b = FindBlock(start);
@@ -927,6 +928,7 @@ bool Sequence::Set(samplePtr buffer, sampleFormat form
@@ -986,6 +987,7 @@ bool Sequence::Set(samplePtr buffer, sampleFormat form
if (format != mSampleFormat) {
temp = NewSamples(mMaxSamples, mSampleFormat);
wxASSERT(temp);
@ -19,7 +19,7 @@ $OpenBSD: patch-src_Sequence_cpp,v 1.4 2009/01/11 09:29:36 jakemsr Exp $
}
samplePtr silence = NULL;
@@ -934,6 +936,7 @@ bool Sequence::Set(samplePtr buffer, sampleFormat form
@@ -993,6 +995,7 @@ bool Sequence::Set(samplePtr buffer, sampleFormat form
silence = NewSamples(mMaxSamples, format);
wxASSERT(silence);
ClearSamples(silence, format, 0, mMaxSamples);

4
audio/audacity/patches/patch-src_audacity_desktop
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_audacity_desktop,v 1.4 2009/01/11 09:29:36 jakemsr Exp $
$OpenBSD: patch-src_audacity_desktop,v 1.5 2009/03/14 03:49:43 jakemsr Exp $
--- src/audacity.desktop.orig Sat Oct 25 05:14:27 2008
+++ src/audacity.desktop Sat Nov 29 01:48:41 2008
+++ src/audacity.desktop Thu Nov 13 21:23:04 2008
@@ -11,7 +11,7 @@ Comment=Record and edit audio files
Comment[de]=Audio-Dateien aufnehmen und bearbeiten
Comment[ru]=Запись и редактирование звуковых файлов

26
audio/audacity/patches/patch-src_export_ExportMP3_cpp
View File

@ -1,23 +1,23 @@
$OpenBSD: patch-src_export_ExportMP3_cpp,v 1.7 2009/01/11 09:29:36 jakemsr Exp $
--- 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)
$OpenBSD: patch-src_export_ExportMP3_cpp,v 1.8 2009/03/14 03:49:43 jakemsr Exp $
--- src/export/ExportMP3.cpp.orig Tue Jan 27 12:50:58 2009
+++ src/export/ExportMP3.cpp Mon Mar 9 00:50:23 2009
@@ -575,8 +575,9 @@ class FindDialog : public wxDialog (public)
mPathText = S.AddTextBox(wxT(""), mLibPath.GetFullPath(), 0);
}
S.Id(ID_BROWSE).AddButton(_("Browse..."), wxALIGN_RIGHT);
- S.AddVariableText(_("To get a free copy of Lame, click here -->"), true);
- S.Id(ID_DLOAD).AddButton(_("Download..."), wxALIGN_RIGHT);
+/* S.AddVariableText(_("To get a free copy of Lame, click here -->"), true);
+ S.Id(ID_DLOAD).AddButton(_("Download..."), wxALIGN_RIGHT); */
S.Id(ID_DLOAD).AddButton(_("Download"), wxALIGN_RIGHT);
+*/
}
S.EndMultiColumn();
@@ -1564,7 +1564,7 @@ class LameExporter : public MP3Exporter (public)
wxString GetLibraryTypeString()
{
- 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 (*)|*"));
}
@@ -1360,7 +1361,7 @@ wxString MP3Exporter::GetLibraryName()
wxString MP3Exporter::GetLibraryTypeString()
{
- 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.*|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"));
}
#endif

15
audio/audacity/patches/patch-src_prefs_FileFormatPrefs_cpp Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_prefs_FileFormatPrefs_cpp,v 1.4 2009/03/14 03:49:43 jakemsr Exp $
--- src/prefs/FileFormatPrefs.cpp.orig Sat Nov 29 02:28:41 2008
+++ src/prefs/FileFormatPrefs.cpp Sat Nov 29 02:29:00 2008
@@ -98,9 +98,10 @@ void FileFormatPrefs::PopulateOrExchange( ShuttleGui &
S.AddVariableText( _("LAME MP3 Library:"),
true,
wxALL | wxALIGN_RIGHT | wxALIGN_CENTRE_VERTICAL );
- S.Id( ID_MP3_DOWN_BUTTON ).AddButton( _("&Download"),
+ wxButton *bdwn = S.Id( ID_MP3_DOWN_BUTTON ).AddButton( _("&Download"),
wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL );
S.EndTwoColumn();
+ bdwn->Enable(FALSE);
}
S.EndStatic();
S.StartStatic( _("FFmpeg Import/Export Library"),1);

18
audio/audacity/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.9 2009/01/11 09:29:36 jakemsr Exp $
@comment $OpenBSD: PLIST,v 1.10 2009/03/14 03:49:43 jakemsr Exp $
@bin bin/audacity
@man man/man1/audacity.1
share/applications/audacity.desktop
@ -49,10 +49,13 @@ share/locale/bg/LC_MESSAGES/audacity.mo
share/locale/bn/
share/locale/bn/LC_MESSAGES/
share/locale/bn/LC_MESSAGES/audacity.mo
share/locale/bs/
share/locale/bs/LC_MESSAGES/
share/locale/bs/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/ca@valencia/
share/locale/ca@valencia/LC_MESSAGES/
share/locale/ca@valencia/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
@ -69,8 +72,15 @@ 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/id/LC_MESSAGES/audacity.mo
share/locale/it/LC_MESSAGES/audacity.mo
share/locale/ja/LC_MESSAGES/audacity.mo
share/locale/ka/
share/locale/ka/LC_MESSAGES/
share/locale/ka/LC_MESSAGES/audacity.mo
share/locale/km/
share/locale/km/LC_MESSAGES/
share/locale/km/LC_MESSAGES/audacity.mo
share/locale/ko/LC_MESSAGES/audacity.mo
share/locale/lt/LC_MESSAGES/audacity.mo
share/locale/mk/