Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=edb293181e7d58c7b4b90402c98e2c970b1afdfd
commit edb293181e7d58c7b4b90402c98e2c970b1afdfd Author: DeX77 <[email protected]> Date: Thu Oct 8 14:41:16 2015 +0200 oss-v4.2_build2011-4-x86_64 - remove: unable to rebuild and old as hell diff --git a/source/multimedia-extra/oss/FrugalBuild b/source/multimedia-extra/oss/FrugalBuild deleted file mode 100644 index 8379542..0000000 --- a/source/multimedia-extra/oss/FrugalBuild +++ /dev/null @@ -1,149 +0,0 @@ -# Compiling Time: 1.25 SBU -# Maintainer: James Buren <[email protected]> - -# Notice: Because of the hacks required to get this to work, this package -# should be updated with care. - -pkgname=oss -pkgver=v4.2_build2011 -_ver="${pkgver/_/-}" -pkgrel=4 -pkgdesc="Open Sound System Version 4 for Linux (Alternative to ALSA)." -url="http://developer.opensound.com"; -_dlurl='http://www.4front-tech.com/developer/sources/stable/gpl' -_ext='-src-gpl.tar.bz2' -groups=('multimedia-extra') -rodepends=("$pkgname-libs") -archs=('i686' 'x86_64') -up2date="Flastarchive $_dlurl $_ext" -backup=('usr/lib/oss/soundon.user') -_F_systemd_units=(oss-on=e oss-off=e) -source=($_dlurl/$pkgname-$_ver$_ext - $pkgname-frugalware.patch - kernel-4.0.patch - oss-on.service - oss-off.service) -options=('scriptlet' 'genscriptlet') -Finclude kernel-module systemd -_F_genscriptlet_install="$startdir/$pkgname.install" -install="$Fsrcdir/$pkgname.install" -subpkgs=("$pkgname-gtk-mixer" "$pkgname-libs") -subdescs=('GUI mixer for oss that uses GTK+' 'Libraries and headers for oss.') -subrodepends=("$pkgname" "") -subdepends=('gtk+2' 'glibc') -subarchs=('i686 x86_64' 'i686 x86_64') -subgroups=('xmultimedia-extra' 'multimedia-extra') -_F_desktop_filename="ossxmix" -_F_desktop_name="OSS Mixer Controls" -_F_desktop_desc="GTK+ application for modifying OSS mixer controls." -_F_desktop_icon="ossxmix.xpm" -_F_desktop_exec="ossxmix" -_F_desktop_categories="GTK;AudioVideo;" -sha1sums=('0928fab1044a201940a44b0b425cafbf3893fa37' \ - 'a5c3d3cdf1d9850b1e4faddef15d77b9f4781c73' \ - 'e88832e6a96807bee9c5bbd053f1d1fbe7a6ef2a' \ - 'c11b5241b8b6cd805b9e32f6d3677c647e0abaa9' \ - 'cad69f7d4d653340947a7119888d4976640b8410') - -_symlink_lib() -{ - if [ -z "$2" ]; then - Fln /usr/lib/oss/lib/$1 /usr/lib/$1 - else - Fln /usr/lib/oss/lib/$1 /usr/lib/$2 - fi -} - -build() -{ - Fcd "$pkgname-$_ver-src-gpl" - - Fpatchall - - Fmkdir "$_F_kernelmod_dir/kernel/oss" - - # Tell the build to turn off compiler warnings, otherwise they will be fatal. - export NO_WARNING_CHECKS='1' - - # Remove build directory if it exists - [ -d "build" ] && rm -rf build - - # Build demands an empty directory to start in - Fexec mkdir build && cd build - - # Setup build directory - Fexec ../configure --enable-libsalsa=NO --regparm - - # Compile first stage - Fexec make build - - # Compile main kernel module - Fexec cd prototype/usr/lib/oss/build - Fexec ln -sf Makefile.osscore Makefile - Fexec sed -i '1 d' Makefile - - for i in ../include/internals/*.h ../include/sys/*.h; do - Fexec ln -sf $i `basename $i` - done - - echo "static const char __oss_compile_vermagic[]" > ubuntu_version_hack.inc - echo "__attribute__((used))" >> ubuntu_version_hack.inc - echo "__attribute__((section(\".modinfo\")))" >> ubuntu_version_hack.inc - echo "= \"$(../../../sbin/ossvermagic -z -s)\";" >> ubuntu_version_hack.inc - make -C "$_F_kernelmod_dir/build" M="$(pwd)" modules || Fdie - ld -r osscore.ko ../objects.regparm/osscore.o -o "$Fdestdir/$_F_kernelmod_dir/kernel/oss/osscore.ko" || Fdie - - # Compile sound kernel modules - echo "static const struct modversion_info ____versions[]" > osscore_symbols.inc - echo " __attribute__((used))" >> osscore_symbols.inc - echo "__attribute__((section(\"__versions\"))) = {" >> osscore_symbols.inc - sed -e "s:^:{:" -e "s:\t:, \":" -e "s:\t\(.\)*:\"},:" < Module.symvers >> osscore_symbols.inc - echo "};" >> osscore_symbols.inc - for i in ../modules.regparm/*.o; do - I=`basename $i .o` - sed "s|MODNAME|$I|" < Makefile.tmpl > Makefile - sed -i '1 d' Makefile || Fdie - make -C "$_F_kernelmod_dir/build" M="$(pwd)" modules || Fdie - ld -r $I.ko $i -o "$Fdestdir/$_F_kernelmod_dir/kernel/oss/$I.ko" || Fdie - done - - # Compile flashsupport - cc -shared -fPIC $CFLAGS $LDFLAGS ../lib/flashsupport.c -o ../lib/libflashsupport.so || Fdie - - # Install everything else now - cd ../../../.. || Fdie - rm -rf usr/lib/oss/lib/flashsupport.c usr/lib/oss/etc/S89oss || Fdie - rm -rf usr/lib/oss/{build,cuckoo,etc_templates} usr/lib/oss/modules.* usr/lib/oss/objects.* || Fdie - rm -rf usr/lib/oss/scripts/90-oss_usb-create-device.fdi - Fsed '`uname -r`' "$_F_kernelmod_uname" usr/lib/oss/scripts/* - cp -rf * "$Fdestdir" || Fdie - _symlink_lib libOSSlib.so - _symlink_lib libflashsupport.so - _symlink_lib libossmix.so - Fmv /usr/lib/oss/conf.tmpl /usr/lib/oss/conf - echo "autosave_mixer yes" > $Fdestdir/usr/lib/oss/etc/userdefs - Fdirschmod / 0755 - Ffileschmod / 0644 - Ffileschmod /usr/bin 0755 - Ffileschmod /usr/sbin 0755 - Ffileschmod /usr/lib/oss/lib 0755 - Ffileschmod /usr/lib/oss/scripts 0755 - Ffileschmod /usr/lib/oss/soundon.user 0755 - Ficonrel ../../cmd/ossxmix/ossxmix.xpm - Ffile /lib/systemd/system/oss-on.service - Ffile /lib/systemd/system/oss-off.service - Fdesktop2 - Fsplit $pkgname-gtk-mixer /usr/share/applications - Fsplit $pkgname-gtk-mixer /usr/share/pixmaps - Fsplit $pkgname-gtk-mixer /usr/share/man/man1/ossxmix.1.gz - Fsplit $pkgname-gtk-mixer /usr/bin/ossxmix - Fsplit $pkgname-libs /usr/lib/lib{OSSlib,flashsupport,ossmix}.so - Fsplit $pkgname-libs /usr/lib/oss/lib/lib{OSSlib,flashsupport,ossmix}.so - Fsplit $pkgname-libs /usr/lib/oss/include - Fsplit $pkgname-libs /etc/oss.conf - - Fgenscriptlet - Fkernelver_compress_modules -} - -# optimization OK diff --git a/source/multimedia-extra/oss/kernel-4.0.patch b/source/multimedia-extra/oss/kernel-4.0.patch deleted file mode 100644 index 7bc4ea3..0000000 --- a/source/multimedia-extra/oss/kernel-4.0.patch +++ /dev/null @@ -1,41 +0,0 @@ -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/source/multimedia-extra/oss/oss-frugalware.patch b/source/multimedia-extra/oss/oss-frugalware.patch deleted file mode 100644 index da7bad3..0000000 --- a/source/multimedia-extra/oss/oss-frugalware.patch +++ /dev/null @@ -1,253 +0,0 @@ -diff -aur a/setup/Linux/oss/scripts/restore_drv.sh b/setup/Linux/oss/scripts/restore_drv.sh ---- a/setup/Linux/oss/scripts/restore_drv.sh 2011-01-04 19:33:08.000000000 -0600 -+++ b/setup/Linux/oss/scripts/restore_drv.sh 2011-01-17 21:53:39.116000300 -0600 -@@ -10,7 +10,7 @@ - - rm -rf /lib/modules/`uname -r`/kernel/oss - --if test -x /sbin/chkconfig -+if test -x /sbin/chkconfig - then /sbin/chkconfig oss off > /dev/null 2>&1 - else - if test -x /sbin/update-rc.d -@@ -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 -aur a/setup/Linux/sbin/soundon b/setup/Linux/sbin/soundon ---- a/setup/Linux/sbin/soundon 2011-01-04 19:33:08.000000000 -0600 -+++ b/setup/Linux/sbin/soundon 2011-01-17 21:51:00.861000300 -0600 -@@ -50,104 +50,6 @@ - exit 10 - fi - --UBUNTU_OVERRIDE= --POS_UBUNTU_OVERRIDE= --if test -f /lib/modules/$KERNEL_VERSION/kernel/oss/osscore.ko --then --# Verify that vermagic of OSS matches the kernel vermagic -- -- OSS_VERMAGIC=`/usr/sbin/ossvermagic -z -q /lib/modules/$KERNEL_VERSION/kernel/oss/osscore.ko` -- -- if ! test "$OSS_VERMAGIC " = "$KERNEL_VERMAGIC " -- then -- OSS_ORIG_VERMAGIC="$OSS_VERMAGIC" -- OSS_VERMAGIC=`/usr/sbin/ossvermagic -z -u -q /lib/modules/$KERNEL_VERSION/kernel/oss/osscore.ko` -- POS_UBUNTU_OVERRIDE=1 -- fi -- -- if ! test "$OSS_VERMAGIC " = "$KERNEL_VERMAGIC " -- then -- echo "Old vermagic: " $OSS_VERMAGIC >> $LOG -- rm -rf /lib/modules/$KERNEL_VERSION/kernel/oss -- echo Previous OSS modules were for a different kernel version - removed -- echo Previous OSS modules were for a different kernel version - removed >> $LOG -- elif test "$POS_UBUNTU_OVERRIDE " = "1 " -- then -- echo "Vermagic backup check activated for Ubuntu. Backup vermagic: $OSS_VERMAGIC. OSS stored vermagic $OSS_ORIG_VERMAGIC" >> $LOG -- UBUNTU_OVERRIDE="-u" -- fi --fi -- --if ! test -f /lib/modules/$KERNEL_VERSION/kernel/oss/osscore.ko --then -- NOTIFY=1 -- echo Relinking OSS kernel modules for \"$KERNEL_VERMAGIC\" -- echo This may take few moments - please stand by... -- echo Relinking OSS kernel modules for $KERNEL_VERMAGIC >> $LOG -- -- rm -f /var/log/relink.log -- if ! (cd $OSSLIBDIR/build && sh install.sh > /var/log/relink.log 2>&1) -- then -- cat /var/log/relink.log >> $LOG 2>&1 -- cat /var/log/relink.log -- echo -- echo Relinking the OSS kernel modules failed -- rm -f /var/log/relink.log -- exit 20 -- fi -- -- cat /var/log/relink.log >> $LOG 2>&1 -- echo Relinking OSS kernel modules finished -- rm -f /var/log/relink.log --fi -- --if ! test -f /lib/modules/$KERNEL_VERSION/kernel/oss/osscore.ko --then -- echo -- echo No /lib/modules/$KERNEL_VERSION/kernel/oss/osscore.ko module >> $LOG -- echo No /lib/modules/$KERNEL_VERSION/kernel/oss/osscore.ko module in the system -- exit 30 --fi -- --OSS_VERMAGIC=`/usr/sbin/ossvermagic -z $UBUNTU_OVERRIDE -q /lib/modules/$KERNEL_VERSION/kernel/oss/osscore.ko` --echo "OSS vermagic: " $OSS_VERMAGIC >> $LOG -- --if ! test "$OSS_VERMAGIC " = "$KERNEL_VERMAGIC " --then -- echo OSS driver modules do not match the current kernel >> $LOG -- echo -- echo Error: OSS driver modules do not match the current kernel -- echo -- echo "Kernel vermagic: " $KERNEL_VERMAGIC -- echo "OSS vermagic: " $OSS_VERMAGIC -- echo -- echo The most likely reason is that the kernel development package -- echo installed in the system is wrong. Please refer to the documentation -- echo of your Linux distribution for more info about setting up the -- echo kernel/driver development environment properly. -- echo -- exit 40 --fi -- --if test -f $OSSLIBDIR/etc/license.asc --then -- /usr/sbin/ossdetect -l >> $LOG --fi -- --if test -d /proc/asound || grep -q '^ *14 ' < /proc/devices --then -- if ! sh $OSSLIBDIR/scripts/remove_drv.sh>> $LOG -- then -- echo Failed to disable conflicting sound drivers >> $LOG -- echo Failed to disable conflicting sound drivers -- echo Reboot and try running soundon again -- echo -- echo Also check that you have not compiled sound support statically -- echo into the kernel. -- exit 50 -- fi --fi -- - echo >> $LOG - echo '*** Loading OSS kernel modules ***' >> $LOG - echo >> $LOG -@@ -230,123 +139,19 @@ - echo >> $LOG - /usr/sbin/savemixer -L -v >> $LOG 2>&1 - --# Setup ALSA emulation -- --if test -f $OSSLIBDIR/.cuckoo_installed --then --# Use kernel based ALSA compatibility -- -- if ! test -f /lib/modules/$KERNEL_VERSION/kernel/sound/core/snd.ko -- then -- sh $OSSLIBDIR/scripts/setup-alsa.sh >> $LOG 2>&1 -- depmod -a -- fi -- -- echo "*** Setting up ALSA compatibility ****" >> $LOG -- modprobe cuckoo >> $LOG 2>&1 -- head -10 /proc/asound/version >> $LOG 2>&1 -- lsmod|grep snd >> $LOG -- echo "**************************************" >> $LOG --elif test -f $OSSLIBDIR/.libsalsa_installed --then --# Use library based ALSA compatibility -- -- if test -f $OSSLIBDIR/lib/libsalsa.so.2.0.0 -- then -- if test "`uname -m` " = "x86_64 " -- then -- 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 -- then -- ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /lib/libasound.so.2 -- #ln -sf $OSSLIBDIR/lib/libOSSlib.so /lib -- fi -- -- if test -s /usr/lib/libasound.so.2 -- then -- ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib/libasound.so.2 -- #ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib -- fi -- fi -- fi --fi -- --# Setup libOSSlib.so --if test -f $OSSLIBDIR/lib/libOSSlib.so --then -- if test "`uname -m` " = "x86_64 " -- then -- 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 -- ln -sf $OSSLIBDIR/lib/libOSSlib.so /lib -- ln -sf $OSSLIBDIR/lib/libossmix.so /lib -- fi -- -- if test -s /usr/lib/libasound.so.2 -- then -- ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib -- ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib -- fi -- fi --fi -- --# Setup Flash 9 audio support plugin for OSS -- --if test -d /usr/lib64 && test -f $OSSLIBDIR/lib/libflashsupport_64.so --then -- ln -sf $OSSLIBDIR/lib/libflashsupport_64.so /usr/lib64/libflashsupport.so --fi -- --if test -d /usr/lib32 && test -f $OSSLIBDIR/lib/libflashsupport_32.so --then -- ln -sf $OSSLIBDIR/lib/libflashsupport_32.so /usr/lib32/libflashsupport.so --fi -- --if ! test -f /usr/lib/libflashsupport.so && test -f $OSSLIBDIR/lib/libflashsupport_32.so --then -- ln -sf $OSSLIBDIR/lib/libflashsupport_32.so /usr/lib/libflashsupport.so --fi -- - if test -x $OSSLIBDIR/soundon.user - then - echo Running $OSSLIBDIR/soundon.user >> $LOG - $OSSLIBDIR/soundon.user >> $LOG 2>&1 - fi - - # Use alternative place for soundon.user - if test -x /etc/oss/soundon.user - then - echo Running /etc/oss/soundon.user >> $LOG - /etc/oss/soundon.user >> $LOG 2>&1 - fi - --if test "`ossinfo -g|grep TRIAL` " != " " --then -- echo -- echo "************************************************************" -- echo "* NOTE! You are using trial version of Open Sound System *" -- echo "************************************************************" -- echo -- -- sleep 1 --fi -- --if test "`ossinfo -g|grep EXPIRED` " != " " --then -- echo -- echo "****************************************************************" -- echo "* NOTE! Your Open Sound System evaluation license has expired *" -- echo "****************************************************************" -- echo -- -- sleep 15 --fi -- - if test "$NOTIFY " = "1 " - then - echo diff --git a/source/multimedia-extra/oss/oss-off.service b/source/multimedia-extra/oss/oss-off.service deleted file mode 100644 index f99f4b9..0000000 --- a/source/multimedia-extra/oss/oss-off.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OSS soundoff -DefaultDependencies=no -Before=shutdown.target - -[Service] -Type=oneshot -ExecStart=/usr/sbin/soundoff -StandardOutput=syslog - -[Install] -WantedBy=shutdown.target diff --git a/source/multimedia-extra/oss/oss-on.service b/source/multimedia-extra/oss/oss-on.service deleted file mode 100644 index ef782d6..0000000 --- a/source/multimedia-extra/oss/oss-on.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=OSS soundon -DefaultDependencies=no -After=sysinit.target -Before=shutdown.target -Conflicts=shutdown.target - -[Service] -Type=oneshot -ExecStart=-/usr/sbin/soundon -StandardOutput=syslog - -[Install] -WantedBy=basic.target diff --git a/source/multimedia-extra/oss/oss.install b/source/multimedia-extra/oss/oss.install deleted file mode 100644 index 2b306b1..0000000 --- a/source/multimedia-extra/oss/oss.install +++ /dev/null @@ -1,63 +0,0 @@ -systemd_units=(@_F_systemd_units@) - -post_install() -{ - echo -n "Suppressing ALSA drivers... " - /usr/lib/oss/scripts/remove_drv.sh &> /dev/null - echo "done." - - depmod -a @_F_kernelmod_uname@ - - local unit - local op - - for i in ${systemd_units[@]}; do - unit=$(echo $i | cut -f 1 -d '=') - op=$(echo $i | cut -f 2 -d '=') - if echo $op | grep -q 'e'; then - systemctl enable $unit.service >/dev/null 2>&1 - fi - if echo $op | grep -q 's'; then - systemctl start $unit.service >/dev/null 2>&1 - fi - done -} - -post_upgrade() -{ - echo -n "Suppressing ALSA drivers... " - /usr/lib/oss/scripts/remove_drv.sh &> /dev/null - echo "done." - - find /lib/modules -name "sound-preoss.tar.bz2" -not -path "*@_F_kernelmod_uname@*" -delete - - depmod -a @_F_kernelmod_uname@ - - systemctl daemon-reload >/dev/null 2>&1 -} - -pre_remove() -{ - echo -n "Restoring ALSA drivers... " - /usr/lib/oss/scripts/restore_drv.sh &> /dev/null - echo "done." - - local unit - - for i in ${systemd_units[@]}; do - unit=$(echo $i | cut -f 1 -d '=') - systemctl --no-reload disable $unit.service >/dev/null 2>&1 - systemctl stop $unit.service >/dev/null 2>&1 - done -} - -post_remove() -{ - depmod -a @_F_kernelmod_uname@ - - systemctl daemon-reload >/dev/null 2>&1 -} - -op=$1 -shift -$op $* _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
