Update to 1.3.0b as previous version doesn't work with new wxWidgtes
ok ajacoutot@
This commit is contained in:
parent
66174dc927
commit
af10693e4c
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.2 2006/08/01 10:50:19 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.3 2006/10/12 14:26:03 alek Exp $
|
||||
|
||||
COMMENT= "free audio editor"
|
||||
|
||||
DISTNAME= audacity-src-1.2.4
|
||||
DISTNAME= audacity-src-1.3.0b
|
||||
PKGNAME= ${DISTNAME:S/-src//}
|
||||
CATEGORIES= audio
|
||||
|
||||
@ -22,7 +22,7 @@ WANTLIB= c m ossaudio pthread stdc++ \
|
||||
FLAC++ ogg vorbisenc
|
||||
|
||||
BUILD_DEPENDS= ::archivers/zip
|
||||
LIB_DEPENDS= wx_gtk.>=2.4::x11/wxWidgets/gtk \
|
||||
LIB_DEPENDS= wx_base_xml,wx_base_odbc,wx_gtk2_html,wx_gtk2_adv,wx_gtk2_xrc,wx_base_net,wx_gtk2_dbgrid,wx_gtk2_qa,wx_base,wx_gtk2_core:wxWidgets-gtk2->=2.6.3:x11/wxWidgets \
|
||||
sndfile.>=1::audio/libsndfile \
|
||||
samplerate.>=1::audio/libsamplerate \
|
||||
FLAC.>=4::audio/flac \
|
||||
@ -36,8 +36,7 @@ USE_LIBTOOL= Yes
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
CFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
|
||||
WXCONFIG="${LOCALBASE}/bin/wxgtk-2.4-config"
|
||||
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
|
||||
|
||||
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
|
||||
--with-id3=system \
|
||||
@ -46,15 +45,16 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
|
||||
--with-libmad=system \
|
||||
--with-libsndfile=system \
|
||||
--with-libsamplerate=system \
|
||||
--with-libresample \
|
||||
--with-nyquist \
|
||||
--with-libresample=local \
|
||||
--with-nyquist=local \
|
||||
--with-ladspa \
|
||||
--with-portmixer \
|
||||
--with-soundtouch \
|
||||
--with-soundtouch=local \
|
||||
--with-portaudio=v18 \
|
||||
--with-help
|
||||
|
||||
MAKE_FLAGS= CC="${CC}"
|
||||
WRKDIST= ${WRKDIR}/${DISTNAME}-beta
|
||||
|
||||
REGRESS_FLAGS= LDFLAGS="-L${X11BASE}/lib"
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
MD5 (audacity-src-1.2.4.tar.gz) = b3e135cd1e34192f6cafa48cca0f77e7
|
||||
RMD160 (audacity-src-1.2.4.tar.gz) = 37089099ea4bfcb5bf9d908f31234ecba4f2bfbd
|
||||
SHA1 (audacity-src-1.2.4.tar.gz) = b21d89db2366ada3c3efb97891aacaf326be2bdf
|
||||
SIZE (audacity-src-1.2.4.tar.gz) = 4497621
|
||||
MD5 (audacity-src-1.3.0b.tar.gz) = d1c5a3359ad95eab6ca8b375972c1a91
|
||||
RMD160 (audacity-src-1.3.0b.tar.gz) = 4ada2e40799f60477d6c2aabb0b91bb03c8882f9
|
||||
SHA1 (audacity-src-1.3.0b.tar.gz) = 6ba57ee1a3a9b6c57bf98142fbe4561b7cadf5db
|
||||
SIZE (audacity-src-1.3.0b.tar.gz) = 4938302
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
|
||||
--- Makefile.in.orig Thu Nov 18 07:17:29 2004
|
||||
+++ Makefile.in Tue Jan 11 08:56:46 2005
|
||||
@@ -37,9 +37,9 @@ install: audacity
|
||||
$OpenBSD: patch-Makefile_in,v 1.2 2006/10/12 14:26:03 alek Exp $
|
||||
--- Makefile.in.orig Sun Nov 27 17:47:27 2005
|
||||
+++ Makefile.in Sat Oct 7 16:53:52 2006
|
||||
@@ -39,9 +39,9 @@ install: audacity $(EXTRAINSTALLTARGETS)
|
||||
|
||||
# install manpage
|
||||
$(INSTALL) -d $(DESTDIR)$(MANDIR)/man1
|
||||
|
@ -1,7 +1,45 @@
|
||||
$OpenBSD: patch-configure,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
|
||||
--- configure.orig Tue Jan 11 19:37:11 2005
|
||||
+++ configure Tue Jan 11 19:42:24 2005
|
||||
@@ -7901,7 +7901,7 @@ echo "$as_me: WARNING: no configuration
|
||||
$OpenBSD: patch-configure,v 1.2 2006/10/12 14:26:03 alek Exp $
|
||||
--- configure.orig Sun Nov 27 17:47:27 2005
|
||||
+++ configure Sun Oct 8 21:14:07 2006
|
||||
@@ -5103,23 +5103,23 @@ fi
|
||||
else
|
||||
PKG_CONFIG_MIN_VERSION=0.9.0
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
|
||||
- echo "$as_me:$LINENO: checking for samplerate >= 0.15.0" >&5
|
||||
-echo $ECHO_N "checking for samplerate >= 0.15.0... $ECHO_C" >&6
|
||||
+ echo "$as_me:$LINENO: checking for samplerate >= 0.0.15" >&5
|
||||
+echo $ECHO_N "checking for samplerate >= 0.0.15... $ECHO_C" >&6
|
||||
|
||||
- if $PKG_CONFIG --exists "samplerate >= 0.15.0" ; then
|
||||
+ if $PKG_CONFIG --exists "samplerate >= 0.0.15" ; then
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
succeeded=yes
|
||||
|
||||
echo "$as_me:$LINENO: checking SAMPLERATE_CFLAGS" >&5
|
||||
echo $ECHO_N "checking SAMPLERATE_CFLAGS... $ECHO_C" >&6
|
||||
- SAMPLERATE_CFLAGS=`$PKG_CONFIG --cflags "samplerate >= 0.15.0"`
|
||||
+ SAMPLERATE_CFLAGS=`$PKG_CONFIG --cflags "samplerate >= 0.0.15"`
|
||||
echo "$as_me:$LINENO: result: $SAMPLERATE_CFLAGS" >&5
|
||||
echo "${ECHO_T}$SAMPLERATE_CFLAGS" >&6
|
||||
|
||||
echo "$as_me:$LINENO: checking SAMPLERATE_LIBS" >&5
|
||||
echo $ECHO_N "checking SAMPLERATE_LIBS... $ECHO_C" >&6
|
||||
- SAMPLERATE_LIBS=`$PKG_CONFIG --libs "samplerate >= 0.15.0"`
|
||||
+ SAMPLERATE_LIBS=`$PKG_CONFIG --libs "samplerate >= 0.0.15"`
|
||||
echo "$as_me:$LINENO: result: $SAMPLERATE_LIBS" >&5
|
||||
echo "${ECHO_T}$SAMPLERATE_LIBS" >&6
|
||||
else
|
||||
@@ -5127,7 +5127,7 @@ echo "${ECHO_T}$SAMPLERATE_LIBS" >&6
|
||||
SAMPLERATE_LIBS=""
|
||||
## If we have a custom action on failure, don't print errors, but
|
||||
## do set a variable so people can do so.
|
||||
- SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "samplerate >= 0.15.0"`
|
||||
+ SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "samplerate >= 0.0.15"`
|
||||
|
||||
fi
|
||||
|
||||
@@ -7723,7 +7723,7 @@ echo "$as_me: WARNING: no configuration
|
||||
{ echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
|
||||
echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
|
||||
# The eval makes quoting arguments work.
|
||||
|
@ -1,13 +1,12 @@
|
||||
$OpenBSD: patch-lib-src_allegro_Makefile_in,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
|
||||
--- lib-src/allegro/Makefile.in.orig Tue Jan 11 19:26:53 2005
|
||||
+++ lib-src/allegro/Makefile.in Tue Jan 11 19:27:33 2005
|
||||
@@ -3,7 +3,8 @@
|
||||
CC = @CC@
|
||||
$OpenBSD: patch-lib-src_allegro_Makefile_in,v 1.2 2006/10/12 14:26:03 alek Exp $
|
||||
--- lib-src/allegro/Makefile.in.orig Sun Nov 27 17:47:28 2005
|
||||
+++ lib-src/allegro/Makefile.in Sat Oct 7 17:04:38 2006
|
||||
@@ -4,7 +4,7 @@ CC = @CC@
|
||||
CCC = @CXX@
|
||||
srcdir=@srcdir@
|
||||
|
||||
-CFLAGS = -g -O
|
||||
+CFLAGS = @CFLAGS@
|
||||
+# CFLAGS = -g -O
|
||||
OBJ = \
|
||||
+CFLAGS = @CFLAGS@
|
||||
CPPOBJ = \
|
||||
allegro.cpp.o \
|
||||
allegrord.cpp.o \
|
||||
|
@ -1,8 +1,9 @@
|
||||
$OpenBSD: patch-lib-src_expat_Makefile_in,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
|
||||
--- lib-src/expat/Makefile.in.orig Tue Jan 11 20:15:55 2005
|
||||
+++ lib-src/expat/Makefile.in Tue Jan 11 20:16:15 2005
|
||||
@@ -1,6 +1,6 @@
|
||||
$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@
|
||||
srcdir=@srcdir@
|
||||
|
||||
-override CFLAGS += @CFLAGS@ -Ixmlparse -Ixmltok
|
||||
+override CFLAGS += -Ixmlparse -Ixmltok
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-lib-src_libresample_Makefile_in,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
|
||||
--- lib-src/libresample/Makefile.in.orig Thu Nov 18 07:17:33 2004
|
||||
+++ lib-src/libresample/Makefile.in Tue Jan 11 08:56:46 2005
|
||||
$OpenBSD: patch-lib-src_libresample_Makefile_in,v 1.2 2006/10/12 14:26:04 alek Exp $
|
||||
--- lib-src/libresample/Makefile.in.orig Sun Nov 27 17:47:29 2005
|
||||
+++ lib-src/libresample/Makefile.in Sun Oct 8 20:52:45 2006
|
||||
@@ -7,6 +7,7 @@ CC = @CC@
|
||||
CFLAGS = @CFLAGS@ -Wall
|
||||
|
||||
@ -9,12 +9,18 @@ $OpenBSD: patch-lib-src_libresample_Makefile_in,v 1.1.1.1 2006/01/12 08:59:27 st
|
||||
|
||||
AR = @AR@
|
||||
RANLIB = @RANLIB@
|
||||
@@ -37,7 +38,7 @@ tests/compareresample: libresample.a tes
|
||||
tests/resample-sndfile: libresample.a tests/resample-sndfile.c
|
||||
@@ -34,12 +35,12 @@ tests/testresample: libresample.a $(srcd
|
||||
tests/compareresample: libresample.a $(srcdir)/tests/compareresample.c $(DIRS)
|
||||
$(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 $(DIRS)
|
||||
$(CC) -o tests/resample-sndfile \
|
||||
$(CFLAGS) tests/resample-sndfile.c \
|
||||
$(CFLAGS) $(srcdir)/tests/resample-sndfile.c \
|
||||
- libresample.a -lsndfile $(LIBS)
|
||||
+ libresample.a $(LDFLAGS) -lsndfile $(LIBS)
|
||||
|
||||
clean:
|
||||
rm -f $(TARGETS) $(OBJS)
|
||||
$(DIRS):
|
||||
mkdir $(DIRS)
|
||||
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-lib-src_portaudio_pa_unix_oss_Makefile,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
|
||||
--- lib-src/portaudio/pa_unix_oss/Makefile.orig Tue Jan 11 20:40:14 2005
|
||||
+++ lib-src/portaudio/pa_unix_oss/Makefile Tue Jan 11 20:40:47 2005
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
CC = gcc
|
||||
|
||||
-override CFLAGS += -g -O -I../pa_common
|
||||
+override CFLAGS += -I../pa_common
|
||||
PASRC = ../pa_common/pa_lib.c pa_unix_oss.c pa_unix.c
|
||||
PAINC = ../pa_common/portaudio.h
|
||||
PAOBJ = ../pa_common/pa_lib.o pa_unix_oss.o pa_unix.o
|
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-lib-src_portaudio_pa_unix_oss_Makefile_in,v 1.1 2006/10/12 14:26:04 alek Exp $
|
||||
--- lib-src/portaudio/pa_unix_oss/Makefile.in.orig Sat Oct 7 17:20:37 2006
|
||||
+++ lib-src/portaudio/pa_unix_oss/Makefile.in Sat Oct 7 17:20:39 2006
|
||||
@@ -5,7 +5,7 @@ srcdir=@srcdir@
|
||||
|
||||
DIRS=../pa_common
|
||||
|
||||
-override CFLAGS += -g -O -I$(srcdir)/../pa_common
|
||||
+override CFLAGS += -I$(srcdir)/../pa_common
|
||||
PASRC = $(srcdir)/../pa_common/pa_lib.c $(srcdir)/pa_unix_oss.c $(srcdir)/pa_unix.c
|
||||
PAINC = $(srcdir)/../pa_common/portaudio.h
|
||||
PAOBJ = ../pa_common/pa_lib.o pa_unix_oss.o pa_unix.o
|
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-lib-src_portmixer_px_unix_oss_Makefile,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
|
||||
--- lib-src/portmixer/px_unix_oss/Makefile.orig Mon Dec 26 18:29:36 2005
|
||||
+++ lib-src/portmixer/px_unix_oss/Makefile Mon Dec 26 18:29:43 2005
|
||||
$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
|
||||
|
||||
-override CFLAGS += -g -I../px_common -I../../portaudio/pa_common
|
||||
+override CFLAGS += -I../px_common -I../../portaudio/pa_common
|
||||
-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
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-lib-src_soundtouch_configure,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
|
||||
--- lib-src/soundtouch/configure.orig Sat Nov 26 18:33:39 2005
|
||||
+++ lib-src/soundtouch/configure Mon Dec 26 18:07:33 2005
|
||||
@@ -1938,7 +1938,8 @@ fi
|
||||
$OpenBSD: patch-lib-src_soundtouch_configure,v 1.2 2006/10/12 14:26:04 alek Exp $
|
||||
--- lib-src/soundtouch/configure.orig Sun Nov 27 17:47:29 2005
|
||||
+++ lib-src/soundtouch/configure Sat Oct 7 16:56:59 2006
|
||||
@@ -1976,7 +1976,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
|
||||
|
||||
|
||||
|
||||
|
14
audio/audacity/patches/patch-locale_Makefile_in
Normal file
14
audio/audacity/patches/patch-locale_Makefile_in
Normal file
@ -0,0 +1,14 @@
|
||||
$OpenBSD: patch-locale_Makefile_in,v 1.1 2006/10/12 14:26:04 alek Exp $
|
||||
--- locale/Makefile.in.orig Sun Oct 8 21:22:47 2006
|
||||
+++ locale/Makefile.in Sun Oct 8 21:22:59 2006
|
||||
@@ -71,8 +71,8 @@ FORCE:
|
||||
|
||||
install: allmo
|
||||
linguas='$(LINGUAS)'; for lang in $$linguas ; do \
|
||||
- $(INSTALL) -d $(INSTALL_PATH)$(DATADIR)/locale/$$lang/LC_MESSAGES ; \
|
||||
- $(INSTALL) -m 644 $$lang/audacity.mo $(INSTALL_PATH)$(DATADIR)/locale/$$lang/LC_MESSAGES/$(AUDACITY_NAME).mo ; \
|
||||
+ $(INSTALL) -d $(DESTDIR)$(DATADIR)/locale/$$lang/LC_MESSAGES ; \
|
||||
+ $(INSTALL) -m 644 $$lang/audacity.mo $(DESTDIR)$(DATADIR)/locale/$$lang/LC_MESSAGES/$(AUDACITY_NAME).mo ; \
|
||||
done
|
||||
|
||||
uninstall:
|
@ -1,21 +0,0 @@
|
||||
$OpenBSD: patch-src_FileFormats_cpp,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
|
||||
--- src/FileFormats.cpp.orig Tue Jan 11 21:03:34 2005
|
||||
+++ src/FileFormats.cpp Tue Jan 11 21:04:34 2005
|
||||
@@ -242,7 +242,7 @@ OSType MacNames[NUM_HEADERS] = {
|
||||
'8SVX', // Amiga IFF / SVX8
|
||||
'NIST', // ??? NIST/Sphere
|
||||
'VOC ', // VOC
|
||||
- '????', // ?? Propellorheads Rex
|
||||
+ '\?\?\?\?', // ?? Propellorheads Rex
|
||||
'SF ', // ?? IRCAM
|
||||
'W64 ', // ?? Wave64
|
||||
'MAT4', // ?? Matlab 4
|
||||
@@ -256,7 +256,7 @@ OSType sf_header_mactype(int format)
|
||||
else if (format>=0 && format<NUM_HEADERS)
|
||||
return MacNames[format];
|
||||
else
|
||||
- return '????';
|
||||
+ return '\?\?\?\?';
|
||||
}
|
||||
|
||||
#endif // __WXMAC__
|
@ -1,55 +0,0 @@
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
|
||||
--- src/Makefile.in.orig Sat Nov 26 18:33:31 2005
|
||||
+++ src/Makefile.in Mon Dec 26 18:34:14 2005
|
||||
@@ -28,8 +28,9 @@ PRECOMP_CFLAGS = @PRECOMP_CFLAGS@
|
||||
|
||||
EXTRAOBJS = @EXTRAOBJS@
|
||||
OPTOBJS = @OPTOBJS@
|
||||
-LIBS = @LIBS@
|
||||
+LIBS = @LIBS@ -lossaudio
|
||||
EXTRATARGETS = @EXTRATARGETS@
|
||||
+LDFLAGS = @LDFLAGS@
|
||||
|
||||
########################################
|
||||
# ALL OBJECT FILES
|
||||
@@ -53,7 +54,6 @@ OBJS = \
|
||||
$(OBJDIR)/Help.o \
|
||||
$(OBJDIR)/HistoryWindow.o \
|
||||
$(OBJDIR)/ImageManipulation.o \
|
||||
- $(OBJDIR)/Internat.o \
|
||||
$(OBJDIR)/LabelTrack.o \
|
||||
$(OBJDIR)/Languages.o \
|
||||
$(OBJDIR)/LangChoice.o \
|
||||
@@ -136,7 +136,6 @@ OBJS = \
|
||||
$(OBJDIR)/widgets/Ruler.o \
|
||||
$(OBJDIR)/widgets/Warning.o \
|
||||
$(OBJDIR)/xml/XMLFileReader.o \
|
||||
- $(OBJDIR)/xml/XMLTagHandler.o \
|
||||
|
||||
TEMPORARILY_DISABLED_IMPORTER_OBJS = \
|
||||
$(OBJDIR)/import/ImportMIDI.o \
|
||||
@@ -147,6 +146,7 @@ LIBAUDACITY_OBJS = \
|
||||
$(OBJDIR)/BlockFile.o \
|
||||
$(OBJDIR)/Dither.o \
|
||||
$(OBJDIR)/FileFormats.o \
|
||||
+ $(OBJDIR)/Internat.o \
|
||||
$(OBJDIR)/Prefs.o \
|
||||
$(OBJDIR)/SampleFormat.o \
|
||||
$(OBJDIR)/blockfile/LegacyBlockFile.o \
|
||||
@@ -154,6 +154,7 @@ LIBAUDACITY_OBJS = \
|
||||
$(OBJDIR)/blockfile/SilentBlockFile.o \
|
||||
$(OBJDIR)/blockfile/SimpleBlockFile.o \
|
||||
$(OBJDIR)/blockfile/PCMAliasBlockFile.o \
|
||||
+ $(OBJDIR)/xml/XMLTagHandler.o \
|
||||
|
||||
#
|
||||
# We stick object files in separate directories for convenience
|
||||
@@ -179,7 +180,7 @@ libaudacity.a: $(DIRS) $(LIBAUDACITY_OBJ
|
||||
ar rcs libaudacity.a $(LIBAUDACITY_OBJS)
|
||||
|
||||
../audacity: $(DIRS) $(OBJS) $(EXTRAOBJS) $(OPTOBJS) libaudacity.a Makefile
|
||||
- $(CCC) -o ../audacity $(OBJS) $(OPTOBJS) $(EXTRAOBJS) libaudacity.a $(LIBS)
|
||||
+ $(CCC) -o ../audacity $(LDFLAGS) $(OBJS) $(OPTOBJS) $(EXTRAOBJS) libaudacity.a $(LIBS)
|
||||
|
||||
#
|
||||
# Mac OS X application
|
@ -1,45 +1,7 @@
|
||||
$OpenBSD: patch-src_export_ExportMP3_cpp,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
|
||||
--- src/export/ExportMP3.cpp.orig Sun Nov 27 03:33:32 2005
|
||||
+++ src/export/ExportMP3.cpp Sat Dec 31 12:30:31 2005
|
||||
@@ -130,28 +130,6 @@ bool MP3Exporter::FindLibrary(wxWindow *
|
||||
|
||||
if (extension != "")
|
||||
baseName += "." + extension;
|
||||
-
|
||||
- if (baseName.CmpNoCase(GetLibraryName())) {
|
||||
-
|
||||
- wxString question;
|
||||
- question.Printf(_("Audacity was expecting a library named \"%s\". "
|
||||
- "Are you sure you want to attempt to export MP3 "
|
||||
- "files using \"%s\"?"),
|
||||
- (const char *)GetLibraryName(),
|
||||
- (const char *)baseName);
|
||||
-
|
||||
- int action = wxMessageBox(question,
|
||||
- _("Export MP3"),
|
||||
- wxYES_NO | wxICON_EXCLAMATION,
|
||||
- parent);
|
||||
-
|
||||
- if (action != wxYES) {
|
||||
- mLibPath = "";
|
||||
- gPrefs->Write("/MP3/MP3LibPath", mLibPath);
|
||||
-
|
||||
- return false;
|
||||
- }
|
||||
- }
|
||||
}
|
||||
else {
|
||||
mLibPath = "";
|
||||
@@ -242,7 +220,7 @@ bool MP3Exporter::FindLibrary(wxWindow *
|
||||
|
||||
wxString GetLibraryPath()
|
||||
{
|
||||
- return "/usr/lib";
|
||||
+ return "!!LOCALBASE!!/lib";
|
||||
}
|
||||
|
||||
wxString GetLibraryName()
|
||||
@@ -252,7 +230,7 @@ bool MP3Exporter::FindLibrary(wxWindow *
|
||||
$OpenBSD: patch-src_export_ExportMP3_cpp,v 1.2 2006/10/12 14:26:04 alek Exp $
|
||||
--- src/export/ExportMP3.cpp.orig Sun Nov 27 17:47:27 2005
|
||||
+++ src/export/ExportMP3.cpp Sat Oct 7 16:57:00 2006
|
||||
@@ -250,7 +250,7 @@ bool MP3Exporter::FindLibrary(wxWindow *
|
||||
|
||||
wxString GetLibraryTypeString()
|
||||
{
|
||||
@ -48,7 +10,7 @@ $OpenBSD: patch-src_export_ExportMP3_cpp,v 1.1.1.1 2006/01/12 08:59:27 steven Ex
|
||||
}
|
||||
|
||||
wxString GetLibraryMessage()
|
||||
@@ -260,10 +238,12 @@ bool MP3Exporter::FindLibrary(wxWindow *
|
||||
@@ -258,10 +258,12 @@ bool MP3Exporter::FindLibrary(wxWindow *
|
||||
/* i18n-hint: This message is used on Unix/Linux */
|
||||
return _("Audacity does not export MP3 files directly, but instead uses the \n"
|
||||
"freely available LAME library to handle MP3 file encoding. You must \n"
|
||||
|
@ -1,8 +1,8 @@
|
||||
$OpenBSD: patch-tests_Makefile_in,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
|
||||
--- tests/Makefile.in.orig Mon Dec 26 18:18:46 2005
|
||||
+++ tests/Makefile.in Mon Dec 26 18:19:21 2005
|
||||
@@ -20,7 +20,7 @@ TESTS = \
|
||||
SimpleBlockFileTest \
|
||||
$OpenBSD: patch-tests_Makefile_in,v 1.2 2006/10/12 14:26:04 alek Exp $
|
||||
--- tests/Makefile.in.orig Sun Nov 27 17:47:27 2005
|
||||
+++ tests/Makefile.in Sat Oct 7 16:57:00 2006
|
||||
@@ -21,7 +21,7 @@ TESTS = \
|
||||
SequenceTest \
|
||||
|
||||
$(TESTS): %: %.cpp ../src/libaudacity.a
|
||||
- $(CXX) -o $@ $< $(CXXFLAGS) $(CPPFLAGS) $(LIBS)
|
||||
|
@ -1,14 +0,0 @@
|
||||
$OpenBSD: patch-tests_SimpleBlockFileTest_cpp,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
|
||||
--- tests/SimpleBlockFileTest.cpp.orig Sat Nov 26 18:33:32 2005
|
||||
+++ tests/SimpleBlockFileTest.cpp Mon Dec 26 21:19:17 2005
|
||||
@@ -37,8 +37,8 @@ public:
|
||||
for(i = 0; i < dataLen; i++)
|
||||
{
|
||||
// These have no significance, it's just random data
|
||||
- int16Data[i] = (i*i);
|
||||
- int24Data[i] = (i*i*i) & 0x00FFFFFF;
|
||||
+ int16Data[i] = ((short)i*i);
|
||||
+ int24Data[i] = (i*i*i) & 0x000FFFFF;
|
||||
float j = (float) i;
|
||||
floatData[i] = j/((j*j)+1);
|
||||
}
|
@ -1,6 +1,8 @@
|
||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2006/01/12 08:59:27 steven Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.2 2006/10/12 14:26:04 alek Exp $
|
||||
bin/audacity
|
||||
@man man/man1/audacity.1
|
||||
share/applications/
|
||||
share/applications/audacity.desktop
|
||||
share/audacity/
|
||||
share/audacity/audacity-1.2-help.htb
|
||||
share/audacity/nyquist/
|
||||
@ -117,3 +119,6 @@ share/locale/zh/LC_MESSAGES/audacity.mo
|
||||
share/locale/zh_TW/
|
||||
share/locale/zh_TW/LC_MESSAGES/
|
||||
share/locale/zh_TW/LC_MESSAGES/audacity.mo
|
||||
share/mime/
|
||||
share/mime/packages/
|
||||
share/mime/packages/audacity.xml
|
||||
|
Loading…
x
Reference in New Issue
Block a user