Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=34ce6fab146cf90c7f0e1f8f9444a6ceb3c83dab
commit 34ce6fab146cf90c7f0e1f8f9444a6ceb3c83dab
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Wed Apr 30 23:27:39 2008 +0200
xmms-1.2.11-1-i686
- bin not used xmms-1.2.10-fw.patch.skip
- rename xmms-1.2.10-cvs-fw.patch to xmms-1.2.11-fw.patch
- add description to xmms-1.2.11-fw.patch (what it does, from where it is, etc)
diff --git a/source/xapps-extra/xmms/FrugalBuild
b/source/xapps-extra/xmms/FrugalBuild
index 7f15528..bb938d5 100644
--- a/source/xapps-extra/xmms/FrugalBuild
+++ b/source/xapps-extra/xmms/FrugalBuild
@@ -15,7 +15,7 @@ up2date="lynx -dump http://www.xmms.org/download.php|grep
^XMMS|cut -d ' ' -f 2"
# SA23986 still needed :)
source=(http://www.xmms.org/files/1.2.x/$pkgname-$pkgver.tar.bz2 \
$pkgname.desktop \
- xmms-1.2.10-cvs-fw.patch SA23986.diff)
+ xmms-1.2.11-fw.patch SA23986.diff)
[ "$CARCH" == "x86_64" ] && confopts=--disable-simd
[ "$CARCH" != "x86_64" ] && confopts=--enable-simd
diff --git a/source/xapps-extra/xmms/xmms-1.2.10-cvs-fw.patch
b/source/xapps-extra/xmms/xmms-1.2.10-cvs-fw.patch
deleted file mode 100644
index 4b9888c..000
--- a/source/xapps-extra/xmms/xmms-1.2.10-cvs-fw.patch
+++ /dev/null
@@ -1,376 +0,0 @@
-diff -Naur xmms-1.2.10.orig/Output/esd/esdout.h xmms-1.2.10/Output/esd/esdout.h
xmms-1.2.10.orig/Output/esd/esdout.h 2006-10-02 12:48:27.0
+0200
-+++ xmms-1.2.10/Output/esd/esdout.h2006-10-02 12:49:37.0 +0200
-@@ -58,6 +58,7 @@
- ESDConfig;
-
- extern ESDConfig esd_cfg;
-+extern void esdout_reset_playerid(void);
-
- void esdout_init(void);
- void esdout_about(void);
-diff -Naur xmms-1.2.10.orig/xmms/main.c xmms-1.2.10/xmms/main.c
xmms-1.2.10.orig/xmms/main.c 2006-10-02 12:48:27.0 +0200
-+++ xmms-1.2.10/xmms/main.c2006-10-02 13:37:32.0 +0200
-@@ -112,6 +112,7 @@
- void mainwin_options_menu_callback(gpointer cb_data, guint action, GtkWidget
* w);
- void mainwin_volume_motioncb(gint pos);
- static void set_timer_mode_menu_cb(TimerMode mode);
-+static void mainwin_jump_to_file(void);
- static void mainwin_queue_manager_queue_refresh(GtkWidget * widget, gpointer
userdata);
-
- enum
-@@ -255,7 +256,7 @@
- enum
- {
- MAINWIN_GENERAL_ABOUT, MAINWIN_GENERAL_PLAYFILE,
MAINWIN_GENERAL_PLAYDIRECTORY,
-- MAINWIN_GENERAL_PLAYLOCATION, MAINWIN_GENERAL_FILEINFO,
-+ MAINWIN_GENERAL_PLAYLOCATION, MAINWIN_GENERAL_PLAYAUDIOCD,
MAINWIN_GENERAL_FILEINFO,
- MAINWIN_GENERAL_SHOWMWIN, MAINWIN_GENERAL_SHOWPLWIN,
- MAINWIN_GENERAL_SHOWEQWIN, MAINWIN_GENERAL_PREV, MAINWIN_GENERAL_PLAY,
- MAINWIN_GENERAL_PAUSE, MAINWIN_GENERAL_STOP, MAINWIN_GENERAL_NEXT,
-@@ -271,9 +272,11 @@
- {
- {N_("/About XMMS"), NULL, mainwin_general_menu_callback,
MAINWIN_GENERAL_ABOUT, ""},
- {N_("/-"), NULL, NULL, 0, ""},
-- {N_("/Play File"), "L", mainwin_general_menu_callback,
MAINWIN_GENERAL_PLAYFILE, ""},
-- {N_("/Play Directory"), "L", mainwin_general_menu_callback,
MAINWIN_GENERAL_PLAYDIRECTORY, ""},
-- {N_("/Play Location"), "L", mainwin_general_menu_callback,
MAINWIN_GENERAL_PLAYLOCATION, ""},
-+ {N_("/Play"), NULL, NULL, 0, ""},
-+ {N_("/Play/Play File"), "L", mainwin_general_menu_callback,
MAINWIN_GENERAL_PLAYFILE, ""},
-+ {N_("/Play/Play Directory"), "L", mainwin_general_menu_callback,
MAINWIN_GENERAL_PLAYDIRECTORY, ""},
-+ {N_("/Play/Play Location"), "L",
mainwin_general_menu_callback, MAINWIN_GENERAL_PLAYLOCATION, ""},
-+ {N_("/Play/Play AudioCD"), "C", mainwin_general_menu_callback,
MAINWIN_GENERAL_PLAYAUDIOCD, ""},
- {N_("/View File Info"), "3" , mainwin_general_menu_callback,
MAINWIN_GENERAL_FILEINFO, ""},
- {N_("/-"), NULL, NULL, 0, ""},
- {N_("/Main Window"), "W", mainwin_general_menu_callback,
MAINWIN_GENERAL_SHOWMWIN, ""},
-@@ -322,6 +325,21 @@
- g_free(filename);
- }
-
-+#ifndef CDDA_DIRECTORY
-+# ifdef HAVE_SYS_CDIO_H
-+# ifdef __FreeBSD__
-+# define CDDA_DIRECTORY "/cdrom"
-+# elif defined __OpenBSD__
-+# define CDDA_DIRECTORY "/cdrom"
-+# else
-+# define CDDA_DIRECTORY "/cdrom/cdrom"
-+# endif
-+# else
-+# define CDDA_DIRECTORY "/mnt/cdrom"
-+# endif
-+#endif
-+
-+
- static void read_config(void)
- {
- ConfigFile *cfgfile;
-@@ -366,6 +384,10 @@
- cfg.snap_distance = 10;
- cfg.pause_between_songs_time = 2;
-
-+ /** Added by Tatu Lahtela */
-+ cfg.mousewheel_scroll_amount = 10;
-+ /* end */
-+
- cfg.vis_type = VIS_ANALYZER;
- cfg.analyzer_mode = ANALYZER_NORMAL;
- cfg.analyzer_type = ANALYZER_BARS;
-@@ -381,6 +403,8 @@
-
- cfg.gentitle_format = NULL;
-
-+ cfg.cdda_directory = CDDA_DIRECTORY;
-+
- filename = g_strconcat(g_get_home_dir(), "/.xmms/config", NULL);
- cfgfile = xmms_cfg_open_file(filename);
- if (cfgfile)
-@@ -442,6 +466,7 @@
- xmms_cfg_read_b
