diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-04 00:20:47 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-04 00:20:47 -0300 |
commit | 97a74a6a87ccbeb5649f226377d0c10ae824f1e1 (patch) | |
tree | 614d5483fcdab0aa6adecc7041c4b872ffb5a293 /community/oss | |
parent | e8eefc5a3834440246552e54c169abfa0703672e (diff) | |
parent | 8c2359e2541f9d1b11443b49d8ea502b3ffea39c (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/unifdef/PKGBUILD
extra/gtk2/PKGBUILD
extra/libmpeg2/PKGBUILD
extra/mesa/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/lib32-libdrm/no-pthread-stubs.patch
multilib/lib32-mesa/PKGBUILD
Diffstat (limited to 'community/oss')
-rw-r--r-- | community/oss/PKGBUILD | 65 | ||||
-rw-r--r-- | community/oss/rc-script | 30 | ||||
-rw-r--r-- | community/oss/remove-hal.patch | 20 | ||||
-rw-r--r-- | community/oss/rm-init-scripts.patch | 52 | ||||
-rw-r--r-- | community/oss/soundon.patch | 28 |
5 files changed, 164 insertions, 31 deletions
diff --git a/community/oss/PKGBUILD b/community/oss/PKGBUILD index d83649895..f5e95e73d 100644 --- a/community/oss/PKGBUILD +++ b/community/oss/PKGBUILD @@ -1,32 +1,37 @@ -# $Id: PKGBUILD 36678 2011-01-05 23:16:19Z bluewind $ +# $Id: PKGBUILD 53275 2011-08-02 16:11:02Z bluewind $ +# Maintainer: Florian Pritz <bluewind@xinu.at> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=oss pkgver=4.2_2004 -pkgrel=1 +pkgrel=2 pkgdesc="Open Sound System UNIX audio architecture" arch=('i686' 'x86_64' 'mips64el') url="http://developer.opensound.com/" license=('GPL2') depends=('gcc' 'make' 'kernel26-headers' 'module-init-tools' 'libtool' 'sed') makedepends=('pkgconfig' 'gawk' 'gtk2' 'findutils') -optdepends=('gtk2: for graphical mixer (ossxmix)' - 'hal: for automatic USB audio configuration') +optdepends=('gtk2: for graphical mixer (ossxmix)') conflicts=('oss-linux' 'oss-linux-free' 'oss-testing' 'libflashsupport' 'libflashsupport-pulse' 'libflashsupport-oss') replaces=('libflashsupport-oss') install=oss.install backup=('usr/lib/oss/soundon.user') source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl.tar.bz2" - 'oss.rm-init-scripts.patch' 'oss.rc' 'oss.soundon.patch') + "rm-init-scripts.patch" + "rc-script" + "soundon.patch" + "remove-hal.patch" + ) md5sums=('256aba264d523fb8ee444aaacfb8d3da' 'b9a380a0ac8896390d71ac13676f27e1' - '8ca7cdf94c56ab02890eb4aba6a4995f' - '65f07fe241bfbf912f76d8b6d8f276b5') + 'cbcbce5c03b127df5eafa8faa091492c' + '65f07fe241bfbf912f76d8b6d8f276b5' + 'cd7f1dc6166bba8c94d96f3a28e948a5') build() { _dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl - cd ${srcdir}/${_dir} + cd "${srcdir}/${_dir}" # Avoid these flags conflicting with OSS build system. unset CFLAGS @@ -42,43 +47,41 @@ build() { gcc -shared -fPIC -O2 -Wall -Werror flashsupport.c -o libflashsupport.so msg "Preparing the build environment." - cd ${srcdir} + cd "${srcdir}" - if [ ! -d build ]; then - # Create build directory and configure - mkdir build && cd build - ${srcdir}/${_dir}/configure --enable-libsalsa=NO - else - # Change to existing build directory - cd build - fi + # Create build directory and configure + rm -rf build + mkdir build && cd build + "${srcdir}/${_dir}/configure" --enable-libsalsa=NO --regparm msg "Building OSS." make build msg "Patching init scripts." - cd ${srcdir}/build/prototype + cd "${srcdir}/build/prototype" rm usr/lib/oss/etc/S89oss - patch -b -p0 < ${srcdir}/oss.rm-init-scripts.patch - patch -b -p0 < ${srcdir}/oss.soundon.patch - + patch -p0 -i "${srcdir}/rm-init-scripts.patch" + patch -p0 -i "${srcdir}/soundon.patch" + # remove hal dependency + patch -p0 -i "${srcdir}/remove-hal.patch" + rm -rf usr/lib/oss/scripts/oss_usb-create-devices usr/lib/oss/scripts/90-oss_usb-create-device.fdi } package() { _dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl - cd ${srcdir}/${_dir} + cd "${srcdir}/${_dir}" msg "Copying files." # Install libflashsupport.so - install -Dm755 oss/lib/libflashsupport.so \ - ${pkgdir}/usr/lib/libflashsupport.so - rm -f oss/lib/{flashsupport.c,libflashsupport.so} + install -dm755 "$pkgdir/usr/lib" + ln -s oss/lib/libflashsupport.so "$pkgdir/usr/lib/libflashsupport.so" + + cd "${srcdir}/build/prototype" + cp -a * "${pkgdir}" - cd ${srcdir}/build/prototype - cp -a * ${pkgdir} - chmod -R a+r ${pkgdir} # All files can have read permission (FS#13815) - find ${pkgdir} -type d -exec chmod a+x '{}' \; # Make namcap happy - install -Dm755 ${srcdir}/oss.rc ${pkgdir}/etc/rc.d/oss + chmod -R a+r "${pkgdir}" # All files can have read permission (FS#13815) + find "${pkgdir}" -type d -exec chmod a+x '{}' \; # Make namcap happy + install -Dm755 "${srcdir}/rc-script" "${pkgdir}/etc/rc.d/oss" } diff --git a/community/oss/rc-script b/community/oss/rc-script new file mode 100644 index 000000000..5c930107c --- /dev/null +++ b/community/oss/rc-script @@ -0,0 +1,30 @@ +#!/bin/bash +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy 'Starting Open Sound System' + if /usr/sbin/soundon; then + add_daemon oss + stat_done + else + stat_fail + fi + ;; + stop) + stat_busy 'Stopping Open Sound System' + if /usr/sbin/soundoff; then + rm_daemon oss + stat_done + else + stat_fail + fi + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "Usage: $0 {start|stop|restart}" +esac diff --git a/community/oss/remove-hal.patch b/community/oss/remove-hal.patch new file mode 100644 index 000000000..27e2ef2de --- /dev/null +++ b/community/oss/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/community/oss/rm-init-scripts.patch b/community/oss/rm-init-scripts.patch new file mode 100644 index 000000000..981ff605f --- /dev/null +++ b/community/oss/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/community/oss/soundon.patch b/community/oss/soundon.patch new file mode 100644 index 000000000..4702b8680 --- /dev/null +++ b/community/oss/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 |