From ca3a862e797159f1bdc763ce2611cd4276a6a94c Mon Sep 17 00:00:00 2001
From: Mikhail Kolesnik <mike@openbunker.org>
Date: Sun, 20 Jan 2008 12:50:02 +0200
Subject: xmms: updated to 1.2.11

---
 xmms/.footprint                     |  2 ++
 xmms/.md5sum                        |  4 +---
 xmms/Pkgfile                        | 14 +++++---------
 xmms/xmms-1.2.10-gcc4.patch         | 23 -----------------------
 xmms/xmms-1.2.10_alsa_unpause.patch | 12 ------------
 5 files changed, 8 insertions(+), 47 deletions(-)
 delete mode 100644 xmms/xmms-1.2.10-gcc4.patch
 delete mode 100644 xmms/xmms-1.2.10_alsa_unpause.patch

(limited to 'xmms')

diff --git a/xmms/.footprint b/xmms/.footprint
index 38dc02c47..92e8e4b32 100644
--- a/xmms/.footprint
+++ b/xmms/.footprint
@@ -41,6 +41,8 @@ drwxr-xr-x	root/root	usr/lib/xmms/Input/
 -rwxr-xr-x	root/root	usr/lib/xmms/Input/libmpg123.so
 -rwxr-xr-x	root/root	usr/lib/xmms/Input/libtonegen.la
 -rwxr-xr-x	root/root	usr/lib/xmms/Input/libtonegen.so
+-rwxr-xr-x	root/root	usr/lib/xmms/Input/libvorbis.la
+-rwxr-xr-x	root/root	usr/lib/xmms/Input/libvorbis.so
 -rwxr-xr-x	root/root	usr/lib/xmms/Input/libwav.la
 -rwxr-xr-x	root/root	usr/lib/xmms/Input/libwav.so
 drwxr-xr-x	root/root	usr/lib/xmms/Output/
diff --git a/xmms/.md5sum b/xmms/.md5sum
index c21849674..0c07f0291 100644
--- a/xmms/.md5sum
+++ b/xmms/.md5sum
@@ -1,3 +1 @@
-702175c409da16b43bf4c6700cbb9061  xmms-1.2.10-gcc4.patch
-03a85cfc5e1877a2e1f7be4fa1d3f63c  xmms-1.2.10.tar.bz2
-d8d69cbb2dd6a3c8255671678a8ca19a  xmms-1.2.10_alsa_unpause.patch
+f3e6dbaf0b3f571a532ab575656be506  xmms-1.2.11.tar.bz2
diff --git a/xmms/Pkgfile b/xmms/Pkgfile
index 9e793ea3f..ff1614d87 100644
--- a/xmms/Pkgfile
+++ b/xmms/Pkgfile
@@ -1,21 +1,17 @@
-# Description: X Multimedia System -  a multimedia player 
+# Description: X Multimedia System - a multimedia player 
 # URL: http://www.xmms.org
 # Maintainer: Mikhail Kolesnik, mike at openbunker dot org
-# Depends on: gtk1 
+# Depends on: gtk1
 
 # Nice to have: libmad, libvorbis
 
 name=xmms
-version=1.2.10
-release=4
-source=(http://www.xmms.org/files/1.2.x/$name-$version.tar.bz2 \
-		$name-$version-gcc4.patch \
-		$name-${version}_alsa_unpause.patch)
+version=1.2.11
+release=1
+source=(http://www.xmms.org/files/1.2.x/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version
-	patch -p1 -i $SRC/$name-$version-gcc4.patch
-	patch -p1 -i $SRC/$name-${version}_alsa_unpause.patch
 	./configure --prefix=/usr \
 				--disable-mikmod \
 				--disable-nls \
diff --git a/xmms/xmms-1.2.10-gcc4.patch b/xmms/xmms-1.2.10-gcc4.patch
deleted file mode 100644
index 8133c3920..000000000
--- a/xmms/xmms-1.2.10-gcc4.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ru xmms-1.2.10-orig/General/ir/ir.h xmms-1.2.10/General/ir/ir.h
---- xmms-1.2.10-orig/General/ir/ir.h	2001-03-05 15:17:44.000000000 +0200
-+++ xmms-1.2.10/General/ir/ir.h	2006-04-08 11:42:02.000000000 +0300
-@@ -49,8 +49,6 @@
- }
- irConfig;
- 
--extern pthread_t irapp_thread;
--extern gboolean keepGoing;
- extern irConfig ircfg;
- extern gboolean irconf_is_going;
- 
-diff -ru 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	2001-12-03 04:38:42.000000000 +0200
-+++ xmms-1.2.10/Output/esd/esdout.h	2006-04-08 11:42:47.000000000 +0300
-@@ -58,6 +58,7 @@
- ESDConfig;
- 
- extern ESDConfig esd_cfg;
-+extern void esdout_reset_playerid(void);
- 
- void esdout_init(void);
- void esdout_about(void);
diff --git a/xmms/xmms-1.2.10_alsa_unpause.patch b/xmms/xmms-1.2.10_alsa_unpause.patch
deleted file mode 100644
index 29c3e5cfd..000000000
--- a/xmms/xmms-1.2.10_alsa_unpause.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- xmms-1.2.10-/Output/alsa/audio.c	Fri Apr  1 21:58:46 2005
-+++ xmms-1.2.10/Output/alsa/audio.c	Fri Apr  1 21:53:12 2005
-@@ -166,6 +166,9 @@
- 	else
- 	{
- 		int err;
-+                if (snd_pcm_state(alsa_pcm) == SND_PCM_STATE_SETUP)
-+                	snd_pcm_prepare(alsa_pcm);
-+                
- 		if (force_start &&
- 		    snd_pcm_state(alsa_pcm) == SND_PCM_STATE_PREPARED)
- 		{
-- 
cgit v1.2.3