[svn] r4720 - in trunk/rpms: . audacious audacious-crossfade
audacious-extras xmms-crossfade
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Fri Sep 15 15:22:29 CEST 2006
Author: thias
Date: 2006-09-15 15:22:27 +0200 (Fri, 15 Sep 2006)
New Revision: 4720
Added:
trunk/rpms/audacious-crossfade/
trunk/rpms/audacious-crossfade/audacious-crossfade.spec
trunk/rpms/audacious-extras/
trunk/rpms/audacious-extras/audacious-extras.spec
trunk/rpms/audacious/audacious-1.1.0-default-skin.patch
trunk/rpms/audacious/audacious-1.1.0-no-rpath.patch
trunk/rpms/audacious/audacious-1.1.0-quoting.patch
trunk/rpms/audacious/audacious-1.1.0-xmms-skins.patch
Modified:
trunk/rpms/audacious/audacious.spec
trunk/rpms/xmms-crossfade/xmms-crossfade.spec
Log:
Update audacious to 1.1.2, add new extras plugins for FC6, add audacious-crossfade and fix xmms-crossfade for FC5+.
Added: trunk/rpms/audacious/audacious-1.1.0-default-skin.patch
===================================================================
--- trunk/rpms/audacious/audacious-1.1.0-default-skin.patch (rev 0)
+++ trunk/rpms/audacious/audacious-1.1.0-default-skin.patch 2006-09-15 13:22:27 UTC (rev 4720)
@@ -0,0 +1,12 @@
+diff -uNr audacious-fedora-1.1.0-dr2-orig/audacious/main.c audacious-fedora-1.1.0-dr2/audacious/main.c
+--- audacious-fedora-1.1.0-dr2-orig/audacious/main.c 2006-06-24 18:20:48.000000000 +0200
++++ audacious-fedora-1.1.0-dr2/audacious/main.c 2006-06-24 22:20:36.167814910 +0200
+@@ -159,7 +159,7 @@
+ 0.0, /* equalizer preamp */
+ {0, 0, 0, 0, 0, /* equalizer bands */
+ 0, 0, 0, 0, 0},
+- NULL, /* skin */
++ "/usr/share/xmms/Skins/Bluecurve-xmms.zip", /* skin */
+ NULL, /* output plugin */
+ NULL, /* file selector path */
+ NULL, /* playlist path */
Added: trunk/rpms/audacious/audacious-1.1.0-no-rpath.patch
===================================================================
--- trunk/rpms/audacious/audacious-1.1.0-no-rpath.patch (rev 0)
+++ trunk/rpms/audacious/audacious-1.1.0-no-rpath.patch 2006-09-15 13:22:27 UTC (rev 4720)
@@ -0,0 +1,20 @@
+diff -Naupr audacious-1.1.0.orig/audacious/Makefile audacious-1.1.0/audacious/Makefile
+--- audacious-1.1.0.orig/audacious/Makefile 2006-06-20 08:39:11.000000000 +0200
++++ audacious-1.1.0/audacious/Makefile 2006-07-19 12:47:59.000000000 +0200
+@@ -102,5 +102,5 @@ build_stamp.c:
+ fi;
+
+ audacious: $(OBJECTS)
+- $(CC) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@ -Wl,-rpath,${libdir}
++ $(CC) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@
+ @printf "%10s %-20s\n" LINK $@
+diff -Naupr audacious-1.1.0.orig/audtool/Makefile audacious-1.1.0/audtool/Makefile
+--- audacious-1.1.0.orig/audtool/Makefile 2006-06-14 09:27:49.000000000 +0200
++++ audacious-1.1.0/audtool/Makefile 2006-07-19 12:48:07.000000000 +0200
+@@ -25,5 +25,5 @@ SOURCES = audtool.c
+ OBJECTS = ${SOURCES:.c=.o}
+
+ audtool: $(OBJECTS)
+- $(CC) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@ -Wl,-rpath,${libdir}
++ $(CC) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@
+ @printf "%10s %-20s\n" LINK $@
Added: trunk/rpms/audacious/audacious-1.1.0-quoting.patch
===================================================================
--- trunk/rpms/audacious/audacious-1.1.0-quoting.patch (rev 0)
+++ trunk/rpms/audacious/audacious-1.1.0-quoting.patch 2006-09-15 13:22:27 UTC (rev 4720)
@@ -0,0 +1,94 @@
+diff -Naupr audacious-1.1.0.orig/audacious/main.c audacious-1.1.0/audacious/main.c
+--- audacious-1.1.0.orig/audacious/main.c 2006-06-29 11:57:27.000000000 +0200
++++ audacious-1.1.0/audacious/main.c 2006-07-19 12:51:27.000000000 +0200
+@@ -47,6 +47,10 @@
+ #include <X11/Xlib.h>
+ #include <X11/Xatom.h>
+
++#ifdef HAVE_GNOME_VFS
++#include <libgnomevfs/gnome-vfs.h>
++#endif
++
+ #include "libaudacious/configdb.h"
+ #include "libaudacious/beepctrl.h"
+ #include "libaudacious/util.h"
+@@ -734,6 +738,47 @@ display_usage(void)
+ exit(EXIT_SUCCESS);
+ }
+
++static gchar*
++quote_filename(gchar* filename) {
++
++ /*
++ * Quote a filename for usage with gnome vfs.
++ * Since we get the filenames from the command line, we can
++ * not determine if they are already quoted or not.
++ *
++ * The algorithm employed here is as follows:
++ * - If the filename contains "://", it is treated as an URI
++ * - If the filename is an URI and contains "%" it is considered quoted.
++ * - If the filenname is not an URI, or an unquoted URI, it is quoted.
++ *
++ * This function does nothing if gnome VFS is not used.
++ */
++
++#ifdef HAVE_GNOME_VFS
++ gchar* quoted_filename;
++ char quote = 0;
++
++ if (strstr(filename, "://")) {
++ if (!strstr(filename, "%")) {
++ quote = 1;
++ }
++ } else {
++ quote = 1;
++ }
++
++ if (quote) {
++ gnome_vfs_init();
++ quoted_filename = gnome_vfs_escape_path_string(filename);
++ free(filename);
++ return quoted_filename;
++ } else {
++ return filename;
++ }
++#else
++ return filename;
++#endif
++}
++
+ static void
+ parse_cmd_line(gint argc,
+ gchar ** argv,
+@@ -831,6 +876,8 @@ parse_cmd_line(gint argc,
+ else
+ filename = g_build_filename(current_dir, argv[i], NULL);
+
++ filename = quote_filename(filename);
++
+ options->filenames = g_list_prepend(options->filenames, filename);
+ }
+
+diff -Naupr audacious-1.1.0.orig/audacious/Makefile audacious-1.1.0/audacious/Makefile
+--- audacious-1.1.0.orig/audacious/Makefile 2006-06-20 08:39:11.000000000 +0200
++++ audacious-1.1.0/audacious/Makefile 2006-07-19 12:51:09.000000000 +0200
+@@ -18,6 +18,7 @@ LDADD = \
+ CFLAGS += \
+ $(GTK_CFLAGS) \
+ $(LIBGLADE_CFLAGS) \
++ $(GNOMEVFS_CFLAGS) \
+ $(BEEP_DEFINES) \
+ $(ARCH_DEFINES) \
+ -I.. \
+diff -Naupr audacious-1.1.0.orig/libaudacious/vfs_gnome.c audacious-1.1.0/libaudacious/vfs_gnome.c
+--- audacious-1.1.0.orig/libaudacious/vfs_gnome.c 2006-03-12 06:06:47.000000000 +0100
++++ audacious-1.1.0/libaudacious/vfs_gnome.c 2006-07-19 12:51:27.000000000 +0200
+@@ -56,7 +56,7 @@ vfs_fopen(const gchar * path,
+ file->eof = FALSE;
+
+ mode_to_gnome_vfs(mode, &g_mode, &truncate, &append);
+- gchar *escaped_file = gnome_vfs_escape_path_string(path);
++ gchar *escaped_file = g_strdup(path);
+
+ if (!truncate) {
+ g_result = gnome_vfs_open(&(file->handle), escaped_file, g_mode);
Added: trunk/rpms/audacious/audacious-1.1.0-xmms-skins.patch
===================================================================
--- trunk/rpms/audacious/audacious-1.1.0-xmms-skins.patch (rev 0)
+++ trunk/rpms/audacious/audacious-1.1.0-xmms-skins.patch 2006-09-15 13:22:27 UTC (rev 4720)
@@ -0,0 +1,19 @@
+diff -uNr audacious-fedora-1.1.0-dr2-orig/audacious/skinwin.c audacious-fedora-1.1.0-dr2/audacious/skinwin.c
+--- audacious-fedora-1.1.0-dr2-orig/audacious/skinwin.c 2006-06-24 18:20:48.000000000 +0200
++++ audacious-fedora-1.1.0-dr2/audacious/skinwin.c 2006-06-24 22:21:57.186381768 +0200
+@@ -251,11 +251,15 @@
+ skinlist_update(void)
+ {
+ gchar *skinsdir;
++ gchar xmmsskinsdir[] = "/usr/share/xmms/Skins";
+
+ skinlist_clear();
+
+ scan_skindir(bmp_paths[BMP_PATH_USER_SKIN_DIR]);
+ scan_skindir(DATA_DIR G_DIR_SEPARATOR_S BMP_SKIN_DIR_BASENAME);
++ if (g_file_test(xmmsskinsdir, G_FILE_TEST_IS_DIR)) {
++ scan_skindir( xmmsskinsdir );
++ }
+
+ skinsdir = getenv("SKINSDIR");
+ if (skinsdir) {
Modified: trunk/rpms/audacious/audacious.spec
===================================================================
--- trunk/rpms/audacious/audacious.spec 2006-09-14 18:11:55 UTC (rev 4719)
+++ trunk/rpms/audacious/audacious.spec 2006-09-15 13:22:27 UTC (rev 4720)
@@ -1,5 +1,6 @@
# $Id$
# Authority: matthias
+# ExcludeDist: fc6
%{?dist: %{expand: %%define %dist 1}}
%{?fedora: %{expand: %%define fc%{fedora} 1}}
@@ -9,13 +10,17 @@
Summary: Media player which uses a skinned interface
Name: audacious
-Version: 1.0.0
+Version: 1.1.2
Release: 1
License: GPL
Group: Applications/Multimedia
URL: http://audacious-media-player.org/
Source: http://audacious-media-player.org/release/audacious-%{version}.tgz
Patch0: audacious-0.1.2-default-alsa.patch
+Patch1: audacious-1.1.0-xmms-skins.patch
+Patch2: audacious-1.1.0-default-skin.patch
+Patch3: audacious-1.1.0-no-rpath.patch
+Patch4: audacious-1.1.0-quoting.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires(post): /sbin/ldconfig, desktop-file-utils
Requires(postun): /sbin/ldconfig, desktop-file-utils
@@ -23,12 +28,12 @@
BuildRequires: libvisual-devel, SDL-devel
BuildRequires: libogg-devel, libvorbis-devel, flac-devel, id3lib-devel
BuildRequires: alsa-lib-devel, esound-devel, libmpcdec-devel, taglib-devel
-%{?_with_vfs:BuildRequires: gnome-vfs2-devel}
+%{!?_without_vfs:BuildRequires: gnome-vfs2-devel}
%{!?_without_gconf:BuildRequires: GConf2-devel}
%{!?_without_lirc:BuildRequires: lirc-devel}
BuildRequires: libsndfile-devel, libsamplerate-devel, libsidplay-devel
-Buildrequires: libmusicbrainz-devel, curl-devel, bc
-BuildRequires: ImageMagick
+Buildrequires: libmusicbrainz-devel, curl-devel, bc, libcdio-devel
+BuildRequires: jack-audio-connection-kit-devel, arts-devel, libmodplug-devel
%{?_with_modxorg:BuildRequires: libXext-devel, libXt-devel}
%description
@@ -39,8 +44,8 @@
%package devel
Summary: Development files for the audacious media player
Group: Development/Libraries
-Requires: %{name} = %{version}, gtk2-devel, pkgconfig
-%{?_with_vfs:Requires: gnome-vfs2-devel}
+Requires: %{name} = %{version}-%{release}, gtk2-devel, pkgconfig
+%{!?_without_vfs:Requires: gnome-vfs2-devel}
%{!?_without_gconf:Requires: GConf2-devel}
%{?_with_modxorg:Requires: libXext-devel, libXt-devel}
@@ -51,16 +56,50 @@
Development files required to develop plugins for audacious.
+%package arts
+Summary: Audacious output plugin for the analog realtime synthesizer
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+
+%description arts
+This package provides an Audacious output plugin that uses aRts (analog
+realtime synthesizer) sound system that KDE uses.
+
+
+%package esd
+Summary: Audacious output plugin for the Enlightened Sound Daemon
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+
+%description esd
+This package provides an Audacious output plugin that uses the Enlightened
+Sound Daemon.
+
+
+%package jack
+Summary: Audacious output plugin for the JACK sound service
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+
+%description jack
+This package provides an Audacious output plugin that uses the JACK sound
+service.
+
+
%prep
%setup
%patch0 -p1 -b .default-alsa
+%patch1 -p1 -b .xmms-skins
+%patch2 -p1 -b .default-skin
+%patch3 -p1 -b .no-rpath
+%patch4 -p1 -b .quoting
%build
%configure \
--disable-rpath \
%{!?_without_gconf:--enable-gconf} \
- %{?_with_vfs:--enable-gnome-vfs} \
+ %{!?_without_vfs:--enable-gnome-vfs} \
--with-xmms-eq \
--enable-sid \
--enable-amidiplug
@@ -71,9 +110,6 @@
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}
%find_lang %{name}
-%{__mkdir_p} %{buildroot}%{_datadir}/pixmaps
-convert audacious/images/audacious_player.xpm \
- %{buildroot}%{_datadir}/pixmaps/audacious.png
%clean
@@ -93,7 +129,15 @@
%defattr(-, root, root, 0755)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/audacious
+%{_bindir}/audtool
%{_libdir}/audacious/
+%dir %{_libdir}/amidi-plug/
+%dir %{_libdir}/amidi-plug/backends/
+%{_libdir}/amidi-plug/backends/ap-alsa.so
+%{_libdir}/amidi-plug/backends/ap-dummy.so
+%exclude %{_libdir}/audacious/Output/libarts.so
+%exclude %{_libdir}/audacious/Output/libESD.so
+%exclude %{_libdir}/audacious/Output/libjackout.so
%{_libdir}/libaudacious.so.*
%{_datadir}/applications/audacious.desktop
%{_datadir}/audacious/
@@ -106,8 +150,35 @@
%{_libdir}/pkgconfig/audacious.pc
%{_libdir}/libaudacious.so
+%files arts
+%defattr(-, root, root, 0755)
+%{_bindir}/audacious-arts-helper
+%{_libdir}/audacious/Output/libarts.so
+%files esd
+%defattr(-, root, root, 0755)
+%{_libdir}/audacious/Output/libESD.so
+
+%files jack
+%defattr(-, root, root, 0755)
+%{_libdir}/audacious/Output/libjackout.so
+
+
%changelog
+* Fri Sep 15 2006 Matthias Saou <http://freshrpms.net/> 1.1.2-1
+- Update to 1.1.2.
+- ExcludeDist fc6 since it's in Extras.
+- Remove no longer present amidi files.
+
+* Wed Jul 19 2006 Matthias Saou <http://freshrpms.net/> 1.1.0-1
+- Update to 1.1.0.
+- No longer convert the xpm icon as a png is installed by default.
+- Add modplug, jack and arts support.
+- Enable gnome-vfs by default now.
+- Add new audtool and amidi-plug libraries.
+- Include all patches from Fedora Extras, update rpath and quoting patches.
+- Split off jack, esd and arts sub-packages for compatibility with Extras.
+
* Wed Apr 19 2006 Matthias Saou <http://freshrpms.net/> 1.0.0-1
- Update to 1.0.0.
- Remove the install fix, but the new Makefile still symlinks in absolute :-/
Added: trunk/rpms/audacious-crossfade/audacious-crossfade.spec
===================================================================
--- trunk/rpms/audacious-crossfade/audacious-crossfade.spec (rev 0)
+++ trunk/rpms/audacious-crossfade/audacious-crossfade.spec 2006-09-15 13:22:27 UTC (rev 4720)
@@ -0,0 +1,56 @@
+# $Id$
+# Authority: matthias
+# Upstream: Peter Eisenlohr <peter$eisenlohr,org>
+
+%define output_plugin_dir %(pkg-config --variable=output_plugin_dir audacious 2>/dev/null || echo %{_libdir}/audacious/Output)
+
+Summary: Crossfade output plugin for Audacious
+Name: audacious-crossfade
+Version: 0.3.11
+Release: 1
+License: GPL
+Group: Applications/Multimedia
+URL: http://www.eisenlohr.org/xmms-crossfade/
+Source: http://www.eisenlohr.org/xmms-crossfade/xmms-crossfade-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires: audacious
+BuildRequires: audacious-devel, libsamplerate-devel
+
+%description
+A neat crossfade plugin for Audacious featuring crossfading and continuous
+output between songs and a gap-killer.
+
+
+%prep
+%setup -n xmms-crossfade-%{version}
+
+
+%build
+%configure \
+ --enable-player=audacious \
+ --disable-oss \
+ --libdir=%{output_plugin_dir}
+%{__make} %{?_smp_mflags}
+
+
+%install
+%{__rm} -rf %{buildroot}
+%makeinstall libdir=%{buildroot}%{output_plugin_dir}
+
+
+%clean
+%{__rm} -rf %{buildroot}
+
+
+%files
+%defattr(-, root, root, 0755)
+%doc AUTHORS ChangeLog COPYING README
+%{output_plugin_dir}/libcrossfade.so
+%exclude %{output_plugin_dir}/libcrossfade.la
+
+
+%changelog
+* Fri Sep 15 2006 Matthias Saou <http://freshrpms.net/> 0.3.11-1
+- Initial RPM release based on the xmms-crossfade spec (same source).
+- Disable internal OSS output since we want to use Alsa by default.
+
Property changes on: trunk/rpms/audacious-crossfade/audacious-crossfade.spec
___________________________________________________________________
Name: svn:keywords
+ Id
Added: trunk/rpms/audacious-extras/audacious-extras.spec
===================================================================
--- trunk/rpms/audacious-extras/audacious-extras.spec (rev 0)
+++ trunk/rpms/audacious-extras/audacious-extras.spec 2006-09-15 13:22:27 UTC (rev 4720)
@@ -0,0 +1,69 @@
+# $Id$
+# Authority: matthias
+# ExclusiveDist: fc6
+
+%define input_plugin_dir %(pkg-config --variable=input_plugin_dir audacious 2>/dev/null || echo %{_libdir}/audacious/Input)
+
+Summary: Extra playback plugins (AAC, MP3 and WMA) for Audacious
+Name: audacious-extras
+Version: 1.1.2
+Release: 1
+License: GPL
+Group: Applications/Multimedia
+URL: http://audacious-media-player.org/
+Source: http://audacious-media-player.org/release/audacious-%{version}.tgz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires: audacious = %{version}
+BuildRequires: gtk2-devel, libglade2-devel, gettext-devel
+# The bare minimum required to get things to build for the plugins we want
+BuildRequires: taglib-devel, libvorbis-devel
+# To get the pkgconfig file for the Input directory location
+BuildRequires: audacious-devel
+
+%description
+Audacious is a media player forked from BMP (Beep Media Player) which uses a
+skinned interface based on Winamp 2.x skins, and in turn based on XMMS.
+
+This package contains a plugin to enable MP3 playback.
+
+
+%prep
+%setup -n audacious-%{version}
+
+
+%build
+%configure --disable-rpath
+%{__make} %{?_smp_mflags}
+
+
+%install
+%{__rm} -rf %{buildroot}
+# aac
+%{__install} -D -m 0755 Plugins/Input/aac/src/libaac.so \
+ %{buildroot}%{input_plugin_dir}/libaac.so
+# mp3
+%{__install} -D -m 0755 Plugins/Input/mpg123/libmpg123.so \
+ %{buildroot}%{input_plugin_dir}/libmpg123.so
+# wma
+%{__install} -D -m 0755 Plugins/Input/wma/libwma.so \
+ %{buildroot}%{input_plugin_dir}/libwma.so
+
+
+%clean
+%{__rm} -rf %{buildroot}
+
+
+%files
+%defattr(-, root, root, 0755)
+%doc COPYING
+%doc Plugins/Input/mpg123/README Plugins/Input/mpg123/TODO
+%{input_plugin_dir}/libaac.so
+%{input_plugin_dir}/libmpg123.so
+%{input_plugin_dir}/libwma.so
+
+
+%changelog
+* Fri Sep 15 2006 Matthias Saou <http://freshrpms.net/> 1.1.2-1
+- Split off -extras from main to make a simple add-on for the Extras package.
+- Note that we make a full build anyway, as it's the easiest (not fastest...).
+
Property changes on: trunk/rpms/audacious-extras/audacious-extras.spec
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/rpms/xmms-crossfade/xmms-crossfade.spec
===================================================================
--- trunk/rpms/xmms-crossfade/xmms-crossfade.spec 2006-09-14 18:11:55 UTC (rev 4719)
+++ trunk/rpms/xmms-crossfade/xmms-crossfade.spec 2006-09-15 13:22:27 UTC (rev 4720)
@@ -7,14 +7,14 @@
Summary: Crossfade output plugin for XMMS
Name: xmms-crossfade
Version: 0.3.11
-Release: 1
+Release: 2
License: GPL
Group: Applications/Multimedia
URL: http://www.eisenlohr.org/xmms-crossfade/
Source: http://www.eisenlohr.org/xmms-crossfade/xmms-crossfade-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: xmms >= 1.0.0, glib >= 1.2.7, gtk+ >= 1.2.7
-BuildRequires: xmms-devel, gtk+-devel, libsamplerate-devel
+BuildRequires: xmms, xmms-devel, gtk+-devel, libsamplerate-devel
# libtool *sigh*
BuildRequires: gcc-c++
@@ -50,6 +50,10 @@
%changelog
+* Fri Sep 15 2006 Matthias Saou <http://freshrpms.net/> 0.3.11-2
+- Add xmms build requirement since it is required and the recent xmms-libs
+ split makes it that it doesn't get installed with xmms-devel anymore.
+
* Wed Jul 19 2006 Dag Wieers <dag at wieers.com> - 0.3.11-1
- Updated to release 0.3.11.
More information about the svn-commits
mailing list