From 0d47d3fdde570bc1d369b269218ae513976249db Mon Sep 17 00:00:00 2001 From: James Meyer Date: Sun, 22 Feb 2009 16:01:24 -0600 Subject: Remove oss from mv-core. This is now in extra --- abs/mv-core/oss-sound/PKGBUILD | 147 --------------------- abs/mv-core/oss-sound/PKGBUILD.keep | 147 --------------------- abs/mv-core/oss-sound/PKGBUILD.orig | 147 --------------------- abs/mv-core/oss-sound/PKGBUILD.oss-free | 45 ------- abs/mv-core/oss-sound/install_sh.diff | 50 ------- abs/mv-core/oss-sound/oss-linux-free/PKGBUILD | 45 ------- abs/mv-core/oss-sound/oss-linux-free/oss.install | 40 ------ .../oss-linux-free/oss4_1016-kernel2626.diff | 21 --- .../oss-linux-free/oss4_1016-moduleinc.diff | 44 ------ .../oss-sound/oss-linux-free/rc.oss-linux-free | 73 ---------- abs/mv-core/oss-sound/oss.install | 56 -------- abs/mv-core/oss-sound/oss4_1016-kernel2626.diff | 21 --- abs/mv-core/oss-sound/oss4_1016-moduleinc.diff | 44 ------ abs/mv-core/oss-sound/rc.oss-linux-free | 73 ---------- 14 files changed, 953 deletions(-) delete mode 100755 abs/mv-core/oss-sound/PKGBUILD delete mode 100755 abs/mv-core/oss-sound/PKGBUILD.keep delete mode 100755 abs/mv-core/oss-sound/PKGBUILD.orig delete mode 100755 abs/mv-core/oss-sound/PKGBUILD.oss-free delete mode 100755 abs/mv-core/oss-sound/install_sh.diff delete mode 100644 abs/mv-core/oss-sound/oss-linux-free/PKGBUILD delete mode 100644 abs/mv-core/oss-sound/oss-linux-free/oss.install delete mode 100644 abs/mv-core/oss-sound/oss-linux-free/oss4_1016-kernel2626.diff delete mode 100644 abs/mv-core/oss-sound/oss-linux-free/oss4_1016-moduleinc.diff delete mode 100755 abs/mv-core/oss-sound/oss-linux-free/rc.oss-linux-free delete mode 100755 abs/mv-core/oss-sound/oss.install delete mode 100644 abs/mv-core/oss-sound/oss4_1016-kernel2626.diff delete mode 100644 abs/mv-core/oss-sound/oss4_1016-moduleinc.diff delete mode 100755 abs/mv-core/oss-sound/rc.oss-linux-free diff --git a/abs/mv-core/oss-sound/PKGBUILD b/abs/mv-core/oss-sound/PKGBUILD deleted file mode 100755 index f9135f0..0000000 --- a/abs/mv-core/oss-sound/PKGBUILD +++ /dev/null @@ -1,147 +0,0 @@ -pkgname=oss-linux-free -pkgver=4.0_1016 -pkgrel=12 -_realname=oss-v4.0-build1016-src-gpl -pkgdesc="OSS/Open source driver" -arch=('i686' 'x86_64') -url="http://www.opensound.com/" -license=('GPL2') -depends=('gcc' 'make' 'gtk2' 'libtool' 'bc' 'sed') -makedepends=('gawk' 'pkgconfig') -conflicts=('oss-linux') -provides=('oss') -install=oss.install -source=(rc.oss-linux-free http://www.4front-tech.com/developer/sources/stable/gpl/$_realname.tar.bz2 oss4_1016-kernel2626.diff oss4_1016-moduleinc.diff) -md5sums=('f343bb70a4dbd1aabefabbea0f76e886' - 'b8c3409b477387dbe87118caf46773ed' - '376fce5cfd92d7793ee90d7352c1cafa' - '4077a972a6b26ae960ce15cfec8aa34f') - -build() { - -rm -rf build ; mkdir build ; cd build - -sed -i "s|export HAVE_ALSA=1|# export HAVE_ALSA=1|g" $srcdir/$_realname/configure -sed -i "s|700|755|g" $srcdir/$_realname/setup/Linux/build.sh -unset CFLAGS - -# Thanks to majeru of the OSS forums for this patch -cd $srcdir/$_realname -patch -p0 -i $srcdir/oss4_1016-kernel2626.diff || return 1 -# Thanks to cesium of the OSS forums for this patch -patch -p1 -i $srcdir/oss4_1016-moduleinc.diff || return 1 -cd $srcdir/build -$srcdir/$_realname/configure || return 1 -make build || return 1 - -cp -r prototype/{etc,usr} $pkgdir/ -install -Dm755 ../rc.oss-linux-free $pkgdir/etc/rc.d/oss-linux-free - -if [ `uname -m` == "i686" ]; then -cd setup/Linux/oss/lib -gcc -m32 -shared -fPIC -O2 -Wall -Werror -lssl flashsupport.c -o libflashsupport.so || return 1 -cp libflashsupport.so $pkgdir/usr/lib/oss/lib/ -fi - -#building modules - PREFIX=$startdir/pkg - OSSLIBDIR=$PREFIX/usr/lib/oss -cd $OSSLIBDIR/build -REGPARM=REGPARM -pushd $OSSLIBDIR -rm -rf objects -ln -s objects.regparm objects -rm -rf modules -ln -s modules.regparm modules -popd - - -if ! test -f $OSSLIBDIR/objects/osscore.o -then - echo Error: OSS core module for $REGPARM kernel are not available - exit 1 -fi - -if ! test -f $OSSLIBDIR/modules/ich.o -then - echo Error: OSS driver modules for $REGPARM kernel are not available - exit 1 -fi - -echo -echo OSS build environment set up for $REGPARM kernels -BASEKERNEL=/lib/modules/2.6.26-ARCH -PKGKERNEL=$startdir/pkg$BASEKERNEL -KERNELDIR=$BASEKERNEL/build - -cp -f ../objects/osscore.o osscore_mainline.o - -ln -sf ../include/sys/*.h ../include/sys/ossddk . - -rm -f Makefile -ln -s Makefile.osscore Makefile - -if ! test -d $OSSLIBDIR/logs -then - mkdir $OSSLIBDIR/logs -fi - -echo Building module osscore - -if ! make KERNELDIR=$KERNELDIR> build.list 2>&1 -then - echo Failed to compile OSS - cat build.list - exit 2 -fi - -if ! test -d $PKGKERNEL/kernel/oss -then - mkdir -p $PKGKERNEL/kernel/oss -fi - -if ! test -d $PKGKERNEL/kernel/oss -then - echo OSS module directory $PKGKERNEL/kernel/oss does not exist. - exit 3 -fi - -if ! ld -r osscore.ko osscore_mainline.o -o $PKGKERNEL/kernel/oss/osscore.ko -then - echo Linking the osscore module failed - exit 5 -fi - -#depmod -a - -for n in ../modules/*.o -do - N=`basename $n .o` - echo Building module $N - - rm -f $N_mainline.o Makefile - - sed "s/MODNAME/$N/" < Makefile.tmpl > Makefile - ln -s $n $N_mainline.o - - if ! make KERNELDIR=$KERNELDIR > build.list 2>&1 - then - echo Compiling module $N failed - cat build.list - exit 4 - fi - - if ! ld -r $N.ko $N_mainline.o -o $PKGKERNEL/kernel/oss/$N.ko - then - echo Linking $N module failed - exit 6 - fi - - rm -f $N_mainline.o - make clean -done - -rm -f Makefile - - -} diff --git a/abs/mv-core/oss-sound/PKGBUILD.keep b/abs/mv-core/oss-sound/PKGBUILD.keep deleted file mode 100755 index f9135f0..0000000 --- a/abs/mv-core/oss-sound/PKGBUILD.keep +++ /dev/null @@ -1,147 +0,0 @@ -pkgname=oss-linux-free -pkgver=4.0_1016 -pkgrel=12 -_realname=oss-v4.0-build1016-src-gpl -pkgdesc="OSS/Open source driver" -arch=('i686' 'x86_64') -url="http://www.opensound.com/" -license=('GPL2') -depends=('gcc' 'make' 'gtk2' 'libtool' 'bc' 'sed') -makedepends=('gawk' 'pkgconfig') -conflicts=('oss-linux') -provides=('oss') -install=oss.install -source=(rc.oss-linux-free http://www.4front-tech.com/developer/sources/stable/gpl/$_realname.tar.bz2 oss4_1016-kernel2626.diff oss4_1016-moduleinc.diff) -md5sums=('f343bb70a4dbd1aabefabbea0f76e886' - 'b8c3409b477387dbe87118caf46773ed' - '376fce5cfd92d7793ee90d7352c1cafa' - '4077a972a6b26ae960ce15cfec8aa34f') - -build() { - -rm -rf build ; mkdir build ; cd build - -sed -i "s|export HAVE_ALSA=1|# export HAVE_ALSA=1|g" $srcdir/$_realname/configure -sed -i "s|700|755|g" $srcdir/$_realname/setup/Linux/build.sh -unset CFLAGS - -# Thanks to majeru of the OSS forums for this patch -cd $srcdir/$_realname -patch -p0 -i $srcdir/oss4_1016-kernel2626.diff || return 1 -# Thanks to cesium of the OSS forums for this patch -patch -p1 -i $srcdir/oss4_1016-moduleinc.diff || return 1 -cd $srcdir/build -$srcdir/$_realname/configure || return 1 -make build || return 1 - -cp -r prototype/{etc,usr} $pkgdir/ -install -Dm755 ../rc.oss-linux-free $pkgdir/etc/rc.d/oss-linux-free - -if [ `uname -m` == "i686" ]; then -cd setup/Linux/oss/lib -gcc -m32 -shared -fPIC -O2 -Wall -Werror -lssl flashsupport.c -o libflashsupport.so || return 1 -cp libflashsupport.so $pkgdir/usr/lib/oss/lib/ -fi - -#building modules - PREFIX=$startdir/pkg - OSSLIBDIR=$PREFIX/usr/lib/oss -cd $OSSLIBDIR/build -REGPARM=REGPARM -pushd $OSSLIBDIR -rm -rf objects -ln -s objects.regparm objects -rm -rf modules -ln -s modules.regparm modules -popd - - -if ! test -f $OSSLIBDIR/objects/osscore.o -then - echo Error: OSS core module for $REGPARM kernel are not available - exit 1 -fi - -if ! test -f $OSSLIBDIR/modules/ich.o -then - echo Error: OSS driver modules for $REGPARM kernel are not available - exit 1 -fi - -echo -echo OSS build environment set up for $REGPARM kernels -BASEKERNEL=/lib/modules/2.6.26-ARCH -PKGKERNEL=$startdir/pkg$BASEKERNEL -KERNELDIR=$BASEKERNEL/build - -cp -f ../objects/osscore.o osscore_mainline.o - -ln -sf ../include/sys/*.h ../include/sys/ossddk . - -rm -f Makefile -ln -s Makefile.osscore Makefile - -if ! test -d $OSSLIBDIR/logs -then - mkdir $OSSLIBDIR/logs -fi - -echo Building module osscore - -if ! make KERNELDIR=$KERNELDIR> build.list 2>&1 -then - echo Failed to compile OSS - cat build.list - exit 2 -fi - -if ! test -d $PKGKERNEL/kernel/oss -then - mkdir -p $PKGKERNEL/kernel/oss -fi - -if ! test -d $PKGKERNEL/kernel/oss -then - echo OSS module directory $PKGKERNEL/kernel/oss does not exist. - exit 3 -fi - -if ! ld -r osscore.ko osscore_mainline.o -o $PKGKERNEL/kernel/oss/osscore.ko -then - echo Linking the osscore module failed - exit 5 -fi - -#depmod -a - -for n in ../modules/*.o -do - N=`basename $n .o` - echo Building module $N - - rm -f $N_mainline.o Makefile - - sed "s/MODNAME/$N/" < Makefile.tmpl > Makefile - ln -s $n $N_mainline.o - - if ! make KERNELDIR=$KERNELDIR > build.list 2>&1 - then - echo Compiling module $N failed - cat build.list - exit 4 - fi - - if ! ld -r $N.ko $N_mainline.o -o $PKGKERNEL/kernel/oss/$N.ko - then - echo Linking $N module failed - exit 6 - fi - - rm -f $N_mainline.o - make clean -done - -rm -f Makefile - - -} diff --git a/abs/mv-core/oss-sound/PKGBUILD.orig b/abs/mv-core/oss-sound/PKGBUILD.orig deleted file mode 100755 index e0e695b..0000000 --- a/abs/mv-core/oss-sound/PKGBUILD.orig +++ /dev/null @@ -1,147 +0,0 @@ -pkgname=oss -pkgver=4.0_1016 -_pkgver=v4.0-1016 -pkgrel=14 -pkgdesc="OSS/Commercial driver" -url="http://www.opensound.com/" -license="" -depends=('glibc' 'gtk2') -makedepends=('make') -conflicts=('oss-linux') -provides=('oss-linux') -replaces=() -backup=() -#http://www.4front-tech.com/release/oss-linux-v4.0-1012-i386.tar.bz2 -install=oss.install -source=(http://www.4front-tech.com/release/oss-linux-v4.0-1016-i386.tar.bz2 install_sh.diff) -arch=('i686') - - -build() { - PREFIX=$startdir/pkg - OSSLIBDIR=$PREFIX/usr/lib/oss - - cd $startdir/src - find . -type d -exec chmod 755 '{}' ';' - patch -p0 < ../install_sh.diff || return 1 - - ## Install - cp -rp etc $PREFIX/ - cp -rp usr $PREFIX/ - cp -rp $PREFIX/usr/share/man $PREFIX/usr/ - rmdir $PREFIX/usr/share - mkdir $PREFIX/usr/lib/oss/logs - # mkdir -p $PREFIX/etc/rc.d - # install oss-linux $PREFIX/etc/rc.d/ - - mv $OSSLIBDIR/conf.tmpl $OSSLIBDIR/conf - mkdir -p $PREFIX/usr/lib - cd $PREFIX/usr/lib - ln -sf oss/lib/libOSSlib.so || return 1 - -#building modules -cd $OSSLIBDIR/build -REGPARM=REGPARM -pushd $OSSLIBDIR -rm -rf objects -ln -s objects.regparm objects -rm -rf modules -ln -s modules.regparm modules -popd - - -if ! test -f $OSSLIBDIR/objects/osscore.o -then - echo Error: OSS core module for $REGPARM kernel are not available - exit 1 -fi - -if ! test -f $OSSLIBDIR/modules/ich.o -then - echo Error: OSS driver modules for $REGPARM kernel are not available - exit 1 -fi - -echo -echo OSS build environment set up for $REGPARM kernels -BASEKERNEL=/lib/modules/2.6.26-ARCH -PKGKERNEL=$startdir/pkg$BASEKERNEL -KERNELDIR=$BASEKERNEL/build - -cp -f ../objects/osscore.o osscore_mainline.o - -ln -sf ../include/sys/*.h ../include/sys/ossddk . - -rm -f Makefile -ln -s Makefile.osscore Makefile - -if ! test -d $OSSLIBDIR/logs -then - mkdir $OSSLIBDIR/logs -fi - -echo Building module osscore - -if ! make KERNELDIR=$KERNELDIR> build.list 2>&1 -then - echo Failed to compile OSS - cat build.list - exit 2 -fi - -if ! test -d $PKGKERNEL/kernel/oss -then - mkdir -p $PKGKERNEL/kernel/oss -fi - -if ! test -d $PKGKERNEL/kernel/oss -then - echo OSS module directory $PKGKERNEL/kernel/oss does not exist. - exit 3 -fi - -if ! ld -r osscore.ko osscore_mainline.o -o $PKGKERNEL/kernel/oss/osscore.ko -then - echo Linking the osscore module failed - exit 5 -fi - -#depmod -a - -for n in ../modules/*.o -do - N=`basename $n .o` - echo Building module $N - - rm -f $N_mainline.o Makefile - - sed "s/MODNAME/$N/" < Makefile.tmpl > Makefile - ln -s $n $N_mainline.o - - if ! make KERNELDIR=$KERNELDIR > build.list 2>&1 - then - echo Compiling module $N failed - cat build.list - exit 4 - fi - - if ! ld -r $N.ko $N_mainline.o -o $PKGKERNEL/kernel/oss/$N.ko - then - echo Linking $N module failed - exit 6 - fi - - rm -f $N_mainline.o - make clean -done - -rm -f Makefile - - - - - - - - -} diff --git a/abs/mv-core/oss-sound/PKGBUILD.oss-free b/abs/mv-core/oss-sound/PKGBUILD.oss-free deleted file mode 100755 index b652603..0000000 --- a/abs/mv-core/oss-sound/PKGBUILD.oss-free +++ /dev/null @@ -1,45 +0,0 @@ -pkgname=oss-linux-free -pkgver=4.0_1016 -pkgrel=3 -_realname=oss-v4.0-build1016-src-gpl -pkgdesc="OSS/Open source driver" -arch=('i686' 'x86_64') -url="http://www.opensound.com/" -license=('GPL2') -depends=('gcc' 'make' 'gtk2' 'libtool' 'bc' 'sed') -makedepends=('gawk' 'pkgconfig') -conflicts=('oss-linux') -provides=('oss') -install=oss.install -source=(rc.oss-linux-free http://www.4front-tech.com/developer/sources/stable/gpl/$_realname.tar.bz2 oss4_1016-kernel2626.diff oss4_1016-moduleinc.diff) -md5sums=('f343bb70a4dbd1aabefabbea0f76e886' - 'b8c3409b477387dbe87118caf46773ed' - '376fce5cfd92d7793ee90d7352c1cafa' - '4077a972a6b26ae960ce15cfec8aa34f') - -build() { - -rm -rf build ; mkdir build ; cd build - -sed -i "s|export HAVE_ALSA=1|# export HAVE_ALSA=1|g" $srcdir/$_realname/configure -sed -i "s|700|755|g" $srcdir/$_realname/setup/Linux/build.sh -unset CFLAGS - -# Thanks to majeru of the OSS forums for this patch -cd $srcdir/$_realname -patch -p0 -i $srcdir/oss4_1016-kernel2626.diff || return 1 -# Thanks to cesium of the OSS forums for this patch -patch -p1 -i $srcdir/oss4_1016-moduleinc.diff || return 1 -cd $srcdir/build -$srcdir/$_realname/configure || return 1 -make build || return 1 - -cp -r prototype/{etc,usr} $pkgdir/ -install -Dm755 ../rc.oss-linux-free $pkgdir/etc/rc.d/oss-linux-free - -if [ `uname -m` == "i686" ]; then -cd setup/Linux/oss/lib -gcc -m32 -shared -fPIC -O2 -Wall -Werror -lssl flashsupport.c -o libflashsupport.so || return 1 -cp libflashsupport.so $pkgdir/usr/lib/oss/lib/ -fi -} diff --git a/abs/mv-core/oss-sound/install_sh.diff b/abs/mv-core/oss-sound/install_sh.diff deleted file mode 100755 index 7276285..0000000 --- a/abs/mv-core/oss-sound/install_sh.diff +++ /dev/null @@ -1,50 +0,0 @@ ---- usr/lib/oss/build/install.sh.old 2007-02-15 17:02:16.000000000 +0800 -+++ usr/lib/oss/build/install.sh 2007-03-02 11:34:05.000000000 +0800 -@@ -10,21 +10,14 @@ - - rm -f $OSSLIBDIR/.cuckoo_installed - --# Check if we should use REGPARM or non-REGPARM modules --if /usr/sbin/ossvermagic -r || /sbin/modinfo ext3|grep -q REGPARM --then -+# Always use REGPARM (for kernel 2.6.20+) - REGPARM=REGPARM -- rm -rf $OSSLIBDIR/objects -- ln -s $OSSLIBDIR/objects.regparm $OSSLIBDIR/objects -- rm -rf $OSSLIBDIR/modules -- ln -s $OSSLIBDIR/modules.regparm $OSSLIBDIR/modules --else -- REGPARM=NOREGPARM -- rm -rf $OSSLIBDIR/objects -- ln -s $OSSLIBDIR/objects.noregparm $OSSLIBDIR/objects -- rm -rf $OSSLIBDIR/modules -- ln -s $OSSLIBDIR/modules.noregparm $OSSLIBDIR/modules --fi -+pushd $OSSLIBDIR -+rm -rf objects -+ln -s objects.regparm objects -+rm -rf modules -+ln -s modules.regparm modules -+popd - - if ! test -f $OSSLIBDIR/objects/osscore.o - then -@@ -291,12 +284,12 @@ - fi - - # Install ALSA interface module (Cuckoo) --#(cd $OSSLIBDIR/cuckoo && make clean) > /dev/null 2>&1 --#if (cd $OSSLIBDIR/cuckoo && make install) > $OSSLIBDIR/logs/cuckoo.log 2>&1 --#then --# touch $OSSLIBDIR/.cuckoo_installed --#fi --#(cd $OSSLIBDIR/cuckoo && make clean) > /dev/null 2>&1 -+(cd $OSSLIBDIR/cuckoo && make clean) > /dev/null 2>&1 -+if (cd $OSSLIBDIR/cuckoo && make install) > $OSSLIBDIR/logs/cuckoo.log 2>&1 -+then -+ touch $OSSLIBDIR/.cuckoo_installed -+fi -+(cd $OSSLIBDIR/cuckoo && make clean) > /dev/null 2>&1 - - # Remove bogus char major 14 device files left from earlier OSS versions. - diff --git a/abs/mv-core/oss-sound/oss-linux-free/PKGBUILD b/abs/mv-core/oss-sound/oss-linux-free/PKGBUILD deleted file mode 100644 index b652603..0000000 --- a/abs/mv-core/oss-sound/oss-linux-free/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -pkgname=oss-linux-free -pkgver=4.0_1016 -pkgrel=3 -_realname=oss-v4.0-build1016-src-gpl -pkgdesc="OSS/Open source driver" -arch=('i686' 'x86_64') -url="http://www.opensound.com/" -license=('GPL2') -depends=('gcc' 'make' 'gtk2' 'libtool' 'bc' 'sed') -makedepends=('gawk' 'pkgconfig') -conflicts=('oss-linux') -provides=('oss') -install=oss.install -source=(rc.oss-linux-free http://www.4front-tech.com/developer/sources/stable/gpl/$_realname.tar.bz2 oss4_1016-kernel2626.diff oss4_1016-moduleinc.diff) -md5sums=('f343bb70a4dbd1aabefabbea0f76e886' - 'b8c3409b477387dbe87118caf46773ed' - '376fce5cfd92d7793ee90d7352c1cafa' - '4077a972a6b26ae960ce15cfec8aa34f') - -build() { - -rm -rf build ; mkdir build ; cd build - -sed -i "s|export HAVE_ALSA=1|# export HAVE_ALSA=1|g" $srcdir/$_realname/configure -sed -i "s|700|755|g" $srcdir/$_realname/setup/Linux/build.sh -unset CFLAGS - -# Thanks to majeru of the OSS forums for this patch -cd $srcdir/$_realname -patch -p0 -i $srcdir/oss4_1016-kernel2626.diff || return 1 -# Thanks to cesium of the OSS forums for this patch -patch -p1 -i $srcdir/oss4_1016-moduleinc.diff || return 1 -cd $srcdir/build -$srcdir/$_realname/configure || return 1 -make build || return 1 - -cp -r prototype/{etc,usr} $pkgdir/ -install -Dm755 ../rc.oss-linux-free $pkgdir/etc/rc.d/oss-linux-free - -if [ `uname -m` == "i686" ]; then -cd setup/Linux/oss/lib -gcc -m32 -shared -fPIC -O2 -Wall -Werror -lssl flashsupport.c -o libflashsupport.so || return 1 -cp libflashsupport.so $pkgdir/usr/lib/oss/lib/ -fi -} diff --git a/abs/mv-core/oss-sound/oss-linux-free/oss.install b/abs/mv-core/oss-sound/oss-linux-free/oss.install deleted file mode 100644 index e17dd0e..0000000 --- a/abs/mv-core/oss-sound/oss-linux-free/oss.install +++ /dev/null @@ -1,40 +0,0 @@ -post_install() { - echo "Probing soundcards, change /usr/lib/oss/etc/installed_drivers as needed afterwards if - you want to disable any of the OSS modules. You can run '/usr/sbin/ossdetect -v' at any time - if you have changed soundcards." - /usr/sbin/ossdetect -v - /sbin/ldconfig - /bin/true -} - -pre_upgrade() { - /etc/rc.d/oss-linux-free stop - /bin/true -} - -post_upgrade() { - /etc/rc.d/oss-linux-free start - echo "If you changed your soundcard, reprobe for soundcards using '/usr/sbin/ossdetect -v'." - /sbin/ldconfig # We need to run this since libflashsupport.so is installed on x86 - /bin/true -} - -pre_remove() { - /etc/rc.d/oss-linux-free stop - sh /usr/lib/oss/scripts/restore_drv.sh -} - -post_remove() { - echo "/usr/lib/oss/ will still contain files after removal as those files were generated by OSS - after instalation. Delete them manually unless you want to keep them for later use." - if [ `uname -m` == "i686" ]; then - rm -f /usr/lib/libflashsupport.so - fi - /bin/true -} - -op=$1 -shift -[ "$(type -t "$op")" = "function" ] && $op "$@" - -# vim:set ts=2 sw=2 et: diff --git a/abs/mv-core/oss-sound/oss-linux-free/oss4_1016-kernel2626.diff b/abs/mv-core/oss-sound/oss-linux-free/oss4_1016-kernel2626.diff deleted file mode 100644 index 730c19e..0000000 --- a/abs/mv-core/oss-sound/oss-linux-free/oss4_1016-kernel2626.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff -uNr setup/Linux/oss/build/osscore.c setup/Linux/oss/build/osscore.c ---- setup/Linux/oss/build/osscore.c 2008-05-24 04:54:28.000000000 +0200 -+++ setup/Linux/oss/build/osscore.c 2008-07-31 19:47:53.000000000 +0200 -@@ -285,7 +285,7 @@ - init_proc_fs (void) - { - if ((oss_proc_root = -- create_proc_entry ("opensound", 0700 | S_IFDIR, &proc_root)) == NULL) -+ create_proc_entry ("opensound", 0700 | S_IFDIR, NULL)) == NULL) - { - oss_cmn_err (CE_CONT, "Cannot create /proc/opensound\n"); - return; -@@ -308,7 +308,7 @@ - { - if (oss_proc_devfiles) - remove_proc_entry ("devfiles", oss_proc_root); -- remove_proc_entry ("opensound", &proc_root); -+ remove_proc_entry ("opensound", NULL); - } - } - diff --git a/abs/mv-core/oss-sound/oss-linux-free/oss4_1016-moduleinc.diff b/abs/mv-core/oss-sound/oss-linux-free/oss4_1016-moduleinc.diff deleted file mode 100644 index 4595ead..0000000 --- a/abs/mv-core/oss-sound/oss-linux-free/oss4_1016-moduleinc.diff +++ /dev/null @@ -1,44 +0,0 @@ -diff -uNr oss-v4.0-build1016-src-gpl/setup/Linux/oss/build/install.sh oss-v4.0-build1016-src-gpl.bak/setup/Linux/oss/build/install.sh ---- oss-v4.0-build1016-src-gpl/setup/Linux/oss/build/install.sh 2008-02-05 18:58:46.000000000 +0100 -+++ oss-v4.0-build1016-src-gpl.bak/setup/Linux/oss/build/install.sh 2008-07-31 10:36:09.000000000 +0200 -@@ -159,6 +159,7 @@ - ln -sf ../include/sys/*.h ../include/sys/ossddk . - - rm -f Makefile -+cp module.inc module.inc.orig - ln -s Makefile.osscore Makefile - - if ! test -d $OSSLIBDIR/logs -@@ -221,7 +222,8 @@ - make clean - done - --rm -f Makefile -+cp module.inc.orig module.inc -+rm -f Makefile module.inc.orig - - echo "depmod -a" - depmod -a -diff -uNr oss-v4.0-build1016-src-gpl/setup/Linux/oss/build/Makefile.osscore oss-v4.0-build1016-src-gpl.bak/setup/Linux/oss/build/Makefile.osscore ---- oss-v4.0-build1016-src-gpl/setup/Linux/oss/build/Makefile.osscore 2005-11-23 23:52:32.000000000 +0100 -+++ oss-v4.0-build1016-src-gpl.bak/setup/Linux/oss/build/Makefile.osscore 2008-07-31 10:34:23.000000000 +0200 -@@ -7,11 +7,17 @@ - - KERNELDIR ?= /lib/modules/$(shell uname -r)/build - PWD := $(shell pwd) -+endif - - default: - $(MAKE) -C $(KERNELDIR) M=$(PWD) modules -- --endif -+ @#Take generated symbol information and add it to module.inc -+ @echo >> module.inc -+ @echo "static const struct modversion_info ____versions[]" >> module.inc -+ @echo " __attribute__((used))" >> module.inc -+ @echo "__attribute__((section(\"__versions\"))) = {" >> module.inc -+ @sed -e "s:^:{:" -e "s:\t:, \":" -e "s:\t\(.\)*:\"},:" < Module.symvers >> module.inc -+ @echo "};" >> module.inc - - clean: - rm -f *.o *.ko *.mod.c *.mod.o .*.cmd core core.* x y z diff --git a/abs/mv-core/oss-sound/oss-linux-free/rc.oss-linux-free b/abs/mv-core/oss-sound/oss-linux-free/rc.oss-linux-free deleted file mode 100755 index 48b65e0..0000000 --- a/abs/mv-core/oss-sound/oss-linux-free/rc.oss-linux-free +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -terminateapps() { - # Thanks to the Gentoo ebuild/start script for the following - # http://bugs.gentoo.org/show_bug.cgi?id=184123 - # http://bugs.gentoo.org/attachment.cgi?id=153689 - devs=`perl -e '{while (<>) {m/^(\S*)/; print "/dev/$1\n"}}' \ - < /proc/opensound/devfiles` - fuser -k ${devs} >/dev/null 2>/dev/null -} - -case "$1" in - start) - stat_busy "Starting OSS/Open source driver" - # start - /usr/sbin/soundon - if [ $? -gt 0 ]; then - stat_fail - else - grep '^softoss' /proc/modules >/dev/null 2>/dev/null - if [ $? -eq 0 ]; then - stat_busy "Replacing old \"softoss\" module with \"vmix\"" - rmmod softoss - modprobe vmix - sed -i 's/^softoss.*$/vmix/' /usr/lib/oss/etc/installed_drivers - fi - add_daemon oss-linux-free - stat_done - fi - ;; - stop) - stat_busy "Saving OSS mixer" - /usr/sbin/savemixer - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - grep '^"cuckoo"' /proc/modules >/dev/null 2>/dev/null - if [ $? -eq 0 ]; then - stat_busy "Removing \"cuckoo\" module" - rmmod cuckoo - fi - stat_busy "Killing processes using OSS" - terminateapps - stat_done - # It doesn't matter if it didnt kill anything! - stat_busy "Stopping OSS/Open source driver" - /usr/sbin/soundoff - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon oss-linux-free - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - terminateapps) - stat_busy "Killing processes using OSS" - terminateapps - stat_done - # It doesn't matter if it didnt kill anything! - ;; - *) - echo "usage: $0 {start|stop|restart|terminateapps}" -esac diff --git a/abs/mv-core/oss-sound/oss.install b/abs/mv-core/oss-sound/oss.install deleted file mode 100755 index 57a8ec6..0000000 --- a/abs/mv-core/oss-sound/oss.install +++ /dev/null @@ -1,56 +0,0 @@ -pre_install() { -#make a backup copy of the alsa modules -KERNAL=`uname -r` -MODULE=/lib/modules/$KERNAL/kernel/sound - -if [ -e $MODULE ] -then - echo "creating archive of alsa modules" - cd $MODULE - cd .. - tar -cvf /lib/modules/$KERNAL/kernel/alsa-$KERNAL.tar sound - rm -rf $MODULE -fi -} - -post_install() { - echo "Probing soundcards, change /usr/lib/oss/etc/installed_drivers as needed afterwards if - you want to disable any of the OSS modules. You can run '/usr/sbin/ossdetect -v' at any time - if you have changed soundcards." - /usr/sbin/ossdetect -v - /sbin/ldconfig - /bin/true -} - -pre_upgrade() { - sv stop oss - pre_install - -} - -post_upgrade() { - sv start oss - echo "If you changed your soundcard, reprobe for soundcards using '/usr/sbin/ossdetect -v'." - /sbin/ldconfig # We need to run this since libflashsupport.so is installed on x86 - /bin/true -} - -pre_remove() { - sv stop off - #sh /usr/lib/oss/scripts/restore_drv.sh -} - -post_remove() { - echo "/usr/lib/oss/ will still contain files after removal as those files were generated by OSS - after instalation. Delete them manually unless you want to keep them for later use." - if [ `uname -m` == "i686" ]; then - rm -f /usr/lib/libflashsupport.so - fi - /bin/true -} - -op=$1 -shift -[ "$(type -t "$op")" = "function" ] && $op "$@" - -# vim:set ts=2 sw=2 et: diff --git a/abs/mv-core/oss-sound/oss4_1016-kernel2626.diff b/abs/mv-core/oss-sound/oss4_1016-kernel2626.diff deleted file mode 100644 index 730c19e..0000000 --- a/abs/mv-core/oss-sound/oss4_1016-kernel2626.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff -uNr setup/Linux/oss/build/osscore.c setup/Linux/oss/build/osscore.c ---- setup/Linux/oss/build/osscore.c 2008-05-24 04:54:28.000000000 +0200 -+++ setup/Linux/oss/build/osscore.c 2008-07-31 19:47:53.000000000 +0200 -@@ -285,7 +285,7 @@ - init_proc_fs (void) - { - if ((oss_proc_root = -- create_proc_entry ("opensound", 0700 | S_IFDIR, &proc_root)) == NULL) -+ create_proc_entry ("opensound", 0700 | S_IFDIR, NULL)) == NULL) - { - oss_cmn_err (CE_CONT, "Cannot create /proc/opensound\n"); - return; -@@ -308,7 +308,7 @@ - { - if (oss_proc_devfiles) - remove_proc_entry ("devfiles", oss_proc_root); -- remove_proc_entry ("opensound", &proc_root); -+ remove_proc_entry ("opensound", NULL); - } - } - diff --git a/abs/mv-core/oss-sound/oss4_1016-moduleinc.diff b/abs/mv-core/oss-sound/oss4_1016-moduleinc.diff deleted file mode 100644 index 4595ead..0000000 --- a/abs/mv-core/oss-sound/oss4_1016-moduleinc.diff +++ /dev/null @@ -1,44 +0,0 @@ -diff -uNr oss-v4.0-build1016-src-gpl/setup/Linux/oss/build/install.sh oss-v4.0-build1016-src-gpl.bak/setup/Linux/oss/build/install.sh ---- oss-v4.0-build1016-src-gpl/setup/Linux/oss/build/install.sh 2008-02-05 18:58:46.000000000 +0100 -+++ oss-v4.0-build1016-src-gpl.bak/setup/Linux/oss/build/install.sh 2008-07-31 10:36:09.000000000 +0200 -@@ -159,6 +159,7 @@ - ln -sf ../include/sys/*.h ../include/sys/ossddk . - - rm -f Makefile -+cp module.inc module.inc.orig - ln -s Makefile.osscore Makefile - - if ! test -d $OSSLIBDIR/logs -@@ -221,7 +222,8 @@ - make clean - done - --rm -f Makefile -+cp module.inc.orig module.inc -+rm -f Makefile module.inc.orig - - echo "depmod -a" - depmod -a -diff -uNr oss-v4.0-build1016-src-gpl/setup/Linux/oss/build/Makefile.osscore oss-v4.0-build1016-src-gpl.bak/setup/Linux/oss/build/Makefile.osscore ---- oss-v4.0-build1016-src-gpl/setup/Linux/oss/build/Makefile.osscore 2005-11-23 23:52:32.000000000 +0100 -+++ oss-v4.0-build1016-src-gpl.bak/setup/Linux/oss/build/Makefile.osscore 2008-07-31 10:34:23.000000000 +0200 -@@ -7,11 +7,17 @@ - - KERNELDIR ?= /lib/modules/$(shell uname -r)/build - PWD := $(shell pwd) -+endif - - default: - $(MAKE) -C $(KERNELDIR) M=$(PWD) modules -- --endif -+ @#Take generated symbol information and add it to module.inc -+ @echo >> module.inc -+ @echo "static const struct modversion_info ____versions[]" >> module.inc -+ @echo " __attribute__((used))" >> module.inc -+ @echo "__attribute__((section(\"__versions\"))) = {" >> module.inc -+ @sed -e "s:^:{:" -e "s:\t:, \":" -e "s:\t\(.\)*:\"},:" < Module.symvers >> module.inc -+ @echo "};" >> module.inc - - clean: - rm -f *.o *.ko *.mod.c *.mod.o .*.cmd core core.* x y z diff --git a/abs/mv-core/oss-sound/rc.oss-linux-free b/abs/mv-core/oss-sound/rc.oss-linux-free deleted file mode 100755 index 48b65e0..0000000 --- a/abs/mv-core/oss-sound/rc.oss-linux-free +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -terminateapps() { - # Thanks to the Gentoo ebuild/start script for the following - # http://bugs.gentoo.org/show_bug.cgi?id=184123 - # http://bugs.gentoo.org/attachment.cgi?id=153689 - devs=`perl -e '{while (<>) {m/^(\S*)/; print "/dev/$1\n"}}' \ - < /proc/opensound/devfiles` - fuser -k ${devs} >/dev/null 2>/dev/null -} - -case "$1" in - start) - stat_busy "Starting OSS/Open source driver" - # start - /usr/sbin/soundon - if [ $? -gt 0 ]; then - stat_fail - else - grep '^softoss' /proc/modules >/dev/null 2>/dev/null - if [ $? -eq 0 ]; then - stat_busy "Replacing old \"softoss\" module with \"vmix\"" - rmmod softoss - modprobe vmix - sed -i 's/^softoss.*$/vmix/' /usr/lib/oss/etc/installed_drivers - fi - add_daemon oss-linux-free - stat_done - fi - ;; - stop) - stat_busy "Saving OSS mixer" - /usr/sbin/savemixer - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - grep '^"cuckoo"' /proc/modules >/dev/null 2>/dev/null - if [ $? -eq 0 ]; then - stat_busy "Removing \"cuckoo\" module" - rmmod cuckoo - fi - stat_busy "Killing processes using OSS" - terminateapps - stat_done - # It doesn't matter if it didnt kill anything! - stat_busy "Stopping OSS/Open source driver" - /usr/sbin/soundoff - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon oss-linux-free - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - terminateapps) - stat_busy "Killing processes using OSS" - terminateapps - stat_done - # It doesn't matter if it didnt kill anything! - ;; - *) - echo "usage: $0 {start|stop|restart|terminateapps}" -esac -- cgit v0.12