oss: updated test branch, updated build, updated install

8 files changed, 63 insertions, 23 deletions

diff --git a/audio-drivers/oss/DEPENDS b/audio-drivers/oss/DEPENDS
index 3c6c646002..b70932b206 100755
--- a/audio-drivers/oss/DEPENDS
+++ b/audio-drivers/oss/DEPENDS
@@ -1 +1,4 @@
-optional_depends  gtk+2 "" "" "Enable ossxmix app?"
+optional_depends  gtk+2 "" "" "Enable ossxmix app?"  &&
+if [[ $OSS_BRANCH == scm ]]; then
+depends mercurial
+fi
diff --git a/audio-drivers/oss/DETAILS b/audio-drivers/oss/DETAILS
index 3d691719a2..07093ee0e5 100755
--- a/audio-drivers/oss/DETAILS
+++ b/audio-drivers/oss/DETAILS
@@ -10,10 +10,10 @@ fi
    SOURCE_IGNORE=volatile
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-scm"
 elif [[ $OSS_BRANCH == test ]]; then
-         VERSION=v4.1-build080705
+         VERSION=v4.1-buildrc2
           SOURCE=$SPELL-$VERSION-src-gpl.tar.bz2
    SOURCE_URL[0]=http://www.4front-tech.com/developer/sources/testing/gpl/$SOURCE
-     SOURCE_HASH=sha512:8b834738719238726d6194ce21ee6e8c541fe08bd44117806ba658a72d4893ea09f0bc907b5f16b12c281fce4ea413418540377fe7dc5c7cb5506ebdf691f61c
+     SOURCE_HASH=sha512:96b39b3381bb9f68adfc4e3fd0eff4f4dd859a48727f079d52755beba9b6affe59dcc8594bb8e5e748b888db7c6148fbd6b3e8c6c7fa6e42a9f2ded062b76321
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}-src-gpl"
 else
          VERSION=v4.0-build1016
diff --git a/audio-drivers/oss/FINAL b/audio-drivers/oss/FINAL
index 3920d0c58a..f495bde7a8 100755
--- a/audio-drivers/oss/FINAL
+++ b/audio-drivers/oss/FINAL
@@ -1 +1,6 @@
-rm_source_dir $SOURCE_DIRECTORY.bld
+rm_source_dir $SOURCE_DIRECTORY.bld  &&
+message "After this is installed you need to run the:"
+message "/usr/lib/oss/build/install.sh"
+message "On the live system you are using"
+message "This will build the kernel modules and"
+message "run the ossdetect tool."
diff --git a/audio-drivers/oss/HISTORY b/audio-drivers/oss/HISTORY
index f82aba1676..278edfa6b3 100644
--- a/audio-drivers/oss/HISTORY
+++ b/audio-drivers/oss/HISTORY
@@ -1,3 +1,12 @@
+2008-11-24 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
+	* PRE_BUILD: fixup of patches
+	* INSTALL: updated to copy only without soundon
+	* FINAL: added warning about how to set it up after copying
+	* DETAILS: updated test
+	* DEPENDS: added mercurial
+	* nohal.diff: removed
+	* nowerror.patch: remove the bloddy -Werror flag
+
 2008-11-20 Ethan Grammatikidis <eekee57@fastmail.fm>
 	* INSTALL: only attempt to copy that fdi file if it exists
 	  Also don't remove prototype/usr/share/hal if fdi file doesn't exist
diff --git a/audio-drivers/oss/INSTALL b/audio-drivers/oss/INSTALL
index 79d1b8c63d..28f3fcf060 100755
--- a/audio-drivers/oss/INSTALL
+++ b/audio-drivers/oss/INSTALL
@@ -4,4 +4,8 @@ if [[ -e setup/Linux/oss/scripts/90-oss_usb-create-device.fdi ]] ; then
           $INSTALL_ROOT/usr/share/hal/fdi/policy/               &&
     rm -rf prototype/usr/share/hal
 fi &&
+if [[ $OSS_BRANCH == stable ]]; then
 make install
+else
+make copy
+fi
diff --git a/audio-drivers/oss/PRE_BUILD b/audio-drivers/oss/PRE_BUILD
index 82dd13ea14..3837138ab4 100755
--- a/audio-drivers/oss/PRE_BUILD
+++ b/audio-drivers/oss/PRE_BUILD
@@ -2,9 +2,10 @@ default_pre_build                            &&
 mk_source_dir  $SOURCE_DIRECTORY.bld         &&
 cd $SOURCE_DIRECTORY                         &&
 if [[ $OSS_BRANCH == stable ]]; then
-patch -p1 < $SPELL_DIRECTORY/buildfix.diff
+patch -p1 < $SPELL_DIRECTORY/buildfix.diff   &&
+patch -p0 < $SPELL_DIRECTORY/nosoundon.diff
 fi                                           &&
-patch -p0 < $SPELL_DIRECTORY/nosoundon.diff  &&
-if [[ $OSS_BRANCH == scm ]]; then
-patch -p0 < $SPELL_DIRECTORY/nohal.diff
+if [[ $OSS_BRANCH != stable ]]; then
+patch -p0 < $SPELL_DIRECTORY/nowerror.patch
 fi
+
diff --git a/audio-drivers/oss/nohal.diff b/audio-drivers/oss/nohal.diff
deleted file mode 100644
index 286cd043e7..0000000000
--- a/audio-drivers/oss/nohal.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- setup/Linux/build.sh.orig	2008-07-15 10:39:12.000000000 +0200
-+++ setup/Linux/build.sh	2008-07-15 10:39:24.000000000 +0200
-@@ -187,12 +187,6 @@
- $SRCDIR/setup/txt2man -t "ossdetect" -v "User Commands" -s 8 os_cmd/Linux/ossdetect/ossdetect.man|gzip -9 > prototype/usr/share/man/man8/ossdetect.8.gz
- echo done ossdetect
- 
--# Hal 0.50+ hotplug
--mkdir -p prototype/usr/lib/hal/scripts
--ln -s /usr/lib/oss/scripts/oss_usb-create-devices prototype/usr/lib/hal/scripts/
--mkdir -p prototype/usr/share/hal/fdi/policy/20thirdparty/
--ln -s /usr/lib/oss/scripts/90-oss_usb-create-device.fdi prototype/usr/share/hal/fdi/policy/20thirdparty/
--
- # Licensing stuff
- if test -f $SRCDIR/4front-private/osslic.c
- then
diff --git a/audio-drivers/oss/nowerror.patch b/audio-drivers/oss/nowerror.patch
new file mode 100644
index 0000000000..80a7a65acb
--- /dev/null
+++ b/audio-drivers/oss/nowerror.patch
@@ -0,0 +1,33 @@
+diff -Nuar setup.orig/Linux/oss/build/install.sh setup/Linux/oss/build/install.sh
+--- setup.orig/Linux/oss/build/install.sh	2008-11-20 07:57:50.000000000 +0100
++++ setup/Linux/oss/build/install.sh	2008-11-20 07:58:50.000000000 +0100
+@@ -336,7 +336,7 @@
+ 
+ # Recompile libflashsupport.so if possible. Otherwise use the precompiled
+ # version.
+-(cd $OSSLIBDIR/lib;gcc -m32 -shared -fPIC -O2 -Wall -Werror flashsupport.c -o $OSSLIBDIR/lib/libflashsupport.so) > /dev/null 2>&1
++(cd $OSSLIBDIR/lib;gcc -m32 -shared -fPIC -O2 -Wall flashsupport.c -o $OSSLIBDIR/lib/libflashsupport.so) > /dev/null 2>&1
+ 
+ if test ! -f $OSSLIBDIR/etc/userdefs
+ then
+diff -Nuar setup.orig/srcconf_linux.inc setup/srcconf_linux.inc
+--- setup.orig/srcconf_linux.inc	2008-11-20 07:57:50.000000000 +0100
++++ setup/srcconf_linux.inc	2008-11-20 07:58:11.000000000 +0100
+@@ -26,7 +26,7 @@
+   if (system(cmd)==0)
+      {
+ 	if (do_warning_checks)
+-  	   strcpy(conf->OSflags, "-fno-common -fno-stack-protector -Wall -Werror");
++  	   strcpy(conf->OSflags, "-fno-common -fno-stack-protector -Wall");
+ else
+   	   strcpy(conf->OSflags, "-fno-common -fno-stack-protector");
+ 	unlink("srcconf.o");
+@@ -34,7 +34,7 @@
+   else
+      {
+ 	if (do_warning_checks)
+-  	   strcpy(conf->OSflags, "-fno-common -Wall -Werror");
++  	   strcpy(conf->OSflags, "-fno-common -Wall");
+ 	else
+   	   strcpy(conf->OSflags, "-fno-common");
+      }