From df005e763d5c02efe7d1615cfa9efb4862cd28e5 Mon Sep 17 00:00:00 2001
From: Rene Rebe <rene.rebe@gmx.net>
Date: Fri, 26 Sep 2003 12:48:36 +0000
Subject: [PATCH] removed the alsa-xmms package since xmms now includes a ALSA
pluging - and copyright tags for the new xmms.conf file
git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1497 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
Documentation/Developers/CHANGELOG-RENE | 1 +
package/fake/alsa-xmms/alsa-xmms.cache | 35 ----------------------
package/fake/alsa-xmms/alsa-xmms.desc | 39 -------------------------
package/rene/xmms/xmms.conf | 22 ++++++++++++++
4 files changed, 23 insertions(+), 74 deletions(-)
delete mode 100644 package/fake/alsa-xmms/alsa-xmms.cache
delete mode 100644 package/fake/alsa-xmms/alsa-xmms.desc
diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE
index dec14ea41..0b300e652 100644
--- a/Documentation/Developers/CHANGELOG-RENE
+++ b/Documentation/Developers/CHANGELOG-RENE
@@ -5,6 +5,7 @@
fixed reroot in makeimages.sh
disable lilo test4 / pseudo.b
updated xmms
+ - removed alsa-xmms (since xmms now includes a ALSA plugin)
*) 2003-09-24 (2.0.0-rc1 - 2.0.0-rc2)
diff --git a/package/fake/alsa-xmms/alsa-xmms.cache b/package/fake/alsa-xmms/alsa-xmms.cache
deleted file mode 100644
index 7eff8a564..000000000
--- a/package/fake/alsa-xmms/alsa-xmms.cache
+++ /dev/null
@@ -1,35 +0,0 @@
-[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-[COPY]
-[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-[COPY] Please add additional copyright information _after_ the line containing
-[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-[COPY]
-[COPY] ROCK Linux: rock-src/package/fake/alsa-xmms/alsa-xmms.cache
-[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-[COPY]
-[COPY] This program is free software; you can redistribute it and/or modify
-[COPY] it under the terms of the GNU General Public License as published by
-[COPY] the Free Software Foundation; either version 2 of the License, or
-[COPY] (at your option) any later version. A copy of the GNU General Public
-[COPY] License can be found at Documentation/COPYING.
-[COPY]
-[COPY] Many people helped and are helping developing ROCK Linux. Please
-[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-[COPY] file for details.
-[COPY]
-[COPY] --- ROCK-COPYRIGHT-NOTE-END ---
-
-[TIMESTAMP] 1062311954 Sun Aug 31 08:39:14 2003
-[CONFIG-ID] 2.0.0-rc2-x86-pentium-mmx-32-reference-expert
-[ROCKVER] 2.0.0-rc2
-
-[LOGS] 5-alsa-xmms.log 9-alsa-xmms.log
-
-[BUILDTIME] 2688 (9)
-[SIZE] 0.07 MB, 14 files
-
-[DEP] alsa bash binutils bzip2 coreutils diffutils file findutils gawk
-[DEP] gcc3 glib12 glibc23 grep gtk+12 linux24-header make mktemp net-tools
-[DEP] perl5 sed sysfiles tar xfree86 xmms
-
diff --git a/package/fake/alsa-xmms/alsa-xmms.desc b/package/fake/alsa-xmms/alsa-xmms.desc
deleted file mode 100644
index 80b0f9f56..000000000
--- a/package/fake/alsa-xmms/alsa-xmms.desc
+++ /dev/null
@@ -1,39 +0,0 @@
-[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-[COPY]
-[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-[COPY] Please add additional copyright information _after_ the line containing
-[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-[COPY]
-[COPY] ROCK Linux: rock-src/package/fake/alsa-xmms/alsa-xmms.desc
-[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-[COPY]
-[COPY] This program is free software; you can redistribute it and/or modify
-[COPY] it under the terms of the GNU General Public License as published by
-[COPY] the Free Software Foundation; either version 2 of the License, or
-[COPY] (at your option) any later version. A copy of the GNU General Public
-[COPY] License can be found at Documentation/COPYING.
-[COPY]
-[COPY] Many people helped and are helping developing ROCK Linux. Please
-[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-[COPY] file for details.
-[COPY]
-[COPY] --- ROCK-COPYRIGHT-NOTE-END ---
-
-[I] xmms alsa 0.9x output plugin
-
-[T] Using this plugin, the oss emulation of alsa is no longer needed to play
-[T] audio files in xmms, as it directly uses alsa for output.
-
-[A] Matthieu Sozeau <mattam@altern.org>
-[M] fake <fake@rapidnetworks.de>
-
-[C] extra/multimedia
-
-[L] GPL
-[S] Stable
-[V] 0.9.12
-[P] X -----5---9 647.000
-
-[D] 1392612738 alsa-xmms-0.9.12.tar.gz http://savannah.nongnu.org/download/alsa-xmms/
-
diff --git a/package/rene/xmms/xmms.conf b/package/rene/xmms/xmms.conf
index fe9d7c4a4..ff61f599f 100644
--- a/package/rene/xmms/xmms.conf
+++ b/package/rene/xmms/xmms.conf
@@ -1,2 +1,24 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+#
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+#
+# ROCK Linux: rock-src/package/rene/xmms/xmms.conf
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+#
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+#
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
var_append confopt " " "--with-dev-dsp=/dev/sound/dsp"
var_append confopt " " "--with-dev-mixer=/dev/sound/mixer"