rpms/audacious/devel audacious-1.1.0-default-skin.patch, NONE, 1.1 audacious-1.1.0-no-rpath.patch, NONE, 1.1 audacious-1.1.0-quoting.patch, NONE, 1.1 audacious-1.1.0-relative-links.patch, NONE, 1.1 audacious-1.1.0-xmms-skins.patch, NONE, 1.1 audacious.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Ralf Ertzinger (ertzing)
fedora-extras-commits at redhat.com
Sun Jul 16 21:11:08 UTC 2006
Author: ertzing
Update of /cvs/extras/rpms/audacious/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2291/devel
Modified Files:
.cvsignore sources
Added Files:
audacious-1.1.0-default-skin.patch
audacious-1.1.0-no-rpath.patch audacious-1.1.0-quoting.patch
audacious-1.1.0-relative-links.patch
audacious-1.1.0-xmms-skins.patch audacious.spec
Log Message:
auto-import audacious-1.1.0-0.2.dr2.sky on branch devel from audacious-1.1.0-0.2.dr2.sky.src.rpm
audacious-1.1.0-default-skin.patch:
--- NEW FILE audacious-1.1.0-default-skin.patch ---
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 */
audacious-1.1.0-no-rpath.patch:
--- NEW FILE audacious-1.1.0-no-rpath.patch ---
--- audacious-fedora-1.1.0-dr2/audacious/Makefile.in~ 2006-06-29 16:30:55.000000000 +0200
+++ audacious-fedora-1.1.0-dr2/audacious/Makefile.in 2006-06-29 16:30:55.000000000 +0200
@@ -101,5 +101,5 @@
fi;
audacious: $(OBJECTS)
- $(CC) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@ -Wl,-rpath,${libdir}
+ $(CC) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@
@printf "%10s %-20s\n" LINK $@
audacious-1.1.0-quoting.patch:
--- NEW FILE audacious-1.1.0-quoting.patch ---
diff -uNr audacious-1.1.0-dr2-orig/audacious/main.c audacious-1.1.0-dr2/audacious/main.c
--- audacious-1.1.0-dr2-orig/audacious/main.c 2006-06-11 06:29:02.000000000 +0200
+++ audacious-1.1.0-dr2/audacious/main.c 2006-07-09 16:35:43.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"
@@ -727,6 +731,47 @@
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,
@@ -820,6 +865,8 @@
else
filename = g_build_filename(current_dir, argv[i], NULL);
+ filename = quote_filename(filename);
+
options->filenames = g_list_prepend(options->filenames, filename);
}
diff -uNr audacious-1.1.0-dr2-orig/audacious/Makefile.in audacious-1.1.0-dr2/audacious/Makefile.in
--- audacious-1.1.0-dr2-orig/audacious/Makefile.in 2006-05-28 17:27:54.000000000 +0200
+++ audacious-1.1.0-dr2/audacious/Makefile.in 2006-07-09 16:53:21.000000000 +0200
@@ -18,6 +18,7 @@
CFLAGS += \
$(GTK_CFLAGS) \
$(LIBGLADE_CFLAGS) \
+ $(GNOMEVFS_CFLAGS) \
$(BEEP_DEFINES) \
$(ARCH_DEFINES) \
-I.. \
diff -uNr audacious-1.1.0-dr2-orig/libaudacious/vfs_gnome.c audacious-1.1.0-dr2/libaudacious/vfs_gnome.c
--- audacious-1.1.0-dr2-orig/libaudacious/vfs_gnome.c 2006-03-12 06:06:47.000000000 +0100
+++ audacious-1.1.0-dr2/libaudacious/vfs_gnome.c 2006-07-09 18:01:35.000000000 +0200
@@ -56,7 +56,7 @@
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);
audacious-1.1.0-relative-links.patch:
--- NEW FILE audacious-1.1.0-relative-links.patch ---
diff -uNr audacious-fedora-1.1.0-dr2-orig/libaudacious/Makefile.in audacious-fedora-1.1.0-dr2/libaudacious/Makefile.in
--- audacious-fedora-1.1.0-dr2-orig/libaudacious/Makefile.in 2006-06-24 18:20:48.000000000 +0200
+++ audacious-fedora-1.1.0-dr2/libaudacious/Makefile.in 2006-06-29 20:45:03.000000000 +0200
@@ -47,7 +47,7 @@
install-posthook:
@mv ${DESTDIR}/${LIBDIR}/libaudacious.so ${DESTDIR}/${LIBDIR}/libaudacious.so.2.0.0
- @ln -sf ${LIBDIR}/libaudacious.so.2.0.0 \
+ @ln -sf libaudacious.so.2.0.0 \
${DESTDIR}/${LIBDIR}/libaudacious.so.2
- @ln -sf ${LIBDIR}/libaudacious.so.2 \
+ @ln -sf libaudacious.so.2 \
${DESTDIR}/${LIBDIR}/libaudacious.so
audacious-1.1.0-xmms-skins.patch:
--- NEW FILE audacious-1.1.0-xmms-skins.patch ---
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) {
--- NEW FILE audacious.spec ---
Name: audacious
Version: 1.1.0
Release: 0.2.dr2%{?dist}
Summary: A GTK2 based media player similar to xmms
Group: Applications/Multimedia
License: GPL
URL: http://audacious-media-player.org/
# The original source files contain various codecs which clash
# with the FE license guidelines. They are removed in the -fedora-
# file.
# Source0: http://audacious-media-player.org/beta/audacious-1.1.0-dr2.tgz
Source0: audacious-fedora-1.1.0-dr2.tar.gz
Patch0: audacious-1.1.0-xmms-skins.patch
Patch1: audacious-1.1.0-default-skin.patch
Patch2: audacious-1.1.0-no-rpath.patch
Patch3: audacious-1.1.0-relative-links.patch
Patch4: audacious-1.1.0-quoting.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel >= 2.6, esound-devel >= 0.2, libvorbis-devel >= 1.0
BuildRequires: zlib-devel, desktop-file-utils, alsa-lib-devel
BuildRequires: gnome-vfs2-devel, libglade2-devel >= 2.4, libsidplay-devel
BuildRequires: libmpcdec-devel, libmusicbrainz-devel, GConf2-devel
BuildRequires: taglib-devel >= 1.4, libogg-devel >= 1.0, flac-devel >= 1.1.2
BuildRequires: libvisual-devel >= 0.2, SDL-devel >= 1.2.9
BuildRequires: gettext, libsndfile-devel, curl-devel, libbinio-devel
BuildRequires: arts-devel, libmodplug-devel, lirc-devel
BuildRequires: jack-audio-connection-kit-devel, libsamplerate-devel
BuildRequires: desktop-file-utils >= 0.9
Requires(post): desktop-file-utils >= 0.9, /sbin/ldconfig
Requires(postun): desktop-file-utils >= 0.9, /sbin/ldconfig
%description
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.
%package devel
Summary: Development files for Audacious
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: glib2-devel gtk2-devel gnome-vfs2-devel GConf2-devel
Requires: pkgconfig
%description devel
Development files for Audacious
%package jack
Summary: Audacious output plugin for 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.
%package esd
Summary: Audacious output plugin for esd sound service
Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release}
%description esd
This package provides an Audacious output plugin that uses the
ESD sound server.
%package arts
Summary: Audacious output plugin for KDE arts sound service
Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release}
%description arts
This package provides an Audacious output plugin that uses the
KDE arts sound server.
%prep
%setup -q -n %{name}-fedora-1.1.0-dr2
# Read xmms skins directory
%patch0 -p1 -b .xmms-skins
# Use bluecurve as default skin
%patch1 -p1 -b .default-skin
# No rpath in binaries
%patch2 -p1 -b .no-rpath
# Relative symlink paths
%patch3 -p1 -b .relative-links
# Filename quoting
%patch4 -p1 -b .quoting
%build
%configure \
--disable-rpath \
--enable-gconf \
--enable-gnome-vfs \
--enable-amidiplug \
--disable-dependency-tracking
make V=1 %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
desktop-file-install --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category X-Fedora \
--add-category Application \
--remove-mime-type audio/mp3 \
--remove-mime-type audio/x-mp3 \
--remove-mime-type audio/mpeg \
--remove-mime-type audio/x-mpeg \
--delete-original \
$RPM_BUILD_ROOT%{_datadir}/applications/audacious.desktop
install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/audacious.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%clean
rm -rf $RPM_BUILD_ROOT
%post
/sbin/ldconfig
update-desktop-database %{_datadir}/applications
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%postun
/sbin/ldconfig
update-desktop-database %{_datadir}/applications
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/audacious
%{_libdir}/*.so.*
%{_libdir}/audacious
%{_datadir}/audacious
%exclude %{_libdir}/audacious/Output/libjackout.so
%exclude %{_libdir}/audacious/Output/libarts.so
%exclude %{_libdir}/audacious/Output/libESD.so
%{_mandir}/man[^3]/*
%{_datadir}/applications/*
%{_datadir}/icons/hicolor/48x48/apps/*
%files devel
%defattr(-,root,root,-)
%{_includedir}/audacious
%{_libdir}/*.so
%{_libdir}/pkgconfig/*
%files jack
%defattr(-,root,root,-)
%{_libdir}/audacious/Output/libjackout.so
%files arts
%defattr(-,root,root,-)
%{_bindir}/audacious-arts-helper
%{_libdir}/audacious/Output/libarts.so
%files esd
%defattr(-,root,root,-)
%{_libdir}/audacious/Output/libESD.so
%changelog
* Sun Jul 9 2006 Ralf Ertzinger <ralf at skytale.net> 1.1.0-0.2.dr2.fc6
- Fix quoting of filenames
* Thu Jun 29 2006 Ralf Ertzinger <ralf at skytale.net> 1.1.0-0.1.dr2.fc6
- Fixed version for Extras review
- Build OSS, arts and jack output plugins
- Split esd, arts and jack into separate packages
- Fix rpath issue
- Fix absolute symlinks
* Sat Jun 24 2006 Ralf Ertzinger <ralf at skytale.net> 1.1.0-0.0.dr2.fc6
- Initial build for Fedora Extras
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 16 Jul 2006 21:08:09 -0000 1.1
+++ .cvsignore 16 Jul 2006 21:11:08 -0000 1.2
@@ -0,0 +1 @@
+audacious-fedora-1.1.0-dr2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 16 Jul 2006 21:08:09 -0000 1.1
+++ sources 16 Jul 2006 21:11:08 -0000 1.2
@@ -0,0 +1 @@
+01b85f020217e9ad92c8b1a89e2e7976 audacious-fedora-1.1.0-dr2.tar.gz
More information about the fedora-extras-commits
mailing list