Compare commits
No commits in common. "rawhide" and "f27" have entirely different histories.
25 changed files with 3514 additions and 1 deletions
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
xmms-1.2.11-20071117cvs.patched.tar.bz2
|
||||
/xmms-1.2.11-mpg123.tar.bz2
|
||||
|
|
@ -1 +0,0 @@
|
|||
Upstream is long gone, GTK 1 app, rpath issues, barely hacked together as is. Time to sleep, old friend.
|
||||
174
rh_mp3.c
Normal file
174
rh_mp3.c
Normal file
|
|
@ -0,0 +1,174 @@
|
|||
|
||||
#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;
|
||||
}
|
||||
2
sources
Normal file
2
sources
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
4b96f79ab252fa790341a1fa80cc081c xmms-1.2.11-20071117cvs.patched.tar.bz2
|
||||
36ace9dfae821fef5e88ab0a752b6935 xmms-1.2.11-mpg123.tar.bz2
|
||||
72
xmms-1.2.10-configfile-safe-write.patch
Normal file
72
xmms-1.2.10-configfile-safe-write.patch
Normal file
|
|
@ -0,0 +1,72 @@
|
|||
--- 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)
|
||||
24
xmms-1.2.10-gcc4.patch
Normal file
24
xmms-1.2.10-gcc4.patch
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
--- 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)
|
||||
20
xmms-1.2.10-reposition.patch
Normal file
20
xmms-1.2.10-reposition.patch
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
--- 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));
|
||||
44
xmms-1.2.10-ubuntu-CVE-2007-0653.patch
Normal file
44
xmms-1.2.10-ubuntu-CVE-2007-0653.patch
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
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);
|
||||
147
xmms-1.2.11-a-b.patch
Normal file
147
xmms-1.2.11-a-b.patch
Normal file
|
|
@ -0,0 +1,147 @@
|
|||
--- xmms-1.2.11/xmms/about.c.ab 2007-11-16 23:53:41.000000000 +0100
|
||||
+++ xmms-1.2.11/xmms/about.c 2007-11-18 20:57:04.000000000 +0100
|
||||
@@ -79,6 +79,7 @@ static const char *credit_text[] =
|
||||
N_("Chris Wilson"),
|
||||
N_("Dave Yearke"),
|
||||
N_("Stephan K. Zitz"),
|
||||
+ N_("Rodrigo Martins de Matos Ventura (the A-B patch)"),
|
||||
NULL,
|
||||
N_("Default skin:"),
|
||||
N_("Leonard \"Blayde\" Tan"),
|
||||
--- xmms-1.2.11/xmms/main.c.ab 2006-07-16 15:40:04.000000000 +0200
|
||||
+++ xmms-1.2.11/xmms/main.c 2007-11-18 21:00:06.000000000 +0100
|
||||
@@ -59,7 +59,7 @@ PButton *mainwin_rew, *mainwin_play, *ma
|
||||
SButton *mainwin_srew, *mainwin_splay, *mainwin_spause, *mainwin_sstop,
|
||||
*mainwin_sfwd, *mainwin_seject, *mainwin_about;
|
||||
TButton *mainwin_shuffle, *mainwin_repeat, *mainwin_eq, *mainwin_pl;
|
||||
-TextBox *mainwin_info, *mainwin_rate_text, *mainwin_freq_text, *mainwin_stime_min,
|
||||
+TextBox *mainwin_info, *mainwin_rate_text, *mainwin_freq_text, *mainwin_stime_min, *mainwin_ab_text,
|
||||
*mainwin_stime_sec;
|
||||
MenuRow *mainwin_menurow;
|
||||
HSlider *mainwin_volume, *mainwin_balance, *mainwin_position, *mainwin_sposition = NULL;
|
||||
@@ -83,6 +83,9 @@ static gboolean mainwin_force_redraw = F
|
||||
static gchar *mainwin_title_text = NULL;
|
||||
static gboolean mainwin_info_text_locked = FALSE;
|
||||
|
||||
+static int ab_position_a = -1;
|
||||
+static int ab_position_b = -1;
|
||||
+
|
||||
/* For x11r5 session management */
|
||||
static char **restart_argv;
|
||||
static int restart_argc;
|
||||
@@ -262,7 +265,8 @@ enum
|
||||
MAINWIN_GENERAL_STOPFADE, MAINWIN_GENERAL_BACK5SEC,
|
||||
MAINWIN_GENERAL_FWD5SEC, MAINWIN_GENERAL_START, MAINWIN_GENERAL_BACK10,
|
||||
MAINWIN_GENERAL_FWD10, MAINWIN_GENERAL_JTT, MAINWIN_GENERAL_JTF,
|
||||
- MAINWIN_GENERAL_CQUEUE, MAINWIN_GENERAL_EXIT
|
||||
+ MAINWIN_GENERAL_CQUEUE, MAINWIN_GENERAL_EXIT,
|
||||
+ MAINWIN_GENERAL_SETAB, MAINWIN_GENERAL_CLEARAB
|
||||
};
|
||||
|
||||
void mainwin_general_menu_callback(gpointer cb_data, guint action, GtkWidget * w);
|
||||
@@ -297,6 +301,9 @@ GtkItemFactoryEntry mainwin_general_menu
|
||||
{N_("/Playback/-"), NULL, NULL, 0, "<Separator>"},
|
||||
{N_("/Playback/Jump to Time"), "<control>J", mainwin_general_menu_callback, MAINWIN_GENERAL_JTT, "<Item>"},
|
||||
{N_("/Playback/Jump to File"), "J", mainwin_general_menu_callback, MAINWIN_GENERAL_JTF, "<Item>"},
|
||||
+ {N_("/Playback/-"), NULL, NULL, 0, "<Separator>"},
|
||||
+ {N_("/Playback/Set A-B"), "A", mainwin_general_menu_callback, MAINWIN_GENERAL_SETAB, "<Item>"},
|
||||
+ {N_("/Playback/Clear A-B"), "S", mainwin_general_menu_callback, MAINWIN_GENERAL_CLEARAB, "<Item>"},
|
||||
{N_("/Playback/Clear Queue"), "<shift>Q", mainwin_general_menu_callback, MAINWIN_GENERAL_CQUEUE, "<Item>"},
|
||||
{N_("/Visualization"), NULL, NULL, 0, "<Item>"},
|
||||
{N_("/-"), NULL, NULL, 0, "<Separator>"},
|
||||
@@ -2521,6 +2528,8 @@ void mainwin_eject_pushed(void)
|
||||
|
||||
void mainwin_play_pushed(void)
|
||||
{
|
||||
+ if (-1!=ab_position_a)
|
||||
+ input_seek(ab_position_a/1000);
|
||||
if (get_input_paused())
|
||||
{
|
||||
input_pause();
|
||||
@@ -3065,6 +3074,25 @@ void mainwin_general_menu_callback(gpoin
|
||||
case MAINWIN_GENERAL_EXIT:
|
||||
mainwin_quit_cb();
|
||||
break;
|
||||
+ case MAINWIN_GENERAL_SETAB:
|
||||
+ if (playlist_get_current_length() != -1)
|
||||
+ if (-1==ab_position_a) {
|
||||
+ ab_position_a = input_get_time();
|
||||
+ ab_position_b = -1;
|
||||
+ } else if (-1==ab_position_b) {
|
||||
+ int time=input_get_time();
|
||||
+ if (time>ab_position_a) ab_position_b=time;
|
||||
+ } else {
|
||||
+ ab_position_a = input_get_time();
|
||||
+ ab_position_b = -1;
|
||||
+ }
|
||||
+ break;
|
||||
+ case MAINWIN_GENERAL_CLEARAB:
|
||||
+ if (playlist_get_current_length() != -1) {
|
||||
+ ab_position_a = -1;
|
||||
+ ab_position_b = -1;
|
||||
+ }
|
||||
+ break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3374,6 +3402,7 @@ static void mainwin_create_widgets(void)
|
||||
textbox_set_xfont(mainwin_info, cfg.mainwin_use_xfont, cfg.mainwin_font);
|
||||
mainwin_rate_text = create_textbox(&mainwin_wlist, mainwin_bg, mainwin_gc, 111, 43, 15, 0, SKIN_TEXT);
|
||||
mainwin_freq_text = create_textbox(&mainwin_wlist, mainwin_bg, mainwin_gc, 156, 43, 10, 0, SKIN_TEXT);
|
||||
+ mainwin_ab_text = create_textbox(&mainwin_wlist, mainwin_bg, mainwin_gc, 195, 43, 15, 0, SKIN_TEXT);
|
||||
|
||||
mainwin_menurow = create_menurow(&mainwin_wlist, mainwin_bg, mainwin_gc, 10, 22, 304, 0, 304, 44, mainwin_mr_change, mainwin_mr_release, SKIN_TITLEBAR);
|
||||
mainwin_menurow->mr_doublesize_selected = cfg.doublesize;
|
||||
@@ -3601,6 +3630,19 @@ gint idle_func(gpointer data)
|
||||
}
|
||||
else
|
||||
{
|
||||
+ if ( -1!=ab_position_a ) {
|
||||
+ if ( -1!=ab_position_b ) {
|
||||
+ textbox_set_text(mainwin_ab_text, "A-B");
|
||||
+ if ( time>ab_position_b ) {
|
||||
+ input_seek(ab_position_a/1000);
|
||||
+ }
|
||||
+ } else {
|
||||
+ textbox_set_text(mainwin_ab_text, "A- ");
|
||||
+ }
|
||||
+ } else {
|
||||
+ textbox_set_text(mainwin_ab_text, " ");
|
||||
+ }
|
||||
+
|
||||
length = playlist_get_current_length();
|
||||
playlistwin_set_time(time, length, cfg.timer_mode);
|
||||
input_update_vis(time);
|
||||
@@ -3697,6 +3739,8 @@ gint idle_func(gpointer data)
|
||||
{
|
||||
GDK_THREADS_ENTER();
|
||||
vis_playback_stop();
|
||||
+ if (-1!=ab_position_a) ab_position_a=-1;
|
||||
+ if (-1!=ab_position_b) ab_position_b=-1;
|
||||
GDK_THREADS_LEAVE();
|
||||
}
|
||||
|
||||
--- xmms-1.2.11/README.ab.ab 2007-11-18 20:57:04.000000000 +0100
|
||||
+++ xmms-1.2.11/README.ab 2007-11-18 20:57:04.000000000 +0100
|
||||
@@ -0,0 +1,21 @@
|
||||
+The A-B feature
|
||||
+---------------
|
||||
+
|
||||
+The A-B feature by Rodrigo Martins de Matos Ventura was found here:
|
||||
+http://lists.xmms.org/pipermail/xmms-devel/2002-January/002282.html
|
||||
+And was rediffed by Oden Eriksson Tue 18 Nov 2003.
|
||||
+
|
||||
+Here's Rodrigos explaination what it is about:
|
||||
+
|
||||
+"I just did a minor patch to CVS version of xmms, in order to
|
||||
+add a small but very useful (at least to me) feature: A-B
|
||||
+repetition. My old CD player has it, and it is extremely useful,
|
||||
+namely for transcribing music.
|
||||
+
|
||||
+The idea is simple: anytime during play, you press the "A" key
|
||||
+(marks A point), the music keeps playing, when you press the "A" key
|
||||
+again (marks B point), it loops endlessly between the two marked
|
||||
+points, until the "S" key is pressed (clear), or a new A point is
|
||||
+marked. Morover, whenever a A-B range is defined, the "play"
|
||||
+button/menu jumps straight to the A position."
|
||||
+
|
||||
19
xmms-1.2.11-alsalib.patch
Normal file
19
xmms-1.2.11-alsalib.patch
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
--- 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
|
||||
77
xmms-1.2.11-arts.patch
Normal file
77
xmms-1.2.11-arts.patch
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
--- 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)
|
||||
24
xmms-1.2.11-dso.patch
Normal file
24
xmms-1.2.11-dso.patch
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
--- 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)
|
||||
142
xmms-1.2.11-is_quitting.patch
Normal file
142
xmms-1.2.11-is_quitting.patch
Normal file
|
|
@ -0,0 +1,142 @@
|
|||
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)
|
||||
{
|
||||
19
xmms-1.2.11-mikmod-fix.patch
Normal file
19
xmms-1.2.11-mikmod-fix.patch
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
diff -up xmms-1.2.11-20071117cvs/Input/mikmod/drv_xmms.c.fix xmms-1.2.11-20071117cvs/Input/mikmod/drv_xmms.c
|
||||
--- xmms-1.2.11-20071117cvs/Input/mikmod/drv_xmms.c.fix 2014-02-11 10:33:47.944425895 -0500
|
||||
+++ xmms-1.2.11-20071117cvs/Input/mikmod/drv_xmms.c 2014-02-11 10:34:39.000359857 -0500
|
||||
@@ -124,7 +124,15 @@ MDRIVER drv_xmms =
|
||||
"xmms output driver v1.0",
|
||||
0, 255,
|
||||
#if (LIBMIKMOD_VERSION > 0x030106)
|
||||
+/* Alias string */
|
||||
"xmms",
|
||||
+#endif
|
||||
+#if (LIBMIKMOD_VERSION >= 0x030200)
|
||||
+/* CmdLineHelp string */
|
||||
+ NULL,
|
||||
+#endif
|
||||
+#if (LIBMIKMOD_VERSION > 0x030106)
|
||||
+/* CommandLine proc */
|
||||
NULL,
|
||||
#endif
|
||||
xmms_IsThere,
|
||||
129
xmms-1.2.11-multilib.patch
Normal file
129
xmms-1.2.11-multilib.patch
Normal file
|
|
@ -0,0 +1,129 @@
|
|||
diff -up xmms-1.2.11-20071117cvs/configure.multidevel xmms-1.2.11-20071117cvs/configure
|
||||
--- xmms-1.2.11-20071117cvs/configure.multidevel 2016-11-18 10:19:19.416318744 -0500
|
||||
+++ xmms-1.2.11-20071117cvs/configure 2016-11-18 10:21:42.901379471 -0500
|
||||
@@ -33510,7 +33510,7 @@ subdirs="$subdirs libxmms"
|
||||
|
||||
|
||||
|
||||
- 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.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/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_commands="$ac_config_commands default"
|
||||
cat >confcache <<\_ACEOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
@@ -34178,6 +34178,7 @@ do
|
||||
"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" ;;
|
||||
diff -up xmms-1.2.11-20071117cvs/xmms-config.in.multidevel xmms-1.2.11-20071117cvs/xmms-config.in
|
||||
--- xmms-1.2.11-20071117cvs/xmms-config.in.multidevel 2001-04-05 20:35:49.000000000 -0400
|
||||
+++ xmms-1.2.11-20071117cvs/xmms-config.in 2016-11-18 10:19:19.433318634 -0500
|
||||
@@ -18,24 +18,6 @@ exec_prefix_set=no
|
||||
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 @@ if test "$echo_exec_prefix" = "yes"; the
|
||||
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 @@ if test "$echo_data_dir" = "yes"; then
|
||||
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
|
||||
diff -up xmms-1.2.11-20071117cvs/xmms.pc.in.multidevel xmms-1.2.11-20071117cvs/xmms.pc.in
|
||||
--- xmms-1.2.11-20071117cvs/xmms.pc.in.multidevel 2016-11-18 10:19:19.434318627 -0500
|
||||
+++ xmms-1.2.11-20071117cvs/xmms.pc.in 2016-11-18 10:19:19.434318627 -0500
|
||||
@@ -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@
|
||||
32
xmms-1.2.6-audio.patch
Normal file
32
xmms-1.2.6-audio.patch
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
--- 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;
|
||||
11
xmms-1.2.6-lazy.patch
Normal file
11
xmms-1.2.6-lazy.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- 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
|
||||
}
|
||||
|
||||
11
xmms-1.2.8-default-skin.patch
Normal file
11
xmms-1.2.8-default-skin.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- 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
|
||||
72
xmms-alsa-fix-loop.patch
Normal file
72
xmms-alsa-fix-loop.patch
Normal file
|
|
@ -0,0 +1,72 @@
|
|||
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;
|
||||
}
|
||||
|
||||
11
xmms-cd-mountpoint.patch
Normal file
11
xmms-cd-mountpoint.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- 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
|
||||
|
||||
11
xmms-play.patch
Normal file
11
xmms-play.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- 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
|
||||
147
xmms.desktop
Normal file
147
xmms.desktop
Normal file
|
|
@ -0,0 +1,147 @@
|
|||
[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 tập tin nhạc Ogg Vorbis và các tập 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-it;audio/x-mod;audio/x-s3m;audio/x-stm;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 nhạc
|
||||
GenericName[zh_CN]=音频播放器
|
||||
GenericName[zh_TW]=音效播放器
|
||||
GenericName[zu]=Umdlali Ozwakalayo
|
||||
Terminal=false
|
||||
Type=Application
|
||||
MapNotify=false
|
||||
Categories=AudioVideo;
|
||||
8
xmms.sh
Normal file
8
xmms.sh
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
#!/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
|
||||
538
xmms.spec
Normal file
538
xmms.spec
Normal file
|
|
@ -0,0 +1,538 @@
|
|||
Name: xmms
|
||||
Version: 1.2.11
|
||||
Release: 32.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
|
||||
# MP3 decode support is now natively supported in Fedora (again).
|
||||
# If the CVS code for xmms still existed, we'd just make a new source0
|
||||
# But it doesn't. So I copied the Input/mpg123 files from xmms-1.2.11.
|
||||
Source3: xmms-1.2.11-mpg123.tar.bz2
|
||||
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
|
||||
Patch5: %{name}-1.2.11-arts.patch
|
||||
Patch6: %{name}-1.2.11-alsalib.patch
|
||||
Patch7: %{name}-cd-mountpoint.patch
|
||||
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
|
||||
Patch19: xmms-1.2.11-mikmod-fix.patch
|
||||
Patch20: xmms-1.2.11-a-b.patch
|
||||
|
||||
# This plugin is gone. Esound is gone. 2001 is gone.
|
||||
Provides: xmms-esd = %{epoch}:%{version}-%{release}
|
||||
Obsoletes: xmms-esd < 1:18.20071117cvs
|
||||
|
||||
BuildRequires: gtk+-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
|
||||
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
|
||||
# mp3 is back
|
||||
Provides: xmms-mp3 = %{version}-%{release}
|
||||
Obsoletes: xmms-mp3 < 1.2.11-8
|
||||
Provides: bundled(libmpg123)
|
||||
|
||||
%description libs
|
||||
The X MultiMedia System player engine and core plugins.
|
||||
|
||||
%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 -a 3
|
||||
# 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
|
||||
# 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
|
||||
%patch19 -p1 -b .mikmod-fix
|
||||
%patch20 -p1 -b .ab
|
||||
# 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-esd \
|
||||
--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
|
||||
|
||||
%install
|
||||
make install DESTDIR=%{buildroot}
|
||||
install -dm 755 %{buildroot}%{_datadir}/xmms/Skins
|
||||
find %{buildroot} -name "*.la" | xargs rm -f
|
||||
|
||||
# Fix translation directory
|
||||
mv %{buildroot}/%{_datadir}/locale/sr@Latn %{buildroot}/%{_datadir}/locale/sr@latin
|
||||
|
||||
# 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
|
||||
%{!?_licensedir:%global license %%doc}
|
||||
%license COPYING
|
||||
%doc AUTHORS ChangeLog FAQ NEWS TODO README README.ab
|
||||
%{_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
|
||||
%license 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 devel
|
||||
%defattr(-,root,root,-)
|
||||
%{_bindir}/xmms-config
|
||||
%{_includedir}/xmms/
|
||||
%{_libdir}/libxmms.so
|
||||
%{_datadir}/aclocal/xmms.m4
|
||||
%{_libdir}/pkgconfig/xmms.pc
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Sep 1 2017 Tom Callaway <spot@fedoraproject.org> - 1:1.2.11-32.20071117cvs
|
||||
- apply a-b patch from Oden Eriksson (bz1480259)
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.2.11-31.20071117cvs
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.2.11-30.20071117cvs
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.2.11-29.20071117cvs
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Mon Jan 16 2017 Tom Callaway <spot@fedoraproject.org> - 1:1.2.11-28.20071117cvs
|
||||
- Add Provides for bundled libmpg123. xmms doesn't really have a good way to use
|
||||
a system copy here, because it is older than dinosaurs.
|
||||
|
||||
* Fri Nov 18 2016 Tom Callaway <spot@fedoraproject.org> - 1:1.2.11-27.20071117cvs
|
||||
- mp3 is back, baby!
|
||||
|
||||
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.2.11-26.20071117cvs
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Wed Jul 15 2015 Ville Skyttä <ville.skytta@iki.fi> - 1:1.2.11-25.20071117cvs
|
||||
- Desktop entry: Add more module format associations, fix some warnings
|
||||
- Mark COPYING as %%license where available
|
||||
|
||||
* Wed Jul 8 2015 Peter Robinson <pbrobinson@fedoraproject.org> 1:1.2.11-24.20071117cvs
|
||||
- Drop obsolete at-spi dependency
|
||||
|
||||
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.2.11-23.20071117cvs
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.2.11-22.20071117cvs
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.2.11-21.20071117cvs
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Tue Feb 11 2014 Tom Callaway <spot@fedoraproject.org> - 1:1.2.11-20.20071117cvs
|
||||
- fix mikmod support (thanks to Ozkan Sezer)
|
||||
- fix serbian translation dir (thanks to Mike FABIAN)
|
||||
|
||||
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.2.11-19.20071117cvs
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Thu Feb 14 2013 Tom Callaway <spot@fedoraproject.org> - 1:1.2.11-18.20071117cvs
|
||||
- drop esound support (esound is dead dead dead)
|
||||
|
||||
* 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.
|
||||
Reference in a new issue