rpms/audacious-plugins-freeworld/F-12 audacious-ffaudio.desktop,
NONE, 1.1 audacious-plugins-2.2-m4a.patch, NONE,
1.1 audacious-plugins-2.2-madplug.patch, NONE, 1.1 .cvsignore,
1.4, 1.5 audacious-aac.desktop, 1.1, 1.2 audacious-mp3.desktop,
1.1, 1.2 audacious-plugins-freeworld.spec, 1.5, 1.6 sources, 1.4,
1.5 audacious-alac.desktop, 1.1,
NONE audacious-plugins-1.3.4-sse-disable.patch, 1.1,
NONE audacious-wma.desktop, 1.1, NONE
Hans de Goede
jwrdegoede at rpmfusion.org
Mon Jan 25 16:44:42 CET 2010
Author: jwrdegoede
Update of /cvs/free/rpms/audacious-plugins-freeworld/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8493
Modified Files:
.cvsignore audacious-aac.desktop audacious-mp3.desktop
audacious-plugins-freeworld.spec sources
Added Files:
audacious-ffaudio.desktop audacious-plugins-2.2-m4a.patch
audacious-plugins-2.2-madplug.patch
Removed Files:
audacious-alac.desktop
audacious-plugins-1.3.4-sse-disable.patch
audacious-wma.desktop
Log Message:
* Mon Jan 25 2010 Hans de Goede <j.w.r.degoede at hhs.nl> 2.2-2
- Don't hang when trying to identify unknown files as mp3 files (rf1031)
--- NEW FILE audacious-ffaudio.desktop ---
[Desktop Entry]
Name=Audacious
Comment=Play music
Comment[hu]=Zene lejátszása
Exec=audacious
Icon=audacious.png
MimeType=audio/x-ms-wma;audio/alac;audio/x-musepack;
Categories=GTK;AudioVideo;Player;
Terminal=false
Type=Application
NoDisplay=true
audacious-plugins-2.2-m4a.patch:
ffaudio-core.c | 3 +++
1 file changed, 3 insertions(+)
--- NEW FILE audacious-plugins-2.2-m4a.patch ---
diff -up audacious-plugins-2.2/src/ffaudio/ffaudio-core.c~ audacious-plugins-2.2/src/ffaudio/ffaudio-core.c
--- audacious-plugins-2.2/src/ffaudio/ffaudio-core.c~ 2009-11-22 23:49:52.000000000 +0100
+++ audacious-plugins-2.2/src/ffaudio/ffaudio-core.c 2009-12-19 15:15:03.000000000 +0100
@@ -664,6 +664,9 @@ static gchar *ffaudio_fmts[] = {
/* VQF */
"vqf",
+ /* Apple Lossless (alac) */
+ "m4a",
+
/* end of table */
NULL
};
audacious-plugins-2.2-madplug.patch:
plugin.c | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE audacious-plugins-2.2-madplug.patch ---
diff -up audacious-plugins-2.2/src/madplug/plugin.c~ audacious-plugins-2.2/src/madplug/plugin.c
--- audacious-plugins-2.2/src/madplug/plugin.c~ 2009-11-22 23:49:53.000000000 +0100
+++ audacious-plugins-2.2/src/madplug/plugin.c 2010-01-25 16:09:29.000000000 +0100
@@ -440,6 +440,10 @@ audmad_is_our_fd(const gchar *filename,
}
}
}
+
+ if (state == STATE_RESYNC_DO) /* reached end of data */
+ state = STATE_FATAL;
+
break;
}
} while (state != STATE_FATAL && tries < max_resync_tries);
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 21 Aug 2009 14:45:57 -0000 1.4
+++ .cvsignore 25 Jan 2010 15:44:42 -0000 1.5
@@ -1 +1 @@
-audacious-plugins-2.1.tgz
+audacious-plugins-2.2.tgz
Index: audacious-aac.desktop
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/F-12/audacious-aac.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audacious-aac.desktop 10 Aug 2008 10:54:05 -0000 1.1
+++ audacious-aac.desktop 25 Jan 2010 15:44:42 -0000 1.2
@@ -8,6 +8,4 @@
Categories=GTK;AudioVideo;Player;
Terminal=false
Type=Application
-Encoding=UTF-8
-X-Desktop-File-Install-Version=0.10
NoDisplay=true
Index: audacious-mp3.desktop
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/F-12/audacious-mp3.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audacious-mp3.desktop 10 Aug 2008 10:54:05 -0000 1.1
+++ audacious-mp3.desktop 25 Jan 2010 15:44:42 -0000 1.2
@@ -8,6 +8,4 @@
Categories=GTK;AudioVideo;Player;
Terminal=false
Type=Application
-Encoding=UTF-8
-X-Desktop-File-Install-Version=0.10
NoDisplay=true
Index: audacious-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/F-12/audacious-plugins-freeworld.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- audacious-plugins-freeworld.spec 21 Aug 2009 14:45:57 -0000 1.5
+++ audacious-plugins-freeworld.spec 25 Jan 2010 15:44:42 -0000 1.6
@@ -1,8 +1,13 @@
-%define aud_ver 2.1
+# TODO:
+# - add more mime types to .desktop file for 'ffaudio' plugin
+# - add BR sidplay2-devel and find a way to make the built sid.so
+# plugin an alternative to Fedora's sidplay1 based sid.so
+
+%define aud_ver 2.2
Name: audacious-plugins-freeworld
-Version: 2.1
-Release: 1%{?dist}
+Version: 2.2
+Release: 2%{?dist}
Summary: Additional plugins for the Audacious media player
Group: Applications/Multimedia
@@ -11,8 +16,9 @@
Source0: http://distfiles.atheme.org/audacious-plugins-%{version}.tgz
Source1: audacious-mp3.desktop
Source2: audacious-aac.desktop
-Source3: audacious-wma.desktop
-Source4: audacious-alac.desktop
+Source3: audacious-ffaudio.desktop
+Patch0: audacious-plugins-2.2-m4a.patch
+Patch1: audacious-plugins-2.2-madplug.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: audacious-devel >= %{aud_ver}
@@ -21,14 +27,14 @@
BuildRequires: lame-devel, libmms-devel, libmad-devel
BuildRequires: gettext, libbinio-devel
BuildRequires: dbus-devel >= 0.60, dbus-glib-devel >= 0.60
+# ffaudio plugin
+BuildRequires: faad2-devel ffmpeg-devel
# require all the plugins
Requires: %{name}-mp3 = %{version}-%{release}
Requires: %{name}-aac = %{version}-%{release}
-Requires: %{name}-wma = %{version}-%{release}
-Requires: %{name}-alac = %{version}-%{release}
-Requires: %{name}-tta = %{version}-%{release}
Requires: %{name}-mms = %{version}-%{release}
+Requires: %{name}-ffaudio = %{version}-%{release}
# obsolete old freshrpms package
Provides: audacious-plugins-extras = %{version}-%{release}
@@ -39,6 +45,9 @@
user interface based on Winamp 2.x skins. It is based on ("forked off")
BMP.
+This package contains additional plugins for the Audacious media player.
+
+
%package mp3
Summary: MP3 playback plugin for Audacious
Group: Applications/Multimedia
@@ -47,9 +56,6 @@
Requires(post): desktop-file-utils >= 0.9
Requires(postun): desktop-file-utils >= 0.9
-Provides: bmp-mp3 = 0.9.7.1
-Obsoletes: bmp-mp3 <= 0.9.7.1
-
# obsolete old livna package
Provides: audacious-plugins-nonfree-mp3 = %{version}-%{release}
Obsoletes: audacious-plugins-nonfree-mp3 < %{version}-%{release}
@@ -82,60 +88,26 @@
This is the plugin needed to play AAC audio files.
-%package wma
-Summary: WMA playback plugin for Audacious
-Group: Applications/Multimedia
-Requires: audacious-plugins >= %{aud_ver}
+%package ffaudio
+Summary: FFMpeg/FAAD2 based input plugin for Audacious
+Group: Applications/Multimedia
+Requires: audacious-plugins >= %{aud_ver}
Requires(post): desktop-file-utils >= 0.9
Requires(postun): desktop-file-utils >= 0.9
-# obsolete old livna package
-Provides: audacious-plugins-nonfree-wma = %{version}-%{release}
-Obsoletes: audacious-plugins-nonfree-wma < %{version}-%{release}
-
-%description wma
-Audacious is a media player that currently uses a skinned
-user interface based on Winamp 2.x skins. It is based on ("forked off")
-BMP.
-
-This is the plugin needed to play WMA audio files.
-
-
-%package alac
-Summary: ALAC playback plugin for Audacious
-Group: Applications/Multimedia
-Requires: audacious-plugins >= %{aud_ver}
-
-Requires(post): desktop-file-utils >= 0.9
-Requires(postun): desktop-file-utils >= 0.9
-
-# obsolete old livna package
-Provides: audacious-plugins-nonfree-alac = %{version}-%{release}
-Obsoletes: audacious-plugins-nonfree-alac < %{version}-%{release}
-
-%description alac
-Audacious is a media player that currently uses a skinned
-user interface based on Winamp 2.x skins. It is based on ("forked off")
-
-This is the plugin needed to play ALAC (Apple Lossless Audio Codec)
-audio files.
+# obsolete discontinued plugins
+Obsoletes: audacious-plugins-freeworld-alac <= 2.1
+Obsoletes: audacious-plugins-freeworld-tta <= 2.1
+Obsoletes: audacious-plugins-freeworld-wma <= 2.1
+
+# obsolete old livna packages
+Obsoletes: audacious-plugins-nonfree-alac < %{version}-%{release}
+Obsoletes: audacious-plugins-nonfree-tta < %{version}-%{release}
+Obsoletes: audacious-plugins-nonfree-wma < %{version}-%{release}
-
-%package tta
-Summary: TTA playback plugin for Audacious
-Group: Applications/Multimedia
-Requires: audacious-plugins >= %{aud_ver}
-
-# obsolete old livna package
-Provides: audacious-plugins-nonfree-tta = %{version}-%{release}
-Obsoletes: audacious-plugins-nonfree-tta < %{version}-%{release}
-
-%description tta
-Audacious is a media player that currently uses a skinned
-user interface based on Winamp 2.x skins. It is based on ("forked off")
-
-This is the plugin needed to play TTA audio files.
+%description ffaudio
+FFMpeg/FAAD2 based input plugin for Audacious.
%package mms
@@ -157,6 +129,9 @@
%prep
%setup -q -n audacious-plugins-%{version}
+%patch0 -p1
+%patch1 -p1
+sed -i '\,^.SILENT:,d' buildsys.mk.in
%build
@@ -168,9 +143,7 @@
--disable-dependency-tracking
make V=1 %{?_smp_mflags} -C src/madplug
make V=1 %{?_smp_mflags} -C src/aac
-make V=1 %{?_smp_mflags} -C src/wma
-make V=1 %{?_smp_mflags} -C src/alac
-make V=1 %{?_smp_mflags} -C src/tta
+make V=1 %{?_smp_mflags} -C src/ffaudio
make V=1 %{?_smp_mflags} -C src/mms
@@ -178,9 +151,7 @@
rm -rf $RPM_BUILD_ROOT
make -C src/madplug install DESTDIR=$RPM_BUILD_ROOT
make -C src/aac install DESTDIR=$RPM_BUILD_ROOT
-make -C src/wma install DESTDIR=$RPM_BUILD_ROOT
-make -C src/alac install DESTDIR=$RPM_BUILD_ROOT
-make -C src/tta install DESTDIR=$RPM_BUILD_ROOT
+make -C src/ffaudio install DESTDIR=$RPM_BUILD_ROOT
make -C src/mms install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install --vendor livna \
@@ -191,16 +162,13 @@
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE2}
-desktop-file-install --vendor livna \
+desktop-file-install --vendor "" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE3}
-desktop-file-install --vendor livna \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- %{SOURCE4}
-
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -217,16 +185,10 @@
%postun aac
update-desktop-database %{_datadir}/applications
-%post wma
-update-desktop-database %{_datadir}/applications
-
-%postun wma
+%post ffaudio
update-desktop-database %{_datadir}/applications
-%post alac
-update-desktop-database %{_datadir}/applications
-
-%postun alac
+%postun ffaudio
update-desktop-database %{_datadir}/applications
@@ -244,25 +206,23 @@
%{_libdir}/audacious/Input/aac.so
%{_datadir}/applications/livna-audacious-aac.desktop
-%files wma
-%defattr(-,root,root,-)
-%{_libdir}/audacious/Input/wma.so
-%{_datadir}/applications/livna-audacious-wma.desktop
-
-%files alac
-%defattr(-,root,root,-)
-%{_libdir}/audacious/Input/alac.so
-%{_datadir}/applications/livna-audacious-alac.desktop
-
-%files tta
+%files ffaudio
%defattr(-,root,root,-)
-%{_libdir}/audacious/Input/tta.so
+%{_libdir}/audacious/Input/ffaudio.so
+%{_datadir}/applications/audacious-ffaudio.desktop
%files mms
%defattr(-,root,root,-)
%{_libdir}/audacious/Transport/mms.so
+
%changelog
+* Mon Jan 25 2010 Hans de Goede <j.w.r.degoede at hhs.nl> 2.2-2
+- Don't hang when trying to identify unknown files as mp3 files (rf1031)
+
+* Sat Dec 19 2009 Hans de Goede <j.w.r.degoede at hhs.nl> 2.2-1
+- Update to 2.2
+
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.5.1-2
- rebuild for new F11 features
Index: sources
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 21 Aug 2009 14:45:57 -0000 1.4
+++ sources 25 Jan 2010 15:44:42 -0000 1.5
@@ -1 +1 @@
-087fcb1f6fb8429b267f18ed3e3acb7a audacious-plugins-2.1.tgz
+ed6790bf5667c824eda72301f0a886a8 audacious-plugins-2.2.tgz
--- audacious-alac.desktop DELETED ---
--- audacious-plugins-1.3.4-sse-disable.patch DELETED ---
--- audacious-wma.desktop DELETED ---
More information about the rpmfusion-commits
mailing list