rpms/mplayer/devel mplayer-r27449.patch, NONE, 1.1 mplayer.spec, 1.1, 1.2
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4820
Modified Files:
mplayer.spec
Added Files:
mplayer-r27449.patch
Log Message:
* Sun Aug 17 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.96.20080613svn
- live-devel is now live555-devel
- added missing libXScrnSaver-devel BR
- fixed audio in some rtsp streams (backport from SVN)
mplayer-r27449.patch:
--- NEW FILE mplayer-r27449.patch ---
Index: libmpdemux/demux_rtp_codec.cpp
===================================================================
--- libmpdemux/demux_rtp_codec.cpp (revision 27448)
+++ libmpdemux/demux_rtp_codec.cpp (revision 27449)
@@ -198,6 +198,7 @@
sh_audio->wf = wf;
demux_stream_t* d_audio = demuxer->audio;
d_audio->sh = sh_audio; sh_audio->ds = d_audio;
+ d_audio->id = sh_audio->aid;
wf->nChannels = subsession->numChannels();
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mplayer.spec 9 Aug 2008 09:32:32 -0000 1.1
+++ mplayer.spec 17 Aug 2008 21:48:07 -0000 1.2
@@ -7,7 +7,7 @@
Name: mplayer
Version: 1.0
-Release: 0.95.%{pre}%{?dist}
+Release: 0.96.%{pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
Group: Applications/Multimedia
@@ -23,6 +23,7 @@
Patch5: %{name}-x86_32-compile.patch
Patch8: %{name}-manlinks.patch
Patch10: %{name}-qcelp.patch
+Patch11: %{name}-r27449.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel
@@ -44,6 +45,7 @@
BuildRequires: lame-devel
BuildRequires: libGL-devel
BuildRequires: libXinerama-devel
+BuildRequires: libXScrnSaver-devel
BuildRequires: libXv-devel
BuildRequires: libXvMC-devel
BuildRequires: libXxf86dga-devel
@@ -57,7 +59,7 @@
BuildRequires: libtheora-devel
BuildRequires: libvorbis-devel
BuildRequires: lirc-devel
-BuildRequires: live-devel
+BuildRequires: live555-devel
BuildRequires: lzo-devel >= 2
BuildRequires: pulseaudio-lib-devel
BuildRequires: speex-devel >= 1.1
@@ -142,6 +144,7 @@
%patch5 -p1 -b .compile
%patch8 -p1 -b .manlinks
%patch10 -p1 -b .qclp
+%patch11 -p0
doconv() {
iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \
@@ -388,6 +391,11 @@
%changelog
+* Sun Aug 17 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.96.20080613svn
+- live-devel is now live555-devel
+- added missing libXScrnSaver-devel BR
+- fixed audio in some rtsp streams (backport from SVN)
+
* Sat Aug 09 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.0-0.95.20080613svn
- rebuild
15 years, 8 months
rpms/vdr-dxr3/F-8 vdr-dxr3-0.2.7-new-ffmpeg.patch, 1.1, 1.2 vdr-dxr3.spec, 1.1, 1.2
by Felix Kaechele
Author: felix
Update of /cvs/free/rpms/vdr-dxr3/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14001
Modified Files:
vdr-dxr3-0.2.7-new-ffmpeg.patch vdr-dxr3.spec
Log Message:
* Mon Aug 11 2008 Felix Kaechele <felix at fetzig dot org> - 0.2.7-4
- updated patch to new ffmpeg
vdr-dxr3-0.2.7-new-ffmpeg.patch:
Index: vdr-dxr3-0.2.7-new-ffmpeg.patch
===================================================================
RCS file: /cvs/free/rpms/vdr-dxr3/F-8/vdr-dxr3-0.2.7-new-ffmpeg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdr-dxr3-0.2.7-new-ffmpeg.patch 4 Aug 2008 19:50:00 -0000 1.1
+++ vdr-dxr3-0.2.7-new-ffmpeg.patch 17 Aug 2008 18:02:06 -0000 1.2
@@ -1,11 +1,6 @@
-Index: dxr3ffmpeg.c
-===================================================================
-RCS file: /cvsroot/dxr3plugin/dxr3/dxr3ffmpeg.c,v
-retrieving revision 1.2.2.10
-retrieving revision 1.2.2.12
-diff -u -r1.2.2.10 -r1.2.2.12
---- dxr3ffmpeg.c 7 Jan 2007 21:59:01 -0000 1.2.2.10
-+++ dxr3ffmpeg.c 13 Aug 2007 08:10:04 -0000 1.2.2.12
+diff -ruN dxr3-0.2.7.orig/dxr3ffmpeg.c dxr3-0.2.7/dxr3ffmpeg.c
+--- dxr3-0.2.7.orig/dxr3ffmpeg.c 2007-01-07 22:57:12.000000000 +0100
++++ dxr3-0.2.7/dxr3ffmpeg.c 2008-08-11 18:40:28.000000000 +0200
@@ -28,8 +28,10 @@
cDxr3Ffmpeg::cDxr3Ffmpeg()
{
@@ -19,3 +14,15 @@
}
// ==================================
+diff -ruN dxr3-0.2.7.orig/dxr3ffmpeg.h dxr3-0.2.7/dxr3ffmpeg.h
+--- dxr3-0.2.7.orig/dxr3ffmpeg.h 2007-01-07 22:57:14.000000000 +0100
++++ dxr3-0.2.7/dxr3ffmpeg.h 2008-08-11 18:54:50.000000000 +0200
+@@ -24,7 +24,7 @@
+
+ extern "C"
+ {
+-#include <avcodec.h>
++#include <libavcodec/avcodec.h>
+ }
+
+ #include <string.h>
Index: vdr-dxr3.spec
===================================================================
RCS file: /cvs/free/rpms/vdr-dxr3/F-8/vdr-dxr3.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdr-dxr3.spec 4 Aug 2008 19:50:00 -0000 1.1
+++ vdr-dxr3.spec 17 Aug 2008 18:02:06 -0000 1.2
@@ -4,7 +4,7 @@
Name: vdr-%{pname}
Version: 0.2.7
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Hollywood+/DXR3 output plugin for VDR
Group: Applications/Multimedia
@@ -29,7 +29,7 @@
%prep
%setup -q -n %{pname}-%{version}
-%patch0
+%patch0 -p1
for f in CONTRIBUTORS HISTORY TROUBLESHOOTING ; do
iconv -f iso-8859-1 -t utf-8 $f > $f.utf-8 ; mv $f.utf-8 $f
done
@@ -63,6 +63,9 @@
%changelog
+* Mon Aug 11 2008 Felix Kaechele <felix at fetzig dot org> - 0.2.7-4
+- updated patch to new ffmpeg
+
* Mon Aug 04 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.2.7-3
- rebuild
15 years, 8 months
rpms/live555/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/live555/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvswo9047/rpms/live555/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module live555
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: live555
# $Id: Makefile,v 1.1 2008/08/17 16:33:43 thl Exp $
NAME := live555
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
--- NEW FILE sources ---
15 years, 8 months
rpms/live555 Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/live555
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvswo9047/rpms/live555
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module live555
--- NEW FILE Makefile ---
# Top level Makefile for module live555
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
--- NEW FILE import.log ---
--- NEW FILE pkg.acl ---
15 years, 8 months
rpms/live555/devel - New directory
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/live555/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvswo9047/rpms/live555/devel
Log Message:
Directory /cvs/free/rpms/live555/devel added to the repository
15 years, 8 months
rpms/live555 - New directory
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/live555
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvswo9047/rpms/live555
Log Message:
Directory /cvs/free/rpms/live555 added to the repository
15 years, 8 months
rpms/audacity-freeworld/devel audacity-freeworld.spec,1.1,1.2
by David Timms
Author: dtimms
Update of /cvs/free/rpms/audacity-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7239
Modified Files:
audacity-freeworld.spec
Log Message:
fix missed Release field increment
Index: audacity-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/devel/audacity-freeworld.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audacity-freeworld.spec 17 Aug 2008 15:51:49 -0000 1.1
+++ audacity-freeworld.spec 17 Aug 2008 15:56:45 -0000 1.2
@@ -3,7 +3,7 @@
Name: audacity-freeworld
Version: 1.3.5
-Release: 0.1.beta%{?dist}
+Release: 0.2.beta%{?dist}
Summary: Multitrack audio editor
Group: Applications/Multimedia
License: GPLv2
15 years, 8 months
rpms/audacity-freeworld/devel audacity-1.3.2-CVE-2007-6061.patch, NONE, 1.1 audacity-1.3.2-FLAC.patch, NONE, 1.1 audacity-1.3.2-allegro-cflags.patch, NONE, 1.1 audacity-1.3.2-destdir.patch, NONE, 1.1 audacity-1.3.2-expat2.patch, NONE, 1.1 audacity-1.3.2-exportmp3.patch, NONE, 1.1 audacity-1.3.2-fr.patch, NONE, 1.1 audacity-1.3.2-gcc43.patch, NONE, 1.1 audacity-1.3.2-jack-api-109.patch, NONE, 1.1 audacity-1.3.2-libdir.patch, NONE, 1.1 audacity-1.3.2-libmp3lame-default.patch, NONE, 1.1 audacity-1.3.2-resample
by David Timms
Author: dtimms
Update of /cvs/free/rpms/audacity-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6835/devel
Modified Files:
.cvsignore sources
Added Files:
audacity-1.3.2-CVE-2007-6061.patch audacity-1.3.2-FLAC.patch
audacity-1.3.2-allegro-cflags.patch
audacity-1.3.2-destdir.patch audacity-1.3.2-expat2.patch
audacity-1.3.2-exportmp3.patch audacity-1.3.2-fr.patch
audacity-1.3.2-gcc43.patch audacity-1.3.2-jack-api-109.patch
audacity-1.3.2-libdir.patch
audacity-1.3.2-libmp3lame-default.patch
audacity-1.3.2-resample.patch
audacity-1.3.2-soundtouch-cxxflags.patch
audacity-1.3.4-gcc43.patch audacity-1.3.4-libdir.patch
audacity-1.3.4-libmp3lame-default.patch
audacity-1.3.5-fr.patch audacity-freeworld.spec
audacity.desktop audacity.png audacity13.desktop
Log Message:
Initial import of livna-devel package, renamed to -freeworld
audacity-1.3.2-CVE-2007-6061.patch:
--- NEW FILE audacity-1.3.2-CVE-2007-6061.patch ---
diff -Nur audacity-src-1.3.2-beta-orig/src/AudacityApp.cpp audacity-src-1.3.2-beta/src/AudacityApp.cpp
--- audacity-src-1.3.2-beta-orig/src/AudacityApp.cpp 2006-10-29 01:05:26.000000000 +0200
+++ audacity-src-1.3.2-beta/src/AudacityApp.cpp 2008-05-02 17:46:49.000000000 +0200
@@ -821,7 +821,7 @@
if (tempFromPrefs != wxT("")) {
if (wxDirExists(tempFromPrefs))
temp = tempFromPrefs;
- else if (wxMkdir(tempFromPrefs))
+ else if (wxMkdir(tempFromPrefs, 0755))
temp = tempFromPrefs;
}
@@ -830,10 +830,21 @@
if (temp==wxT("") && tempDefaultLoc != wxT("")) {
if (wxDirExists(tempDefaultLoc))
temp = tempDefaultLoc;
- else if (wxMkdir(tempDefaultLoc))
+ else if (wxMkdir(tempDefaultLoc, 0755))
temp = tempDefaultLoc;
}
+ // Check temp directory ownership.
+ struct stat tempStatBuf;
+ if ( lstat(temp.mb_str(), &tempStatBuf) != 0 ) {
+ temp.clear();
+ }
+ else {
+ if ( geteuid() != tempStatBuf.st_uid ) {
+ temp.clear();
+ }
+ }
+
if (temp == wxT("")) {
// Failed
wxMessageBox(_("Audacity could not find a place to store temporary files.\nPlease enter an appropriate directory in the preferences dialog."));
audacity-1.3.2-FLAC.patch:
--- NEW FILE audacity-1.3.2-FLAC.patch ---
diff -Nur audacity-src-1.3.2-beta-orig/configure audacity-src-1.3.2-beta/configure
--- audacity-src-1.3.2-beta-orig/configure 2006-10-29 01:05:36.000000000 +0200
+++ audacity-src-1.3.2-beta/configure 2007-02-24 03:12:59.000000000 +0100
@@ -5162,9 +5162,9 @@
- { echo "$as_me:$LINENO: checking for FLAC__file_decoder_new in -lFLAC" >&5
-echo $ECHO_N "checking for FLAC__file_decoder_new in -lFLAC... $ECHO_C" >&6; }
-if test "${ac_cv_lib_FLAC_FLAC__file_decoder_new+set}" = set; then
+ { echo "$as_me:$LINENO: checking for FLAC__stream_decoder_init_file in -lFLAC" >&5
+echo $ECHO_N "checking for FLAC__stream_decoder_init_file in -lFLAC... $ECHO_C" >&6; }
+if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_init_file+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -5182,11 +5182,11 @@
#ifdef __cplusplus
extern "C"
#endif
-char FLAC__file_decoder_new ();
+char FLAC__stream_decoder_init_file ();
int
main ()
{
-return FLAC__file_decoder_new ();
+return FLAC__stream_decoder_init_file ();
;
return 0;
}
@@ -5225,21 +5225,21 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_FLAC_FLAC__file_decoder_new=yes
+ ac_cv_lib_FLAC_FLAC__stream_decoder_init_file=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_FLAC_FLAC__file_decoder_new=no
+ ac_cv_lib_FLAC_FLAC__stream_decoder_init_file=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__file_decoder_new" >&5
-echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__file_decoder_new" >&6; }
-if test $ac_cv_lib_FLAC_FLAC__file_decoder_new = yes; then
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__stream_decoder_init_file" >&5
+echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__stream_decoder_init_file" >&6; }
+if test $ac_cv_lib_FLAC_FLAC__stream_decoder_init_file = yes; then
lib_found="yes"
else
lib_found="no"
diff -Nur audacity-src-1.3.2-beta-orig/src/export/ExportFLAC.cpp audacity-src-1.3.2-beta/src/export/ExportFLAC.cpp
--- audacity-src-1.3.2-beta-orig/src/export/ExportFLAC.cpp 2006-10-29 01:05:27.000000000 +0200
+++ audacity-src-1.3.2-beta/src/export/ExportFLAC.cpp 2007-02-24 03:09:44.000000000 +0100
@@ -58,7 +58,6 @@
gPrefs->Read(wxT("/FileFormats/FLACBitDepth"), wxT("16"));
FLAC::Encoder::File *encoder= new FLAC::Encoder::File();
- encoder->set_filename(OSFILENAME(fName));
encoder->set_channels(numChannels);
encoder->set_sample_rate(int(rate + 0.5));
@@ -72,7 +71,7 @@
format=int16Sample;
encoder->set_bits_per_sample(16);
}
- encoder->init();
+ encoder->init(OSFILENAME(fName));
int numWaveTracks;
WaveTrack **waveTracks;
diff -Nur audacity-src-1.3.2-beta-orig/src/import/ImportFLAC.cpp audacity-src-1.3.2-beta/src/import/ImportFLAC.cpp
--- audacity-src-1.3.2-beta-orig/src/import/ImportFLAC.cpp 2006-10-29 01:05:28.000000000 +0200
+++ audacity-src-1.3.2-beta/src/import/ImportFLAC.cpp 2007-02-24 03:04:04.000000000 +0100
@@ -264,19 +264,15 @@
bool FLACImportFileHandle::Init()
{
- bool success = mFile->set_filename(OSFILENAME(mName));
- if (!success) {
- return false;
- }
- FLAC::Decoder::File::State state = mFile->init();
- if (state != FLAC__FILE_DECODER_OK) {
+ FLAC__StreamDecoderInitStatus state = mFile->init(OSFILENAME(mName));
+ if (state != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
return false;
}
mFile->process_until_end_of_metadata();
- state = mFile->get_state();
- if (state != FLAC__FILE_DECODER_OK) {
- return false;
- }
+ // FLAC__StreamDecoderState decstate = mFile->get_state();
+ // if (state != FLAC__STREAM_DECODER_FILE_DECODER_OK) {
+ // return false;
+ // }
if (!mFile->is_valid() || mFile->get_was_error())
{
// This probably is not a FLAC file at all
@@ -340,7 +336,7 @@
mChannels[1]->SetTeamed(true);
}
- mFile->process_until_end_of_file();
+ mFile->process_until_end_of_stream();
*outTracks = new Track *[*outNumTracks];
for(c = 0; c < *outNumTracks; c++) {
audacity-1.3.2-allegro-cflags.patch:
--- NEW FILE audacity-1.3.2-allegro-cflags.patch ---
diff -Nur audacity-src-1.3.2-beta-orig/lib-src/allegro/Makefile.in audacity-src-1.3.2-beta/lib-src/allegro/Makefile.in
--- audacity-src-1.3.2-beta-orig/lib-src/allegro/Makefile.in 2006-10-29 01:05:59.000000000 +0200
+++ audacity-src-1.3.2-beta/lib-src/allegro/Makefile.in 2008-03-22 10:26:33.000000000 +0100
@@ -4,7 +4,7 @@
CCC = @CXX@
srcdir=@srcdir@
-CFLAGS = -g -O
+CFLAGS = @CFLAGS@
CPPOBJ = \
allegro.cpp.o \
allegrord.cpp.o \
audacity-1.3.2-destdir.patch:
--- NEW FILE audacity-1.3.2-destdir.patch ---
--- audacity-src-1.3.2-beta/locale/Makefile.in.destdir 2007-01-05 21:48:15.000000000 +0100
+++ audacity-src-1.3.2-beta/locale/Makefile.in 2007-01-05 21:48:29.000000000 +0100
@@ -17,7 +17,7 @@
INSTALL=@INSTALL@
AUDACITY_NAME=@AUDACITY_NAME@
ifdef DESTDIR
- INSTALL_PATH=$(top_srcdir)/$(DESTDIR)
+ INSTALL_PATH=$(DESTDIR)
else
INSTALL_PATH=
endif
audacity-1.3.2-expat2.patch:
--- NEW FILE audacity-1.3.2-expat2.patch ---
diff -Nur audacity-src-1.3.2-beta-orig/src/xml/XMLFileReader.cpp audacity-src-1.3.2-beta/src/xml/XMLFileReader.cpp
--- audacity-src-1.3.2-beta-orig/src/xml/XMLFileReader.cpp 2006-10-29 01:05:26.000000000 +0200
+++ audacity-src-1.3.2-beta/src/xml/XMLFileReader.cpp 2007-08-28 12:11:08.000000000 +0200
@@ -61,9 +61,9 @@
size_t len = fread(buffer, 1, bufferSize, theXMLFile.fp());
done = (len < bufferSize);
if (!XML_Parse(mParser, buffer, len, done)) {
- mErrorStr.Printf(_("Error: %hs at line %d"),
+ mErrorStr.Printf(_("Error: %hs at line %lu"),
XML_ErrorString(XML_GetErrorCode(mParser)),
- XML_GetCurrentLineNumber(mParser));
+ (long unsigned int)XML_GetCurrentLineNumber(mParser));
theXMLFile.Close();
return false;
}
audacity-1.3.2-exportmp3.patch:
--- NEW FILE audacity-1.3.2-exportmp3.patch ---
diff -Nur audacity-src-1.3.2-beta-orig/src/export/ExportMP3.cpp audacity-src-1.3.2-beta/src/export/ExportMP3.cpp
--- audacity-src-1.3.2-beta-orig/src/export/ExportMP3.cpp 2006-10-29 01:05:27.000000000 +0200
+++ audacity-src-1.3.2-beta/src/export/ExportMP3.cpp 2007-02-24 01:29:37.000000000 +0100
@@ -370,7 +370,7 @@
lame_set_num_channels(mGF, channels);
lame_set_in_samplerate(mGF, sampleRate);
- lame_set_out_samplerate(mGF, sampleRate);
+ lame_set_out_samplerate(mGF, 0);
lame_init_params(mGF);
audacity-1.3.2-fr.patch:
--- NEW FILE audacity-1.3.2-fr.patch ---
diff -Nur audacity-src-1.3.2-beta-orig/locale/fr.po audacity-src-1.3.2-beta/locale/fr.po
--- audacity-src-1.3.2-beta-orig/locale/fr.po 2006-10-29 01:06:02.000000000 +0200
+++ audacity-src-1.3.2-beta/locale/fr.po 2007-02-15 23:28:47.000000000 +0100
@@ -17,7 +17,7 @@
"Max spike width (higher is more sensitive)"
msgstr ""
"\n"
-"Largeur maximum du pic (la sensibilit augmente avec la largeur)"
+"Largeur maximum du pic (la sensibilité augmente avec la largeur)"
#: ../src/Menus.cpp:3703
msgid ""
@@ -34,11 +34,11 @@
msgstr ""
"\n"
" \n"
-"Slectionnez le seuil (la sensibilit diminue avec le seuil)"
+"Sélectionnez le seuil (la sensibilité diminue avec le seuil)"
#: ../src/widgets/AButton.cpp:181
msgid " (disabled)"
-msgstr " (dsactiv)"
+msgstr " (désactivé)"
#: ../src/import/Import.cpp:86
msgid ""
@@ -82,14 +82,14 @@
"\n"
"It has been removed from the history list."
msgstr ""
-"%s n'existe pas et ne peut tre ouvert.\n"
+"%s n'existe pas et ne peut être ouvert.\n"
"\n"
-"Il a t retir de l'historique."
+"Il a été retiré de l'historique."
#: ../src/AudacityApp.cpp:279 ../src/Project.cpp:1891
#, c-format
msgid "%s is already open in another window."
-msgstr "%s est dj ouvert dans une autre fentre."
+msgstr "%s est déjà ouvert dans une autre fenêtre."
# i18n-hint: This is the pattern for filenames that are created
# when a file needs to be backed up to a different name. For
@@ -111,7 +111,7 @@
#: ../src/Menus.cpp:328
msgid "&All\tCtrl+A"
-msgstr "&Tout slectionner\tCtrl+A"
+msgstr "&Tout sélectionner\tCtrl+A"
#: ../src/Menus.cpp:563
msgid "&Analyze"
@@ -127,7 +127,7 @@
#: ../src/Menus.cpp:603
msgid "&Contents..."
-msgstr "&Table des matires..."
+msgstr "&Table des matières..."
#: ../src/Menus.cpp:294
msgid "&Copy\tCtrl+C"
@@ -153,7 +153,7 @@
#: ../src/Menus.cpp:751
#, c-format
msgid "&Export Selection As %s..."
-msgstr "&Exporter la slection en %s..."
+msgstr "&Exporter la sélection en %s..."
#: ../src/Menus.cpp:148
msgid "&File"
@@ -161,11 +161,11 @@
#: ../src/Menus.cpp:410
msgid "&Fit in Window\tCtrl+F"
-msgstr "&Adapter la fentre\tCtrl+F"
+msgstr "&Adapter à la fenêtre\tCtrl+F"
#: ../src/Menus.cpp:504
msgid "&Generate"
-msgstr "&Gnrer"
+msgstr "&Générer"
#: ../src/Menus.cpp:598 ../src/Menus.cpp:601
msgid "&Help"
@@ -205,11 +205,11 @@
#: ../src/AudacityApp.cpp:532 ../src/Menus.cpp:387
#, fuzzy
msgid "&Preferences...\tCtrl+,"
-msgstr "&Prfrences...\tCtrl+P"
+msgstr "&Préférences...\tCtrl+P"
#: ../src/Menus.cpp:391
msgid "&Preferences...\tCtrl+P"
-msgstr "&Prfrences...\tCtrl+P"
+msgstr "&Préférences...\tCtrl+P"
#: ../src/Menus.cpp:436
msgid "&Project"
@@ -238,7 +238,7 @@
#: ../src/Menus.cpp:299
msgid "&Trim\tCtrl+T"
-msgstr "&Ne garder que la slection\tCtrl+T"
+msgstr "&Ne garder que la sélection\tCtrl+T"
#: ../src/Menus.cpp:271
msgid "&Undo\tCtrl+Z"
@@ -259,7 +259,7 @@
#: ../src/Menus.cpp:412
msgid "&Zoom to Selection\tCtrl+E"
-msgstr "&Zoomer sur la slection\tCtrl+E"
+msgstr "&Zoomer sur la sélection\tCtrl+E"
#: ../src/TrackPanel.cpp:4847
msgid "'left' channel"
@@ -278,7 +278,7 @@
"(Not all combinations of headers\n"
"and encodings are possible.)"
msgstr ""
-"(Les combinaison d'entte\n"
+"(Les combinaison d'entête\n"
"et d'encodage ne sont pas\n"
"toutes possibles."
@@ -328,19 +328,19 @@
#: ../src/prefs/GUIPrefs.cpp:391
msgid "-145 dB (PCM range of 24 bit samples)"
-msgstr "-145 dB (amplitude PCM en chantillonnage 24 bits)"
+msgstr "-145 dB (amplitude PCM en échantillonnage 24 bits)"
#: ../src/prefs/GUIPrefs.cpp:383
msgid "-36 dB (shallow range for high-amplitude editing)"
-msgstr "-36 dB (pour dition de grande amplitude)"
+msgstr "-36 dB (pour édition de grande amplitude)"
#: ../src/prefs/GUIPrefs.cpp:385
msgid "-48 dB (PCM range of 8 bit samples)"
-msgstr "-48 dB (amplitude PCM en chantillonnage 8 bits)"
+msgstr "-48 dB (amplitude PCM en échantillonnage 8 bits)"
#: ../src/prefs/GUIPrefs.cpp:387
msgid "-96 dB (PCM range of 16 bit samples)"
-msgstr "-96 dB (amplitude PCM en chantillonnage 16 bits)"
+msgstr "-96 dB (amplitude PCM en échantillonnage 16 bits)"
#: ../src/effects/ChangeLength.cpp:113 ../src/effects/ChangeLength.cpp:127
#: ../src/effects/ChangeLength.cpp:162
@@ -357,19 +357,19 @@
#: ../src/prefs/AudioIOPrefs.cpp:235
msgid "2 (Stereo)"
-msgstr "2 (Stro)"
+msgstr "2 (Stéréo)"
#: ../src/import/ImportRaw.cpp:361
msgid "2 Channels (Stereo)"
-msgstr "2 Canaux (Stro)"
+msgstr "2 Canaux (Stéréo)"
#: ../src/prefs/SpectrumPrefs.cpp:44
msgid "256 - default"
-msgstr "256 - par dfaut"
+msgstr "256 - par défaut"
#: ../src/prefs/SpectrumPrefs.cpp:48
msgid "4096 - most narrowband"
-msgstr "4096 - bande plus troite"
+msgstr "4096 - bande plus étroite"
#: ../src/prefs/SpectrumPrefs.cpp:39
#, fuzzy
@@ -382,7 +382,7 @@
#: ../src/AboutDialog.cpp:186
msgid "A Free Digital Audio Editor"
-msgstr "Un diteur audio numrique libre"
+msgstr "Un éditeur audio numérique libre"
#: ../src/AboutDialog.cpp:100
msgid "About Audacity..."
@@ -400,7 +400,7 @@
#: ../src/TranscriptionToolBar.cpp:246
#, fuzzy
msgid "Add Label"
-msgstr "Marqueur ajout"
+msgstr "Marqueur ajouté"
#: ../src/Menus.cpp:495
msgid "Add Label At Playback Position\tCtrl+M"
@@ -408,16 +408,16 @@
#: ../src/Menus.cpp:494
msgid "Add Label At Selection\tCtrl+B"
-msgstr "Ajouter un marqueur la slection\tCtrl+B"
+msgstr "Ajouter un marqueur à la sélection\tCtrl+B"
[...3345 lines suppressed...]
#~ msgid "Recording time remaining: %d minutes"
-#~ msgstr "Dure d'enregistrement restante : %d minutes"
+#~ msgstr "Durée d'enregistrement restante : %d minutes"
#~ msgid "Recording time remaining: %d seconds"
-#~ msgstr "Dure d'enregistrement restante : %d secondes"
+#~ msgstr "Durée d'enregistrement restante : %d secondes"
#~ msgid "Selection: %.3lf - %.3lf (%.3lf NTSC frames) %s"
-#~ msgstr "Slection : %.3lf - %.3lf (%.3lf images NTSC) %s"
+#~ msgstr "Sélection : %.3lf - %.3lf (%.3lf images NTSC) %s"
#~ msgid "Selection: %.3lf - %.3lf (%.3lf PAL frames) %s"
-#~ msgstr "Slection : %.3lf - %.3lf (%.3lf images PAL) %s"
+#~ msgstr "Sélection : %.3lf - %.3lf (%.3lf images PAL) %s"
#~ msgid "Selection: %.3lf - %.3lf (%.3lf film frames) %s"
-#~ msgstr "Slection : %.3lf - %.3lf (%.3lf film) %s"
+#~ msgstr "Sélection : %.3lf - %.3lf (%.3lf film) %s"
#~ msgid ""
#~ "Selection: %02i:%02i:%06.3lf - %02i:%02i:%06.3lf (%02i:%02i:%06.3lf cdda "
#~ "min:sec:frames) %s"
#~ msgstr ""
-#~ "Slection : %02i:%02i:%06.3lf - %02i:%02i:%06.3lf (%02i:%02i:%06.3lf cdda "
+#~ "Sélection : %02i:%02i:%06.3lf - %02i:%02i:%06.3lf (%02i:%02i:%06.3lf cdda "
#~ "min:sec:trames) %s"
#~ msgid ""
#~ "Selection: %1i:%02i:%02i:%06.3lf - %1i:%02i:%02i:%06.3lf (%1i:%02i:%02i:%"
#~ "06.3lf NTSC drop-frame h:mm:ss:ff) (%.3lf NTSC frames) %s"
#~ msgstr ""
-#~ "Slection : %1i:%02i:%02i:%06.3lf - %1i:%02i:%02i:%06.3lf (%1i:%02i:%02i:%"
+#~ "Sélection : %1i:%02i:%02i:%06.3lf - %1i:%02i:%02i:%06.3lf (%1i:%02i:%02i:%"
#~ "06.3lf NTSC drop-frame h:mm:ss:ii) (%.3lf images NTSC) %s"
#~ msgid ""
#~ "Selection: %1i:%02i:%02i:%06.3lf - %1i:%02i:%02i:%06.3lf (%1i:%02i:%02i:%"
#~ "06.3lf NTSC non-drop-frame h:mm:ss:ff) (%.3lf NTSC frames) %s"
#~ msgstr ""
-#~ "Slection : %1i:%02i:%02i:%06.3lf - %1i:%02i:%02i:%06.3lf (%1i:%02i:%02i:%"
+#~ "Sélection : %1i:%02i:%02i:%06.3lf - %1i:%02i:%02i:%06.3lf (%1i:%02i:%02i:%"
#~ "06.3lf NTSC non-drop-frame h:mm:ss:ii) (%.3lf images NTSC) %s"
#~ msgid ""
#~ "Selection: %1i:%02i:%02i:%06.3lf - %1i:%02i:%02i:%06.3lf (%1i:%02i:%02i:%"
#~ "06.3lf PAL h:mm:ss:ff) (%.3lf PAL frames) %s"
#~ msgstr ""
-#~ "Slection : %1i:%02i:%02i:%06.3lf - %1i:%02i:%02i:%06.3lf (%1i:%02i:%02i:%"
+#~ "Sélection : %1i:%02i:%02i:%06.3lf - %1i:%02i:%02i:%06.3lf (%1i:%02i:%02i:%"
#~ "06.3lf PAL h:mm:ss:ff) (%.3lf images PAL) %s"
#~ msgid ""
#~ "Selection: %1i:%02i:%02i:%06.3lf - %1i:%02i:%02i:%06.3lf (%1i:%02i:%02i:%"
#~ "06.3lf film h:mm:ss:ff) (%.3lf film frames) %s"
#~ msgstr ""
-#~ "Slection : %1i:%02i:%02i:%06.3lf - %1i:%02i:%02i:%06.3lf (%1i:%02i:%02i:%"
+#~ "Sélection : %1i:%02i:%02i:%06.3lf - %1i:%02i:%02i:%06.3lf (%1i:%02i:%02i:%"
#~ "06.3lf film h:mm:ss:ff) (%.3lf film) %s"
#~ msgid ""
#~ "Selection: %1i:%02i:%09.6f - %1i:%02i:%09.6f (%1i:%02i:%09.6f hr:min:"
#~ "sec) %s"
#~ msgstr ""
-#~ "Slection : %1i:%02i:%09.6f - %1i:%02i:%09.6f (%1i:%02i:%09.6f h:min:"
+#~ "Sélection : %1i:%02i:%09.6f - %1i:%02i:%09.6f (%1i:%02i:%09.6f h:min:"
#~ "sec) %s"
#~ msgid ""
#~ "Selection: %i+%04i - %i+%04i (%i+%04i cdda sectors+bytes) [Snap-To "
#~ "Samples]"
#~ msgstr ""
-#~ "Slection : %i+%04i - %i+%04i (%i+%04i cdda secteurs+octets) "
-#~ "[ l'chantillon prs]"
+#~ "Sélection : %i+%04i - %i+%04i (%i+%04i cdda secteurs+octets) "
+#~ "[à l'échantillon près]"
#~ msgid ""
#~ "Selection: %i+%04i - %i+%04i (%i+%04i cdda sectors+bytes) [Snap-To "
#~ "Samples] Change Project Rate to 44100 for cdda"
#~ msgstr ""
-#~ "Slection: %i+%04i - %i+%04i (%i+%04i cdda secteurs+octets) "
-#~ "[ l'chantillon prs] Change l'chantillonnage du projet 44100 pour CDDA"
+#~ "Sélection: %i+%04i - %i+%04i (%i+%04i cdda secteurs+octets) "
+#~ "[à l'échantillon près] Change l'échantillonnage du projet à 44100 pour CDDA"
#~ msgid "Selection: %i+%i - %i+%i (%i+%i sec+samples) [Snap-To Samples]"
#~ msgstr ""
-#~ "Slection: %i+%i - %i+%i (%i+%i sec+chantillons) [ l'chantillon prs]"
+#~ "Sélection: %i+%i - %i+%i (%i+%i sec+échantillons) [à l'échantillon près]"
#~ msgid ""
#~ "Selection: %i:%02i+%i - %i:%02i+%i (%i:%02i+%i min:sec+samples) [Snap-"
#~ "To Samples]"
#~ msgstr ""
-#~ "Slection: %i:%02i+%i - %i:%02i+%i (%i:%02i+%i min:sec+chantillons) "
-#~ "[ l'chantillon prs]"
+#~ "Sélection: %i:%02i+%i - %i:%02i+%i (%i:%02i+%i min:sec+échantillons) "
+#~ "[à l'échantillon près]"
#~ msgid "Selection: %i:%09.6f - %i:%09.6f (%i:%09.6f min:sec) %s"
-#~ msgstr "Slection : %i:%09.6f - %i:%09.6f (%i:%09.6f min:sec) %s"
+#~ msgstr "Sélection : %i:%09.6f - %i:%09.6f (%i:%09.6f min:sec) %s"
#~ msgid ""
#~ "Selection: %i:%09.6lf - %i:%09.6lf (%i:%09.6lf min:sec) [Snap-To "
#~ "Samples]"
#~ msgstr ""
-#~ "Slection : %i:%09.6lf - %i:%09.6lf (%i:%09.6lf min:sec) [ l'chantillon "
-#~ "prs]"
+#~ "Sélection : %i:%09.6lf - %i:%09.6lf (%i:%09.6lf min:sec) [à l'échantillon "
+#~ "près]"
#~ msgid "Selection: %lf - %lf (%lf sec) %s"
-#~ msgstr "Slection : %lf - %lf (%lf sec) %s"
+#~ msgstr "Sélection : %lf - %lf (%lf sec) %s"
#~ msgid "Selection: %lf - %lf (%lf sec) [Snap-To Samples]"
-#~ msgstr "Slection : %lf - %lf (%lf sec) [ l'chantillon prs]"
+#~ msgstr "Sélection : %lf - %lf (%lf sec) [à l'échantillon près]"
#~ msgid "Selection: %li - %li (%li samples) [Snap-To Samples]"
-#~ msgstr "Slection : %li - %li (%li chantillons) [ l'chantillon prs]"
+#~ msgstr "Sélection : %li - %li (%li échantillons) [à l'échantillon près]"
#~ msgid "Set Selection Format"
-#~ msgstr "Choisir un format de slection "
+#~ msgstr "Choisir un format de sélection "
#~ msgid ""
#~ "The VU meters will now be disabled.\n"
@@ -6106,9 +6106,9 @@
#~ "To enable them again, open the Preferences dialog and click on the "
#~ "Interface tab."
#~ msgstr ""
-#~ "Les VU mtres vont tre dsactivs.\n"
+#~ "Les VU mètres vont être désactivés.\n"
#~ "\n"
-#~ "Pour les ractiver, ouvrez la bote de dialogue Prfrences et cliquez sur "
+#~ "Pour les réactiver, ouvrez la boîte de dialogue Préférences et cliquez sur "
#~ "l'onglet Interface."
#~ msgid ""
@@ -6118,21 +6118,21 @@
#~ "into an existing project. To open a project file,\n"
#~ "select Open from the File menu.\n"
#~ msgstr ""
-#~ "Le fichier slectionn est un projet Audacity.\n"
+#~ "Le fichier sélectionné est un projet Audacity.\n"
#~ "\n"
-#~ "Seuls les fichiers audio peuvent tre imports dans un projet existant,\n"
+#~ "Seuls les fichiers audio peuvent être importés dans un projet existant,\n"
#~ "pas les fichiers Projets. Pour ouvrir un fichier Projet,\n"
#~ "faites Ouvrir dans le menu Fichier.\n"
#~ msgid "Time shift sequence"
-#~ msgstr "Squence de calage temporel"
+#~ msgstr "Séquence de calage temporel"
# i18n-hint: This snap-to string will appear in the status bar.
#~ msgid "[Snap-To Off]"
-#~ msgstr "[Slection libre]"
+#~ msgstr "[Sélection libre]"
#~ msgid "[Snap-To On]"
-#~ msgstr "[Slection par bloc]"
+#~ msgstr "[Sélection par bloc]"
# i18n-hint: fps is "frames per second",
# cdda is "Compact Disc Digital Audio - don't translate
@@ -6143,7 +6143,7 @@
# A "sector" is a technical term - don't translate unless you're sure
# you know the correct term.
#~ msgid "cdda sectors+bytes (snap to samples)"
-#~ msgstr "CDDA secteurs+octets ( l'chantillon prs)"
+#~ msgstr "CDDA secteurs+octets (à l'échantillon près)"
#~ msgid "film h:mm:ss:ff 24 fps"
#~ msgstr "film h:mm:ss:ii 24 i/s"
@@ -6155,16 +6155,16 @@
#~ msgstr "min:sec"
#~ msgid "min:sec+samples (snap to samples)"
-#~ msgstr "min:sec+chantillons ( l'chantillon prs)"
+#~ msgstr "min:sec+échantillons (à l'échantillon près)"
#~ msgid "samples (snap to samples)"
-#~ msgstr "chantillons ( l'chantillon prs)"
+#~ msgstr "échantillons (à l'échantillon près)"
#~ msgid "sec"
#~ msgstr "sec"
#~ msgid "sec (snap to samples)"
-#~ msgstr "sec ( l'chantillon prs)"
+#~ msgstr "sec (à l'échantillon près)"
#~ msgid "sec+samples (snap to samples)"
-#~ msgstr "sec+chantillons ( l'chantillon prs)"
+#~ msgstr "sec+échantillons (à l'échantillon près)"
audacity-1.3.2-gcc43.patch:
--- NEW FILE audacity-1.3.2-gcc43.patch ---
diff -Nur audacity-src-1.3.2-beta-orig/lib-src/soundtouch/include/soundtouch_config.h.in audacity-src-1.3.2-beta/lib-src/soundtouch/include/soundtouch_config.h.in
--- audacity-src-1.3.2-beta-orig/lib-src/soundtouch/include/soundtouch_config.h.in 2006-10-29 01:06:01.000000000 +0200
+++ audacity-src-1.3.2-beta/lib-src/soundtouch/include/soundtouch_config.h.in 2008-01-03 16:53:06.000000000 +0100
@@ -43,24 +43,6 @@
/* Use Integer as Sample type */
#undef INTEGER_SAMPLES
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
/* Define as the return type of signal handlers (`int' or `void'). */
#undef RETSIGTYPE
diff -Nur audacity-src-1.3.2-beta-orig/lib-src/soundtouch/source/example/SoundStretch/WavFile.cpp audacity-src-1.3.2-beta/lib-src/soundtouch/source/example/SoundStretch/WavFile.cpp
--- audacity-src-1.3.2-beta-orig/lib-src/soundtouch/source/example/SoundStretch/WavFile.cpp 2006-10-29 01:06:00.000000000 +0200
+++ audacity-src-1.3.2-beta/lib-src/soundtouch/source/example/SoundStretch/WavFile.cpp 2008-01-03 15:53:25.000000000 +0100
@@ -48,6 +48,7 @@
#include <stdio.h>
#include <stdexcept>
#include <string>
+#include <cstring>
#include <assert.h>
#include <limits.h>
audacity-1.3.2-jack-api-109.patch:
--- NEW FILE audacity-1.3.2-jack-api-109.patch ---
diff -Nur audacity-src-1.3.2-beta-orig/lib-src/portaudio-v19/src/hostapi/jack/pa_jack.c audacity-src-1.3.2-beta/lib-src/portaudio-v19/src/hostapi/jack/pa_jack.c
--- audacity-src-1.3.2-beta-orig/lib-src/portaudio-v19/src/hostapi/jack/pa_jack.c 2006-10-29 01:05:49.000000000 +0200
+++ audacity-src-1.3.2-beta/lib-src/portaudio-v19/src/hostapi/jack/pa_jack.c 2008-02-11 01:13:04.000000000 +0100
@@ -1669,27 +1669,19 @@
{
for( i = 0; i < stream->num_incoming_connections; i++ )
{
- UNLESS( !jack_port_lock( stream->jack_client, stream->local_input_ports[i] ),
- paUnanticipatedHostError );
if( jack_port_connected( stream->local_input_ports[i] ) )
{
UNLESS( !jack_port_disconnect( stream->jack_client, stream->local_input_ports[i] ),
paUnanticipatedHostError );
}
- UNLESS( !jack_port_unlock( stream->jack_client, stream->local_input_ports[i] ),
- paUnanticipatedHostError );
}
for( i = 0; i < stream->num_outgoing_connections; i++ )
{
- UNLESS( !jack_port_lock( stream->jack_client, stream->local_output_ports[i] ),
- paUnanticipatedHostError );
if( jack_port_connected( stream->local_output_ports[i] ) )
{
UNLESS( !jack_port_disconnect( stream->jack_client, stream->local_output_ports[i] ),
paUnanticipatedHostError );
}
- UNLESS( !jack_port_unlock( stream->jack_client, stream->local_output_ports[i] ),
- paUnanticipatedHostError );
}
}
audacity-1.3.2-libdir.patch:
--- NEW FILE audacity-1.3.2-libdir.patch ---
diff -Nur audacity-src-1.3.2-beta-orig/src/effects/ladspa/LoadLadspa.cpp audacity-src-1.3.2-beta/src/effects/ladspa/LoadLadspa.cpp
--- audacity-src-1.3.2-beta-orig/src/effects/ladspa/LoadLadspa.cpp 2006-10-29 01:05:27.000000000 +0200
+++ audacity-src-1.3.2-beta/src/effects/ladspa/LoadLadspa.cpp 2008-02-10 22:00:53.000000000 +0100
@@ -86,8 +86,8 @@
#ifdef __WXGTK__
wxGetApp().AddUniquePathToPathList(wxT(INSTALL_PREFIX) wxT("/ladspa"), pathList);
- wxGetApp().AddUniquePathToPathList(wxT("/usr/local/lib/ladspa"), pathList);
- wxGetApp().AddUniquePathToPathList(wxT("/usr/lib/ladspa"), pathList);
+ wxGetApp().AddUniquePathToPathList(wxT("/usr/local/__RPM_LIB__/ladspa"), pathList);
+ wxGetApp().AddUniquePathToPathList(wxT("__RPM_LIBDIR__/ladspa"), pathList);
#endif
#ifdef __WXMAC__
diff -Nur audacity-src-1.3.2-beta-orig/src/export/ExportMP3.cpp audacity-src-1.3.2-beta/src/export/ExportMP3.cpp
--- audacity-src-1.3.2-beta-orig/src/export/ExportMP3.cpp 2006-10-29 01:05:27.000000000 +0200
+++ audacity-src-1.3.2-beta/src/export/ExportMP3.cpp 2008-02-10 21:58:51.000000000 +0100
@@ -258,7 +258,7 @@
wxString GetLibraryPath()
{
- return wxT("/usr/lib");
+ return wxT("__RPM_LIBDIR__");
}
wxString GetLibraryName()
audacity-1.3.2-libmp3lame-default.patch:
--- NEW FILE audacity-1.3.2-libmp3lame-default.patch ---
diff -Nur audacity-src-1.3.2-beta-orig/src/AudacityApp.cpp audacity-src-1.3.2-beta/src/AudacityApp.cpp
--- audacity-src-1.3.2-beta-orig/src/AudacityApp.cpp 2006-10-29 01:05:26.000000000 +0200
+++ audacity-src-1.3.2-beta/src/AudacityApp.cpp 2007-02-20 01:02:49.000000000 +0100
@@ -509,6 +509,8 @@
return false;
}
+ gPrefs->Write(wxT("/MP3/MP3LibPath"),wxT("__RPM_LIBDIR__/libmp3lame.so.0"));
+
// More initialization
InitCleanSpeech();
audacity-1.3.2-resample.patch:
--- NEW FILE audacity-1.3.2-resample.patch ---
diff -Nur audacity-src-1.3.2-beta-orig/configure audacity-src-1.3.2-beta/configure
--- audacity-src-1.3.2-beta-orig/configure 2006-10-29 01:05:36.000000000 +0200
+++ audacity-src-1.3.2-beta/configure 2007-02-18 21:07:34.000000000 +0100
@@ -6079,7 +6079,7 @@
fi
- if false ; then
+ if true ; then
cat >>confdefs.h <<\_ACEOF
#define USE_LIBSAMPLERATE 1
diff -Nur audacity-src-1.3.2-beta-orig/src/Resample.cpp audacity-src-1.3.2-beta/src/Resample.cpp
--- audacity-src-1.3.2-beta-orig/src/Resample.cpp 2006-10-29 01:05:28.000000000 +0200
+++ audacity-src-1.3.2-beta/src/Resample.cpp 2007-02-18 21:07:23.000000000 +0100
@@ -137,7 +137,7 @@
wxString Resample::GetMethodName(int index)
{
- return wxString(src_get_name(index));
+ return wxString(wxString::FromAscii(src_get_name(index)));
}
int Resample::GetFastMethod()
audacity-1.3.2-soundtouch-cxxflags.patch:
--- NEW FILE audacity-1.3.2-soundtouch-cxxflags.patch ---
diff -Nur audacity-src-1.3.2-beta-orig/lib-src/soundtouch/configure audacity-src-1.3.2-beta/lib-src/soundtouch/configure
--- audacity-src-1.3.2-beta-orig/lib-src/soundtouch/configure 2006-10-29 01:06:00.000000000 +0200
+++ audacity-src-1.3.2-beta/lib-src/soundtouch/configure 2008-03-22 10:15:28.000000000 +0100
@@ -2443,7 +2443,8 @@
#AC_MAINTAINER_MODE
-CXXFLAGS= ac_ext=cpp
+#CXXFLAGS=
+ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
audacity-1.3.4-gcc43.patch:
--- NEW FILE audacity-1.3.4-gcc43.patch ---
diff -Nur audacity-src-1.3.4-beta-orig/lib-src/libvamp/vamp-sdk/hostext/PluginLoader.cpp audacity-src-1.3.4-beta/lib-src/libvamp/vamp-sdk/hostext/PluginLoader.cpp
--- audacity-src-1.3.4-beta-orig/lib-src/libvamp/vamp-sdk/hostext/PluginLoader.cpp 2008-01-23 18:32:54.000000000 +0100
+++ audacity-src-1.3.4-beta/lib-src/libvamp/vamp-sdk/hostext/PluginLoader.cpp 2008-03-22 01:43:07.000000000 +0100
@@ -41,6 +41,7 @@
#include <fstream>
#include <cctype> // tolower
+#include <cstring>
#ifdef _WIN32
diff -Nur audacity-src-1.3.4-beta-orig/lib-src/libvamp/vamp-sdk/PluginAdapter.cpp audacity-src-1.3.4-beta/lib-src/libvamp/vamp-sdk/PluginAdapter.cpp
--- audacity-src-1.3.4-beta-orig/lib-src/libvamp/vamp-sdk/PluginAdapter.cpp 2008-01-23 18:32:54.000000000 +0100
+++ audacity-src-1.3.4-beta/lib-src/libvamp/vamp-sdk/PluginAdapter.cpp 2008-03-22 01:13:09.000000000 +0100
@@ -36,6 +36,10 @@
#include "PluginAdapter.h"
+#include <cstdlib>
+#include <cstring>
+using namespace std;
+
//#define DEBUG_PLUGIN_ADAPTER 1
diff -Nur audacity-src-1.3.4-beta-orig/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp audacity-src-1.3.4-beta/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp
--- audacity-src-1.3.4-beta-orig/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp 2008-01-23 18:32:54.000000000 +0100
+++ audacity-src-1.3.4-beta/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp 2008-03-22 01:27:20.000000000 +0100
@@ -36,6 +36,9 @@
#include "PluginHostAdapter.h"
+#include <cstdlib>
+
+
namespace Vamp
{
@@ -63,7 +66,7 @@
std::vector<std::string> path;
std::string envPath;
- char *cpath = getenv("VAMP_PATH");
+ char *cpath = std::getenv("VAMP_PATH");
if (cpath) envPath = cpath;
#ifdef _WIN32
@@ -80,7 +83,7 @@
if (envPath == "") {
envPath = DEFAULT_VAMP_PATH;
- char *chome = getenv("HOME");
+ char *chome = std::getenv("HOME");
if (chome) {
std::string home(chome);
std::string::size_type f;
audacity-1.3.4-libdir.patch:
--- NEW FILE audacity-1.3.4-libdir.patch ---
diff -Nur audacity-src-1.3.4-beta-orig/src/effects/ladspa/LoadLadspa.cpp audacity-src-1.3.4-beta/src/effects/ladspa/LoadLadspa.cpp
--- audacity-src-1.3.4-beta-orig/src/effects/ladspa/LoadLadspa.cpp 2008-01-23 18:32:52.000000000 +0100
+++ audacity-src-1.3.4-beta/src/effects/ladspa/LoadLadspa.cpp 2008-03-21 23:21:45.000000000 +0100
@@ -92,8 +92,8 @@
#ifdef __WXGTK__
wxGetApp().AddUniquePathToPathList(wxT(INSTALL_PREFIX) wxT("/ladspa"), pathList);
- wxGetApp().AddUniquePathToPathList(wxT("/usr/local/lib/ladspa"), pathList);
- wxGetApp().AddUniquePathToPathList(wxT("/usr/lib/ladspa"), pathList);
+ wxGetApp().AddUniquePathToPathList(wxT("/usr/local/__RPM_LIB__/ladspa"), pathList);
+ wxGetApp().AddUniquePathToPathList(wxT("__RPM_LIBDIR__/ladspa"), pathList);
#endif
#ifdef __WXMAC__
diff -Nur audacity-src-1.3.5-beta-orig/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp audacity-src-1.3.5-beta/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp
--- audacity-src-1.3.5-beta-orig/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp 2008-05-07 23:19:58.000000000 +0200
+++ audacity-src-1.3.5-beta/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp 2008-05-11 20:56:59.000000000 +0200
@@ -75,7 +75,7 @@
#ifdef __APPLE__
#define DEFAULT_VAMP_PATH "$HOME/Library/Audio/Plug-Ins/Vamp:/Library/Audio/Plug-Ins/Vamp"
#else
-#define DEFAULT_VAMP_PATH "$HOME/vamp:$HOME/.vamp:/usr/local/lib/vamp:/usr/lib/vamp"
+#define DEFAULT_VAMP_PATH "$HOME/vamp:$HOME/.vamp:/usr/local/__RPM_LIB__/vamp:__RPM_LIBDIR__/vamp"
#endif
#endif
audacity-1.3.4-libmp3lame-default.patch:
--- NEW FILE audacity-1.3.4-libmp3lame-default.patch ---
diff -Nur audacity-src-1.3.4-beta-orig/src/AudacityApp.cpp audacity-src-1.3.4-beta/src/AudacityApp.cpp
--- audacity-src-1.3.4-beta-orig/src/AudacityApp.cpp 2008-01-23 18:32:52.000000000 +0100
+++ audacity-src-1.3.4-beta/src/AudacityApp.cpp 2008-04-12 16:40:33.000000000 +0200
@@ -726,6 +726,8 @@
return false;
}
+ gPrefs->Write(wxT("/MP3/MP3LibPath"),wxT("__RPM_LIBDIR__/libmp3lame.so.0"));
+
// More initialization
InitCleanSpeech();
audacity-1.3.5-fr.patch:
--- NEW FILE audacity-1.3.5-fr.patch ---
diff -Nur audacity-src-1.3.5-beta-orig/locale/fr.po audacity-src-1.3.5-beta/locale/fr.po
--- audacity-src-1.3.5-beta-orig/locale/fr.po 2008-05-07 23:20:10.000000000 +0200
+++ audacity-src-1.3.5-beta/locale/fr.po 2008-06-08 22:13:18.000000000 +0200
@@ -2831,7 +2831,7 @@
#: Project.cpp:1746
msgid "Audacity projects|*.aup|"
-msgstr "Projets Audacity (*.aup)|*.aup"
+msgstr "Projets Audacity (*.aup)|*.aup|"
#: Project.cpp:1799
#: Project.cpp:2186
--- NEW FILE audacity-freeworld.spec ---
%define realname audacity
Conflicts: %{realname}
Name: audacity-freeworld
Version: 1.3.5
Release: 0.1.beta%{?dist}
Summary: Multitrack audio editor
Group: Applications/Multimedia
License: GPLv2
URL: http://audacity.sourceforge.net
Source0: http://downloads.sf.net/sourceforge/audacity/audacity-src-1.3.5.tar.bz2
Source1: audacity.png
Source2: audacity.desktop
Patch1: audacity-1.3.4-libdir.patch
Patch2: audacity-1.3.4-gcc43.patch
Patch3: audacity-1.3.4-libmp3lame-default.patch
Patch4: audacity-1.3.5-fr.patch
# for 1.3.2-beta
Source100: http://downloads.sf.net/sourceforge/audacity/audacity-src-1.3.2.tar.gz
Source101: audacity13.desktop
# iconv on locale/fr.po (MAC to ISO Latin-1)
Patch102: audacity-1.3.2-fr.patch
Patch103: audacity-1.3.2-exportmp3.patch
Patch104: audacity-1.3.2-destdir.patch
Patch105: audacity-1.3.2-resample.patch
Patch106: audacity-1.3.2-FLAC.patch
Patch107: audacity-1.3.2-expat2.patch
Patch108: audacity-1.3.2-gcc43.patch
Patch109: audacity-1.3.2-libdir.patch
Patch110: audacity-1.3.2-jack-api-109.patch
Patch111: audacity-1.3.2-soundtouch-cxxflags.patch
Patch112: audacity-1.3.2-allegro-cflags.patch
Patch113: audacity-1.3.2-libmp3lame-default.patch
Patch114: audacity-1.3.2-CVE-2007-6061.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
BuildRequires: desktop-file-utils
BuildRequires: expat-devel
BuildRequires: flac-devel
BuildRequires: gettext
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: ladspa-devel
BuildRequires: libid3tag-devel
BuildRequires: libogg-devel
BuildRequires: libsamplerate-devel
BuildRequires: libsndfile-devel
BuildRequires: libvorbis-devel
BuildRequires: soundtouch-devel
BuildRequires: zip
BuildRequires: zlib-devel
BuildRequires: libmad-devel
# for 1.3.5-beta
BuildRequires: wxGTK2-devel
# for 1.3.2-beta
BuildRequires: compat-wxGTK26-devel
%description
Audacity is a cross-platform multitrack audio editor. It allows you to
record sounds directly or to import Ogg, WAV, AIFF, AU, IRCAM, or MP3
files. It features a few simple effects, all of the editing features
you should need, and unlimited undo. The GUI was built with wxWindows
and the audio I/O currently uses OSS under Linux. Audacity runs on
Linux/*BSD, MacOS, and Windows.
%prep
%setup -q -a 100 -c
###
### 1.3.5-beta
###
cd audacity-src-1.3.5-beta
# Substitute hardcoded library paths.
%patch1 -p1
%patch3 -p1
for i in src/effects/ladspa/LoadLadspa.cpp src/export/ExportMP3.cpp src/AudacityApp.cpp lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp
do
sed -i -e 's!__RPM_LIBDIR__!%{_libdir}!g' $i
sed -i -e 's!__RPM_LIB__!%{_lib}!g' $i
done
grep -q -s __RPM_LIB * -R && exit 1
%patch2 -p1 -b .gcc43
%patch4 -p1 -b .fr
# Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
for i in locale/*.po src/export/ExportMP3.cpp
do
sed -i -e 's!libmp3lame.so\([^.]\)!libmp3lame.so.0\1!g' $i
done
cd -
###
### 1.3.2-beta
###
cd audacity-src-1.3.2-beta
%patch102 -p1 -b .fr
%patch103 -p1 -b .exportmp3
%patch104 -p1 -b .destdir
%patch105 -p1 -b .resample
%patch106 -p1 -b .FLAC
%patch107 -p1 -b .expat2
%patch108 -p1 -b .gcc43
# Substitute hardcoded library paths.
%patch109 -p1
%patch113 -p1
for i in src/effects/ladspa/LoadLadspa.cpp src/export/ExportMP3.cpp src/AudacityApp.cpp
do
sed -i -e 's!__RPM_LIBDIR__!%{_libdir}!g' $i
sed -i -e 's!__RPM_LIB__!%{_lib}!g' $i
done
grep -q -s __RPM_LIB * -R && exit 1
# F9 devel only
%if 0%{?fedora} > 8
%patch110 -p1 -b .jack-api
%endif
%patch111 -p1 -b .soundtouch-cxxflags
%patch112 -p1 -b .allegro-cflags
%patch114 -p1 -b .CVE-2007-6061
# Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
for i in help/wxhelp/audacity.hhk help/wxhelp/exportmp3.htm locale/*.po src/export/ExportMP3.cpp
do
sed -i -e 's!libmp3lame.so\([^.]\)!libmp3lame.so.0\1!g' $i
done
%ifnarch %{ix86} x86_64
sed -i -e 's!-msse!!' lib-src/soundtouch/source/SoundTouch/Makefile.*
%endif
# for wxGTK26-compat
sed -i -e 's!wx-config!wx-2.6-config!g' configure
cd -
%build
cd audacity-src-1.3.5-beta
%configure \
--with-help \
--with-libsndfile=system \
--without-libresample \
--with-libsamplerate=system \
--with-libflac=system \
--with-ladspa \
--with-vorbis=system \
--with-id3tag=system \
--with-expat=system \
--with-soundtouch=system \
--with-libmad=system
# _smp_mflags cause problems
make
cd -
cd audacity-src-1.3.2-beta
%configure \
--with-help \
--with-libsndfile=system \
--without-libresample \
--with-libsamplerate=system \
--with-libflac=system \
--with-ladspa \
--with-vorbis=system \
--with-id3tag=system \
--with-expat=system \
--program-suffix=13 \
--with-libmad=system
# _smp_mflags cause problems
make
cd -
%install
rm -rf ${RPM_BUILD_ROOT}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps
cd audacity-src-1.3.5-beta
make DESTDIR=${RPM_BUILD_ROOT} install
cd -
%{find_lang} %{realname}
cd audacity-src-1.3.2-beta
make DESTDIR=${RPM_BUILD_ROOT} install
cd -
%{find_lang} %{realname}13
cat %{realname}13.lang >> %{realname}.lang
rm -f $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
desktop-file-install \
--vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE2} %{SOURCE101}
%clean
rm -rf ${RPM_BUILD_ROOT}
%post
umask 022
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database &> /dev/null || :
%postun
umask 022
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database &> /dev/null || :
%files -f %{realname}.lang
%defattr(-,root,root,-)
%{_bindir}/%{realname}
%{_bindir}/%{realname}13
%{_datadir}/%{realname}/
%{_datadir}/%{realname}13/
%{_mandir}/man*/*
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
%{_datadir}/mime/packages/*
%doc %{_datadir}/doc/*
%changelog
* Mon Aug 18 2008 David Timms <iinet.net.au@dtimms> - 1.3.5-0.2.beta
- rename spec and Name to audacity-freeworld. ToDo: complete the changes.
- import livna package into rpmfusion.
* Sun Jun 8 2008 Michael Schwendt <mschwendt(a)users.sf.net> - 1.3.5-0.1.beta
- fix bad fr.po that makes Fichier>Open dialog too wide
- sync with F-9 updates-testing
- update to 1.3.5-beta
- tmp patch merged upstream
- expat2 patch merged upstream
- desktop-file: drop deprecated Encoding, drop Icon file extension
* Fri May 9 2008 Michael Schwendt <mschwendt(a)users.sf.net>
- scriptlets: run update-desktop-database without path
- drop scriptlet dependencies
* Sat May 3 2008 Michael Schwendt <mschwendt(a)users.sf.net> - 1.3.4-0.7.20080123cvs
- check ownership of temporary files directory (#436260) (CVE-2007-6061)
* Sat Apr 12 2008 Michael Schwendt <mschwendt(a)users.sf.net> - 1.3.4-0.6.20080123cvs
- set a default location for libmp3lame.so.0 again
* Fri Mar 21 2008 Michael Schwendt <mschwendt(a)users.sf.net> - 1.3.4-0.5.20080123cvs
- package the old 1.3.2-beta and a post 1.3.4-beta snapshot in the
same package -- users may stick to the older one, but please help
with evaluating the newer one
- merge packaging changes from my 1.3.3/1.3.4 test packages:
- build newer release with wxGTK 2.8.x
- BR soundtouch-devel and --with-soundtouch=system
- drop obsolete patches: resample, mp3 export, destdir, FLAC, fr
* Fri Mar 21 2008 Michael Schwendt <mschwendt(a)users.sf.net> - 1.3.2-0.9.beta
- make soundtouch and allegro build with RPM optflags
* Sun Feb 10 2008 Michael Schwendt <mschwendt(a)users.sf.net> - 1.3.2-0.8.beta
- rawhide: patch for JACK 0.109.0 API changes (jack_port_lock/unlock removal).
- rebuilt for GCC 4.3 as requested by Fedora Release Engineering
- subst _libdir in ladspa plugin loader
* Thu Jan 3 2008 Michael Schwendt <mschwendt(a)users.sf.net> - 1.3.2-0.7.beta
- Patch for GCC 4.3.0 C++.
* Fri Nov 16 2007 Michael Schwendt <mschwendt(a)users.sf.net> - 1.3.2-0.6.beta
- rebuilt for FLAC 1.1.4 -> 1.2.x upgrade, which broke FLAC import
* Mon Mar 5 2007 Michael Schwendt <mschwendt(a)users.sf.net>
- add umask 022 to scriptlets
* Sat Mar 3 2007 Michael Schwendt <mschwendt[ATusers.sf.net> - 1.3.2-0.5.beta
- build with wxGTK 2.6 compatibility package
* Sat Feb 24 2007 Michael Schwendt <mschwendt(a)users.sf.net> - 1.3.2-0.4.beta
- patch for FLAC 1.1.4 API compatibility
- patch ExportMP3.cpp (MPEG-2 Layer III bitrates resulted in
broken/empty files)
* Tue Feb 20 2007 Michael Schwendt <mschwendt(a)users.sf.net> - 1.3.2-0.3.beta
- patch app init to set a default location for libmp3lame.so.0
- fix the libmp3lame.so.0 subst
- subst _libdir in libmp3lame search
- use sed instead of perl
* Sun Feb 18 2007 Michael Schwendt <mschwendt(a)users.sf.net> - 1.3.2-0.2.beta
- patch the source to use libsamplerate actually and fix Resample.cpp
* Thu Feb 15 2007 Michael Schwendt <mschwendt(a)users.sf.net> - 1.3.2-0.1.beta
- sync with Fedora Extras 6 upgrade to 1.3.2-beta
- add BR expat-devel jack-audio-connection-kit-devel alsa-lib-devel
- built-in/patched: nyquist soundtouch
- built-in/patched, n/a: twolame
- adjust configure options accordingly
- patches 1-3 unnecessary, add gemi's audacity-1.3.2-destdir.patch
- make patch from iconv src/Languages.cpp conversion (ISO Latin-1 to UTF-8)
- make patch for locale/fr.po (MAC to ISO Latin-1)
* Wed Oct 18 2006 Michael Schwendt <mschwendt(a)users.sf.net> - 1.2.4-0.3.b.2
- rename to "audacity-nonfree" and "Conflicts: audacity"
* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info>
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
* Sun Sep 24 2006 Michael Schwendt <mschwendt[At]users.sf.net>
- rebuild
* Sat Jun 3 2006 Michael Schwendt <mschwendt(a)users.sf.net> - 1.2.4-0.2.b
- bump and rebuild
* Fri Mar 17 2006 Michael Schwendt <mschwendt(a)users.sf.net> - 1.2.4-0.1.b
- Update to 1.2.4b (stable release).
- Follow upstream recommendation and use the GTK+ 1.x wxGTK.
This is because of various issues with fonts/layout/behaviour.
- Build with compat-wxGTK-devel.
- Modify build section to find wx-2.4-config instead of wx-config.
* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Wed Jul 20 2005 Michael Schwendt <mschwendt(a)users.sf.net> - 1.2.3-5.lvn.1
- Sync with minor changes in Fedora Extras 4 package.
- Drop Epoch and bump release so this is high enough for an upgrade.
* Fri May 20 2005 David Woodhouse <dwmw2(a)infradead.org> - 1.2.3-4
- Add more possible MIME types for ogg which may be seen even though
they're not standard.
* Sun Jan 30 2005 Michael Schwendt <mschwendt(a)users.sf.net> - 0:1.2.3-1.lvn.1
- Build with mp3 and wxGTK2 by default,
- Make the libmp3lame perl substitution in %%prep more robust.
- s/Fedora/Livna/ in desktop file.
* Sat Nov 20 2004 Gerard Milmeister <gemi(a)bluewin.ch> - 0:1.2.3-1
- New Version 1.2.3
* Sat Oct 30 2004 Michael Schwendt <mschwendt(a)users.sf.net> - 0:1.2.2-0.fdr.1
- Update to 1.2.2, patch aboutdialog to be readable with wxGTK.
* Mon May 10 2004 Gerard Milmeister <gemi(a)bluewin.ch> - 0:1.2.1-0.fdr.1
- New Version 1.2.1
* Sun Apr 11 2004 Gerard Milmeister <gemi(a)bluewin.ch> - 0:1.2.0-0.fdr.2
- Fix for Language.cpp restored
* Tue Mar 2 2004 Gerard Milmeister <gemi(a)bluewin.ch> - 0:1.2.0-0.fdr.1
- New Version 1.2.0
* Mon Nov 24 2003 Gerard Milmeister <gemi(a)bluewin.ch> - 0:1.2.0-0.fdr.4.pre3
- Added icon
- Separated mp3 plugin
* Sun Nov 23 2003 Gerard Milmeister <gemi(a)bluewin.ch> - 0:1.2.0-0.fdr.2.pre3
- Changes to specfile
* Sun Nov 2 2003 Gerard Milmeister <gemi(a)bluewin.ch> - 0:1.2.0-0.fdr.1.pre3
- New upstream version 1.2.0-pre3
* Sat Oct 25 2003 Gerard Milmeister <gemi(a)bluewin.ch> - 0:1.2.0-pre2.fdr.1
- First Fedora release
--- NEW FILE audacity.desktop ---
[Desktop Entry]
Name=Audacity
GenericName=Sound editor
Type=Application
Exec=audacity
Icon=audacity
Terminal=false
Comment=A multitrack audio editor
MimeType=audio/x-wav;application/ogg;audio/x-aiff;audio/x-aiffc;audio/x-aifc;audio/basic;application/x-audacity-project;
Categories=AudioVideo;GNOME;
StartupWMClass=Audacity
--- NEW FILE audacity13.desktop ---
[Desktop Entry]
Name=Audacity (older 1.3.2-beta)
GenericName=Sound editor
Type=Application
Exec=audacity13
Icon=audacity.png
Terminal=false
Comment=A multitrack audio editor
Encoding=UTF-8
MimeType=audio/x-wav;application/ogg;audio/x-aiff;audio/x-aiffc;audio/x-aifc;audio/basic;application/x-audacity-project;
Categories=AudioVideo;GNOME;
StartupWMClass=Audacity
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 17 Aug 2008 12:28:34 -0000 1.1
+++ .cvsignore 17 Aug 2008 15:51:49 -0000 1.2
@@ -0,0 +1,2 @@
+audacity-src-1.3.2.tar.gz
+audacity-src-1.3.5.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 17 Aug 2008 12:28:34 -0000 1.1
+++ sources 17 Aug 2008 15:51:49 -0000 1.2
@@ -0,0 +1,2 @@
+bf63673140254f1283dfd55b61ff2422 audacity-src-1.3.2.tar.gz
+b15503c331e7145942fa0e4b27760d61 audacity-src-1.3.5.tar.bz2
15 years, 8 months
rpms/wormsofprey/F-8 wop-0.4.3-gcc43.patch,NONE,1.1
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/wormsofprey/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3678
Added Files:
wop-0.4.3-gcc43.patch
Log Message:
* Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.4.3-3
- Release bump for rpmfusion
wop-0.4.3-gcc43.patch:
--- NEW FILE wop-0.4.3-gcc43.patch ---
--- wop-0.4.3/src/scusibot.cpp 2005-10-16 19:53:05.000000000 +0200
+++ wop-0.4.3.new/src/scusibot.cpp 2008-03-20 10:52:07.000000000 +0100
@@ -5,6 +5,7 @@
#include "stationarygun.hpp"
#include "global.hpp"
#include <vector>
+#include <algorithm>
ScusiBot::ScusiBot()
: m_event( Event::EMPTY ), m_count( 0 ), m_state( IDLE ) {
--- wop-0.4.3/src/spriteset.cpp 2006-03-27 12:27:53.000000000 +0200
+++ wop-0.4.3.new/src/spriteset.cpp 2008-03-20 13:08:52.000000000 +0100
@@ -2,6 +2,7 @@
#include "spriteset.hpp"
#include "global.hpp"
+#include "sprite.hpp"
/**********************************************************/
@@ -17,6 +18,9 @@
#endif // SUPPRESS_COLORING
#endif // BLACK_
+/* force creation of an implementation of SpriteSet<Sprite> */
+static SpriteSet<Sprite> foo;
+
/**********************************************************/
template <class T>
15 years, 8 months
rpms/wormsofprey/F-9 wop-0.4.3-gcc43.patch,NONE,1.1
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/wormsofprey/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3271
Added Files:
wop-0.4.3-gcc43.patch
Log Message:
* Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.4.3-3
- Release bump for rpmfusion
wop-0.4.3-gcc43.patch:
--- NEW FILE wop-0.4.3-gcc43.patch ---
--- wop-0.4.3/src/scusibot.cpp 2005-10-16 19:53:05.000000000 +0200
+++ wop-0.4.3.new/src/scusibot.cpp 2008-03-20 10:52:07.000000000 +0100
@@ -5,6 +5,7 @@
#include "stationarygun.hpp"
#include "global.hpp"
#include <vector>
+#include <algorithm>
ScusiBot::ScusiBot()
: m_event( Event::EMPTY ), m_count( 0 ), m_state( IDLE ) {
--- wop-0.4.3/src/spriteset.cpp 2006-03-27 12:27:53.000000000 +0200
+++ wop-0.4.3.new/src/spriteset.cpp 2008-03-20 13:08:52.000000000 +0100
@@ -2,6 +2,7 @@
#include "spriteset.hpp"
#include "global.hpp"
+#include "sprite.hpp"
/**********************************************************/
@@ -17,6 +18,9 @@
#endif // SUPPRESS_COLORING
#endif // BLACK_
+/* force creation of an implementation of SpriteSet<Sprite> */
+static SpriteSet<Sprite> foo;
+
/**********************************************************/
template <class T>
15 years, 8 months