rpms/xmms/FC-4 xmms-1.2.10-crossfade-0.3.9.patch, NONE, 1.1 xmms-1.2.10-extra_libs.patch, NONE, 1.1 xmms.spec, 1.12, 1.13
Matthias Saou (thias)
fedora-extras-commits at redhat.com
Wed Mar 1 12:16:34 UTC 2006
Author: thias
Update of /cvs/extras/rpms/xmms/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11347
Modified Files:
xmms.spec
Added Files:
xmms-1.2.10-crossfade-0.3.9.patch xmms-1.2.10-extra_libs.patch
Log Message:
Clean xmms-config output (#182267).
xmms-1.2.10-crossfade-0.3.9.patch:
--- NEW FILE xmms-1.2.10-crossfade-0.3.9.patch ---
diff -ur xmms-1.2.10/xmms/input.c xmms-1.2.10.patched/xmms/input.c
--- xmms-1.2.10/xmms/input.c 2003-08-08 19:10:44.000000000 +0200
+++ xmms-1.2.10.patched/xmms/input.c 2005-11-25 00:12:36.000000000 +0100
@@ -285,6 +285,14 @@
}
}
+gboolean input_stopped_for_restart = FALSE; /* crossfade */
+void input_stop_for_restart() /* crossfade */
+{
+ input_stopped_for_restart = TRUE;
+ input_stop();
+ input_stopped_for_restart = FALSE;
+}
+
void input_stop(void)
{
if (ip_data->playing && get_current_input_plugin())
diff -ur xmms-1.2.10/xmms/input.h xmms-1.2.10.patched/xmms/input.h
--- xmms-1.2.10/xmms/input.h 2000-02-16 22:05:57.000000000 +0100
+++ xmms-1.2.10.patched/xmms/input.h 2005-11-25 00:12:36.000000000 +0100
@@ -34,6 +34,7 @@
gboolean input_check_file(gchar * filename);
void input_play(char *filename);
void input_stop(void);
+void input_stop_for_restart(void);
void input_pause(void);
int input_get_time(void);
void input_set_eq(int on, float preamp, float *bands);
diff -ur xmms-1.2.10/xmms/main.c xmms-1.2.10.patched/xmms/main.c
--- xmms-1.2.10/xmms/main.c 2004-02-23 21:31:43.000000000 +0100
+++ xmms-1.2.10.patched/xmms/main.c 2005-11-25 00:12:36.000000000 +0100
@@ -881,8 +881,10 @@
mainwin_set_shade(!cfg.player_shaded);
}
+gboolean is_quitting = FALSE; /* crossfade */
void mainwin_quit_cb(void)
{
+ is_quitting = TRUE; /* crossfade */
input_stop();
gtk_widget_hide(equalizerwin);
gtk_widget_hide(playlistwin);
@@ -1523,7 +1525,8 @@
int *pos;
if (get_input_playing())
- input_stop();
+ input_stop_for_restart();
+
pos = gtk_clist_get_row_data(clist, GPOINTER_TO_INT(clist->selection->data));
playlist_set_position(*pos);
playlist_play();
diff -ur xmms-1.2.10/xmms/playlist.c xmms-1.2.10.patched/xmms/playlist.c
--- xmms-1.2.10/xmms/playlist.c 2004-02-23 21:31:43.000000000 +0100
+++ xmms-1.2.10.patched/xmms/playlist.c 2005-11-25 00:12:36.000000000 +0100
@@ -124,7 +124,7 @@
if (get_input_playing())
{
PL_UNLOCK();
- input_stop();
+ input_stop_for_restart();
PL_LOCK();
*restart_playing = TRUE;
}
@@ -570,7 +570,7 @@
}
if (get_input_playing())
- input_stop();
+ input_stop_for_restart();
vis_clear_data(mainwin_vis);
vis_clear_data(playlistwin_vis);
@@ -668,7 +668,7 @@
{
/* We need to stop before changing playlist_position */
PL_UNLOCK();
- input_stop();
+ input_stop_for_restart();
PL_LOCK();
restart_playing = TRUE;
}
@@ -723,7 +723,7 @@
{
/* We need to stop before changing playlist_position */
PL_UNLOCK();
- input_stop();
+ input_stop_for_restart();
PL_LOCK();
restart_playing = TRUE;
}
@@ -852,7 +852,7 @@
{
/* We need to stop before changing playlist_position */
PL_UNLOCK();
- input_stop();
+ input_stop_for_restart();
PL_LOCK();
restart_playing = TRUE;
}
xmms-1.2.10-extra_libs.patch:
--- NEW FILE xmms-1.2.10-extra_libs.patch ---
--- xmms-1.2.10/xmms-config.in.extra_libs 2001-04-05 19:35:49.000000000 -0500
+++ xmms-1.2.10/xmms-config.in 2005-12-13 07:20:44.000000000 -0600
@@ -23,10 +23,10 @@
lib_dir="@libdir@"
if ( (gtk-config --version) > /dev/null 2>&1) then
- gtk_libs=`gtk-config --libs`
+ #gtk_libs=`gtk-config --libs`
gtk_cflags=`gtk-config --cflags`
else
- gtk_libs="@GTK_LIBS@"
+ #gtk_libs="@GTK_LIBS@"
gtk_cflags="@GTK_CFLAGS@"
fi
Index: xmms.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms/FC-4/xmms.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xmms.spec 28 Dec 2005 14:27:52 -0000 1.12
+++ xmms.spec 1 Mar 2006 12:16:33 -0000 1.13
@@ -1,7 +1,7 @@
Summary: The X MultiMedia System, a media player
Name: xmms
Version: 1.2.10
-Release: 19%{?dist}
+Release: 21%{?dist}
Epoch: 1
License: GPL
Group: Applications/Multimedia
@@ -20,18 +20,29 @@
Patch9: xmms-underquoted.patch
Patch10: xmms-alsa-backport.patch
Patch11: xmms-1.2.10-gcc4.patch
+Patch12: xmms-1.2.10-crossfade-0.3.9.patch
+Patch13: xmms-1.2.10-extra_libs.patch
Requires: unzip
# the desktop file and redhat-menus are redundant requires really
Requires: /usr/share/desktop-menu-patches/redhat-audio-player.desktop
Requires: redhat-menus >= 0.11
-BuildRequires: gtk+-devel esound-devel arts-devel alsa-lib-devel
-BuildRequires: libvorbis-devel mikmod-devel
-Requires(pre): desktop-file-utils >= 0.9
+BuildRequires: gtk+-devel, esound-devel, arts-devel, alsa-lib-devel
+BuildRequires: libogg-devel, libvorbis-devel, mikmod-devel
+BuildRequires: gettext-devel, zlib-devel, libGL-devel
+# Use monolithic X up to FC4, and modular X for FC5+
+%if 0%{?fedora} < 5
+BuildRequires: xorg-x11-devel
+%else
+BuildRequires: libXt-devel, libSM-devel, libXxf86vm-devel
+%endif
+Requires(post): desktop-file-utils >= 0.9
+Requires(postun): desktop-file-utils >= 0.9
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Obsoletes: x11amp0.7-1-1 x11amp xmms-esd xmms-gl xmms-mikmod xmms-gnome
+Obsoletes: xmms-esd xmms-gl xmms-mikmod xmms-gnome
+# This is to avoid requiring all of arts, esound, alsa...
%define _use_internal_dependency_generator 0
%define __find_requires %{SOURCE2}
@@ -40,15 +51,15 @@
an interface similar to Winamp's. Xmms supports playlists and
streaming content and has a configurable interface.
+
%package devel
-Summary: Static libraries and header files for Xmms plug-in development.
+Summary: Files required for XMMS plug-in development
Group: Development/Libraries
-Obsoletes: x11amp-devel
-Requires: %{name} = %{epoch}:%{version} gtk+-devel
+Requires: %{name} = %{epoch}:%{version}, gtk+-devel
%description devel
-The static libraries and header files needed for building plug-ins for
-the Xmms multimedia player.
+Files needed for building plug-ins for the X MultiMedia System.
+
%prep
%setup -q
@@ -72,52 +83,55 @@
%patch10 -p0 -b .alsa-backport
# Fix compilation with gcc4
%patch11 -p1 -b .gcc4
+# Fix for crossfade >= 0.3.9 to work properly
+%patch12 -p1 -b .crossfade
+# Remove extra libs from xmms-config output (was only needed for static linking)
+%patch13 -p1 -b .extra_libs
+
%build
%configure \
- --disable-dependency-tracking \
- --enable-kanji \
- --enable-texthack \
- --enable-ipv6 \
- --with-pic
+ --disable-dependency-tracking \
+ --enable-kanji \
+ --enable-texthack \
+ --enable-ipv6 \
+ --with-pic \
+ --disable-static
+# Hack around old libtool and x86_64 issue
for i in `find . -name Makefile`; do
- cat $i | sed s/-lpthread//g > $i.tmp
- mv $i.tmp $i
+ cat $i | sed s/-lpthread//g > $i.tmp
+ mv $i.tmp $i
done
-make
+%{__make} %{?_smp_mflags}
-gcc -fPIC $RPM_OPT_FLAGS -shared -Wl,-soname -Wl,librh_mp3.so -o librh_mp3.so \
- %{SOURCE5} -I. `gtk-config --cflags gtk`
+# Compile the default mp3 "warning dialog" plugin
+%{__cc} %{optflags} -fPIC -shared -Wl,-soname -Wl,librh_mp3.so -o librh_mp3.so \
+ -I. `gtk-config --cflags gtk` %{SOURCE5}
-%install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR=%{buildroot}
+%find_lang %{name}
-install -m 755 librh_mp3.so %{buildroot}%{_libdir}/xmms/Input
+# Install default mp3 "warning dialog" plugin
+%{__install} -m 0755 librh_mp3.so %{buildroot}%{_libdir}/xmms/Input/
-mkdir -pv %{buildroot}%{_datadir}/applications
-(cd $RPM_BUILD_ROOT%{_datadir}/applications && ln -sf \
- %{_datadir}/desktop-menu-patches/redhat-audio-player.desktop)
+# Link to the desktop menu entry included in redhat-menus
+%{__mkdir_p} %{buildroot}%{_datadir}/applications
+%{__ln_s} %{_datadir}/desktop-menu-patches/redhat-audio-player.desktop \
+ %{buildroot}%{_datadir}/applications/
-mkdir -p %{buildroot}%{_datadir}/pixmaps/mini
-install -m 644 xmms/xmms_logo.xpm %{buildroot}%{_datadir}/pixmaps/
-install -m 644 xmms/xmms_mini.xpm %{buildroot}%{_datadir}/pixmaps/mini/
-install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/
+# Install xmms.xpm, the Icon= from the menu entry
+%{__install} -D -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/xmms.xpm
-# create empty skins directory to be included
-mkdir -p %{buildroot}%{_datadir}/xmms/Skins
+# Create empty Skins directory to be included
+%{__mkdir_p} %{buildroot}%{_datadir}/xmms/Skins/
-# unpackaged files
-rm -f %{buildroot}/%{_datadir}/xmms/*/lib*.{a,la} \
- %{buildroot}/%{_libdir}/libxmms.la \
- %{buildroot}/%{_libdir}/xmms/*/*.la \
- %{buildroot}/%{_mandir}/man1/gnomexmms*
-
-%find_lang %{name}
%clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
+
%post
/sbin/ldconfig
@@ -127,32 +141,66 @@
/sbin/ldconfig
update-desktop-database -q || :
+
%files -f %{name}.lang
%defattr(-,root,root,0755)
-%doc AUTHORS COPYING ChangeLog FAQ NEWS TODO README
+%doc AUTHORS ChangeLog COPYING FAQ NEWS TODO README
%{_bindir}/xmms
%{_bindir}/wmxmms
-%{_libdir}/libxmms.so.1*
-%{_libdir}/xmms/
-%{_datadir}/applications/*
+%{_libdir}/libxmms.so.*
+%dir %{_libdir}/xmms/
+%dir %{_libdir}/xmms/Effect/
+%dir %{_libdir}/xmms/General/
+%dir %{_libdir}/xmms/Input/
+%dir %{_libdir}/xmms/Output/
+%dir %{_libdir}/xmms/Visualization/
+%{_libdir}/xmms/Effect/*.so
+%{_libdir}/xmms/General/*.so
+%{_libdir}/xmms/Input/*.so
+%{_libdir}/xmms/Output/*.so
+%{_libdir}/xmms/Visualization/*.so
+%exclude %{_libdir}/xmms/*/*.la
+%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/xmms.xpm
-%{_datadir}/pixmaps/xmms_logo.xpm
-%{_datadir}/pixmaps/mini/xmms_mini.xpm
%{_datadir}/xmms/
-%{_mandir}/man1/[wx]*
+%{_mandir}/man1/*
%files devel
%defattr(-,root,root,0755)
%{_bindir}/xmms-config
%{_includedir}/xmms/
-%{_libdir}/lib*.a
-%{_libdir}/lib*.so
+%exclude %{_libdir}/*.la
+%{_libdir}/*.so
%{_datadir}/aclocal/xmms.m4
+
%changelog
+* Mon Feb 13 2006 Matthias Saou <http://freshrpms.net/> 1:1.2.10-21
+- Remove gtk libs from xmms-config output, as they are only really needed for
+ static linking, which we no longer support (#182267).
+- Disable static in %%configure instead of excluding the built file.
+- Add conditional modular X build requirements.
+
+* Mon Feb 13 2006 Matthias Saou <http://freshrpms.net/> 1:1.2.10-20
+- Spec file cleanup.
+- Include crossfade 0.3.9 patch.
+- Remove very old x11amp obsoletes.
+- Exclude static libraries, update devel summary and description for it.
+- List all plugins directories in order to be aware of breakage if the
+ libtool problem ever happens again.
+- Fix post/postun scriplets.
+- Remove xmms_logo.xpm and xmms_mini.xpm, they should be unused.
+- Add libXt-devel to fullfill the "checking for X..." configure check.
+- Add gettext-devel to make more configure checks happy.
+
* Wed Dec 28 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.2.10-19
- Remove -lpthread from all LDFLAGS as this confuses the old libtool
used by xmms on x86_64 (FE-bug #175493)
+- Add missing modular Xorg BuildReqs, this (re)enables session managment
+ support and the openGL plugins.
+
+* Tue Dec 20 2005 Matthias Saou <http://freshrpms.net/> 1:1.2.10-18.1
+- Update gcc4 patch to include fix for xmms.org bug #1730, fixes FC5 build.
* Sat May 28 2005 Matthias Saou <http://freshrpms.net/> 1:1.2.10-18
- Build with explicit --with-pic to fix compilation of flac plugin on
More information about the fedora-extras-commits
mailing list