Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting2.git;a=commitdiff;h=7decd79b7a18f1408e590fc5ca74b644cb25e783
commit 7decd79b7a18f1408e590fc5ca74b644cb25e783 Author: James Buren <r...@frugalware.org> Date: Mon Jan 17 22:12:37 2011 -0600 oss-v4.2_build2004-1-i686 * version bump * delete old kernel patch * delete ALSA backups at install/upgrade time diff --git a/source/multimedia-extra/oss/FrugalBuild b/source/multimedia-extra/oss/FrugalBuild index cee4e47..99dc80e 100644 --- a/source/multimedia-extra/oss/FrugalBuild +++ b/source/multimedia-extra/oss/FrugalBuild @@ -5,9 +5,9 @@ # should be updated with care. pkgname=oss -pkgver=v4.2_build2003 +pkgver=v4.2_build2004 _ver="${pkgver/_/-}" -pkgrel=6 +pkgrel=1 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' @@ -18,7 +18,6 @@ up2date="Flastarchive $_dlurl $_ext" backup=('usr/lib/oss/soundon.user') install="$pkgname.install" source=($_dlurl/$pkgname-$_ver$_ext - $pkgname-kernel-2.6.36.patch $pkgname-disable-redundant-actions.patch rc.$pkgname) options=('scriptlet') @@ -37,9 +36,8 @@ _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=('3e94c5c36b6955ad1224a65376b4a373f3a807ab' \ - '48aaf87228449590f0a82cdf17264e6b0a963546' \ - '1a30ba006f37066f369fc8b5f18af465cb6f0793' \ +sha1sums=('75c3ff1cf3e3bd5b351b1f778100387f998c7f3a' \ + 'e7887412fa6434e12ea8bf441cd6fd52008997e5' \ '7f1c8c3758179bb1890dd17f232ebf824505cfea') build() { @@ -118,8 +116,8 @@ build() { Ficonrel ../../cmd/ossxmix/ossxmix.xpm Frcd2 Fdesktop2 - Fsplit $pkgname-gtk-mixer /usr/share/applications/ossxmix.desktop - Fsplit $pkgname-gtk-mixer /usr/share/pixmaps/ossxmix.xpm + 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 } diff --git a/source/multimedia-extra/oss/oss-disable-redundant-actions.patch b/source/multimedia-extra/oss/oss-disable-redundant-actions.patch index 04157aa..60e9edf 100644 --- a/source/multimedia-extra/oss/oss-disable-redundant-actions.patch +++ b/source/multimedia-extra/oss/oss-disable-redundant-actions.patch @@ -1,6 +1,6 @@ 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 2010-05-11 06:26:05.000000000 -0500 -+++ b/setup/Linux/oss/scripts/restore_drv.sh 2010-12-14 11:26:24.119000141 -0600 +--- 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 @@ -20,8 +20,8 @@ diff -aur a/setup/Linux/oss/scripts/restore_drv.sh b/setup/Linux/oss/scripts/res 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 2010-05-11 06:26:05.000000000 -0500 -+++ b/setup/Linux/sbin/soundon 2010-12-14 11:26:24.120000141 -0600 +--- 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 @@ -110,7 +110,7 @@ diff -aur a/setup/Linux/sbin/soundon b/setup/Linux/sbin/soundon - /usr/sbin/ossdetect -l >> $LOG -fi - --if grep -q '^ *14 ' < /proc/devices +-if test -d /proc/asound || grep -q '^ *14 ' < /proc/devices -then - if ! sh $OSSLIBDIR/scripts/remove_drv.sh>> $LOG - then diff --git a/source/multimedia-extra/oss/oss-kernel-2.6.36.patch b/source/multimedia-extra/oss/oss-kernel-2.6.36.patch deleted file mode 100644 index 433b996..0000000 --- a/source/multimedia-extra/oss/oss-kernel-2.6.36.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -aur oss-v4.2-build2003-src-gpl/setup/Linux/oss/build/osscore.c oss-v4.2-build2003-src-gpl-2/setup/Linux/oss/build/osscore.c ---- oss-v4.2-build2003-src-gpl/setup/Linux/oss/build/osscore.c 2010-05-11 06:26:05.000000000 -0500 -+++ oss-v4.2-build2003-src-gpl-2/setup/Linux/oss/build/osscore.c 2010-12-14 05:38:08.847000125 -0600 -@@ -933,7 +933,9 @@ - read_t tmp_read = (read_t) op->read; - write_t tmp_write = (write_t) op->write; - /* readdir_t tmp_readdir = (readdir_t)op->readdir; */ -+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,35) - ioctl_t tmp_ioctl = (ioctl_t) op->ioctl; -+#endif - mmap_t tmp_mmap = (mmap_t) op->mmap; - open_t tmp_open = (open_t) op->open; - release_t tmp_release = (release_t) op->release; -@@ -953,7 +955,9 @@ - fop->write = tmp_write; - fop->readdir = NULL; /* tmp_readdir; */ - fop->poll = tmp_poll; -+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,35) - fop->ioctl = tmp_ioctl; -+#endif - fop->mmap = tmp_mmap; - fop->open = tmp_open; - fop->release = tmp_release; diff --git a/source/multimedia-extra/oss/oss.install b/source/multimedia-extra/oss/oss.install index 22a27ec..aa43ab6 100644 --- a/source/multimedia-extra/oss/oss.install +++ b/source/multimedia-extra/oss/oss.install @@ -1,6 +1,7 @@ post_install() { echo -n "Suppressing ALSA drivers... " + find /lib/modules -name "sound-preoss.tar.bz2" -delete /usr/lib/oss/scripts/remove_drv.sh &> /dev/null depmod -a /usr/sbin/chkconfig --add rc.oss _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git