Package: oss4-dkms
Followup-For: Bug #595298

Linux 2.6.38-2 has entered testing, and is also affected by this.
Fortunately, importing the 4.2-build2004 upstream version is
very straightforward, it just needs adjusting of os_cmd.patch and
bumping of the version number.
Here, this created a working oss4-dkms package able to drive my
oss_via823x in both linux-image-2.6.32-5-686 and
linux-image-2.6.38-2-686 .

Sorry for nagging, but could a developer please take the time to
address this? (Or explain why it's not that simple.) Broken oss4 in
wheezy is unfun.

Attached are the modified os_cmd.patch and a shell script building
updated oss4 packages.

regards,
    Jan

-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (990, 'testing'), (99, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.38-2-686 (SMP w/1 CPU core)
Locale: LANG=C, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages oss4-dkms depends on:
ii  dkms                     2.1.1.2-6       Dynamic Kernel Module Support Fram
ii  linux-headers-2.6-686 [l 2.6.38+33       Header files for Linux 2.6-686 (me
ii  linux-headers-2.6.32-5-6 2.6.32-31       Header files for Linux 2.6.32-5-68
ii  linux-headers-2.6.38-2-6 2.6.38-3        Header files for Linux 2.6.38-2-68
ii  oss4-base                4.2-build2004-0 Open Sound System - base package

oss4-dkms recommends no packages.

oss4-dkms suggests no packages.

-- no debconf information

-- 
()  ascii ribbon campaign - against html e-mail
/\  www.asciiribbon.org   - against proprietary attachments
Index: /oss-build/os_cmd/Linux/ossdetect/ossdetect.c
===================================================================
--- oss-build/os_cmd/Linux/ossdetect/ossdetect.c	2009-11-27 00:06:58.000000000 -0600
+++ oss-build/os_cmd/Linux/ossdetect/ossdetect.c	2011-04-12 01:16:16.000000000 +0200
@@ -90,7 +90,7 @@
       if (l > 0 && tmp[l - 1] == '\n')
 	tmp[l - 1] = '\0';
 
-      if (strncmp (tmp, "OSSLIBDIR=", 10) == 0)
+      if (strncmp (tmp, "OSSETCDIR=", 10) == 0)
 	{
 	  l = snprintf (name, sizeof (name), "%s", &tmp[10]);
 	  if ((l >= OSSLIBDIRLEN) || (l < 0))
@@ -110,11 +110,11 @@
     }
 
   fprintf (stderr, "OSSLIBDIR not set in /etc/oss.conf, using default "
-		   "/usr/lib/oss\n");
+		   "/etc/oss4\n");
 oexit:
   fclose (f);
 oexit2:
-  snprintf (name, sizeof (name), "/usr/lib/oss");
+  snprintf (name, sizeof (name), "/etc/oss4");
   return name;
 }
 
@@ -648,7 +648,7 @@
       exit (0);
     }
 
-  load_devlist ("etc/devices.list", 0);
+  load_devlist ("devices.list", 0);
 
   if (stat ("/etc/oss_3rdparty", &st) != -1)
     load_devlist ("/etc/oss_3rdparty", 1);
@@ -674,7 +674,7 @@
     }
 
   snprintf (instfname, sizeof (instfname), "%s/%s", osslibdir,
-	    "etc/installed_drivers");
+	    "installed_drivers");
  
   if ((f = fopen (instfname, "w")) == NULL)
     {
Index: /oss-build/os_cmd/Linux/ossdetect/ossdetect.man
===================================================================
--- oss-build/os_cmd/Linux/ossdetect/ossdetect.man	2009-11-27 00:06:58.000000000 -0600
+++ oss-build/os_cmd/Linux/ossdetect/ossdetect.man	2009-11-27 00:06:59.000000000 -0600
@@ -6,9 +6,10 @@
 
 DESCRIPTION
 The ossdetect application performs automatic detection of soundcards.
-The application looks at the /usr/lib/oss/etc/device.list and performs
+The application looks at the $OSSETCDIR/device.list and performs
 automatic detection. It will create a file with the list of the configured
-drivers in /usr/lib/oss/etc/installed_drivers.
+drivers in $OSSETCDIR/installed_drivers.
+OSSETCDIR is decided by reading /etc/oss.conf, and defaults to /etc/oss4.
 
 The Input Multiplexer driver (IMUX) is not configured by default and
 can be added to the OSS configuration using the -i option.
@@ -26,6 +27,7 @@
 ossdevlinks(1), ossinfo(1)
 
 FILES
+/etc/oss.conf
 /usr/sbin/ossdetect
 
 AUTHOR
sudo apt-get build-dep oss4
apt-get source oss4
cd oss4-4.2-build2003/
wget 
http://www.4front-tech.com/developer/sources/stable/gpl/oss-v4.2-build2004-src-gpl.tar.bz2
cp ../os_cmd.patch debian/patches/
dch -v 4.2-build2004-0
fakeroot dpkg-buildpackage -b -uc

Attachment: signature.asc
Description: Digital signature

Reply via email to