Initial AUR4 import - version 2011-2

9 files changed, 369 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..5ce389b183f1
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,44 @@
+pkgbase = oss-nonfree
+	pkgver = 4.2_2011
+	pkgrel = 2
+	url = http://www.opensound.com/oss.html
+	arch = i686
+	arch = x86_64
+	license = custom:4Front Commercial License
+	noextract = oss-linux-v4.2-2011-amd64.tar.bz2
+	source = http://www.4front-tech.com/release/oss-linux-v4.2-2011-amd64.tar.bz2
+	source = LICENSE
+	source = linux-4.0.patch
+	source = oss.service
+	source = remove-hal.patch
+	source = rm-init-scripts.patch
+	source = soundon.patch
+	sha512sums = 51fd86b3b6265cd6e29eda29722019774881bda2cf3381288e7e65b9ed857d898101b5b8f3775ecff84e8d375f3f3a9117c09192c28f329d646702bc06e97c72
+	sha512sums = 75632fd1052834ccef32c72a30b2d2fd97448332ac1152962f6aaa29eac98a53b354dd2c3336312b760d88070d5165fef0f7f8e3ee3b8a2a3634d6fc5f56c995
+	sha512sums = 72c3ccffba392064bd387e0459ddeff5f95c970af64c9eb9b29a55ff530abd54e69b213f3669b75d8ca89379554d25601b1daeed51ab39bbf5bd06b46344965f
+	sha512sums = 355e1380432947c0e9caa21114b2c3debeb162fb5abcf845125ec281ce52b437ad1ee1db04d37e9b7a5ac79816c4dcbc21b4ed4cf8191f71218d99acd7bab70e
+	sha512sums = 6956e5e2e9323b568bb18e80bbee591b0e5ffd3d4612a50df09879941b2733c31d6b3178dc9a46c283bd1629f76b7ff5e2b54893a42a47f6379eaee4731fd9be
+	sha512sums = 64e6d9d8eb5320f737d3a0698a245da2b2d141b68cfb2f02e448144d1c610aa8b8a6c38b56fcca364d63171a49afe93161a00545cdb90086b5328997b3096690
+	sha512sums = 5b91a4f3477db1bdbc40c891aaa8bc384f5a690e8290bc4db7bdb4a715a858b2f42780bfeb14281560a0e1a73d1cd4022ed738f01b74c26456dcf0b9952981b5
+
+pkgname = oss-nonfree
+	pkgdesc = Open Sound System UNIX audio architecture (including nonfree drivers)
+	install = oss.install
+	depends = linux-headers
+	optdepends = gtk2: for graphical mixer (ossxmix)
+	optdepends = libflashsupport-oss: Adobe flash plugin support
+	provides = oss
+	conflicts = oss
+	conflicts = oss-git
+	conflicts = libflashsupport-oss
+	conflicts = libflashsupport-oss-git
+	backup = usr/lib/oss/soundon.user
+
+pkgname = libflashsupport-oss-nonfree
+	pkgdesc = Adobe flash plugin support lib (OSSv4)
+	depends = oss
+	conflicts = libflashsupport
+	conflicts = libflashsupport-oss
+	conflicts = libflashsupport-oss-git
+	conflicts = libflashsupport-pulse
+
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000000..bdb83cfb50d4
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,40 @@
+4Front Commercial License
+(Obtained from http://www.opensound.com/license.html on 23 June 2013.)
+---
+Terms and Conditions of the OSS License
+
+    Your OSS license allows you to run OSS indefinitely on a single machine. You may transfer your OSS license from one machine to another but may not use the license concurrently on multiple machines.
+
+    You are entitled to FREE upgrades for OSS for only the operating system you purchased OSS for. If your operating system kernel changes and if there is a version of OSS for that kernel version, you can obtain a FREE upgrade. Free upgrades are provided for two(2) years for the date of purchase.
+
+    You are entitled to receive FREE technical support for a period of 1 year from the date of purchase.
+
+    Your OSS license file has no user restrictions or restrictions on the number of soundcards you can run with the drivers
+
+    You may purchase an OSS License key on behalf of a third party or resell the product license under the same terms and conditions you purchsed the license.
+
+    If you change your operating system, then you will have to purchase a new OSS license file (if you wish to run OSS) for that operating system. There are NO FREE TRANSFER OF LICENSES BETWEEN OPERATING SYSTEMS.
+
+    If you violate the terms and conditions set forth, eg, sharing your licenses with a third party or illegally trading OSS licenses, your license will be terminated without any refund.
+
+    4Front recommends that you test OSS thoroughly before purchasing. ALL SALES ARE FINAL.
+---
+Description of low level drivers
+
+Pro Audio soundcard option (PRO)
+This feature is required if you have a LynxStudio One/TWO/AES16 or any of the Envy24 base devices like Maudio Delta series or the RME Digi32 or Digi96 professional soundcards.
+---
+Help with Ordering OSS
+
+Q1: How does the OSS ordering work?
+A1: When you place an order for OSS, a license key is sent to you via email. There is no CD or Floppy disk for this product as everything is handled electronically. The email will contain all the instructions to set up the permanant license key. Note: you must first install the DEMO OSS distribution.
+Q2: If I've already downloaded the Demo version of OSS, will I get or need any more software for my permanant license?
+A2: If you've already installed the Demo version of OSS, then you've got all the drivers you need. The only difference in purchasing the OSS license is that the OSS license will lift the 4 month "UNREGISTERED MODE" restrictions. The software you have is the full live software.
+Q3: If I need to purchase the OSS license via a purchase order or money order or cheque, what do I need to do?
+A3: You still need to fill out the order form completely and select the appropriate method of payment. Your license key will only be emailed to you upon receipt of your PO or cheque. See the Order page for contact info.
+Q4: If I lose my license key, what do I do?
+A4: In general we will only send your license key free of charge if you lose your license email/key within 30 days of your purchase. After that, there is a $5.00 fee for lost licenses. We do strongly recommend that you backup the license to floppy for safe-keeping.
+Q5: What happened to lowlevel driver options that were available in the past?
+A5: With OSS v3.99.2a we did away with lowlevel driver options. The price has increased a bit but the end result is that if you have any number of different devices, one license key will be used to control all the devices. The optional license is need you have a professional audio device.
+
+The new approach makes it simple for customers to just install OSS and get a license key without having to know what sound card they have. Customers with existing licenses should see no problems with the new drivers and the new licensing menachisms. Customers with existing OSS licenses should have no problems adding additiona devices and getting them configured - no additional payment is necessary. 
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..4e2fb0c5684d
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,102 @@
+# Maintainer: Alex Wiggins <alex.d.wiggins@gmail.com>
+# Contributer: Kyle Keen <keenerd@gmail.com>
+# Contributor: Florian Pritz <bluewind@xinu.at>
+# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor: Sebastian Schwarz <seschwar@gmail.com>
+
+pkgbase=oss-nonfree
+pkgname=oss-nonfree
+true && pkgname=(oss-nonfree libflashsupport-oss-nonfree)
+pkgver=4.2_2011
+pkgrel=2
+arch=(i686 x86_64)
+url="http://www.opensound.com/oss.html"
+license=('custom:4Front Commercial License')
+if [[ "$CARCH" == i686 ]]; then
+    _pkgarch="i386"
+else
+    _pkgarch="amd64"
+fi
+source=("http://www.4front-tech.com/release/oss-linux-v${pkgver/_*}-${pkgver/*_}-$_pkgarch.tar.bz2"
+        LICENSE
+	linux-4.0.patch
+        oss.service
+        remove-hal.patch
+        rm-init-scripts.patch
+        soundon.patch)
+noextract=("oss-linux-v${pkgver/_*}-${pkgver/*_}-$_pkgarch.tar.bz2")
+sha512sums=('51fd86b3b6265cd6e29eda29722019774881bda2cf3381288e7e65b9ed857d898101b5b8f3775ecff84e8d375f3f3a9117c09192c28f329d646702bc06e97c72'
+            '75632fd1052834ccef32c72a30b2d2fd97448332ac1152962f6aaa29eac98a53b354dd2c3336312b760d88070d5165fef0f7f8e3ee3b8a2a3634d6fc5f56c995'
+            '72c3ccffba392064bd387e0459ddeff5f95c970af64c9eb9b29a55ff530abd54e69b213f3669b75d8ca89379554d25601b1daeed51ab39bbf5bd06b46344965f'
+            '355e1380432947c0e9caa21114b2c3debeb162fb5abcf845125ec281ce52b437ad1ee1db04d37e9b7a5ac79816c4dcbc21b4ed4cf8191f71218d99acd7bab70e'
+            '6956e5e2e9323b568bb18e80bbee591b0e5ffd3d4612a50df09879941b2733c31d6b3178dc9a46c283bd1629f76b7ff5e2b54893a42a47f6379eaee4731fd9be'
+            '64e6d9d8eb5320f737d3a0698a245da2b2d141b68cfb2f02e448144d1c610aa8b8a6c38b56fcca364d63171a49afe93161a00545cdb90086b5328997b3096690'
+            '5b91a4f3477db1bdbc40c891aaa8bc384f5a690e8290bc4db7bdb4a715a858b2f42780bfeb14281560a0e1a73d1cd4022ed738f01b74c26456dcf0b9952981b5')
+if [[ "$CARCH" == i686 ]]; then
+    sha512sums[0]=44eb86ae9262f7a76e493169b4b2c473b0807847af75a5ab51b5dcfc4f43a580497652ccd82df0c80f0987f91dcea84d16907f3d647bcd37dd274abafdf67c63
+else
+    sha512sums[0]=51fd86b3b6265cd6e29eda29722019774881bda2cf3381288e7e65b9ed857d898101b5b8f3775ecff84e8d375f3f3a9117c09192c28f329d646702bc06e97c72
+fi
+
+build() {
+    bsdtar xf "oss-linux-v${pkgver/_*}-${pkgver/*_}-$_pkgarch.tar.bz2" \
+            usr/lib/oss/lib/flashsupport.c
+    gcc $CFLAGS -shared -fPIC -Wall -Werror \
+            usr/lib/oss/lib/flashsupport.c -o libflashsupport.so
+}
+
+package_libflashsupport-oss-nonfree() {
+    pkgdesc="Adobe flash plugin support lib (OSSv4)"
+    conflicts=(libflashsupport libflashsupport-oss libflashsupport-oss-git libflashsupport-pulse)
+    depends=(oss)
+
+    install -dm755 "$pkgdir/usr/lib"
+    ln -s oss/lib/libflashsupport.so "$pkgdir/usr/lib/libflashsupport.so"
+}
+
+package_oss-nonfree() {
+    pkgdesc="Open Sound System UNIX audio architecture (including nonfree drivers)"
+    depends=(linux-headers)
+    optdepends=('gtk2: for graphical mixer (ossxmix)'
+                'libflashsupport-oss: Adobe flash plugin support')
+    provides=(oss)
+    conflicts=(oss oss-git libflashsupport-oss libflashsupport-oss-git)
+    backup=(usr/lib/oss/soundon.user)
+    install=oss.install
+
+    cd "$pkgdir"
+    bsdtar xf "$srcdir/oss-linux-v${pkgver/_*}-${pkgver/*_}-$_pkgarch.tar.bz2"
+
+    # make OSS compile with current Linux kernels
+    cd usr/lib
+    patch -p1 < "$srcdir/linux-4.0.patch"
+    # - no longer required from build 2010 
+    # patch -p2 < "$srcdir/linux-3.14.0.patch"
+    cd ../..
+    
+    # remove outdated stuff
+    patch -p0 < "$srcdir/rm-init-scripts.patch"
+    rm usr/lib/oss/etc/S89oss
+    patch -p0 < "$srcdir/remove-hal.patch"
+    rm usr/lib/oss/scripts/*oss_usb-create-device*
+    patch -p0 < "$srcdir/soundon.patch"
+
+    # usr-move fixes
+    mv usr/sbin/* usr/bin
+    rmdir usr/sbin
+    grep -IlrZ '\<s\?bin\>' . \
+            | xargs -0 sed -i 's,\<\(usr/\)\?s\?bin\>,usr/bin,g' --
+        grep -IlrZ '\<lib/modules\>' . \
+            | xargs -0 sed -i 's,\<\(usr/\)\?lib/modules\>,usr/&,g' --
+
+    # make OSS install its modules to /usr/lib/modules/$KERNEL/extramodules/oss
+    # grep -IlrZ '\<usr/lib/modules/[^/]\+/kernel/oss\>' . \
+    #        | xargs -0 sed -i 's,\<usr/lib/modules/\([^/]\+\)/kernel/oss\>,usr/lib/modules/\1/extramodules/oss,g' --
+
+    chmod -R a+rX .  # FS#13815
+    install -Dm755 "$srcdir/libflashsupport.so" \
+            usr/lib/oss/lib/libflashsupport.so
+    install -Dm644 "$srcdir/LICENSE" "usr/share/licenses/$pkgname/LICENSE"
+    install -Dm644 "$srcdir/oss.service" usr/lib/systemd/system/oss.service
+}
diff --git a/linux-4.0.patch b/linux-4.0.patch
new file mode 100644
index 000000000000..3a313729274b
--- /dev/null
+++ b/linux-4.0.patch
@@ -0,0 +1,29 @@
+diff -durN /oss/build/osscore.c /oss/build/osscore.c
+--- /oss/build/osscore.c	2014-09-04 00:15:31.000000000 +0200
++++ /oss/build/osscore.c	2015-04-25 23:16:19.502116503 +0200
+@@ -1950,8 +1950,13 @@
+     }
+   else
+     {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
+       flags[1] = read_cr4 ();
+       write_cr4 (flags[1] | 0x600);	/* Set OSFXSR & OSXMMEXCEPT */
++#else
++      flags[1] = __read_cr4 ();
++      __write_cr4 (flags[1] | 0x600);	/* Set OSFXSR & OSXMMEXCEPT */
++#endif
+       FX_SAVE (envbuf);
+       asm ("fninit");
+       asm ("fwait");
+@@ -1971,7 +1976,11 @@
+   else
+     {
+       FX_RESTORE (envbuf);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
+       write_cr4 (flags[1]);	/* Restore cr4 */
++#else
++      __write_cr4 (flags[1]);	/* Restore cr4 */
++#endif
+     }
+   write_cr0 (flags[0]);		/* Restore cr0 */
+ }
diff --git a/oss.install b/oss.install
new file mode 100644
index 000000000000..672d636447b0
--- /dev/null
+++ b/oss.install
@@ -0,0 +1,30 @@
+post_install() {
+	echo "Running OSS install script..."
+	sh /usr/lib/oss/build/install.sh &>/dev/null
+	echo
+	echo " Note that OSS can't currently work together with kernel"
+	echo " ALSA modules, so they were moved out by the OSS install"
+	echo " scripts. If you want the ALSA kernel modules back, you can"
+	echo " just remove this package using pacman."
+}
+
+post_upgrade() {
+	echo "Running OSS update script..."
+	sh /usr/lib/oss/build/install.sh &>/dev/null
+
+	if [[ $(vercmp $2 4.2_2006) == "-1" ]]; then
+		echo "libflashsupport.so has been split into a seperate package."
+		echo "If you want flash to use oss, please install libflashsupport-oss"
+	fi
+}
+
+pre_remove() {
+	# Restore any replaced ALSA drivers.
+	sh /usr/lib/oss/scripts/restore_drv.sh
+}
+
+post_remove() {
+	echo " Open Sound System was now removed, and the ALSA kernel"
+	echo " modules were restored."
+}
+
diff --git a/oss.service b/oss.service
new file mode 100644
index 000000000000..0200d2477400
--- /dev/null
+++ b/oss.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Open Sound System v4
+Before=sound.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/soundon
+ExecStop=/usr/bin/soundoff
+
+[Install]
+WantedBy=multi-user.target
diff --git a/remove-hal.patch b/remove-hal.patch
new file mode 100644
index 000000000000..27e2ef2ded90
--- /dev/null
+++ b/remove-hal.patch
@@ -0,0 +1,20 @@
+Date: Tue Aug  2 16:37:31 CEST 2011
+Author: Florian Pritz <bluewind@xinu.at>
+This removes all hal dependencies
+
+References:
+http://www.archlinux.org/todo/92/
+
+--- usr/lib/oss/build/install_2011-08-02_162647.sh	2011-08-02 16:26:47.000000000 +0200
++++ usr/lib/oss/build/install.sh	2011-08-02 16:27:13.000000000 +0200
+@@ -336,10 +336,4 @@
+   echo "autosave_mixer yes" > $OSSLIBDIR/etc/userdefs
+ fi
+ 
+-# Hal 0.5.0+ hotplug
+-mkdir -p /usr/lib/hal/scripts
+-ln -sf $OSSLIBDIR/scripts/oss_usb-create-devices /usr/lib/hal/scripts/
+-mkdir -p /usr/share/hal/fdi/policy/20thirdparty/
+-ln -sf $OSSLIBDIR/scripts/90-oss_usb-create-device.fdi /usr/share/hal/fdi/policy/20thirdparty/
+-
+ exit 0
diff --git a/rm-init-scripts.patch b/rm-init-scripts.patch
new file mode 100644
index 000000000000..981ff605fc4c
--- /dev/null
+++ b/rm-init-scripts.patch
@@ -0,0 +1,52 @@
+--- usr/lib/oss/build/install.sh.orig	2008-09-25 11:41:47.180167692 -0300
++++ usr/lib/oss/build/install.sh	2008-09-25 11:41:47.180167692 -0300
+@@ -290,38 +290,6 @@
+    echo 
+ fi
+ 
+-if ! test -d /etc/init.d
+-then
+-  mkdir /etc/init.d
+-fi
+-
+-rm -f /etc/init.d/oss /etc/rc.d/rc3.d/S89oss /etc/rc3.d/S89oss
+-cp -f $OSSLIBDIR/etc/S89oss /etc/init.d/oss
+-
+-chmod 744 /etc/init.d/oss
+-
+-if test -x /sbin/chkconfig
+-then
+-  /sbin/chkconfig oss on        > /dev/null 2>&1
+-else
+- if test -x /usr/sbin/update-rc.d
+- then
+-   /usr/sbin/update-rc.d oss defaults > /dev/null 2>&1
+- else
+-  if test -d etc/rc.d/rc3.d
+-  then
+-    rm -f /etc/rc.d/rc3.d/S89oss
+-    ln -s /etc/init.d/oss /etc/rc.d/rc3.d/S89oss
+-  else
+-    if test -d /etc/rc3.d
+-    then
+-      rm -f /etc/rc3.d/S89oss
+-      ln -s /etc/init.d/oss /etc/rc3.d/S89oss
+-    fi
+-  fi
+- fi
+-fi
+-
+ # Install ALSA interface module (Cuckoo)
+ #(cd $OSSLIBDIR/cuckoo && make clean) > /dev/null 2>&1
+ #if (cd $OSSLIBDIR/cuckoo && make install) > /var/log/cuckoo.log 2>&1
+--- usr/lib/oss/scripts/restore_drv.sh.orig	2008-09-25 11:41:47.210168487 -0300
++++ usr/lib/oss/scripts/restore_drv.sh	2008-09-25 11:41:47.210168487 -0300
+@@ -18,8 +18,6 @@
+   fi
+ fi
+ 
+-rm -f /etc/init.d/oss
+-
+ if ! test -d /lib/modules/`uname -r`/kernel/sound
+ then
+    if test -f /lib/modules/`uname -r`/sound-preoss.tar.bz2
diff --git a/soundon.patch b/soundon.patch
new file mode 100644
index 000000000000..b5311a0274e9
--- /dev/null
+++ b/soundon.patch
@@ -0,0 +1,40 @@
+--- usr/sbin/soundon.old	2009-09-04 06:35:26.000000000 +0100
++++ usr/sbin/soundon	2009-11-15 13:59:53.000000000 +0000
+@@ -34,7 +34,10 @@
+ echo "OSS version: " `cat $OSSLIBDIR/version.dat` >> $LOG 2>&1
+ KERNEL_VERSION=`uname -r`
+ echo "Kernel version: " $KERNEL_VERSION >> $LOG
++# Fix for ossvermagic for kernels after 2.6,
++# (on 3.8, 3.9 and 3.10 kernels, this takes 2 minutes and returns nothing).
++#KERNEL_VERMAGIC=`/usr/sbin/ossvermagic -z -s`
+-KERNEL_VERMAGIC=`/usr/sbin/ossvermagic -z -s`
++KERNEL_VERMAGIC=""
+ echo "Kernel vermagic: " $KERNEL_VERMAGIC >> $LOG 2>&1
+ 
+ if ! test -f $OSSLIBDIR/etc/installed_drivers
+@@ -255,7 +258,10 @@
+   then
+      if test "`uname -m` " = "x86_64 "
+      then
+-       ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib64/libasound.so.2
++       # Fix for compatibility with Arch's directory structure
++       # Not that we use it, there is no $OSSLIBDIR/.libsalsa_installed
++       ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib/libasound.so.2
++       #ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib64/libasound.so.2
+        #ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64
+      else
+        if test -s /lib/libasound.so.2
+@@ -278,8 +284,11 @@
+ then
+    if test "`uname -m` " = "x86_64 "
+    then
+-     ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64
+-     ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib64
++     # Fix for compatibility with Arch's directory structure
++     ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib
++     ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib
++     #ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64
++     #ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib64
+    else
+      if test -s /lib/libasound.so.2
+      then