diff --git a/package/base/mad/mad.conf b/package/base/mad/mad.conf index c7a261598..916b652f9 100644 --- a/package/base/mad/mad.conf +++ b/package/base/mad/mad.conf @@ -27,3 +27,9 @@ if pkginstalled alsa; then elif pkginstalled esd; then var_append confopt " " "--with-esd" fi + +# needed for pkgconfig.patch.libmad +versionhotfix 0.15.1b +preconf='if [ ${xsrctar/-[0-9]*/} = libmad ]; then touch NEWS AUTHORS ChangeLog; autogen=1; else autogen=0; fi' +postmake='if [ ${xsrctar/-[0-9]*/} = libmad ]; then cp $libdir/pkgconfig/libmad.pc $libdir/pkgconfig/mad.pc; fi' + diff --git a/package/base/mad/pkgconfig.patch.libmad b/package/base/mad/pkgconfig.patch.libmad new file mode 100644 index 000000000..e811e976e --- /dev/null +++ b/package/base/mad/pkgconfig.patch.libmad @@ -0,0 +1,41 @@ +diff -urN libmad-0.15.0b.orig/configure.ac libmad-0.15.0b/configure.ac +--- libmad-0.15.0b.orig/configure.ac 2003-06-05 06:27:07 +0400 ++++ libmad-0.15.0b/configure.ac 2003-11-03 19:43:10 +0300 +@@ -429,4 +429,5 @@ + + AC_CONFIG_FILES([Makefile msvc++/Makefile \ + libmad.list]) +-AC_OUTPUT ++AC_OUTPUT(libmad.pc) ++ +diff -urN libmad-0.15.0b.orig/libmad.pc.in libmad-0.15.0b/libmad.pc.in +--- libmad-0.15.0b.orig/libmad.pc.in 1970-01-01 03:00:00 +0300 ++++ libmad-0.15.0b/libmad.pc.in 2003-11-03 19:44:02 +0300 +@@ -0,0 +1,12 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: libmad ++Description: MPEG Audio Decoder Library ++Requires: ++Version: @VERSION@ ++Libs: -L${libdir} -lmad -lm ++Cflags: -I${includedir} ++ +diff -urN libmad-0.15.0b.orig/Makefile.am libmad-0.15.0b/Makefile.am +--- libmad-0.15.0b.orig/Makefile.am 2003-06-04 11:36:57 +0400 ++++ libmad-0.15.0b/Makefile.am 2003-11-03 19:44:54 +0300 +@@ -33,7 +33,10 @@ + minimad_INCLUDES = + minimad_LDADD = libmad.la + +-EXTRA_DIST = mad.h.sed \ ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = libmad.pc ++ ++EXTRA_DIST = mad.h.sed $(pkgconfig_DATA) \ + CHANGES COPYRIGHT CREDITS README TODO VERSION + + exported_headers = version.h fixed.h bit.h timer.h stream.h frame.h \ diff --git a/package/sirkull/audacity/audacity.desc b/package/sirkull/audacity/audacity.desc index 04b97f5c6..fd1ef6b96 100644 --- a/package/sirkull/audacity/audacity.desc +++ b/package/sirkull/audacity/audacity.desc @@ -38,8 +38,8 @@ [L] GPL [S] Stable -[V] 2004-12-17 +[V] 1.3.4 [P] X --?--5---9 217.100 -[D] X audacity-src-2004-12-17.tar.bz2 cvs://pserver:anonymous@audacity.cvs.sourceforge.net:/cvsroot/audacity::audacity/!2004-12-17/ +[D] 2864637845 audacity-src-1.3.4.tar.bz2 http://heanet.dl.sourceforge.net/sourceforge/audacity/ diff --git a/package/sirkull/audacity/flac_hotfixes.patch b/package/sirkull/audacity/flac_hotfixes.patch deleted file mode 100644 index 024afccb3..000000000 --- a/package/sirkull/audacity/flac_hotfixes.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ./lib-src/libflac/include/FLAC/seekable_stream_decoder.h.orig 2006-04-28 10:00:26.000000000 +0200 -+++ ./lib-src/libflac/include/FLAC/seekable_stream_decoder.h 2006-04-28 10:00:32.000000000 +0200 -@@ -681,7 +681,7 @@ - * \retval FLAC__StreamDecoderState - * The stream decoder state. - */ --FLAC__StreamDecoderState FLAC__seekable_stream_decoder_get_stream_decoder_state(const FLAC__SeekableStreamDecoder *decoder); -+FLAC__SeekableStreamDecoderState FLAC__seekable_stream_decoder_get_stream_decoder_state(const FLAC__SeekableStreamDecoder *decoder); - - /** Get the "MD5 signature checking" flag. - * This is the value of the setting, not whether or not the decoder is ---- ./lib-src/libflac/src/libFLAC++/seekable_stream_decoder.cc.orig 2006-04-28 10:02:47.000000000 +0200 -+++ ./lib-src/libflac/src/libFLAC++/seekable_stream_decoder.cc 2006-04-28 10:03:39.000000000 +0200 -@@ -99,7 +99,7 @@ - Stream::State SeekableStream::get_stream_decoder_state() const - { - FLAC__ASSERT(is_valid()); -- return Stream::State(::FLAC__seekable_stream_decoder_get_stream_decoder_state(decoder_)); -+ return Stream::State((FLAC__StreamDecoderState)::FLAC__seekable_stream_decoder_get_stream_decoder_state(decoder_)); - } - - bool SeekableStream::get_md5_checking() const diff --git a/package/sirkull/audacity/getstylehotfix.patch b/package/sirkull/audacity/getstylehotfix.patch new file mode 100644 index 000000000..e6c5a72d8 --- /dev/null +++ b/package/sirkull/audacity/getstylehotfix.patch @@ -0,0 +1,21 @@ +--- audacity-src-1.3.4-beta/lib-src/FileDialog/gtk/FileDialogPrivate.cpp 2007-11-13 23:01:48.000000000 +0100 ++++ audacity-src-1.3.4-beta/lib-src/FileDialog/gtk/FileDialogPrivate.cpp 2008-03-14 23:29:08.000000000 +0100 +@@ -68,7 +68,7 @@ + extern "C" { + static void gtk_filedialog_ok_callback(GtkWidget *widget, FileDialog *dialog) + { +- int style = dialog->GetStyle(); ++ int style = 0; // dialog->GetStyle(); + gchar* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)); + + // gtk version numbers must be identical with the one in ctor (that calls set_do_overwrite_confirmation) +@@ -453,7 +453,8 @@ + #if defined(__WXGTK24__) && (!defined(__WXGPE__)) + if (!gtk_check_version(2,4,0)) + { +- if (GetStyle() & wxSAVE) ++ // if (GetStyle() & wxSAVE) ++ if (0 & wxSAVE) + gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(name)); + else + SetPath(wxFileName(GetDirectory(), name).GetFullPath());