oss: update to stable 4.1

7 files changed, 13 insertions, 140 deletions

diff --git a/audio-drivers/oss/DEPENDS b/audio-drivers/oss/DEPENDS
index b70932b206..0ac61f7ebd 100755
--- a/audio-drivers/oss/DEPENDS
+++ b/audio-drivers/oss/DEPENDS
@@ -1,3 +1,4 @@
+depends bc  &&
 optional_depends  gtk+2 "" "" "Enable ossxmix app?"  &&
 if [[ $OSS_BRANCH == scm ]]; then
 depends mercurial
diff --git a/audio-drivers/oss/DETAILS b/audio-drivers/oss/DETAILS
index 07093ee0e5..a8511c43a7 100755
--- a/audio-drivers/oss/DETAILS
+++ b/audio-drivers/oss/DETAILS
@@ -16,10 +16,10 @@ elif [[ $OSS_BRANCH == test ]]; then
      SOURCE_HASH=sha512:96b39b3381bb9f68adfc4e3fd0eff4f4dd859a48727f079d52755beba9b6affe59dcc8594bb8e5e748b888db7c6148fbd6b3e8c6c7fa6e42a9f2ded062b76321
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}-src-gpl"
 else
-         VERSION=v4.0-build1016
+         VERSION=v4.1-build1051
           SOURCE=$SPELL-$VERSION-src-gpl.tar.bz2
    SOURCE_URL[0]=http://www.4front-tech.com/developer/sources/stable/gpl/$SOURCE
-     SOURCE_HASH=sha512:c4511b090a8cdd7a4979dc4921eafa71aa7ef2bbd0baa50aab3c442d30cf5ee685c989b2101c36bc93e3ff302d9ea14a2e23e468e5552641d5423d93b6bbe1b7
+     SOURCE_HASH=sha512:98d1c335b25e894449c80d5f3dafd1555e26539006225bdec306bcf9143babff3f85cce5306ad87f5066d0879db0fd78ab78778b96b909e5ee8b7ea099a1be83
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}-src-gpl"
 fi
         WEB_SITE="http://www.opensound.com "
diff --git a/audio-drivers/oss/HISTORY b/audio-drivers/oss/HISTORY
index f5a83ec2b9..d7dafce9e0 100644
--- a/audio-drivers/oss/HISTORY
+++ b/audio-drivers/oss/HISTORY
@@ -1,3 +1,11 @@
+2009-03-01 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
+	* DETAILS: updated OSS_BRANCH=stable to v4.1-build1051
+	* DEPENDS: missing bc as dependency
+	* PREPARE: switch test with stable
+	* PRE_BUILD: no more patches
+	* buildfix.diff: removed
+	* nosoundon.diff: removed
+
 2008-11-24 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
 	* PRE_BUILD: fixup of patches
 	* INSTALL: updated to copy only without soundon
diff --git a/audio-drivers/oss/PREPARE b/audio-drivers/oss/PREPARE
index 2cbed32ed0..f19d7bb8bf 100755
--- a/audio-drivers/oss/PREPARE
+++ b/audio-drivers/oss/PREPARE
@@ -1,5 +1,6 @@
+OSS_BRANCH=${OSS_BRANCH/test/stable}  &&
 config_query_list OSS_BRANCH "Which branch do you want?"  \
-                  stable test scm                         &&
+                  stable scm                         &&
 if [[ $OSS_BRANCH == scm ]]; then
   config_query OSS_SCM_AUTO \
   "Automaticaly update the spell on sorcery queue/system-update?" \
diff --git a/audio-drivers/oss/PRE_BUILD b/audio-drivers/oss/PRE_BUILD
index 3837138ab4..e5efc6a2bd 100755
--- a/audio-drivers/oss/PRE_BUILD
+++ b/audio-drivers/oss/PRE_BUILD
@@ -1,10 +1,6 @@
 default_pre_build                            &&
 mk_source_dir  $SOURCE_DIRECTORY.bld         &&
 cd $SOURCE_DIRECTORY                         &&
-if [[ $OSS_BRANCH == stable ]]; then
-patch -p1 < $SPELL_DIRECTORY/buildfix.diff   &&
-patch -p0 < $SPELL_DIRECTORY/nosoundon.diff
-fi                                           &&
 if [[ $OSS_BRANCH != stable ]]; then
 patch -p0 < $SPELL_DIRECTORY/nowerror.patch
 fi
diff --git a/audio-drivers/oss/buildfix.diff b/audio-drivers/oss/buildfix.diff
deleted file mode 100644
index 4d9f533b26..0000000000
--- a/audio-drivers/oss/buildfix.diff
+++ /dev/null
@@ -1,125 +0,0 @@
-
-# HG changeset patch
-# User Hannu Savolainen <hannu@opensound.com>
-# Date 1202257182 -7200
-# Node ID bc0a06e2e9bde5a503beb02d820125cf3ac46497
-# Parent 1cb776eaa147ecdcc964299686b3a16ffebbec39
-Changes to make libsalsa compatible with latest ALSA versions.
-
---- a/lib/libsalsa/seq.c	Tue Feb 05 14:42:35 2008 +0200
-+++ b/lib/libsalsa/seq.c	Wed Feb 06 02:19:42 2008 +0200
-@@ -1695,13 +1695,8 @@ const unsigned int snd_seq_event_types[2
-     FIXED_EV (SND_SEQ_EVFLG_MESSAGE),
-   [SND_SEQ_EVENT_PORT_SUBSCRIBED...SND_SEQ_EVENT_PORT_UNSUBSCRIBED] =
-     FIXED_EV (SND_SEQ_EVFLG_CONNECTION),
--  [SND_SEQ_EVENT_SAMPLE...SND_SEQ_EVENT_SAMPLE_PRIVATE1] =
--    FIXED_EV (SND_SEQ_EVFLG_SAMPLE),
-   [SND_SEQ_EVENT_USR0...SND_SEQ_EVENT_USR9] =
-     FIXED_EV (SND_SEQ_EVFLG_RAW) | FIXED_EV (SND_SEQ_EVFLG_USERS),
--  [SND_SEQ_EVENT_INSTR_BEGIN...SND_SEQ_EVENT_INSTR_CHANGE] =
--    _SND_SEQ_TYPE (SND_SEQ_EVFLG_INSTR) |
--    _SND_SEQ_TYPE (SND_SEQ_EVFLG_VARUSR),
-   [SND_SEQ_EVENT_SYSEX...SND_SEQ_EVENT_BOUNCE] =
-     _SND_SEQ_TYPE (SND_SEQ_EVFLG_VARIABLE),
-   [SND_SEQ_EVENT_USR_VAR0...SND_SEQ_EVENT_USR_VAR4] =
---- a/lib/libsalsa/seq_output.c	Tue Feb 05 14:42:35 2008 +0200
-+++ b/lib/libsalsa/seq_output.c	Wed Feb 06 02:19:42 2008 +0200
-@@ -254,33 +254,6 @@ convert_event (snd_seq_t * seq, snd_seq_
-     case SND_SEQ_EVENT_PORT_UNSUBSCRIBED:
-       dbg_printf ("\tSND_SEQ_EVENT_PORT_UNSUBSCRIBED\n");
-       break;
--    case SND_SEQ_EVENT_SAMPLE:
--      dbg_printf ("\tSND_SEQ_EVENT_SAMPLE\n");
--      break;
--    case SND_SEQ_EVENT_SAMPLE_CLUSTER:
--      dbg_printf ("\tSND_SEQ_EVENT_SAMPLE_CLUSTER\n");
--      break;
--    case SND_SEQ_EVENT_SAMPLE_START:
--      dbg_printf ("\tSND_SEQ_EVENT_SAMPLE_START\n");
--      break;
--    case SND_SEQ_EVENT_SAMPLE_STOP:
--      dbg_printf ("\tSND_SEQ_EVENT_SAMPLE_STOP\n");
--      break;
--    case SND_SEQ_EVENT_SAMPLE_FREQ:
--      dbg_printf ("\tSND_SEQ_EVENT_SAMPLE_FREQ\n");
--      break;
--    case SND_SEQ_EVENT_SAMPLE_VOLUME:
--      dbg_printf ("\tSND_SEQ_EVENT_SAMPLE_VOLUME\n");
--      break;
--    case SND_SEQ_EVENT_SAMPLE_LOOP:
--      dbg_printf ("\tSND_SEQ_EVENT_SAMPLE_LOOP\n");
--      break;
--    case SND_SEQ_EVENT_SAMPLE_POSITION:
--      dbg_printf ("\tSND_SEQ_EVENT_SAMPLE_POSITION\n");
--      break;
--    case SND_SEQ_EVENT_SAMPLE_PRIVATE1:
--      dbg_printf ("\tSND_SEQ_EVENT_SAMPLE_PRIVATE1\n");
--      break;
-     case SND_SEQ_EVENT_USR0:
-       dbg_printf ("\tSND_SEQ_EVENT_USR0\n");
-       break;
-@@ -311,63 +284,6 @@ convert_event (snd_seq_t * seq, snd_seq_
-     case SND_SEQ_EVENT_USR9:
-       dbg_printf ("\tSND_SEQ_EVENT_USR9\n");
-       break;
--    case SND_SEQ_EVENT_INSTR_BEGIN:
--      dbg_printf ("\tSND_SEQ_EVENT_INSTR_BEGIN\n");
--      break;
--    case SND_SEQ_EVENT_INSTR_END:
--      dbg_printf ("\tSND_SEQ_EVENT_INSTR_END\n");
--      break;
--    case SND_SEQ_EVENT_INSTR_INFO:
--      dbg_printf ("\tSND_SEQ_EVENT_INSTR_INFO\n");
--      break;
--    case SND_SEQ_EVENT_INSTR_INFO_RESULT:
--      dbg_printf ("\tSND_SEQ_EVENT_INSTR_INFO_RESULT\n");
--      break;
--    case SND_SEQ_EVENT_INSTR_FINFO:
--      dbg_printf ("\tSND_SEQ_EVENT_INSTR_FINFO\n");
--      break;
--    case SND_SEQ_EVENT_INSTR_FINFO_RESULT:
--      dbg_printf ("\tSND_SEQ_EVENT_INSTR_FINFO_RESULT\n");
--      break;
--    case SND_SEQ_EVENT_INSTR_RESET:
--      dbg_printf ("\tSND_SEQ_EVENT_INSTR_RESET\n");
--      break;
--    case SND_SEQ_EVENT_INSTR_STATUS:
--      dbg_printf ("\tSND_SEQ_EVENT_INSTR_STATUS\n");
--      break;
--    case SND_SEQ_EVENT_INSTR_STATUS_RESULT:
--      dbg_printf ("\tSND_SEQ_EVENT_INSTR_STATUS_RESULT\n");
--      break;
--    case SND_SEQ_EVENT_INSTR_PUT:
--      dbg_printf ("\tSND_SEQ_EVENT_INSTR_PUT\n");
--      break;
--    case SND_SEQ_EVENT_INSTR_GET:
--      dbg_printf ("\tSND_SEQ_EVENT_INSTR_GET\n");
--      break;
--    case SND_SEQ_EVENT_INSTR_GET_RESULT:
--      dbg_printf ("\tSND_SEQ_EVENT_INSTR_GET_RESULT\n");
--      break;
--    case SND_SEQ_EVENT_INSTR_FREE:
--      dbg_printf ("\tSND_SEQ_EVENT_INSTR_FREE\n");
--      break;
--    case SND_SEQ_EVENT_INSTR_LIST:
--      dbg_printf ("\tSND_SEQ_EVENT_INSTR_LIST\n");
--      break;
--    case SND_SEQ_EVENT_INSTR_LIST_RESULT:
--      dbg_printf ("\tSND_SEQ_EVENT_INSTR_LIST_RESULT\n");
--      break;
--    case SND_SEQ_EVENT_INSTR_CLUSTER:
--      dbg_printf ("\tSND_SEQ_EVENT_INSTR_CLUSTER\n");
--      break;
--    case SND_SEQ_EVENT_INSTR_CLUSTER_GET:
--      dbg_printf ("\tSND_SEQ_EVENT_INSTR_CLUSTER_GET\n");
--      break;
--    case SND_SEQ_EVENT_INSTR_CLUSTER_RESULT:
--      dbg_printf ("\tSND_SEQ_EVENT_INSTR_CLUSTER_RESULT\n");
--      break;
--    case SND_SEQ_EVENT_INSTR_CHANGE:
--      dbg_printf ("\tSND_SEQ_EVENT_INSTR_CHANGE\n");
--      break;
-     case SND_SEQ_EVENT_SYSEX:
-       dbg_printf ("\tSND_SEQ_EVENT_SYSEX\n");
-       break;
-
diff --git a/audio-drivers/oss/nosoundon.diff b/audio-drivers/oss/nosoundon.diff
deleted file mode 100644
index 3305c24e60..0000000000
--- a/audio-drivers/oss/nosoundon.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- setup/Linux/make.local.orig	2008-07-15 09:26:52.000000000 +0200
-+++ setup/Linux/make.local	2008-07-15 09:27:12.000000000 +0200
-@@ -15,5 +15,3 @@
- 
- install:	copy
- 	cd /usr/lib/oss/build && sh install.sh
--	sync
--	soundoff && sync && soundon