rpms/xmms/F-9 import.log, NONE, 1.1 xmms-1.2.11-alsalib.patch, NONE, 1.1 xmms-1.2.11-arts.patch, NONE, 1.1 xmms-1.2.11-multilib.patch, NONE, 1.1 xmms-1.2.11-nomp3.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xmms.spec, 1.34, 1.35 xmms-1.2.10-joycrash.patch, 1.1, NONE xmms-1.2.10-multidevel.patch, 1.1, NONE xmms-1.2.10-pls-188603.patch, 1.1, NONE xmms-1.2.10-ubuntu-CVE-2007-0653.patch, 1.1, NONE xmms-1.2.8-alsalib.patch, 1.1, NONE xmms-1.2.8-arts.patch, 1.1, NONE xmms-1.2.9-nomp3.patch, 1.1, NONE xmms-alsa-backport.patch, 1.1, NONE xmms-underquoted.patch, 1.1, NONE
Paul F. Johnson
pfj at fedoraproject.org
Thu Sep 11 22:54:05 UTC 2008
- Previous message (by thread): rpms/audit/devel .cvsignore, 1.94, 1.95 audit.spec, 1.182, 1.183 sources, 1.118, 1.119
- Next message (by thread): rpms/fig2sxd/F-9 import.log, NONE, 1.1 fig2sxd.spec, 1.1, 1.2 fig2sxd.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pfj
Update of /cvs/pkgs/rpms/xmms/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18767/F-9
Modified Files:
.cvsignore sources xmms.spec
Added Files:
import.log xmms-1.2.11-alsalib.patch xmms-1.2.11-arts.patch
xmms-1.2.11-multilib.patch xmms-1.2.11-nomp3.patch
Removed Files:
xmms-1.2.10-joycrash.patch xmms-1.2.10-multidevel.patch
xmms-1.2.10-pls-188603.patch
xmms-1.2.10-ubuntu-CVE-2007-0653.patch
xmms-1.2.8-alsalib.patch xmms-1.2.8-arts.patch
xmms-1.2.9-nomp3.patch xmms-alsa-backport.patch
xmms-underquoted.patch
Log Message:
Bump to new version
Removed old patches and fixed quite a few as well
--- NEW FILE import.log ---
xmms-1_2_11-1_20071117cvs_1_fc10:F-9:xmms-1.2.11-1.20071117cvs.1.fc10.src.rpm:1221173566
xmms-1.2.11-alsalib.patch:
--- NEW FILE xmms-1.2.11-alsalib.patch ---
--- xmms-1.2.11-20071117cvs/configure 2008-09-02 19:22:09.000000000 +0100
+++ xmms-1.2.11-20071117cvs/configure-new 2008-09-02 21:02:33.000000000 +0100
@@ -30090,8 +30090,6 @@
#define HAVE_LIBASOUND 1
_ACEOF
- LIBS="-lasound $LIBS"
-
else
alsa_found=no
@@ -30104,7 +30102,6 @@
have_alsa=yes
LIBS=`echo $LIBS | sed 's/-lasound//g'`
LIBS=`echo $LIBS | sed 's/ //'`
- LIBS="-lasound $LIBS"
fi
if test "x$alsa_found" = "xno" ; then
have_alsa=no
xmms-1.2.11-arts.patch:
--- NEW FILE xmms-1.2.11-arts.patch ---
--- xmms-1.2.11-20071117cvs/xmms/main.c 2008-09-02 19:08:34.000000000 +0100
+++ xmms-1.2.11-20071117cvs/xmms/main-new.c 2008-09-02 19:16:29.000000000 +0100
@@ -307,6 +307,40 @@
sizeof(mainwin_general_menu_entries) /
sizeof(mainwin_general_menu_entries[0]);
+#include <kde/artsc/artsc.h>
+#include <dlfcn.h>
+
+/* dlopen libarts, for seeing if we should use this as the default plugin. */
+static int arts_running(void) {
+ void *arts_handle;
+ int (*a_init)(void);
+ void (*a_close)(void);
+ int ret = 0;
+
+ arts_handle = dlopen("libartsc.so.0", RTLD_NOW);
+ if (!arts_handle)
+ return 0;
+
+ a_init = dlsym(arts_handle, "arts_init");
+ a_close = dlsym(arts_handle, "arts_free");
+ if (!a_init || !a_close) {
+ dlclose(arts_handle);
+ return 0;
+ }
+ signal(SIGPIPE, SIG_DFL);
+ if ((*a_init)() == 0) {
+ ret = 1;
+ /* there are problems with library unloading in conjunction with X11, */
+ /* (Arts::X11GlobalComm), so we don't unload stuff here */
+ /* (*a_close)(); */
+ }
+ signal(SIGPIPE, SIG_IGN);
+ dlclose(arts_handle);
+ return ret;
+}
+
+
+
static void make_xmms_dir(void)
{
gchar *filename;
@@ -503,6 +537,19 @@
cfg.skin = g_strdup("/usr/share/xmms/Skins/Bluecurve-xmms.zip");
if (cfg.outputplugin == NULL)
{
+ /* If aRts is running and the plugin is there, use that... */
+ if (arts_running())
+ {
+ cfg.outputplugin = g_strdup_printf("%s/%s/libarts.so", PLUGIN_DIR, plugin_dir_list[0]);
+ if (access(cfg.outputplugin, X_OK))
+ {
+ g_free(cfg.outputplugin);
+ cfg.outputplugin = NULL;
+ }
+ }
+ }
+ if (cfg.outputplugin == NULL)
+ {
#ifdef HAVE_OSS
cfg.outputplugin = g_strdup_printf("%s/%s/libALSA.so", PLUGIN_DIR, plugin_dir_list[0]);
#elif defined(sun)
@@ -515,6 +562,13 @@
cfg.outputplugin = g_strdup("");
#endif
}
+ /* Migrate users of the previous arts plugin */
+ if (!strcmp(g_basename(cfg.outputplugin),"libartsout.so")) {
+ if (access(cfg.outputplugin,X_OK)) {
+ g_free(cfg.outputplugin);
+ cfg.outputplugin = g_strdup_printf("%s/%s/libarts.so", PLUGIN_DIR, plugin_dir_list[0]);
+ }
+ }
if (cfg.eqpreset_default_file == NULL)
cfg.eqpreset_default_file = g_strdup("dir_default.preset");
if (cfg.eqpreset_extension == NULL)
xmms-1.2.11-multilib.patch:
--- NEW FILE xmms-1.2.11-multilib.patch ---
--- xmms-1.2.11-20071117cvs/configure 2008-09-02 21:03:56.000000000 +0100
+++ xmms-1.2.11-20071117cvs/configure-new 2008-09-02 21:36:04.000000000 +0100
@@ -33510,7 +33510,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/Mak
efile 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_s
cope/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
@@ -34178,6 +34178,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.11-20071117cvs/xmms-config.in 2001-04-06 01:35:49.000000000 +0100
+++ xmms-1.2.11-20071117cvs/xmms-config-new.in 2008-09-02 22:23:29.000000000 +0100
@@ -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_dirr
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/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@
xmms-1.2.11-nomp3.patch:
--- NEW FILE xmms-1.2.11-nomp3.patch ---
--- xmms-1.2.11-20071117cvs/xmms/input.c 2005-05-15 22:46:35.000000000 +0100
+++ xmms-1.2.11-20071117cvs/xmms/input-new.c 2008-09-02 19:07:19.000000000 +0100
@@ -17,6 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#define _GNU_SOURCE 1
#include "xmms.h"
#include "fft.h"
#include "libxmms/titlestring.h"
@@ -228,16 +229,21 @@
{
GList *node;
InputPlugin *ip;
-
+ InputPlugin *rhmp3 = NULL;
node = get_input_list();
while (node)
{
ip = (InputPlugin *) node->data;
- if (ip && !g_list_find(disabled_iplugins, ip) &&
+ if (ip && !strcmp(basename(ip->filename),"librh_mp3.so"))
+ rhmp3 = ip;
+ else if (ip && !g_list_find(disabled_iplugins, ip) &&
ip->is_our_file(filename))
return TRUE;
node = node->next;
}
+ if (rhmp3 && !g_list_find(disabled_iplugins, rhmp3) &&
+ rhmp3->is_our_file(filename))
+ return TRUE;
return FALSE;
}
@@ -245,7 +251,7 @@
{
GList *node;
InputPlugin *ip;
-
+ InputPlugin *rhmp3 = NULL;
node = get_input_list();
if (get_current_output_plugin() == NULL)
{
@@ -263,8 +269,9 @@
while (node)
{
ip = node->data;
- if (ip && !g_list_find(disabled_iplugins, ip) &&
- ip->is_our_file(filename))
+ if (ip && !strcmp(basename(ip->filename),"librh_mp3.so"))
+ rhmp3 = ip;
+ else if (ip && !g_list_find(disabled_iplugins, ip) && ip->is_our_file(filename))
{
set_current_input_plugin(ip);
ip->output = get_current_output_plugin();
@@ -274,6 +281,15 @@
}
node = node->next;
}
+ if (rhmp3 && !g_list_find(disabled_iplugins, rhmp3) &&
+ rhmp3->is_our_file(filename))
+ {
+ set_current_input_plugin(rhmp3);
+ rhmp3->output = get_current_output_plugin();
+ rhmp3->play_file(filename);
+ ip_data->playing = TRUE;
+ return;
+ }
set_current_input_plugin(NULL);
}
--- xmms-1.2.11-20071117cvs/Input/Makefile.am 2002-03-15 23:10:06.000000000 +0000
+++ xmms-1.2.11-20071117cvs/Input/Makefile-new.am 2008-09-02 13:50:06.000000000 +0100
@@ -1,3 +1,3 @@
-ALL_PLUGINS = wav mpg123 mikmod cdaudio tonegen vorbis
+ALL_PLUGINS = wav mikmod cdaudio tonegen vorbis
SUBDIRS = @INPUT_PLUGINS@
--- xmms-1.2.11-20071117cvs/Input/Makefile.in 2007-11-17 22:45:30.000000000 +0000
+++ xmms-1.2.11-20071117cvs/Input/Makefile-new.in 2008-09-02 13:51:16.000000000 +0100
@@ -260,7 +260,7 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
xmmsdir = @xmmsdir@
-ALL_PLUGINS = wav mpg123 mikmod cdaudio tonegen vorbis
+ALL_PLUGINS = wav mikmod cdaudio tonegen vorbis
SUBDIRS = @INPUT_PLUGINS@
all: all-recursive
--- xmms-1.2.11-20071117cvs/po/POTFILES.in 2004-01-17 22:45:07.000000000 +0000
+++ xmms-1.2.11-20071117cvs/po/POTFILES-new.in 2008-09-02 13:52:14.000000000 +0100
@@ -19,11 +19,6 @@
Input/cdaudio/http.c
Input/mikmod/drv_xmms.c
Input/mikmod/plugin.c
-Input/mpg123/common.c
-Input/mpg123/configure.c
-Input/mpg123/fileinfo.c
-Input/mpg123/http.c
-Input/mpg123/mpg123.c
Input/tonegen/tonegen.c
Input/vorbis/configure.c
Input/vorbis/fileinfo.c
--- xmms-1.2.9/configure.cow 2004-01-28 21:14:46.418517318 -0500
+++ xmms-1.2.9/configure 2004-01-28 21:14:57.290123348 -0500
@@ -19192,7 +19192,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/mpg123/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 Visual
ization/blur_scope/Makefile 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/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/Mak
efile 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
@@ -19863,7 +19863,6 @@
"Output/alsa/Makefile" ) CONFIG_FILES="$CONFIG_FILES Output/alsa/Makefile" ;;
"Input/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/Makefile" ;;
"Input/wav/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/wav/Makefile" ;;
- "Input/mpg123/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/mpg123/Makefile" ;;
"Input/mikmod/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/mikmod/Makefile" ;;
"Input/cdaudio/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/cdaudio/Makefile" ;;
"Input/tonegen/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/tonegen/Makefile" ;;
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xmms/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 15 Apr 2005 20:07:18 -0000 1.3
+++ .cvsignore 11 Sep 2008 22:53:35 -0000 1.4
@@ -1 +1 @@
-xmms-1.2.10.patched.tar.bz2
+xmms-1.2.11-20071117cvs.patched.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmms/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 15 Apr 2005 20:07:18 -0000 1.3
+++ sources 11 Sep 2008 22:53:35 -0000 1.4
@@ -1 +1 @@
-16414f1c15f0b87c3ee6362a7dcf4e7e xmms-1.2.10.patched.tar.bz2
+4b96f79ab252fa790341a1fa80cc081c xmms-1.2.11-20071117cvs.patched.tar.bz2
Index: xmms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmms/F-9/xmms.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- xmms.spec 19 Feb 2008 18:59:36 -0000 1.34
+++ xmms.spec 11 Sep 2008 22:53:35 -0000 1.35
@@ -1,39 +1,34 @@
Name: xmms
-Version: 1.2.10
-Release: 38%{?dist}
+Version: 1.2.11
+Release: 1.20071117cvs.1%{?dist}
Epoch: 1
Summary: The X MultiMedia System, a media player
Group: Applications/Multimedia
-License: GPL
+License: GPLv2+
URL: http://www.xmms.org/
# http://www.xmms.org/download.php, to recreate the tarball:
# $ wget http://www.xmms.org/files/1.2.x/xmms-1.2.10.tar.bz2
# $ tar jx --exclude "mpg123*" -f xmms-1.2.10.tar.bz2
# $ tar jcf xmms-1.2.10.patched.tar.bz2 xmms-1.2.10
-Source0: %{name}-%{version}.patched.tar.bz2
+Source0: %{name}-%{version}-20071117cvs.patched.tar.bz2
Source1: xmms.sh
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
-Patch4: %{name}-1.2.9-nomp3.patch
-Patch5: %{name}-1.2.8-arts.patch
-Patch6: %{name}-1.2.8-alsalib.patch
+Patch4: %{name}-1.2.11-nomp3.patch
+Patch5: %{name}-1.2.11-arts.patch
+Patch6: %{name}-1.2.11-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
+Patch8: %{name}-1.2.11-multilib.patch
Patch11: %{name}-1.2.10-gcc4.patch
Patch12: %{name}-1.2.10-crossfade-0.3.9.patch
-Patch13: %{name}-1.2.10-pls-188603.patch
Patch14: %{name}-1.2.10-configfile-safe-write.patch
Patch15: %{name}-1.2.10-reposition.patch
-Patch16: %{name}-1.2.10-ubuntu-CVE-2007-0653.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk+-devel
@@ -87,9 +82,7 @@
%prep
-%setup -q
-# Fix joystick plugin crashes
-%patch0 -p1 -b .joycrash
+%setup -q -n %{name}-%{version}-20071117cvs
# Set default output plugin to ALSA
%patch1 -p1 -b .audio
# Use RTLD_LAZY, not RTLD_NOW
@@ -106,19 +99,11 @@
%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
-%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
# Randomize playlists better
-%patch13 -p1 -b .pls
%patch14 -p1
%patch15 -p1
-%patch16 -p1
# Avoid standard rpaths on lib64 archs, --disable-rpath doesn't do it
sed -i -e 's|"/lib /usr/lib"|"/%{_lib} %{_libdir}"|' configure
@@ -230,6 +215,15 @@
%changelog
+* Wed Sep 10 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.2.11-20071117cvs-1.1
+- Reverted license to gplv2+ (oopsy!)
+
+* Tue Sep 02 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.2.11-20071117cvs-1
+- Bump to 1.2.11 devel branch
+- Alter license
+- Removed unused patches
+- Fixed old patches to work with new version
+
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:1.2.10-38
- Autorebuild for GCC 4.3
--- xmms-1.2.10-joycrash.patch DELETED ---
--- xmms-1.2.10-multidevel.patch DELETED ---
--- xmms-1.2.10-pls-188603.patch DELETED ---
--- xmms-1.2.10-ubuntu-CVE-2007-0653.patch DELETED ---
--- xmms-1.2.8-alsalib.patch DELETED ---
--- xmms-1.2.8-arts.patch DELETED ---
--- xmms-1.2.9-nomp3.patch DELETED ---
--- xmms-alsa-backport.patch DELETED ---
--- xmms-underquoted.patch DELETED ---
- Previous message (by thread): rpms/audit/devel .cvsignore, 1.94, 1.95 audit.spec, 1.182, 1.183 sources, 1.118, 1.119
- Next message (by thread): rpms/fig2sxd/F-9 import.log, NONE, 1.1 fig2sxd.spec, 1.1, 1.2 fig2sxd.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list