diff options
| -rw-r--r-- | abs/extra/oss/PKGBUILD | 41 | ||||
| -rw-r--r-- | abs/extra/oss/gcc-5.patch | 52 |
2 files changed, 73 insertions, 20 deletions
diff --git a/abs/extra/oss/PKGBUILD b/abs/extra/oss/PKGBUILD index 829c839..d7ba89a 100644 --- a/abs/extra/oss/PKGBUILD +++ b/abs/extra/oss/PKGBUILD @@ -1,5 +1,6 @@ -# Maintainer: Damian Nowak <damian.nowak@atlashost.eu> -# Maintainer: Julian Rother <julian@toksik.org> +# 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> @@ -9,26 +10,24 @@ pkgbase=oss pkgname=oss true && pkgname=(oss libflashsupport-oss) -pkgver=4.2_2008 +pkgver=4.2_2011 pkgrel=3 arch=(i686 x86_64) url="http://developer.opensound.com/" license=(GPL2) -makedepends=(gcc gtk2) +makedepends=(gtk2) source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl.tar.bz2" - 'linux-3.8.0.patch::http://www.opensound.com/forum/download/file.php?id=113' - 'linux-3.10.0.patch::http://www.opensound.com/forum/download/file.php?id=126' - 'linux-3.10.7.patch::http://www.opensound.com/forum/download/file.php?id=129' + 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=('bb80a5b6943724a668888684e0d8ec2c5799530ed6943a50a0f68b4eea2d639579e0bbaba4a614267bad4792252d0b3a431d926ae7bf15b01df9442988118b07' - '6483ed671b79a01dded17732e23a7cb8141329b62a2ddb812567f119389e98afc735d6b3cea20e801517d1a417dc823a3ebdbdcba004f44a0c3e6674a169a16e' - 'a2793ec82152167615428ed00ba423fa0571bafdb3e5eb790a02a276d5a4eb663c8a4bae6923f7b2536ed8ed5683254bb1efea26336810b7685aa2b1c9f4a5c5' - '609367d6eadc29a34535461db719b132fe675a06a0532ea3a451191b21a0499801a3a6e706a214833db8179741086a9c1a3f450b79d2d663ec8fb173c97c01f8' +sha512sums=('2e48bf5fa14521feedb18bc3b4c96ba996c5ef9d54f00f1e39c9412152db65972438b7408cb8161e32609af2c56207251d14e1106668cde32a8f0b56a98311fb' + '504efe3af933af69e14408215a8a71d6b94d181e076f90be538f859f1d2c2ae6d2e8e49499c1e50ee3f074004e3f79c1da2b734c95cc666b98d566d404cfc7a5' + '762a8e84d3106ae26ee50e4022c62bee551d2a46923945b291975d3c1ff7a87876ad4a94408fe1718a5dd4613d279a0f7a8820f8fcb0479ca1f210bc711ea835' '355e1380432947c0e9caa21114b2c3debeb162fb5abcf845125ec281ce52b437ad1ee1db04d37e9b7a5ac79816c4dcbc21b4ed4cf8191f71218d99acd7bab70e' '6956e5e2e9323b568bb18e80bbee591b0e5ffd3d4612a50df09879941b2733c31d6b3178dc9a46c283bd1629f76b7ff5e2b54893a42a47f6379eaee4731fd9be' '64e6d9d8eb5320f737d3a0698a245da2b2d141b68cfb2f02e448144d1c610aa8b8a6c38b56fcca364d63171a49afe93161a00545cdb90086b5328997b3096690' @@ -38,18 +37,20 @@ sha512sums=('bb80a5b6943724a668888684e0d8ec2c5799530ed6943a50a0f68b4eea2d639579e _dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl prepare() { - cd "$srcdir/$_dir" + cd "$_dir" # OSS wants an empty build directory rm -rf build mkdir build # make OSS compile with current Linux kernels - patch -p0 < "$srcdir/linux-3.8.0.patch" - patch -p0 < "$srcdir/linux-3.10.0.patch" - patch -p0 < "$srcdir/linux-3.10.7.patch" + 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" @@ -65,7 +66,7 @@ prepare() { } build() { - cd "$srcdir/$_dir/build" + cd "$_dir/build" ../configure --enable-libsalsa=NO --regparm make build gcc $CFLAGS -shared -fPIC -Wall -Werror oss/lib/flashsupport.c \ @@ -74,7 +75,7 @@ build() { package_libflashsupport-oss() { pkgdesc="Adobe flash plugin support lib (OSSv4)" - conflicts=(libflashsupport libflashsupport-pulse) + conflicts=(libflashsupport libflashsupport-oss-nonfree libflashsupport-oss-git libflashsupport-pulse) depends=(oss) install -dm755 "$pkgdir/usr/lib" @@ -83,14 +84,14 @@ package_libflashsupport-oss() { package_oss() { pkgdesc="Open Sound System UNIX audio architecture" - depends=(gcc make linux-headers libtool sed) + depends=(linux-headers) optdepends=('gtk2: for graphical mixer (ossxmix)' 'libflashsupport-oss: Adobe flash plugin support') - conflicts=(oss-linux oss-linux-free oss-testing) + conflicts=(oss-git oss-nonfree libflashsupport-oss-git libflashsupport-oss-nonfree) backup=(usr/lib/oss/soundon.user) install=oss.install - cd "$srcdir/$_dir/build" + cd "$_dir/build" make DESTDIR="$pkgdir/" copy install -Dm755 libflashsupport.so \ "$pkgdir/usr/lib/oss/lib/libflashsupport.so" diff --git a/abs/extra/oss/gcc-5.patch b/abs/extra/oss/gcc-5.patch new file mode 100644 index 0000000..5b303b4 --- /dev/null +++ b/abs/extra/oss/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), |