7:14 a.m.
Author: jwrdegoede
Update of /cvs/free/rpms/audacity-freeworld/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31266
Modified Files:
.cvsignore audacity-freeworld.spec sources
Added Files:
audacity-2.0.3-non-dl-ffmpeg.patch
Removed Files:
audacity.png
Log Message:
* Sat May 4 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 2.0.3-1
- New upstream release 2.0.3
- Fix FTBFS by using ffmpeg-compat (rf#2707)
- Disable dynamic loading to force proper Requires for the used libs
audacity-2.0.3-non-dl-ffmpeg.patch:
FFmpeg.h | 6 ++++++
1 file changed, 6 insertions(+)
--- NEW FILE audacity-2.0.3-non-dl-ffmpeg.patch ---
--- audacity-src-2.0.3/src/FFmpeg.h 2013-01-18 16:50:58.000000000 +0100
+++ audacity-src-2.0.3.new/src/FFmpeg.h 2013-05-04 17:39:13.754469535 +0200
@@ -38,11 +38,17 @@
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
+ #include <libavformat/avio.h>
#include <libavutil/fifo.h>
#include <libavutil/mathematics.h>
#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52, 102, 0)
#define AVIOContext ByteIOContext
+ #if defined(DISABLE_DYNAMIC_LOADING_FFMPEG)
+ #define avio_read get_buffer
+ #define avio_seek url_fseek
+ #define avio_close url_fclose
+ #endif
#endif
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 94, 1)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-17/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 27 Aug 2012 12:36:57 -0000 1.16
+++ .cvsignore 20 May 2013 07:14:19 -0000 1.17
@@ -1 +1 @@
-audacity-minsrc-2.0.2.tar.bz2
+audacity-minsrc-2.0.3.tar.xz
Index: audacity-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-17/audacity-freeworld.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- audacity-freeworld.spec 27 Aug 2012 12:36:58 -0000 1.28
+++ audacity-freeworld.spec 20 May 2013 07:14:19 -0000 1.29
@@ -1,9 +1,6 @@
-# Compile options:
-# --with mp3 : enable mp3 support
-
Name: audacity-freeworld
-Version: 2.0.2
+Version: 2.0.3
Release: 1%{?dist}
Summary: Multitrack audio editor
Group: Applications/Multimedia
@@ -15,7 +12,7 @@
# use for upstream source releases:
#Source0:
http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%#{version}-...
-Source0: http://audacity.googlecode.com/files/audacity-minsrc-%{version}.tar.bz2
+Source0: http://audacity.googlecode.com/files/audacity-minsrc-%{version}.tar.xz
%define tartopdir audacity-src-%{version}
Patch1: audacity-2.0.1-libmp3lame-default.patch
@@ -25,11 +22,11 @@
# enable startup notification
# add categories Sequencer X-Jack AudioVideoEditing for F-12 Studio feature
Patch3: audacity-2.0.2-desktop.in.patch
+Patch4: audacity-2.0.3-non-dl-ffmpeg.patch
Provides: audacity-nonfree = %{version}-%{release}
Obsoletes: audacity-nonfree < %{version}-%{release}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
BuildRequires: desktop-file-utils
BuildRequires: expat-devel
@@ -40,22 +37,21 @@
BuildRequires: libid3tag-devel
BuildRequires: taglib-devel
BuildRequires: libogg-devel
-BuildRequires: libsamplerate-devel
BuildRequires: libsndfile-devel
BuildRequires: libvorbis-devel
+BuildRequires: portaudio-devel >= 19-16
BuildRequires: soundtouch-devel
-%if 0%{?fedora} < 11
-BuildRequires: vamp-plugin-sdk-devel
-%else
+BuildRequires: soxr-devel
BuildRequires: vamp-plugin-sdk-devel >= 2.0
-%endif
BuildRequires: zip
BuildRequires: zlib-devel
BuildRequires: wxGTK-devel
BuildRequires: libmad-devel
-BuildRequires: ffmpeg-devel
+BuildRequires: ffmpeg-compat-devel
BuildRequires: lame-devel
-
+BuildRequires: twolame-devel
+# For new symbols in portaudio
+Requires: portaudio%{?_isa} >= 19-16
%description
Audacity is a cross-platform multitrack audio editor. It allows you to
@@ -86,30 +82,48 @@
done
%patch3 -b .desktop.old
+%patch4 -p1
%build
+export PKG_CONFIG_PATH=%{_libdir}/ffmpeg-compat/pkgconfig/
%configure \
+ --disable-dynamic-loading \
--with-help \
--with-libsndfile=system \
+ --with-libsoxr=system \
--without-libresample \
- --with-libsamplerate=system \
+ --without-libsamplerate \
--with-libflac=system \
--with-ladspa \
--with-vorbis=system \
--with-id3tag=system \
--with-expat=system \
--with-soundtouch=system \
+ --with-libvamp=system \
+ --with-portaudio=system \
--with-ffmpeg=system \
- --with-libmad=system
+ --with-libmad=system \
+ --with-libtwolame=system \
+ --with-lame=system \
+%ifnarch %{ix86} x86_64
+ --disable-sse \
+%else
+ %{nil}
+%endif
+
+# ensure we use the system headers for these, note we do this after
+# configure as it wants to run sub-configures in these dirs
+for i in ffmpeg libresample libsoxr libvamp portaudio-v19; do
+ rm -rf lib-src/$i
+done
+
# _smp_mflags cause problems
make
%install
-rm -rf ${RPM_BUILD_ROOT}
-
-make DESTDIR=${RPM_BUILD_ROOT} install
+%make_install
# Audacity 1.3.8-beta complains if the help/manual directories
# don't exist.
@@ -117,31 +131,33 @@
%{find_lang} %{realname}
-desktop-file-install \
- --vendor fedora \
- --delete-original \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- $RPM_BUILD_ROOT%{_datadir}/applications/audacity.desktop
-
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
+desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+%if 0%{?fedora} && 0%{?fedora} < 19
+ --vendor fedora --delete-original \
+%endif
+ $RPM_BUILD_ROOT%{_datadir}/applications/audacity.desktop
%post
umask 022
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database &> /dev/null || :
-
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
umask 022
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database &> /dev/null || :
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f %{realname}.lang
-%defattr(-,root,root,-)
%{_bindir}/%{realname}
%dir %{_datadir}/%{realname}
%{_datadir}/%{realname}/EQDefaultCurves.xml
@@ -156,21 +172,20 @@
%changelog
-* Mon Aug 27 2012 David Timms <iinet.net.au@dtimms> - 2.0.2-1
-- update to 2.0.2 final
-
-* Tue Aug 21 2012 David Timms <iinet.net.au@dtimms> - 2.0.2-0.3.rc4
-- update to 2.0.2 release candidate 4
+* Sat May 4 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 2.0.3-1
+- New upstream release 2.0.3
+- Fix FTBFS by using ffmpeg-compat (rf#2707)
+- Disable dynamic loading to force proper Requires for the used libs
-* Mon Aug 13 2012 David Timms <iinet.net.au@dtimms> - 2.0.2-0.1.rc2
-- update to 2.0.2 release candidate 2
+* Sun Mar 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.1-2
+- Mass rebuilt for Fedora 19 Features
* Tue Jul 3 2012 David Timms <iinet.net.au@dtimms> - 2.0.1-1
- update to 2.0.1 final
- rebase libmp3lame-default.patch
- rebase desktop.in.patch
-* Wed Jun 26 2012 David Timms <iinet.net.au@dtimms> - 2.0.1-0.1.rc2
+* Tue Jun 26 2012 David Timms <iinet.net.au@dtimms> - 2.0.1-0.1.rc2
- update to 2.0.1 release candidate 2
* Wed Mar 14 2012 David Timms <iinet.net.au@dtimms> - 2.0.0-1
@@ -183,8 +198,8 @@
* Tue Mar 6 2012 David Timms <iinet.net.au@dtimms> - 2.0.0-0.8.rc8
- update to 2.0.0 release candidate 8 for testing only
-* Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com> -
2.0.0-0.3.rc1.20120218svn11513
-- Rebuilt for c++ ABI breakage
+* Wed Feb 22 2012 David Timms <iinet.net.au@dtimms> - 2.0.0-0.3.rc3
+- update to 2.0.0 release candidate 3
* Sat Feb 18 2012 David Timms <iinet.net.au@dtimms> -
2.0.0-0.2.rc1.20120218svn11513
- update to release candidate from svn snapshot
@@ -225,10 +240,10 @@
Applied svn trunk portmixer configure changes.
- del previous patch attempt (unsuccessful)
-* Mon Oct 31 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.9.beta
+* Sun Oct 31 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.9.beta
- fix build failure due to portmixer configure problems
-* Mon Oct 31 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.8.beta
+* Sun Oct 31 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.8.beta
- fix hang when play at speed with ratio less than 0.09 is used (#637347)
* Sat Aug 7 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.7.beta
@@ -296,10 +311,10 @@
- add support for ffmpeg import and export via BR and --with-ffmpeg
- add patch to allow selection of ffmpeg library on unix.
-* Thu Aug 22 2008 David Timms <iinet.net.au@dtimms> - 1.3.5-0.4.beta
+* Fri Aug 22 2008 David Timms <iinet.net.au@dtimms> - 1.3.5-0.4.beta
- mod patch2 apply command
-* Thu Aug 22 2008 David Timms <iinet.net.au@dtimms> - 1.3.5-0.3.beta
+* Fri Aug 22 2008 David Timms <iinet.net.au@dtimms> - 1.3.5-0.3.beta
- add Requires lame-libs
- update 1.3.4-gcc43.patch to suit 1.3.5, since patch mostly upstreamed.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-17/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 27 Aug 2012 12:36:58 -0000 1.16
+++ sources 20 May 2013 07:14:19 -0000 1.17
@@ -1 +1 @@
-c838bc4485b0af104a7f6d9c6955a284 audacity-minsrc-2.0.2.tar.bz2
+648cce8a9ce86eebfc53921172ee9d89 audacity-minsrc-2.0.3.tar.xz
