diff options
author | Alex Wiggins | 2015-06-08 21:29:49 +0100 |
---|---|---|
committer | Alex Wiggins | 2015-06-08 21:29:49 +0100 |
commit | 8c8fd748133454638133536326ed80a6efb918b6 (patch) | |
tree | 79d7bc22bd9a9bf2d35c494dc55d9b5855b7c307 | |
download | aur-8c8fd748133454638133536326ed80a6efb918b6.tar.gz |
Initial AUR4 import - version 2011-3
-rw-r--r-- | .SRCINFO | 47 | ||||
-rw-r--r-- | PKGBUILD | 115 | ||||
-rw-r--r-- | gcc-5.patch | 52 | ||||
-rw-r--r-- | kmod-link.patch | 27 | ||||
-rw-r--r-- | linux-4.0.patch | 41 | ||||
-rw-r--r-- | oss.install | 30 | ||||
-rw-r--r-- | oss.service | 12 | ||||
-rw-r--r-- | ossvermagic.patch | 12 | ||||
-rw-r--r-- | remove-hal.patch | 20 | ||||
-rw-r--r-- | rm-init-scripts.patch | 52 | ||||
-rw-r--r-- | soundon.patch | 28 |
11 files changed, 436 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..84f9c133ea86 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,47 @@ +pkgbase = oss + pkgver = 4.2_2011 + pkgrel = 3 + url = http://developer.opensound.com/ + arch = i686 + arch = x86_64 + license = GPL2 + makedepends = gtk2 + source = http://www.4front-tech.com/developer/sources/stable/gpl/oss-v4.2-build2011-src-gpl.tar.bz2 + source = linux-4.0.patch::http://www.4front-tech.com/forum/download/file.php?id=164 + source = gcc-5.patch + source = oss.service + source = remove-hal.patch + source = rm-init-scripts.patch + source = soundon.patch + source = kmod-link.patch + source = ossvermagic.patch + sha512sums = 2e48bf5fa14521feedb18bc3b4c96ba996c5ef9d54f00f1e39c9412152db65972438b7408cb8161e32609af2c56207251d14e1106668cde32a8f0b56a98311fb + sha512sums = 504efe3af933af69e14408215a8a71d6b94d181e076f90be538f859f1d2c2ae6d2e8e49499c1e50ee3f074004e3f79c1da2b734c95cc666b98d566d404cfc7a5 + sha512sums = 762a8e84d3106ae26ee50e4022c62bee551d2a46923945b291975d3c1ff7a87876ad4a94408fe1718a5dd4613d279a0f7a8820f8fcb0479ca1f210bc711ea835 + sha512sums = 355e1380432947c0e9caa21114b2c3debeb162fb5abcf845125ec281ce52b437ad1ee1db04d37e9b7a5ac79816c4dcbc21b4ed4cf8191f71218d99acd7bab70e + sha512sums = 6956e5e2e9323b568bb18e80bbee591b0e5ffd3d4612a50df09879941b2733c31d6b3178dc9a46c283bd1629f76b7ff5e2b54893a42a47f6379eaee4731fd9be + sha512sums = 64e6d9d8eb5320f737d3a0698a245da2b2d141b68cfb2f02e448144d1c610aa8b8a6c38b56fcca364d63171a49afe93161a00545cdb90086b5328997b3096690 + sha512sums = a8196aeea43499f4822bad6adc8c7f8721eb122045732ab34bb675182a1c4403c3f4a30ead85188fdaec77ee79a5097dd8de84782f8915db4061157474b5c7c6 + sha512sums = f73b837643c7b86c5ce3a2ff18a66b99166d16ac7d1ac3d419b203efd8d398d8c4b21c304d6fa1c038ebf180ca0620d6517be384b307bb66e84a15b0339800df + sha512sums = eec0608d82d5bec305b374d9cb62d70860d7be833f87f563a828c44b2dd67754cb27716194d2ea2707391d1257ba1b4b7b5cdf513d618dfd877a065999baa4ad + +pkgname = oss + pkgdesc = Open Sound System UNIX audio architecture + install = oss.install + depends = linux-headers + optdepends = gtk2: for graphical mixer (ossxmix) + optdepends = libflashsupport-oss: Adobe flash plugin support + conflicts = oss-git + conflicts = oss-nonfree + conflicts = libflashsupport-oss-git + conflicts = libflashsupport-oss-nonfree + backup = usr/lib/oss/soundon.user + +pkgname = libflashsupport-oss + pkgdesc = Adobe flash plugin support lib (OSSv4) + depends = oss + conflicts = libflashsupport + conflicts = libflashsupport-oss-nonfree + conflicts = libflashsupport-oss-git + conflicts = libflashsupport-pulse + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..d7ba89a9d835 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,115 @@ +# Maintainer: Alex Wiggins <alex.d.wiggins@gmail.com> +# Contributor: Damian Nowak <damian.nowak@atlashost.eu> +# Contributor: Julian Rother <julian@toksik.org> +# Contributor: Sebastian Schwarz <seschwar@gmail.com> +# Contributor: 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> + +pkgbase=oss +pkgname=oss +true && pkgname=(oss libflashsupport-oss) +pkgver=4.2_2011 +pkgrel=3 +arch=(i686 x86_64) +url="http://developer.opensound.com/" +license=(GPL2) +makedepends=(gtk2) +source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl.tar.bz2" + linux-4.0.patch::http://www.4front-tech.com/forum/download/file.php?id=164 + gcc-5.patch + oss.service + remove-hal.patch + rm-init-scripts.patch + soundon.patch + kmod-link.patch + ossvermagic.patch) +sha512sums=('2e48bf5fa14521feedb18bc3b4c96ba996c5ef9d54f00f1e39c9412152db65972438b7408cb8161e32609af2c56207251d14e1106668cde32a8f0b56a98311fb' + '504efe3af933af69e14408215a8a71d6b94d181e076f90be538f859f1d2c2ae6d2e8e49499c1e50ee3f074004e3f79c1da2b734c95cc666b98d566d404cfc7a5' + '762a8e84d3106ae26ee50e4022c62bee551d2a46923945b291975d3c1ff7a87876ad4a94408fe1718a5dd4613d279a0f7a8820f8fcb0479ca1f210bc711ea835' + '355e1380432947c0e9caa21114b2c3debeb162fb5abcf845125ec281ce52b437ad1ee1db04d37e9b7a5ac79816c4dcbc21b4ed4cf8191f71218d99acd7bab70e' + '6956e5e2e9323b568bb18e80bbee591b0e5ffd3d4612a50df09879941b2733c31d6b3178dc9a46c283bd1629f76b7ff5e2b54893a42a47f6379eaee4731fd9be' + '64e6d9d8eb5320f737d3a0698a245da2b2d141b68cfb2f02e448144d1c610aa8b8a6c38b56fcca364d63171a49afe93161a00545cdb90086b5328997b3096690' + 'a8196aeea43499f4822bad6adc8c7f8721eb122045732ab34bb675182a1c4403c3f4a30ead85188fdaec77ee79a5097dd8de84782f8915db4061157474b5c7c6' + 'f73b837643c7b86c5ce3a2ff18a66b99166d16ac7d1ac3d419b203efd8d398d8c4b21c304d6fa1c038ebf180ca0620d6517be384b307bb66e84a15b0339800df' + 'eec0608d82d5bec305b374d9cb62d70860d7be833f87f563a828c44b2dd67754cb27716194d2ea2707391d1257ba1b4b7b5cdf513d618dfd877a065999baa4ad') +_dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl + +prepare() { + cd "$_dir" + + # OSS wants an empty build directory + rm -rf build + mkdir build + + # make OSS compile with current Linux kernels + patch -p1 < "$srcdir/linux-4.0.patch" + # patch -p0 < "$srcdir/linux-3.14.0.patch" + patch -p0 < "$srcdir/ossvermagic.patch" + + # make OSS compile with gcc-5 + patch -p0 < "$srcdir/gcc-5.patch" + + # remove outdated stuff + cd setup/Linux + patch -p2 < "$srcdir/rm-init-scripts.patch" + rm oss/etc/S89oss + patch -p2 < "$srcdir/remove-hal.patch" + rm oss/scripts/*oss_usb-create-device* + patch -p1 < "$srcdir/soundon.patch" + + # FS#35672 + mv oss/build/{osscore.c,osscore_wrapper.c} + patch -p2 < "$srcdir/kmod-link.patch" + cd ../.. +} + +build() { + cd "$_dir/build" + ../configure --enable-libsalsa=NO --regparm + make build + gcc $CFLAGS -shared -fPIC -Wall -Werror oss/lib/flashsupport.c \ + -o libflashsupport.so +} + +package_libflashsupport-oss() { + pkgdesc="Adobe flash plugin support lib (OSSv4)" + conflicts=(libflashsupport libflashsupport-oss-nonfree 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() { + pkgdesc="Open Sound System UNIX audio architecture" + depends=(linux-headers) + optdepends=('gtk2: for graphical mixer (ossxmix)' + 'libflashsupport-oss: Adobe flash plugin support') + conflicts=(oss-git oss-nonfree libflashsupport-oss-git libflashsupport-oss-nonfree) + backup=(usr/lib/oss/soundon.user) + install=oss.install + + cd "$_dir/build" + make DESTDIR="$pkgdir/" copy + install -Dm755 libflashsupport.so \ + "$pkgdir/usr/lib/oss/lib/libflashsupport.so" + cd "$pkgdir" + + # 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 -Dm644 "$srcdir/oss.service" usr/lib/systemd/system/oss.service +} + diff --git a/gcc-5.patch b/gcc-5.patch new file mode 100644 index 000000000000..5b303b497596 --- /dev/null +++ b/gcc-5.patch @@ -0,0 +1,52 @@ +--- kernel/OS/Linux/os_linux.h 2015-01-28 08:07:23.000000000 +0000 ++++ kernel/OS/Linux/os_linux.h 2015-06-01 23:12:46.044784820 +0100 +@@ -119,7 +119,7 @@ + /* System wall timer access */ + #define GET_JIFFIES() oss_get_jiffies() + +-extern inline unsigned int ++__attribute__ ((gnu_inline)) extern inline unsigned int + __inb (unsigned short port) + { + unsigned int _v; +@@ -127,7 +127,7 @@ + "0" (0)); + return _v; + } +-extern inline unsigned int ++__attribute__ ((gnu_inline)) extern inline unsigned int + __inw (unsigned short port) + { + unsigned int _v; +@@ -135,7 +135,7 @@ + "0" (0)); + return _v; + } +-extern inline unsigned int ++__attribute__ ((gnu_inline)) extern inline unsigned int + __inl (unsigned short port) + { + unsigned int _v; +@@ -143,19 +143,19 @@ + return _v; + } + +-extern inline void ++__attribute__ ((gnu_inline)) extern inline unsigned int + __outb (unsigned char value, unsigned short port) + { + __asm__ __volatile__ ("out" "b" " %" "b" "0,%" "w" "1"::"a" (value), + "d" (port)); + } +-extern inline void ++__attribute__ ((gnu_inline)) extern inline unsigned int + __outw (unsigned short value, unsigned short port) + { + __asm__ __volatile__ ("out" "w" " %" "w" "0,%" "w" "1"::"a" (value), + "d" (port)); + } +-extern inline void ++__attribute__ ((gnu_inline)) extern inline unsigned int + __outl (unsigned int value, unsigned short port) + { + __asm__ __volatile__ ("out" "l" " %" "0,%" "w" "1"::"a" (value), diff --git a/kmod-link.patch b/kmod-link.patch new file mode 100644 index 000000000000..8ee9ab5539cf --- /dev/null +++ b/kmod-link.patch @@ -0,0 +1,27 @@ +--- setup/Linux/oss/build/install.sh 2012-05-22 00:23:41.000000000 +0200 ++++ setup/Linux/oss/build/install.sh 2013-11-10 21:00:08.858276861 +0100 +@@ -203,11 +203,8 @@ + exit 3 + fi + +-if ! $LD -r osscore.ko osscore_mainline.o -o /lib/modules/$UNAME/kernel/oss/osscore.ko +-then +- echo Linking the osscore module failed +- exit 5 +-fi ++ ++cp -f osscore.ko /lib/modules/$UNAME/kernel/oss/osscore.ko + + if test -f Module.symvers + then +--- setup/Linux/oss/build/Makefile.osscore 2012-05-22 00:23:41.000000000 +0200 ++++ setup/Linux/oss/build/Makefile.osscore 2013-11-14 18:57:44.270163268 +0100 +@@ -5,6 +5,7 @@ + ifneq ($(KERNELRELEASE),) + + obj-m := osscore.o ++ osscore-y := osscore_wrapper.o osscore_mainline.o + + else + + diff --git a/linux-4.0.patch b/linux-4.0.patch new file mode 100644 index 000000000000..7bc4ea36d760 --- /dev/null +++ b/linux-4.0.patch @@ -0,0 +1,41 @@ +diff -durN oss-v4.2-build2011-src-gpl/setup/Linux/oss/build/osscore.c oss-v4.2-build2011-src-gpl-patched/setup/Linux/oss/build/osscore.c +--- oss-v4.2-build2011-src-gpl/setup/Linux/oss/build/osscore.c 2014-09-04 00:15:31.000000000 +0200 ++++ oss-v4.2-build2011-src-gpl-patched/setup/Linux/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 -durN oss-v4.2-build2011-src-gpl/setup/setupdir.sh oss-v4.2-build2011-src-gpl-patched/setup/setupdir.sh +--- oss-v4.2-build2011-src-gpl/setup/setupdir.sh 2015-04-25 23:03:34.173985609 +0200 ++++ oss-v4.2-build2011-src-gpl-patched/setup/setupdir.sh 2015-04-25 23:03:14.267351737 +0200 +@@ -36,7 +36,7 @@ + # Use Linux24 as the OS name for Linux 2.4.x + if test "$OS " = "Linux " + then +- if test "`uname -r|sed 's/2.//'|sed 's/\..*//'` " = "4 " ++ if test "`uname -r | cut -d '.' -f 1-2` " = "2.4 " + then + OS=Linux24 + fi 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/ossvermagic.patch b/ossvermagic.patch new file mode 100644 index 000000000000..9c20912401d7 --- /dev/null +++ b/ossvermagic.patch @@ -0,0 +1,12 @@ +--- os_cmd/Linux/ossvermagic/ossvermagic.c 2013-06-14 06:55:00.000000000 +0200 ++++ os_cmd/Linux/ossvermagic/ossvermagic.c 2013-11-14 18:42:23.910206071 +0100 +@@ -81,6 +81,8 @@ + if (!ok) + ok = ELF_LOAD_SYMTAB (fname, "__mod_vermagic", sym_callback); + if (!ok) ++ ok = ELF_LOAD_SYMTAB (fname, "__UNIQUE_ID_vermagic0", sym_callback); ++ if (!ok) + ELF_LOAD_SYMTAB (fname, "__oss_compile_vermagic", sym_callback); + } + + 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..4702b868004c --- /dev/null +++ b/soundon.patch @@ -0,0 +1,28 @@ +--- usr/sbin/soundon.old 2009-09-04 06:35:26.000000000 +0100 ++++ usr/sbin/soundon 2009-11-15 13:59:53.000000000 +0000 +@@ -255,7 +255,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 +281,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 |