rpms/xmms/FC-5 xmms-1.2.10-joycrash.patch, NONE, 1.1 xmms-1.2.10-multidevel.patch, NONE, 1.1 xmms.spec, 1.20, 1.21 xmms-1.2.10-extra_libs.patch, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Mon May 29 16:33:07 UTC 2006
Author: scop
Update of /cvs/extras/rpms/xmms/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21434
Modified Files:
xmms.spec
Added Files:
xmms-1.2.10-joycrash.patch xmms-1.2.10-multidevel.patch
Removed Files:
xmms-1.2.10-extra_libs.patch
Log Message:
* Thu May 25 2006 Ville Skyttä <ville.skytta at iki.fi> - 1:1.2.10-25
- Avoid multilib conflicts in -devel, introducing xmms.pc.
- Include license text in -libs.
* Tue May 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 1:1.2.10-24
- Apply upstream fix for joystick plugin crashes.
xmms-1.2.10-joycrash.patch:
--- NEW FILE xmms-1.2.10-joycrash.patch ---
===================================================================
RCS file: /cvs/xmms/General/joystick/joy.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- xmms/General/joystick/joy.c 2001/02/04 18:00:11 1.8
+++ xmms/General/joystick/joy.c 2004/07/17 21:54:55 1.9
@@ -177,8 +177,11 @@ static void init(void)
/* ---------------------------------------------------------------------- */
static void cleanup(void)
{
- keep_going = FALSE;
- pthread_join(joyapp_thread, NULL);
+ if (keep_going)
+ {
+ keep_going = FALSE;
+ pthread_join(joyapp_thread, NULL);
+ }
if (joy_fd1 > 0)
close(joy_fd1);
if (joy_fd2 > 0)
xmms-1.2.10-multidevel.patch:
--- NEW FILE xmms-1.2.10-multidevel.patch ---
--- xmms-1.2.10/xmms-config.in~ 2001-04-06 03:35:49.000000000 +0300
+++ xmms-1.2.10/xmms-config.in 2006-05-25 00:22:21.000000000 +0300
@@ -18,24 +18,6 @@
data_dir="@datadir@/@PACKAGE@"
version="@VERSION@"
-include_dir="@includedir@"
-xmms_include_dir="@includedir@/@PACKAGE@"
-lib_dir="@libdir@"
-
-if ( (gtk-config --version) > /dev/null 2>&1) then
- gtk_libs=`gtk-config --libs`
- gtk_cflags=`gtk-config --cflags`
-else
- gtk_libs="@GTK_LIBS@"
- gtk_cflags="@GTK_CFLAGS@"
-fi
-
-plugin_dir="@plugindir@"
-visualization_plugin_dir="@plugindir@/@VISUALIZATION_PLUGIN_DIR@"
-input_plugin_dir="@plugindir@/@INPUT_PLUGIN_DIR@"
-output_plugin_dir="@plugindir@/@OUTPUT_PLUGIN_DIR@"
-effect_plugin_dir="@plugindir@/@EFFECT_PLUGIN_DIR@"
-general_plugin_dir="@plugindir@/@GENERAL_PLUGIN_DIR@"
usage()
{
@@ -146,24 +128,12 @@
echo $exec_prefix
fi
-if test "$include_dir" != "/usr/include"; then
- cflags="-I$include_dir -I$xmms_include_dir $gtk_cflags"
-else
- cflags="-I$xmms_include_dir $gtk_cflags"
-fi
-
-if test "$lib_dir" != "/usr/lib"; then
- libs="-L$lib_dir $gtk_libs -lxmms"
-else
- libs="$gtk_libs -lxmms"
-fi
-
if test "$echo_cflags" = "yes"; then
- echo $cflags
+ pkg-config xmms --cflags
fi
if test "$echo_libs" = "yes"; then
- echo $libs
+ pkg-config xmms --libs
fi
if test "$echo_data_dir" = "yes"; then
@@ -171,25 +141,25 @@
fi
if test "$echo_plugin_dir" = "yes"; then
- echo $plugin_dir
+ pkg-config xmms --variable=plugin_dir
fi
if test "$echo_visualization_plugin_dir" = "yes"; then
- echo $visualization_plugin_dir
+ pkg-config xmms --variable=visualization_plugin_dir
fi
if test "$echo_input_plugin_dir" = "yes"; then
- echo $input_plugin_dir
+ pkg-config xmms --variable=input_plugin_dir
fi
if test "$echo_output_plugin_dir" = "yes"; then
- echo $output_plugin_dir
+ pkg-config xmms --variable=output_plugin_dir
fi
if test "$echo_general_plugin_dir" = "yes"; then
- echo $general_plugin_dir
+ pkg-config xmms --variable=general_plugin_dir
fi
if test "$echo_effect_plugin_dir" = "yes"; then
- echo $effect_plugin_dir
+ pkg-config xmms --variable=effect_plugin_dir
fi
--- xmms-1.2.10/configure~ 2004-02-23 23:44:32.000000000 +0200
+++ xmms-1.2.10/configure 2006-05-24 23:55:50.000000000 +0300
@@ -19201,7 +19201,7 @@
- ac_config_files="$ac_config_files Makefile xmms.1 wmxmms.1 xmms.spec xmms-config xmms/Makefile xmms/defskin/Makefile Output/Makefile Output/OSS/Makefile Output/esd/Makefile Output/disk_writer/Makefile Output/solaris/Makefile Output/sun/Makefile Output/alsa/Makefile Input/Makefile Input/wav/Makefile Input/mikmod/Makefile Input/cdaudio/Makefile Input/tonegen/Makefile Input/vorbis/Makefile Effect/Makefile Effect/voice/Makefile Effect/echo_plugin/Makefile Effect/stereo_plugin/Makefile General/Makefile General/ir/Makefile General/joystick/Makefile General/song_change/Makefile Visualization/Makefile Visualization/blur_scope/Ma!
kefile Visualization/sanalyzer/Makefile Visualization/opengl_spectrum/Makefile wmxmms/Makefile po/Makefile.in intl/Makefile"
+ ac_config_files="$ac_config_files Makefile xmms.1 wmxmms.1 xmms.spec xmms-config xmms.pc xmms/Makefile xmms/defskin/Makefile Output/Makefile Output/OSS/Makefile Output/esd/Makefile Output/disk_writer/Makefile Output/solaris/Makefile Output/sun/Makefile Output/alsa/Makefile Input/Makefile Input/wav/Makefile Input/mikmod/Makefile Input/cdaudio/Makefile Input/tonegen/Makefile Input/vorbis/Makefile Effect/Makefile Effect/voice/Makefile Effect/echo_plugin/Makefile Effect/stereo_plugin/Makefile General/Makefile General/ir/Makefile General/joystick/Makefile General/song_change/Makefile Visualization/Makefile Visualization/blur_!
scope/Makefile Visualization/sanalyzer/Makefile Visualization/opengl_spectrum/Makefile wmxmms/Makefile po/Makefile.in intl/Makefile"
ac_config_commands="$ac_config_commands default"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -19861,6 +19861,7 @@
"wmxmms.1" ) CONFIG_FILES="$CONFIG_FILES wmxmms.1" ;;
"xmms.spec" ) CONFIG_FILES="$CONFIG_FILES xmms.spec" ;;
"xmms-config" ) CONFIG_FILES="$CONFIG_FILES xmms-config" ;;
+ "xmms.pc" ) CONFIG_FILES="$CONFIG_FILES xmms.pc" ;;
"xmms/Makefile" ) CONFIG_FILES="$CONFIG_FILES xmms/Makefile" ;;
"xmms/defskin/Makefile" ) CONFIG_FILES="$CONFIG_FILES xmms/defskin/Makefile" ;;
"Output/Makefile" ) CONFIG_FILES="$CONFIG_FILES Output/Makefile" ;;
--- xmms-1.2.10/xmms.pc.in~ 2006-05-24 23:54:59.000000000 +0300
+++ xmms-1.2.10/xmms.pc.in 2006-05-24 23:54:48.000000000 +0300
@@ -0,0 +1,18 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+data_dir=@datadir@
+plugin_dir=@plugindir@
+visualization_plugin_dir=${plugin_dir}/@VISUALIZATION_PLUGIN_DIR@
+input_plugin_dir=${plugin_dir}/@INPUT_PLUGIN_DIR@
+output_plugin_dir=${plugin_dir}/@OUTPUT_PLUGIN_DIR@
+effect_plugin_dir=${plugin_dir}/@EFFECT_PLUGIN_DIR@
+general_plugin_dir=${plugin_dir}/@GENERAL_PLUGIN_DIR@
+
+Name: XMMS
+Description: The X MultiMedia System, a media player
+Version: @VERSION@
+Requires: gtk+
+Libs: -L${libdir} -lxmms
+Cflags: -I${includedir} -I${includedir}/@PACKAGE@
Index: xmms.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms/FC-5/xmms.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xmms.spec 12 Apr 2006 19:58:53 -0000 1.20
+++ xmms.spec 29 May 2006 16:33:07 -0000 1.21
@@ -4,7 +4,7 @@
Name: xmms
Version: 1.2.10
-Release: 23%{?dist}
+Release: 25%{?dist}
Epoch: 1
Summary: The X MultiMedia System, a media player
@@ -19,6 +19,8 @@
Source1: xmms.req
Source2: xmms.xpm
Source3: rh_mp3.c
+# http://cvs.xmms.org/cvsweb.cgi/xmms/General/joystick/joy.c.diff?r1=1.8&r2=1.9
+Patch0: %{name}-1.2.10-joycrash.patch
Patch1: %{name}-1.2.6-audio.patch
Patch2: %{name}-1.2.6-lazy.patch
Patch3: %{name}-1.2.8-default-skin.patch
@@ -26,11 +28,12 @@
Patch5: %{name}-1.2.8-arts.patch
Patch6: %{name}-1.2.8-alsalib.patch
Patch7: %{name}-cd-mountpoint.patch
+# Patch8 on top of patch4
+Patch8: %{name}-1.2.10-multidevel.patch
Patch9: %{name}-underquoted.patch
Patch10: %{name}-alsa-backport.patch
Patch11: %{name}-1.2.10-gcc4.patch
Patch12: %{name}-1.2.10-crossfade-0.3.9.patch
-Patch13: %{name}-1.2.10-extra_libs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk+-devel
@@ -69,6 +72,7 @@
Group: Development/Libraries
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: gtk+-devel
+Requires: pkgconfig
%description devel
Files needed for building plug-ins for the X MultiMedia System.
@@ -76,6 +80,8 @@
%prep
%setup -q
+# Fix joystick plugin crashes
+%patch0 -p1 -b .joycrash
# Set default output plugin to ALSA
%patch1 -p1 -b .audio
# Use RTLD_LAZY, not RTLD_NOW
@@ -90,6 +96,8 @@
%patch6 -p1 -b .alsalib
# Use something that's more likely to work as the default cdrom mountpoint
%patch7 -p0 -b .cd-mountpoint
+# Avoid multilib devel conflicts
+%patch8 -p1 -b .multidevel
# Fix m4 underquoted warning
%patch9 -p1 -b .underquoted
# Backport for recent ALSA
@@ -98,8 +106,6 @@
%patch11 -p1 -b .gcc4
# Fix for crossfade >= 0.3.9 to work properly
%patch12 -p1 -b .crossfade
-# Remove extra libs from xmms-config output (only needed for static linking)
-%patch13 -p1 -b .extra_libs
# Avoid standard rpaths on lib64 archs, --disable-rpath doesn't do it
sed -i -e 's|"/lib /usr/lib"|"/%{_lib} %{_libdir}"|' configure
@@ -139,6 +145,8 @@
install -Dpm 644 %{SOURCE2} \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/xmms.xpm
+install -Dpm 644 xmms.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xmms.pc
+
%find_lang %{name}
@@ -171,6 +179,7 @@
%files libs
%defattr(-,root,root,-)
+%doc COPYING
%{_libdir}/libxmms.so.*
%{_libdir}/xmms/
@@ -179,10 +188,18 @@
%{_bindir}/xmms-config
%{_includedir}/xmms/
%{_libdir}/libxmms.so
+%{_libdir}/pkgconfig/xmms.pc
%{_datadir}/aclocal/xmms.m4
%changelog
+* Thu May 25 2006 Ville Skyttä <ville.skytta at iki.fi> - 1:1.2.10-25
+- Avoid multilib conflicts in -devel, introducing xmms.pc.
+- Include license text in -libs.
+
+* Tue May 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 1:1.2.10-24
+- Apply upstream fix for joystick plugin crashes.
+
* Thu Apr 6 2006 Ville Skyttä <ville.skytta at iki.fi> - 1:1.2.10-23
- Split library and plugins to xmms-libs (#184606).
- ALSA is ubiquitous, don't filter dependencies to it.
--- xmms-1.2.10-extra_libs.patch DELETED ---
More information about the fedora-extras-commits
mailing list