Compare commits

...
This repository has been archived on 2026-09-10. You can view files and clone it, but you cannot make any changes to its state, such as pushing and creating new issues, pull requests or comments.

29 commits

Author SHA1 Message Date
f4b09030e9 Upstream is long gone, GTK 1 app, rpath issues, barely hacked together as is. Time to sleep, old friend. 2021-05-27 11:54:48 -04:00
Fedora Release Engineering
6c2585ff91 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-28 00:11:25 +00:00
Tom Stellard
9ede891cf1 Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2021-01-09 01:32:58 +00:00
Fedora Release Engineering
7a61760c02 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-08-01 09:45:56 +00:00
Fedora Release Engineering
9392341b5f - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-29 14:52:06 +00:00
Fedora Release Engineering
7fea6829db - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-31 04:38:07 +00:00
Fedora Release Engineering
1e11ca0b01 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-27 04:23:05 +00:00
Fedora Release Engineering
bfdcce2ced - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-03 12:35:18 +00:00
dad51eae3d Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
2019-01-28 20:24:56 +01:00
Fedora Release Engineering
4f9d2cad27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-14 09:24:58 +00:00
Jason Tibbitts
f8832f541c Remove needless use of %defattr 2018-07-09 23:55:25 -05:00
Igor Gnatenko
1c4630e8db add BuildRequires: gcc
Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
2018-07-09 19:06:54 +02:00
Fedora Release Engineering
1ffb414666 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-09 21:49:05 +00:00
5635a7bd8f
Remove obsolete scriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-01-30 13:12:55 +01:00
69841bce38 apply a-b patch from Oden Eriksson (bz1480259) 2017-09-01 16:01:46 -04:00
Fedora Release Engineering
c91b35ea6b - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-03 10:48:09 +00:00
Fedora Release Engineering
2e54c3174e - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 22:15:12 +00:00
Fedora Release Engineering
ebe81b0d30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-11 17:59:00 +00:00
e4f0b5f31c Add Provides for bundled libmpg123. xmms doesnt really have a good way to use a system copy here, because it is older than dinosaurs. 2017-01-16 14:15:31 -05:00
ecde3f1667 mp3 support enablement 2016-11-18 10:41:51 -05:00
Fedora Release Engineering
2adce75ee1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-05 03:37:48 +00:00
Ville Skyttä
32ba1c3768 Desktop entry: Add more module format associations, fix some warnings
- Mark COPYING as %license where available
2015-07-15 23:05:24 +03:00
Peter Robinson
73dc70f437 Drop obsolete at-spi dependency 2015-07-08 12:07:45 +01:00
Dennis Gilmore
d47915724f - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-19 04:11:05 +00:00
15865e07ee - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-18 10:17:50 +00:00
Dennis Gilmore
0108699a15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-08 01:11:06 -05:00
a3e0d01b4c fix mikmod support (thanks to Ozkan Sezer), fix serbian translation dir (thanks to Mike FABIAN) 2014-02-11 10:41:58 -05:00
Dennis Gilmore
3a85e32a3e - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild 2013-08-04 03:34:36 -05:00
9d64695002 drop esound support 2013-02-14 15:11:39 -05:00
24 changed files with 1 additions and 3422 deletions

1
.gitignore vendored
View file

@ -1 +0,0 @@
xmms-1.2.11-20071117cvs.patched.tar.bz2

1
dead.package Normal file
View file

@ -0,0 +1 @@
Upstream is long gone, GTK 1 app, rpath issues, barely hacked together as is. Time to sleep, old friend.

174
rh_mp3.c
View file

@ -1,174 +0,0 @@
#include "libxmms/configfile.h"
#include <gtk/gtk.h>
#include "xmms/plugin.h"
#include "xmms/i18n.h"
#include "libxmms/util.h"
static int enabled;
static gpointer foo;
static void init(void)
{
ConfigFile *cfg;
enabled = 1;
cfg = xmms_cfg_open_default_file();
xmms_cfg_read_boolean(cfg, "zzmp3", "enabled", &enabled);
xmms_cfg_free(cfg);
}
static int get_time(void)
{
return -1;
}
static void clicked_button()
{
ConfigFile *cfg;
gchar *filename;
filename = g_strconcat(g_get_home_dir(), "/.xmms/config", NULL);
cfg = xmms_cfg_open_file(filename);
if (!cfg)
cfg = xmms_cfg_new();
xmms_cfg_write_boolean(cfg, "zzmp3", "enabled", enabled);
xmms_cfg_write_file(cfg, filename);
xmms_cfg_free(cfg);
g_free(filename);
}
static void pref_toggled(void *button)
{
GtkWidget *check = GTK_WIDGET(button);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check)))
enabled = 0;
else
enabled = 1;
}
static void play_file(char *filename)
{
GtkWidget *dialog, *vbox, *label, *checkbox, *bbox, *button;
dialog = gtk_dialog_new();
gtk_window_set_title(GTK_WINDOW(dialog), _("MPEG Layer 1/2/3 Not Supported"));
vbox = gtk_vbox_new(FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 15);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), vbox, TRUE, TRUE, 0);
label = gtk_label_new(_("Due to patent licensing, and conflicts between\n"
"such patent licenses and the licenses of application\n"
"source code, MPEG-1/2 audio layer 3 (mp3) support has\n"
"been removed from this application by Red Hat, Inc.\n\n"
"We apologize for the inconvenience."));
gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
checkbox = gtk_check_button_new_with_label (_("Do not show this dialog again"));
gtk_signal_connect_object(GTK_OBJECT(checkbox), "toggled", GTK_SIGNAL_FUNC(pref_toggled), GTK_OBJECT(checkbox));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox), TRUE);
gtk_box_pack_start(GTK_BOX(vbox), checkbox, TRUE, TRUE, 0);
gtk_widget_show(label);
gtk_widget_show(checkbox);
gtk_widget_show(vbox);
bbox = gtk_hbutton_box_new();
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_SPREAD);
gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area), bbox, FALSE, FALSE, 0);
button = gtk_button_new_with_label(_("Ok"));
gtk_signal_connect(GTK_OBJECT(button), "clicked", clicked_button, button);
gtk_signal_connect_object(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT(dialog));
gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
gtk_widget_grab_default(button);
gtk_widget_show(button);
gtk_widget_show(bbox);
gtk_widget_show(dialog);
gtk_signal_connect(GTK_OBJECT(dialog), "destroy",
GTK_SIGNAL_FUNC(gtk_widget_destroyed), &dialog);
}
static int is_our_file(char *filename)
{
char *ext;
guint16 wavid;
if (!enabled) return FALSE;
if (!strncasecmp(filename, "http://", 7))
{ /* We assume all http:// (except those ending in .ogg) are mpeg -- why do we do that? */
ext = strrchr(filename, '.');
if (ext)
{
if (!strncasecmp(ext, ".ogg", 4))
return FALSE;
if (!strncasecmp(ext, ".rm", 3) ||
!strncasecmp(ext, ".ra", 3) ||
!strncasecmp(ext, ".rpm", 4) ||
!strncasecmp(ext, ".ram", 4))
return FALSE;
}
return TRUE;
}
ext = strrchr(filename, '.');
if (ext)
{
if (!strncasecmp(ext, ".mp2", 4) || !strncasecmp(ext, ".mp3", 4))
{
return TRUE;
}
}
return FALSE;
}
static void aboutbox(void) {
static GtkWidget *aboutbox;
if (aboutbox != NULL)
return;
aboutbox = xmms_show_message(
_("MPEG Layer 1/2/3 Placeholder plugin"),
_("Placeholder for MPEG Layer 1/2/3, explaining patent issues\n"
"Red Hat, Inc."),
_("Ok"), FALSE, NULL, NULL);
gtk_signal_connect(GTK_OBJECT(aboutbox), "destroy",
GTK_SIGNAL_FUNC(gtk_widget_destroyed), &aboutbox);
}
InputPlugin zzmp3_ip =
{
NULL,
NULL,
NULL, /* description */
init,
aboutbox,
NULL, /* configure */
is_our_file,
NULL,
play_file,
NULL, /* stop */
NULL, /* pause */
NULL, /* seek */
NULL, /* set eq */
get_time, /* get time */
NULL, NULL, NULL,
NULL, NULL, NULL, NULL,
NULL, /* get_song_info */
NULL, /* file_info_box */
NULL
};
InputPlugin *get_iplugin_info(void)
{
zzmp3_ip.description =
g_strdup(_("MPEG Layer 1/2/3 Placeholder Plugin"));
return &zzmp3_ip;
}

View file

@ -1 +0,0 @@
4b96f79ab252fa790341a1fa80cc081c xmms-1.2.11-20071117cvs.patched.tar.bz2

View file

@ -1,72 +0,0 @@
--- xmms-1.2.10/libxmms/configfile.c.bak 2003-05-20 00:22:07.000000000 +0300
+++ xmms-1.2.10/libxmms/configfile.c 2006-12-30 15:08:31.045540619 +0200
@@ -123,12 +123,27 @@ gboolean xmms_cfg_write_file(ConfigFile
GList *section_list, *line_list;
ConfigSection *section;
ConfigLine *line;
+ gchar *tmpfn;
+ int tmpfnfd;
g_return_val_if_fail(cfg != NULL, FALSE);
g_return_val_if_fail(filename != NULL, FALSE);
- if (!(file = fopen(filename, "w")))
+ tmpfn = g_strconcat(filename, ".XXXXXX", NULL);
+ if (!tmpfn)
return FALSE;
+ tmpfnfd = mkstemp(tmpfn);
+ if (tmpfnfd == -1) {
+ free (tmpfn);
+ return FALSE;
+ }
+ file = fdopen(tmpfnfd, "w");
+ if (!file) {
+ unlink (tmpfn);
+ g_free (tmpfn);
+ close (tmpfnfd);
+ return FALSE;
+ }
section_list = cfg->sections;
while (section_list)
@@ -136,20 +151,36 @@ gboolean xmms_cfg_write_file(ConfigFile
section = (ConfigSection *) section_list->data;
if (section->lines)
{
- fprintf(file, "[%s]\n", section->name);
+ if (fprintf(file, "[%s]\n", section->name) < 0)
+ goto err;
line_list = section->lines;
while (line_list)
{
line = (ConfigLine *) line_list->data;
- fprintf(file, "%s=%s\n", line->key, line->value);
+ if (fprintf(file, "%s=%s\n", line->key, line->value) < 0)
+ goto err;
line_list = g_list_next(line_list);
}
- fprintf(file, "\n");
+ if (fprintf(file, "\n") < 0)
+ goto err;
}
section_list = g_list_next(section_list);
}
- fclose(file);
+ if (fflush (file) == EOF)
+ goto err;
+ if (fsync (tmpfnfd) == -1) /* dir not synced */
+ goto err;
+ if (fclose(file) == EOF)
+ goto err;
+ if (rename (tmpfn, filename) == -1)
+ goto err;
return TRUE;
+
+err:
+ fclose(file);
+ unlink(tmpfn);
+ g_free (tmpfn);
+ return FALSE;
}
gboolean xmms_cfg_write_default_file(ConfigFile * cfg)

View file

@ -1,24 +0,0 @@
--- xmms-1.2.10/General/ir/ir.h.orig 2001-03-05 23:17:44.000000000 +1000
+++ xmms-1.2.10/General/ir/ir.h 2005-03-24 20:48:31.000000000 +1000
@@ -49,8 +49,6 @@
}
irConfig;
-extern pthread_t irapp_thread;
-extern gboolean keepGoing;
extern irConfig ircfg;
extern gboolean irconf_is_going;
--- xmms-1.2.10/xmms/sm.c.orig 2004-01-11 18:33:00.000000000 +0100
+++ xmms-1.2.10/xmms/sm.c 2004-04-12 22:44:28.000000000 +0200
@@ -147,8 +147,9 @@
#else
-void sm_init(int argc, char **argv, const char *previous_session_id)
+const char * sm_init(int argc, char **argv, const char *previous_session_id)
{
+ return NULL;
}
void sm_cleanup(void)

View file

@ -1,20 +0,0 @@
--- xmms-1.2.10/xmms/dock.c.bak 2001-03-08 07:48:38.000000000 +0200
+++ xmms-1.2.10/xmms/dock.c 2007-01-12 22:32:36.156705327 +0200
@@ -625,6 +625,17 @@
void dock_set_uposition(GtkWidget *w, gint x, gint y)
{
+ gint maxx, maxy;
+
+ maxx = gdk_screen_width();
+ maxy = gdk_screen_height();
+ if ((maxx < (x + 15)) || (maxy < (y + 15))) {
+ x = maxx / 2;
+ y = maxy / 2;
+ g_warning("%s: current screen size %dx%d smaller than "
+ "window position specified in config file, resetting to "
+ "x=%d y=%d\n", __FUNCTION__, maxx, maxy, x, y);
+ }
gtk_widget_set_uposition(w, x, y);
gtk_object_set_data(GTK_OBJECT(w), "window_x", GINT_TO_POINTER(x));
gtk_object_set_data(GTK_OBJECT(w), "window_y", GINT_TO_POINTER(y));

View file

@ -1,44 +0,0 @@
diff -up xmms-1.2.11-20071117cvs/xmms/bmp.c.CVE-2007-0653 xmms-1.2.11-20071117cvs/xmms/bmp.c
--- xmms-1.2.11-20071117cvs/xmms/bmp.c.CVE-2007-0653 2006-07-10 17:45:11.000000000 -0400
+++ xmms-1.2.11-20071117cvs/xmms/bmp.c 2011-07-14 15:54:02.497834489 -0400
@@ -19,6 +19,12 @@
*/
#include "xmms.h"
+#if HAVE_STDINT_H
+#include <stdint.h>
+#elif !defined(UINT32_MAX)
+#define UINT32_MAX 0xffffffffU
+#endif
+
struct rgb_quad
{
guchar rgbBlue;
@@ -183,7 +189,7 @@ GdkPixmap *read_bmp(gchar * filename)
}
else if (bitcount != 24 && bitcount != 16 && bitcount != 32)
{
- gint ncols, i;
+ guint32 ncols, i;
ncols = offset - headSize - 14;
if (headSize == 12)
@@ -201,9 +207,17 @@ GdkPixmap *read_bmp(gchar * filename)
}
}
fseek(file, offset, SEEK_SET);
+ /* verify buffer size */
+ if (!h || !w ||
+ w > (((UINT32_MAX - 3) / 3) / h) ||
+ h > (((UINT32_MAX - 3) / 3) / w)) {
+ g_warning("read_bmp(): width(%u)*height(%u) too large", w, h);
+ fclose(file);
+ return NULL;
+ }
+ data = g_malloc0((w * 3 * h) + 3); /* +3 is just for safety */
buffer = g_malloc(imgsize);
fread(buffer, imgsize, 1, file);
- data = g_malloc0((w * 3 * h) + 3); /* +3 is just for safety */
if (bitcount == 1)
read_1b_rgb(buffer, imgsize, data, w, h, rgb_quads);

View file

@ -1,19 +0,0 @@
--- 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

View file

@ -1,77 +0,0 @@
--- 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)

View file

@ -1,24 +0,0 @@
--- xmms-1.2.11-20071117cvs/xmms/Makefile.am 2003-12-01 22:45:23.000000000 +0000
+++ xmms-1.2.11-20071117cvs/xmms/Makefile-new.am 2010-02-20 23:23:26.000000000 +0000
@@ -6,7 +6,8 @@
xmms_LDFLAGS = -export-dynamic
xmms_LDADD = @GTK_LIBS@ @PTHREAD_LIBS@ @SM_LIBS@ @VM_LIBS@ \
-@POSIX_LIBS@ $(top_builddir)/libxmms/libxmms.la @LTLIBINTL@
+@POSIX_LIBS@ $(top_builddir)/libxmms/libxmms.la @LTLIBINTL@ \
+-ldl
INCLUDES = @GTK_CFLAGS@ @XMMS_DEFINES@ @ARCH_DEFINES@ \
-I$(top_builddir)/intl -I$(top_srcdir)
--- xmms-1.2.11-20071117cvs/xmms/Makefile.in 2007-11-17 22:45:34.000000000 +0000
+++ xmms-1.2.11-20071117cvs/xmms/Makefile-new.in 2010-02-20 23:24:28.000000000 +0000
@@ -307,7 +307,8 @@
xmmsincludedir = $(includedir)/xmms
xmms_LDFLAGS = -export-dynamic
xmms_LDADD = @GTK_LIBS@ @PTHREAD_LIBS@ @SM_LIBS@ @VM_LIBS@ \
-@POSIX_LIBS@ $(top_builddir)/libxmms/libxmms.la @LTLIBINTL@
+@POSIX_LIBS@ $(top_builddir)/libxmms/libxmms.la @LTLIBINTL@ \
+-ldl
INCLUDES = @GTK_CFLAGS@ @XMMS_DEFINES@ @ARCH_DEFINES@ \
-I$(top_builddir)/intl -I$(top_srcdir)

View file

@ -1,142 +0,0 @@
diff -Naupr xmms-1.2.11.orig/xmms/input.c xmms-1.2.11/xmms/input.c
--- xmms-1.2.11.orig/xmms/input.c 2005-05-15 02:01:21.000000000 +0200
+++ xmms-1.2.11/xmms/input.c 2009-09-14 22:17:57.756115021 +0200
@@ -286,6 +286,14 @@ void input_seek(int time)
}
}
+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 -Naupr xmms-1.2.11.orig/xmms/input.h xmms-1.2.11/xmms/input.h
--- xmms-1.2.11.orig/xmms/input.h 2000-02-16 22:05:57.000000000 +0100
+++ xmms-1.2.11/xmms/input.h 2009-09-14 22:17:57.757114619 +0200
@@ -34,6 +34,7 @@ InputVisType input_get_vis_type();
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 -Naupr xmms-1.2.11.orig/xmms/main.c xmms-1.2.11/xmms/main.c
--- xmms-1.2.11.orig/xmms/main.c 2006-07-16 15:40:04.000000000 +0200
+++ xmms-1.2.11/xmms/main.c 2009-09-14 22:17:57.759114418 +0200
@@ -888,8 +888,10 @@ void mainwin_shade_toggle(void)
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);
@@ -1540,7 +1542,8 @@ static void mainwin_jump_to_file_real_cb
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 -Naupr xmms-1.2.11.orig/xmms/playlist.c xmms-1.2.11/xmms/playlist.c
--- xmms-1.2.11.orig/xmms/playlist.c 2007-11-16 22:51:30.000000000 +0100
+++ xmms-1.2.11/xmms/playlist.c 2009-09-14 22:17:57.763114547 +0200
@@ -78,9 +78,10 @@ void playlist_clear(void)
{
GList *node;
PlaylistEntry *entry;
-
+
+ /* always assume that there is another song comming up */
if (get_input_playing())
- input_stop();
+ input_stop_for_restart();
PL_LOCK();
if (playlist)
@@ -142,7 +143,7 @@ void playlist_delete_node(GList *node, g
if (get_input_playing())
{
PL_UNLOCK();
- input_stop();
+ input_stop_for_restart();
PL_LOCK();
*restart_playing = TRUE;
}
@@ -583,7 +584,7 @@ void playlist_play(void)
}
if (get_input_playing())
- input_stop();
+ input_stop_for_restart();
vis_clear_data(mainwin_vis);
vis_clear_data(playlistwin_vis);
@@ -681,7 +682,7 @@ void playlist_next(void)
{
/* We need to stop before changing playlist_position */
PL_UNLOCK();
- input_stop();
+ input_stop_for_restart();
PL_LOCK();
restart_playing = TRUE;
}
@@ -736,7 +737,7 @@ void playlist_prev(void)
{
/* We need to stop before changing playlist_position */
PL_UNLOCK();
- input_stop();
+ input_stop_for_restart();
PL_LOCK();
restart_playing = TRUE;
}
@@ -924,7 +925,7 @@ void playlist_set_position(int pos)
{
/* We need to stop before changing playlist_position */
PL_UNLOCK();
- input_stop();
+ input_stop_for_restart();
PL_LOCK();
restart_playing = TRUE;
}
@@ -951,11 +952,25 @@ void playlist_set_position(int pos)
void playlist_eof_reached(void)
{
GList *plist_pos_list;
-
- input_stop();
+ gboolean stop_for_restart = TRUE;
PL_LOCK();
+
+ /*
+ * First, determine if we are going to play another song after
+ * this one and call input_stop() / input_stop_for_restart()
+ * accordingly.
+ */
plist_pos_list = find_playlist_position_list();
+ if (!queued_list && !g_list_next(plist_pos_list) && !cfg.repeat)
+ stop_for_restart = FALSE;
+
+ PL_UNLOCK();
+ if (stop_for_restart)
+ input_stop_for_restart();
+ else
+ input_stop();
+ PL_LOCK();
if (cfg.no_playlist_advance)
{

View file

@ -1,128 +0,0 @@
--- 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/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.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
@@ -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_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/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@

View file

@ -1,124 +0,0 @@
--- 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 Visualization/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/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
@@ -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" ;;

View file

@ -1,32 +0,0 @@
--- xmms-1.2.4/xmms/main.c.audio Mon Nov 20 10:45:10 2000
+++ xmms-1.2.4/xmms/main.c Tue Nov 28 19:39:51 2000
@@ -469,7 +469,7 @@
if (cfg.outputplugin == NULL)
{
#ifdef HAVE_OSS
- cfg.outputplugin = g_strdup_printf("%s/%s/libOSS.so", PLUGIN_DIR, plugin_dir_list[0]);
+ cfg.outputplugin = g_strdup_printf("%s/%s/libALSA.so", PLUGIN_DIR, plugin_dir_list[0]);
#elif defined(sun)
cfg.outputplugin = g_strdup_printf("%s/%s/libSolaris.so", PLUGIN_DIR, plugin_dir_list[0]);
#else
--- xmms-1.2.4/Output/OSS/audio.c.audio Fri Jul 28 20:19:41 2000
+++ xmms-1.2.4/Output/OSS/audio.c Tue Nov 28 19:36:19 2000
@@ -592,7 +592,7 @@
else
device_name = g_strdup(DEV_DSP);
}
- fd = open(device_name, O_WRONLY);
+ fd = open(device_name, O_WRONLY|O_NONBLOCK);
if (fd == -1)
{
g_warning("oss_open(): Failed to open audio device (%s): %s",
@@ -600,7 +600,8 @@
g_free(device_name);
return 0;
}
-
+ fcntl(fd,F_SETFL,fcntl(fd,F_GETFL) &~ O_NONBLOCK);
+
input.format.xmms = fmt;
input.frequency = rate;
input.channels = nch;

View file

@ -1,11 +0,0 @@
--- xmms-1.2.6/xmms/pluginenum.c.lazy Tue Jan 15 17:14:24 2002
+++ xmms-1.2.6/xmms/pluginenum.c Tue Jan 15 17:14:33 2002
@@ -229,7 +229,7 @@
*/
return shl_load(filename, BIND_DEFERRED, 0);
#else
- return dlopen(filename, RTLD_NOW);
+ return dlopen(filename, RTLD_LAZY);
#endif
}

View file

@ -1,11 +0,0 @@
--- xmms-1.2.8/xmms/main.c.foo 2003-09-08 15:07:13.000000000 -0400
+++ xmms-1.2.8/xmms/main.c 2003-09-08 15:07:55.000000000 -0400
@@ -495,6 +495,8 @@
cfg.mainwin_font = g_strdup("-adobe-helvetica-medium-r-*-*-8-*");
if (cfg.gentitle_format == NULL)
cfg.gentitle_format = g_strdup("%p - %t");
+ if (cfg.skin == NULL && !cfgfile && !access("/usr/share/xmms/Skins/Bluecurve-xmms.zip",R_OK))
+ cfg.skin = g_strdup("/usr/share/xmms/Skins/Bluecurve-xmms.zip");
if (cfg.outputplugin == NULL)
{
#ifdef HAVE_OSS

View file

@ -1,72 +0,0 @@
diff -up xmms-1.2.11-20071117cvs/Output/alsa/audio.c.fix-loop xmms-1.2.11-20071117cvs/Output/alsa/audio.c
--- xmms-1.2.11-20071117cvs/Output/alsa/audio.c.fix-loop 2006-07-25 17:45:08.000000000 -0400
+++ xmms-1.2.11-20071117cvs/Output/alsa/audio.c 2011-07-15 16:05:55.805328775 -0400
@@ -807,7 +807,7 @@ static void *alsa_loop(void *arg)
unsigned short *revents;
if (npfds <= 0)
- goto _error;
+ goto _cleanup;
pfds = alloca(sizeof(*pfds) * npfds);
revents = alloca(sizeof(*revents) * npfds);
while (going && alsa_pcm)
@@ -828,16 +828,34 @@ static void *alsa_loop(void *arg)
int i;
snd_pcm_poll_descriptors_revents(alsa_pcm, pfds,
npfds, revents);
- for (i = 0; i < npfds; i++)
+ for (i = 0; i < npfds; i++)
+ {
if (revents[i] & POLLOUT)
{
+ debug("calling alsa_write_out_thread_data()");
alsa_write_out_thread_data();
+ debug("done with alsa_write_out_thread_data, break!");
break;
- }
+ }
+ debug("Still in the for loop");
+ }
+ debug("Out of the for loop, but still in the if poll.");
}
+ debug("Still in the not-paused not-prebuffer conditional");
}
else
- xmms_usleep(10000);
+ {
+ if (paused)
+ debug("Sorry, I'm paused. Taking a little nap.");
+ if (prebuffer)
+ debug("Buffering like Real Player.");
+ if (paused || prebuffer) {
+ xmms_usleep(10000);
+ } else {
+ debug("All done!");
+ goto _cleanup;
+ }
+ }
if (pause_request != paused)
alsa_do_pause(pause_request);
@@ -850,11 +868,12 @@ static void *alsa_loop(void *arg)
}
}
- _error:
+ _cleanup:
alsa_close_pcm();
g_free(thread_buffer);
thread_buffer = NULL;
pthread_exit(NULL);
+ return;
}
/* open callback */
@@ -901,6 +920,7 @@ int alsa_open(AFormat fmt, int rate, int
flush_request = -1;
pthread_create(&audio_thread, NULL, alsa_loop, NULL);
+ debug("Do we get here?");
return 1;
}

View file

@ -1,11 +0,0 @@
--- Input/cdaudio/cdaudio.c~ 2004-01-28 01:09:39.000000000 +0200
+++ Input/cdaudio/cdaudio.c 2005-04-30 18:39:04.000000000 +0300
@@ -78,7 +78,7 @@
# define CDDA_DIRECTORY "/cdrom/cdrom0"
# endif
# else
-# define CDDA_DIRECTORY "/mnt/cdrom"
+# define CDDA_DIRECTORY "/media/cdrecorder"
# endif
#endif

View file

@ -1,11 +0,0 @@
--- xmms-1.2.11-20071117cvs/xmms/xmms.desktop 2002-02-11 23:15:56.000000000 +0000
+++ xmms-1.2.11-20071117cvs/xmms/xmms.desktop-new 2009-09-02 14:19:57.000000000 +0100
@@ -14,7 +14,7 @@
comment[tr]=X Multimedya Sistem
comment[zh_TW]=X ¦h´CÅé¨t²Î
Encoding=Legacy-Mixed
-Exec=xmms
+Exec=xmms -e -p %F
Icon=xmms_mini.xpm
MimeType=audio/x-scpls;audio/x-mpegurl;audio/mpegurl;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg
Terminal=0

View file

@ -1,147 +0,0 @@
[Desktop Entry]
Name=XMMS
Comment=Play Ogg Vorbis and other audio files
Comment[af]=Speel Ogg Vorbis en ander klanklêers
Comment[am]=Ogg Vorbis
Comment[ar]=تشغيل Ogg فوربس و ملفات أخري
Comment[as]=Ogg Vorbis ি-
Comment[be]=Прайграе Ogg Vorbis і іншыя аўдыё файлы
Comment[bg]=Просвирване на Ogg Vorbis и други музикални файлове
Comment[bn]=Ogg Vorvis ি
Comment[bn_IN]=Ogg Vorvis ি
Comment[ca]=Reproduïu fitxers Ogg Vorbis i d'altres formats de so
Comment[cs]=Přehrát zvukové soubory Ogg Vorbis a další
Comment[cy]=Gwrando ar Ogg Vorbis a ffeiliau sain eraill
Comment[da]=Afspil Ogg Vorbis og andre lydfiler
Comment[de]=Ogg Vorbis und andere Audio-Dateien wiedergeben
Comment[el]=Αναπαραγωγή Ogg Vorbis και άλλων αρχείων ήχου
Comment[en_GB]=Play Ogg Vorbis and other audio files
Comment[es]=Reproducir Ogg Vorbis y otros ficheros de audio
Comment[et]=Erinevate helifailide esitamine
Comment[fa]=پخش اُگوُربیس و پروندههای صوتی دیگر
Comment[fi]=Soita mm. Ogg Vorbis -äänitiedostoja
Comment[fr]=Lire les Ogg Vorbis et autres fichiers audio
Comment[gl]=Reproduza Ogg Vorbis e outros ficheiros de audio
Comment[gu]= િ
Comment[he]=נגן קבצי Ogg Vorbis וקבצי קול נוספים
Comment[hi]=Ogg Vorbis
Comment[hr]=Pokretanje Ogg Vorbis i ostalih datoteka zvuka
Comment[hu]=Ogg Vorbis és más hangfájlok lejátszása
Comment[hy]=Նվագել Ogg Vorbis և այլ տիպի ձայնային ֆայլեր
Comment[id]=Mainkan Ogg Vorbis dan berkas audio lainnya
Comment[ilo]=Patugtogen ti Ogg Vorbis ken sabsabali pay nga intar ti paguni
Comment[is]=Spila Ogg Vorbis og fleiri tónlistaskrár
Comment[it]=Riproduce Ogg Vorbis e altri file audio
Comment[ja]=Ogg Vorbis
Comment[ka]=Ogg Vorbis
Comment[kn]=Ogg Vorbis ಿ ಿ ಿಿ
Comment[ko]=Ogg Vorbis
Comment[lt]=Groja Ogg Vorbis ir kitas audio bylas
Comment[lv]=Spēlēt Ogg Vorbis un citas audio datnes
Comment[mk]=Пушта Ogg Vorbis и други аудио датотеки
Comment[ml]=Ogg Vorbis ി ിി
Comment[mr]=Ogg Vorbis ि
Comment[ms]=Main fail audio Ogg Vorbis dan lain-lain
Comment[nb]=Spill av Ogg Vorbis og andre lydfiler
Comment[nl]=Ogg Vorbis en andere audiobestanden afspelen
Comment[no]=Spill av Ogg Vorbis og andre lydfiler
Comment[nso]=Bapala Ogg Vorbis le difaele tše dingwe tšeo di nago le modumo
Comment[or]= ି ି ି
Comment[pa]=Ogg Vorbis
Comment[pl]=Odtwarzanie Ogg Vorbis i innych plików dźwiękowych
Comment[pt]=Toque ficheiros Ogg Vorbis e outros formatos de áudio
Comment[pt_BR]=Toque Ogg Vorbis e outros arquivos de áudio
Comment[ro]=Redă fişiere audio precum Ogg Vorbis
Comment[ru]=Воспроизводит файлы Ogg Vorbis и другие звуковые файлы
Comment[si]=Ogg Vorbis
Comment[sk]=Hrať Ogg Vorbis a ostatné zvukové súbory
Comment[sl]=Predvaja Ogg Vorbis in druge zvočne datoteke
Comment[sr]=Пуштање Ogg Vorbis и осталих аудио датотека
Comment[sr@latin]=Puštanje Ogg Vorbis i ostalih audio datoteka
Comment[sv]=Spela Ogg Vorbis-filer och andra ljudfiler
Comment[ta]=Ogg Vorbis ி
Comment[te]=Ogg Vorbis ి ి
Comment[th]= Ogg Vorbis
Comment[tr]=Ogg Vorbis ve diğer işitsel dosyaları çalar
Comment[uk]=Відтворення файлів Ogg Vorbis та інших звукових файлів
Comment[ur]=اور دو سری آ ڈ یو فا ٔیلز چلا یں Ogg Vorbis
Comment[vi]=Chơi tp tin nhc Ogg Vorbis và các tp tin khác
Comment[zh_CN]= Ogg Vorbis
Comment[zh_TW]= Ogg Vorbis
Comment[zu]=Dlala i- Ogg Vorbis kanye namafayela okuzwa
Exec=xmms -e -p %F
Icon=xmms
MimeType=audio/x-mp3;audio/x-mod;audio/x-wav;audio/x-mpegurl;audio/mpegurl;audio/x-scpls;application/x-ogg;application/ogg
GenericName=Audio Player
GenericName[af]=Klankspeler
GenericName[am]=
GenericName[ar]=مُشغِّل الصّوتيّات
GenericName[as]=
GenericName[be]=Аўдыё прайгравач
GenericName[bg]=Музикален плейър
GenericName[bn]=ি
GenericName[bn_IN]=ি
GenericName[ca]=Reproductor de so
GenericName[cs]=Přehrávač zvuku
GenericName[cy]=Chwaraewr Sain
GenericName[da]=Lydafspiller
GenericName[de]=Audio-Player
GenericName[el]=Αναπαραγωγέας Audio
GenericName[en_GB]=Audio Player
GenericName[es]=Reproductor de audio
GenericName[et]=Audio mängijad
GenericName[fa]=پخشکنندهٔ صدا
GenericName[fi]=Äänisoitin
GenericName[fr]=Lecteur audio
GenericName[gl]=Reproductor de audio
GenericName[gu]=િ
GenericName[he]=נגן צלילים
GenericName[hi]=
GenericName[hr]=Svirač zvuka
GenericName[hu]=Hanglejátszó
GenericName[hy]=Ձայնարկիչ
GenericName[id]=Audio Player
GenericName[ilo]=Pagpatokar iti Uni
GenericName[is]=Hljóðspilari
GenericName[it]=Lettore audio
GenericName[ja]=
GenericName[ka]=
GenericName[kn]=ಿ ಿ
GenericName[ko]=
GenericName[lt]=Audio Grotuvas
GenericName[lv]=Audio atskaņotājs
GenericName[mk]=Аудио пуштач
GenericName[ml]=ി
GenericName[mr]=
GenericName[ms]=Pemain Audio
GenericName[nb]=Lydavspiller
GenericName[nl]=Geluidsspeler
GenericName[no]=Lydavspiller
GenericName[nso]=Sebapadi se nago le Modumo
GenericName[or]=ି
GenericName[pa]=
GenericName[pl]=Odtwarzacz dźwięku
GenericName[pt]=Reprodutor Áudio
GenericName[pt_BR]=Reprodutor de Áudio
GenericName[ro]=Player audio
GenericName[ru]=Звуковой проигрыватель
GenericName[si]=
GenericName[sk]=Prehrávač zvuku
GenericName[sl]=Predvajalnik zvoka
GenericName[sr]=Аудио програм
GenericName[sr@latin]=Audio program
GenericName[sv]=Ljudspelare
GenericName[ta]=ி ி
GenericName[te]=Audio Player
GenericName[th]=
GenericName[tr]=Sesçalar
GenericName[uk]=Програвач звуку
GenericName[ur]=Player آ ڈ یو
GenericName[vi]=B chơi nhc
GenericName[zh_CN]=
GenericName[zh_TW]=
GenericName[zu]=Umdlali Ozwakalayo
Terminal=0
Type=Application
MapNotify=false
Categories=AudioVideo;

View file

@ -1,8 +0,0 @@
#!/bin/sh
# https://bugzilla.redhat.com/213172
if [ -z "$XLIB_SKIP_ARGB_VISUALS" ] ; then
exec env XLIB_SKIP_ARGB_VISUALS=1 /usr/libexec/xmms "$@"
else
exec /usr/libexec/xmms "$@"
fi

491
xmms.spec
View file

@ -1,491 +0,0 @@
Name: xmms
Version: 1.2.11
Release: 17.20071117cvs%{?dist}
Epoch: 1
Summary: The X MultiMedia System, a media player
Group: Applications/Multimedia
License: GPLv2+
URL: http://legacy.xmms2.org/
# http://www.xmms.org/download.php, to recreate the tarball:
# $ wget http://legacy.xmms2.org/xmms-1.2.11.tar.bz2
# $ tar jx --exclude "mpg123*" -f xmms-1.2.11.tar.bz2
# $ tar jcf xmms-1.2.11.patched.tar.bz2 xmms-1.2.11
Source0: %{name}-%{version}-20071117cvs.patched.tar.bz2
Source1: xmms.sh
Source2: xmms.xpm
Source3: rh_mp3.c
Source4: xmms.desktop
# http://cvs.xmms.org/cvsweb.cgi/xmms/General/joystick/joy.c.diff?r1=1.8&r2=1.9
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.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.11-multilib.patch
Patch9: %{name}-play.patch
Patch11: %{name}-1.2.10-gcc4.patch
# From xmms-crossfade-0.3.14/patches/ adapted from 1.2.10 to 1.2.11
Patch12: %{name}-1.2.11-is_quitting.patch
Patch14: %{name}-1.2.10-configfile-safe-write.patch
Patch15: %{name}-1.2.10-reposition.patch
Patch16: %{name}-1.2.11-dso.patch
Patch17: xmms-1.2.10-ubuntu-CVE-2007-0653.patch
Patch18: xmms-alsa-fix-loop.patch
BuildRequires: gtk+-devel
BuildRequires: esound-devel
BuildRequires: arts-devel
BuildRequires: alsa-lib-devel
BuildRequires: libogg-devel
BuildRequires: libvorbis-devel
BuildRequires: mikmod-devel
BuildRequires: gettext-devel
BuildRequires: zlib-devel
BuildRequires: libGL-devel
BuildRequires: libXt-devel
BuildRequires: libSM-devel
BuildRequires: libXxf86vm-devel
BuildRequires: desktop-file-utils
Requires: unzip libcanberra-gtk2 gtk2 at-spi
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
# Skin packages can require this from xmms and all GUI compatible players
Provides: xmms-gui
%description
XMMS is a multimedia (Ogg Vorbis, CDs) player for the X Window System
with an interface similar to Winamp's. XMMS supports playlists and
streaming content and has a configurable interface.
%package libs
Summary: XMMS engine and core plugins
Group: System Environment/Libraries
%description libs
The X MultiMedia System player engine and core plugins.
%package esd
Summary: EsounD output plugin for XMMS
Group: System Environment/Libraries
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
%description esd
EsounD output plugin for the X MultiMedia System.
%package devel
Summary: Files required for XMMS plug-in development
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.
%prep
%setup -q -n %{name}-%{version}-20071117cvs
# Set default output plugin to ALSA
%patch1 -p1 -b .audio
# Use RTLD_LAZY, not RTLD_NOW
%patch2 -p1 -b .lazy
# Change the default skin
%patch3 -p1 -b .default-skin
# Don't build MP3 support, support bits for MP3 placeholder
%patch4 -p1 -b .nomp3
# Link arts dynamically and detect its presence for choosing output plugin
%patch5 -p1 -b .arts
# Don't link *everything* against alsa-lib
%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 for crossfade >= 0.3.14 to work properly
%patch12 -p1 -b .crossfade
# Randomize playlists better
%patch14 -p1
%patch15 -p1
%patch9 -p1 -b .playonclick
%patch16 -p1 -b .dso
%patch17 -p1 -b .CVE-2007-0653
%patch18 -p1 -b .fix-loop
# Avoid standard rpaths on lib64 archs, --disable-rpath doesn't do it
sed -i -e 's|"/lib /usr/lib"|"/%{_lib} %{_libdir}"|' configure
for f in AUTHORS ChangeLog README ; do
iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f
done
%build
%configure \
--disable-dependency-tracking \
--enable-kanji \
--enable-texthack \
--enable-ipv6 \
--with-pic \
--disable-static
# causes problems with dso linking
#find . -name Makefile | xargs sed -i -e s/-lpthread//g # old libtool, x86_64
make
# smp_flags removed due to build issues
%{__cc} $RPM_OPT_FLAGS -fPIC -shared -Wl,-soname -Wl,librh_mp3.so \
-o librh_mp3.so -I. $(gtk-config --cflags gtk) %{SOURCE3}
%install
make install DESTDIR=%{buildroot}
install -pm 755 librh_mp3.so %{buildroot}%{_libdir}/xmms/Input
install -dm 755 %{buildroot}%{_datadir}/xmms/Skins
find %{buildroot} -name "*.la" | xargs rm -f
# On FC5 x86_64, some get created even though we pass --disable-static
rm -f %{buildroot}%{_libdir}/xmms/*/*.a
# https://bugzilla.redhat.com/213172
for bin in xmms wmxmms ; do
install -Dpm 755 %{buildroot}%{_bindir}/$bin \
%{buildroot}%{_libexecdir}/$bin
sed -e "s|/usr/libexec/xmms|%{_libexecdir}/$bin|" %{SOURCE1} > \
%{buildroot}%{_bindir}/$bin
chmod 755 %{buildroot}%{_bindir}/$bin
done
# Desktop menu entry
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE4}
# Desktop menu icon
install -Dpm 644 %{SOURCE2} \
%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/xmms.xpm
install -Dpm 644 xmms.pc %{buildroot}%{_libdir}/pkgconfig/xmms.pc
%find_lang %{name}
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%post libs -p /sbin/ldconfig
%postun
if [ $1 -eq 0 ]; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database &>/dev/null || :
fi
%postun libs -p /sbin/ldconfig
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database &>/dev/null || :
%files -f %{name}.lang
%doc AUTHORS ChangeLog COPYING FAQ NEWS TODO README
%{_bindir}/xmms
%{_bindir}/wmxmms
%{_libexecdir}/xmms
%{_libexecdir}/wmxmms
%{_datadir}/applications/xmms.desktop
%{_datadir}/icons/hicolor/*x*/apps/xmms.xpm
%{_datadir}/xmms/
%{_mandir}/man1/*xmms.1*
%files libs
%doc COPYING
%{_libdir}/libxmms.so.*
%dir %{_libdir}/xmms/
%{_libdir}/xmms/Effect/
%{_libdir}/xmms/General/
%{_libdir}/xmms/Input/
%dir %{_libdir}/xmms/Output/
%{_libdir}/xmms/Output/libALSA.so
%{_libdir}/xmms/Output/libOSS.so
%{_libdir}/xmms/Output/libdisk_writer.so
%{_libdir}/xmms/Visualization/
%files esd
%defattr(-,root,root,-)
%{_libdir}/xmms/Output/libesdout.so
%files devel
%defattr(-,root,root,-)
%{_bindir}/xmms-config
%{_includedir}/xmms/
%{_libdir}/libxmms.so
%{_datadir}/aclocal/xmms.m4
%{_libdir}/pkgconfig/xmms.pc
%changelog
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.2.11-17.20071117cvs
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.2.11-16.20071117cvs
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Fri Jul 15 2011 Tom Callaway <spot@fedoraproject.org> - 1:1.2.11-15.20071117cvs
- fix alsa plugin loop code to, well, stop looping when the track is done
- fix desktop file to enqueue and play files
- add patch from Ubuntu for CVE-2007-0653
* Thu Jul 14 2011 Tom Callaway <spot@fedoraproject.org> - 1:1.2.11-14.20071117cvs
- fix url (bz 672011)
* Thu Jul 14 2011 Tom Callaway <spot@fedoraproject.org> - 1:1.2.11-13.20071117cvs
- minor spec cleanup and rebuild
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.2.11-12.20071117cvs
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Sat Feb 20 2010 Paul F. Johnson <paul@all-the-johnsons.co.uk> 1:1.2.11-11.20071117cvs
- DSO linking fix
* Wed Dec 9 2009 Matthias Saou <http://freshrpms.net/> 1:1.2.11-10.20071117cvs
- Include xmms.desktop, taken from redhat-audio-player.desktop which is no
longer provided by any package (it was about time).
- Update scriplets to what I understand is best from ScriptletSnippets page.
* Wed Sep 23 2009 Rex Dieter <rdieter@fedoraproject.org> 1:1.2.11-9.20071117cvs
- optimize desktop/icon scriptlets
* Mon Sep 14 2009 Matthias Saou <http://freshrpms.net/> 1:1.2.11-8.20071117cvs
- Update crossfade patch to the latest version (#518176).
* Wed Sep 02 2009 Paul F. Johnson <paul@all-the-johnsons.co.uk> 1:1.2.11-7.20071117cvs
- Fix play on click bug (BZ434692)
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.2.11-6.20071117cvs
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 1:1.2.11-5.20071117cvs
- Add "xmms-gui" provides, to be required from xmms-skins package (#470135).
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.2.11-4.20071117cvs
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Sat Nov 29 2008 Paul F. Johnson <paul@all-the-johnsons.co.uk> 1.2.11-20071117cvs-3
- Fix multilib patch
* Thu Sep 18 2008 Paul F. Johnson <paul@all-the-johnsons.co.uk> 1.2.11-20071117cvs-2
- Additional requires
* Wed Sep 10 2008 Paul F. Johnson <paul@all-the-johnsons.co.uk> 1.2.11-20071117cvs-1.1
- Reverted license to gplv2+ (oopsy!)
* Tue Sep 02 2008 Paul F. Johnson <paul@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@fedoraproject.org> - 1:1.2.10-38
- Autorebuild for GCC 4.3
* Mon Feb 18 2008 Jesse Keating <jkeating@redhat.com> - 1.2.10-37
- Rebuild for new mikmod
* Fri Apr 13 2007 Paul F. Johnson <paul@all-the-johnsons.co.uk> 1:1.2.10-36
- add back in the .pc file
* Sun Apr 01 2007 Paul F. Johnson <paul@all-the-johnsons.co.uk> 1:1.2.10-35
- added CVE fix for buffer problem
* Sat Mar 10 2007 Paul F. Johnson <paul@all-the-johnsons.co.uk> 1:1.2.10-34
- built from cvs tarball (amended to remove mp3)
* Fri Jan 19 2007 Paul F. Johnson <paul@all-the-johnsons.co.uk> 1:1.2.10-32
- removed R xmms in libs
* Thu Jan 18 2007 Paul F. Johnson <paul@all-the-johnsons.co.uk> 1:1.2.10-31
- fixes for repositioning on mode change and .xmms file
* Mon Jan 1 2007 Paul F. Johnson <paul@all-the-johnsons.co.uk> 1:1.2.10-30
- new package owner
- added R to libs package
- rebuild
* Mon Nov 6 2006 Ville Skyttä <ville.skytta at iki.fi> - 1:1.2.10-29
- Work around incompatibilities with the Composite X extension (#213172).
- Apply upstream playlist randomization improvements (#188603).
* Mon Aug 28 2006 Ville Skyttä <ville.skytta at iki.fi> - 1:1.2.10-28
- Rebuild.
* Wed Jun 21 2006 Ville Skyttä <ville.skytta at iki.fi> - 1:1.2.10-27
- Split EsounD output plugin into -esd subpackage, don't filter dependencies.
- Make menu entry symlink relative.
- Re-enable parallel make.
* Wed Jun 7 2006 Jeremy Katz <katzj@redhat.com> - 1:1.2.10-26
- don't use parallel make to try to stop the build hang
* 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.
- Avoid standard rpaths on lib64 archs.
- Tighten versioned -devel dependency to -libs.
- Drop no longer needed Obsoletes.
- Install icon to %%{_datadir}/icons.
- Convert docs to UTF-8.
- Specfile rewrite/cleanup.
- Drop bogus Source0 URL.
- Don't use %%exclude.
* Thu Mar 2 2006 Matthias Saou <http://freshrpms.net/> 1:1.2.10-22
- Remove /usr/lib64/xmms/General/libsong_change.a (fix for FC5 x86_64...).
* 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@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
x86_64.
* Thu May 5 2005 Matthias Saou <http://freshrpms.net/> 1:1.2.10-17
- Don't have scriplets fail if update-desktop-database returns an error.
* Sat Apr 30 2005 Ville Skyttä <ville.skytta at iki.fi> - 1:1.2.10-16
- Use /media/cdrecorder as the default CDROM mountpoint for the CD audio
plugin, it's more likely to work nowadays than /mnt/cdrom.
- Drop no longer needed skins tarball.
- Build with dependency tracking disabled.
* Fri Apr 15 2005 Matthias Saou <http://freshrpms.net/> 1:1.2.10-15
- Change main icon from xpm to png (smaller, more consistent).
- Split off the aRts plugin.
- Split off the skins at last, as noarch (#65614).
- Remove generic INSTALL instructions.
- Remove autoconf and automake build reqs, as they're no longer called.
- Remove unneeded glib2-devel build req.
* Wed Apr 6 2005 Seth Vidal <skvidal at phy.duke.edu> 1:1.2.10-14
- put back conflict
* Wed Apr 6 2005 Seth Vidal <skvidal at phy.duke.edu> 1:1.2.10-13
- clean up spec file a bit.
- remove everything except for the last 2 yrs of changelog entries.
- make things match Fedora Extras Packaging Guidelines more
* Wed Apr 6 2005 Seth Vidal <skvidal at phy.duke.edu> 1:1.2.10-12
- Apply patch from David Hill RH bz: 152138
* Thu Mar 24 2005 David Hill <djh[at]ii.net> 1:1.2.10-12
- Add gcc4 patch
* Wed Jan 05 2005 Colin Walters <walters@redhat.com> 1:1.2.10-11
- Change BR on mikmod to mikmod-devel (138057)
* Tue Nov 23 2004 Colin Walters <walters@redhat.com> 1:1.2.10-10
- Add xmms-alsa-backport.patch (bug 140565, John Haxby)
* Wed Oct 13 2004 Colin Walters <walters@redhat.com> 1:1.2.10-9
- Correct update-desktop-database correction for postun
* Wed Oct 13 2004 Colin Walters <walters@redhat.com> 1:1.2.10-8
- Call update-desktop-database on correct directory
* Mon Oct 04 2004 Colin Walters <walters@redhat.com> 1:1.2.10-7
- PreReq desktop-file-utils 0.9
- Run update-desktop-database
* Sun Aug 15 2004 Tim Waugh <twaugh@redhat.com> 1:1.2.10-6
- Fixed another underquoted m4 definition.
* Thu Jul 15 2004 Tim Waugh <twaugh@redhat.com> 1:1.2.10-5
- Fixed warnings in shipped m4 file.
* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Mon May 31 2004 Warren Togami <wtogami@redhat.com> 1:1.2.10-3.p
- #124701 -devel req gtk+-devel
* Thu Mar 11 2004 Bill Nottingham <notting@redhat.com> 1:1.2.10-2.p
- update to 1.2.10
- fix buildreqs (#114857)
- switch default output plugin to ALSA
* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Mon Feb 23 2004 Than Ngo <than@redhat.com> 1:1.2.9-5.p
- enable arts plugin, it should work with arts-1.2.0-1.5 or newer.
* Sat Feb 14 2004 Than Ngo <than@redhat.com> 1:1.2.9-4.p
- disable xmms-1.2.8-arts.patch
* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Wed Jan 28 2004 Bill Nottingham <notting@redhat.com> 1:1.2.9-2.p
- enable ipv6 (#105774)
* Wed Jan 28 2004 Bill Nottingham <notting@redhat.com> 1:1.2.9-1.p
- update to 1.2.9
* Fri Dec 12 2003 Bill Nottingham <notting@redhat.com> 1:1.2.8-4.p
- rebuild, pick up alsa plugin
* Wed Oct 22 2003 Bill Nottingham <notting@redhat.com> 1:1.2.8-3.p
- fix dependency blacklisting (corollary of #100917)
* Mon Oct 13 2003 Than Ngo <than@redhat.com> 1:1.2.8-2.p
- workaround to fix arts crash
* Mon Sep 8 2003 Bill Nottingham <notting@redhat.com> 1:1.2.8-1.p
- update to 1.2.8
- clean out now-upstream stuff (Welsh po file, other patches)
- switch to Håvard's arts plugin, tweak it's default buffer size
- don't explicitly require trademarked skin name (#84554)
* Mon Jun 30 2003 Bill Nottingham <notting@redhat.com> 1:1.2.7-23.p
- add welsh po file (#98244)
* Sun Jun 8 2003 Tim Powers <timp@redhat.com> 1:1.2.7-22.1.p
- built for RHEL
* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Tue Jun 3 2003 Jeff Johnson <jbj@redhat.com>
- add explicit epoch's where needed.

1778
xmms.xpm

File diff suppressed because it is too large Load diff