commit audacity for openSUSE:Factory
Hello community,
here is the log from the commit of package audacity for openSUSE:Factory
checked in at Mon Oct 11 16:37:13 CEST 2010.
--------
--- audacity/audacity.changes 2010-06-04 15:27:53.000000000 +0200
+++ audacity/audacity.changes 2010-10-04 16:55:12.000000000 +0200
@@ -1,0 +2,8 @@
+Mon Oct 4 14:27:46 UTC 2010 - reddwarf@opensuse.org
+
+- Cleaned with spec-cleaner
+- Fix support for newer ffmpeg versions
+- Use download/verify services
+- Add -implicit patch as suggested by post-build scripts
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
audacity-minsrc-1.3.12-beta.tar.bz2
New:
----
_service
_service:download_url:audacity-minsrc-1.3.12-beta.tar.bz2
audacity-implicit.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ audacity.spec ++++++
--- /var/tmp/diff_new_pack.MEOAwZ/_old 2010-10-11 16:36:09.000000000 +0200
+++ /var/tmp/diff_new_pack.MEOAwZ/_new 2010-10-11 16:36:09.000000000 +0200
@@ -21,12 +21,21 @@
%bcond_with twolame
Name: audacity
+BuildRequires: alsa-devel
# we use internal PortAudio(so it is not included here in BuildRequires), because audacity team grab sources
# from Portaudio's svn more frequently than we (e.g. see support for non-mmap devices like pulseaudio)
-BuildRequires: flac-devel gcc-c++ jack-devel libexpat-devel
-BuildRequires: libid3tag-devel libsamplerate-devel libsndfile-devel
-BuildRequires: libvorbis-devel soundtouch-devel update-desktop-files
-BuildRequires: alsa-devel taglib-devel wxGTK-devel
+BuildRequires: flac-devel
+BuildRequires: gcc-c++
+BuildRequires: jack-devel
+BuildRequires: libexpat-devel
+BuildRequires: libid3tag-devel
+BuildRequires: libsamplerate-devel
+BuildRequires: libsndfile-devel
+BuildRequires: libvorbis-devel
+BuildRequires: soundtouch-devel
+BuildRequires: taglib-devel
+BuildRequires: update-desktop-files
+BuildRequires: wxGTK-devel
#vamp-plugin-sdk-devel is available since openSUSE 11.2
%if %suse_version > 1110
BuildRequires: vamp-plugin-sdk-devel
@@ -40,25 +49,26 @@
%if %{with twolame}
BuildRequires: libtwolame-devel
%endif
-Summary: A Free, Cross-Platform Digital Audio Editor
Version: 1.3.12
-Release: 6
+Release: 7
License: GPLv2+
-Group: Productivity/Multimedia/Sound/Editors and Convertors
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Summary: A Free, Cross-Platform Digital Audio Editor
Url: http://audacity.sourceforge.net/
+Group: Productivity/Multimedia/Sound/Editors and Convertors
Source: %{name}-minsrc-%{version}-beta.tar.bz2
Source1: %{name}.png
Source2: %{name}-license-nyquist
-# PATCH-FIX-OPENSUSE %{name}-no_buildstamp.patch cmorve69@yahoo.es -- this patch removes the buildstamp
+# PATCH-FIX-OPENSUSE %{name}-no_buildstamp.patch reddwarf@opensuse.org -- this patch removes the buildstamp
Patch0: %{name}-no_buildstamp.patch
Patch5: %{name}-retval.patch
Patch12: %{name}-audiodevdefaults.patch
Patch13: audacity-nomac.patch
-# PATCH-FIX-OPENSUSE %{name}-ffmpeg_match_ext.patch cmorve69@yahoo.es -- Fix ffmpeg support with versions after 2010-03-08
+# PATCH-FIX-OPENSUSE %{name}-ffmpeg_match_ext.patch reddwarf@opensuse.org -- Fix ffmpeg support with versions after 2010-03-08. Upstream knows the problem but doesn't wants the patch right now.
Patch14: %{name}-ffmpeg_match_ext.patch
-# PATCH-FIX-OPENSUSE %{name}-no_exact_ffmpeg_version.patch cmorve69@yahoo.es -- remove referene to minor/micro ffmpeg versions so build-compare can do its work
+# PATCH-FIX-OPENSUSE %{name}-no_exact_ffmpeg_version.patch reddwarf@opensuse.org -- remove referene to minor/micro ffmpeg versions so build-compare can do its work
Patch15: %{name}-no_exact_ffmpeg_version.patch
+Patch16: %{name}-implicit.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Audacity is a program that manipulates digital audio wave forms. In
@@ -75,6 +85,7 @@
%patch13 -p1
%patch14
%patch15
+%patch16
%{__cp} %{S:2} LICENSE_NYQUIST.txt
%build
@@ -103,21 +114,21 @@
--with-ladspa \
--with-libid3tag=system \
--with-libsamplerate=system
-%{__make} %{?jobs:-j%jobs}
+%{__make} %{?_smp_mflags}
%install
%makeinstall
%suse_update_desktop_file audacity
-%{__install} -v -d -m755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
-%{__install} -v -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps
+%{__install} -v -d -m755 %{buildroot}%{_datadir}/pixmaps
+%{__install} -v -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps
#delete default icon we have nicer - transparent :)
-%__rm $RPM_BUILD_ROOT%{_datadir}/pixmaps/*.xpm
+%__rm %{buildroot}%{_datadir}/pixmaps/*.xpm
# we will add docs later in %files section
-%__rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/audacity
+%__rm -rf %{buildroot}%{_datadir}/doc/audacity
%find_lang %{name}
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files -f %{name}.lang
%defattr(-,root,root)
++++++ audacity-ffmpeg_match_ext.patch ++++++
--- /var/tmp/diff_new_pack.MEOAwZ/_old 2010-10-11 16:36:09.000000000 +0200
+++ /var/tmp/diff_new_pack.MEOAwZ/_new 2010-10-11 16:36:09.000000000 +0200
@@ -2,6 +2,15 @@
===================================================================
--- src/FFmpeg.cpp.orig
+++ src/FFmpeg.cpp
+@@ -204,7 +204,7 @@ static int ufile_read(URLContext *h, uns
+ return ret;
+ }
+
+-static int ufile_write(URLContext *h, unsigned char *buf, int size)
++static int ufile_write(URLContext *h, const unsigned char *buf, int size)
+ {
+ return (int) ((wxFile *) h->priv_data)->Write(buf, size);
+ }
@@ -356,7 +356,7 @@ int ufile_fopen_input(AVFormatContext **
}
// Otherwize, resort to extension matching if available
++++++ audacity-implicit.patch ++++++
Index: lib-src/portmixer/src/px_unix_oss.c
===================================================================
--- lib-src/portmixer/src/px_unix_oss.c.orig
+++ lib-src/portmixer/src/px_unix_oss.c
@@ -44,6 +44,7 @@
#include
participants (1)
-
root@hilbert.suse.de