Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77testing.git;a=commitdiff;h=3c12e72056d16f637da0324718b1aa4dda54f6eb
commit 3c12e72056d16f637da0324718b1aa4dda54f6eb Author: James Buren <[email protected]> Date: Sat May 3 22:12:14 2014 -0500 oss-v4.2_build2009-1-x86_64 * rebuild with kernel 3.14 * version bump * remove old kernel patches * update frugalware patch so it applies to new version * add kernel patch for 3.14 diff --git a/source/multimedia-extra/oss/FrugalBuild b/source/multimedia-extra/oss/FrugalBuild index ecc4e8d..15ee9ed 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_build2008 +pkgver=v4.2_build2009 _ver="${pkgver/_/-}" -pkgrel=7 +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' @@ -20,10 +20,9 @@ backup=('usr/lib/oss/soundon.user') _F_systemd_units=(oss-on=e oss-off=e) source=($_dlurl/$pkgname-$_ver$_ext $pkgname-frugalware.patch - kernel-3.8.patch - kernel-3.10.patch oss-on.service - oss-off.service) + oss-off.service + kernel-3.14.patch) options=('scriptlet' 'genscriptlet') Finclude kernel-module systemd _F_genscriptlet_install="$startdir/$pkgname.install" @@ -40,12 +39,11 @@ _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=('cffbb45f4a411fda25271ae2c21982df06569491' \ - 'e7887412fa6434e12ea8bf441cd6fd52008997e5' \ - 'b47b9f8b0e249a27e757a55f001d4938ea8a41a2' \ - '4396f59d710a1588aba3722b9734b03051e4195b' \ +sha1sums=('1aaf77d8edd7f6fb9f587556896e06ed604434f3' \ + 'a5c3d3cdf1d9850b1e4faddef15d77b9f4781c73' \ 'c11b5241b8b6cd805b9e32f6d3677c647e0abaa9' \ - 'cad69f7d4d653340947a7119888d4976640b8410') + 'cad69f7d4d653340947a7119888d4976640b8410' \ + '68872c5c6ec5e2cfffb5de91a4f9b82d6a526950') _symlink_lib() { diff --git a/source/multimedia-extra/oss/kernel-3.10.patch b/source/multimedia-extra/oss/kernel-3.10.patch deleted file mode 100644 index 494f95f..0000000 --- a/source/multimedia-extra/oss/kernel-3.10.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff -ur a/setup/Linux/oss/build/osscore.c b/setup/Linux/oss/build/osscore.c ---- a/setup/Linux/oss/build/osscore.c 2013-07-22 18:04:05.195475667 -0500 -+++ b/setup/Linux/oss/build/osscore.c 2013-07-22 18:05:04.904473447 -0500 -@@ -276,28 +276,59 @@ - return strlen (tmp); - } - -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) - static struct file_operations oss_proc_operations = { - .read = oss_read_devfiles, - }; -+#else -+static struct file_operations fops = { -+ .owner = THIS_MODULE, -+ .read = oss_read_devfiles, -+}; -+#endif -+ - - static void - init_proc_fs (void) - { -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) -+ - if ((oss_proc_root = -- create_proc_entry ("opensound", 0700 | S_IFDIR, NULL)) == NULL) -+ create_proc_entry ("opensound", 0700 | S_IFDIR, NULL)) == NULL) -+ { -+ oss_cmn_err (CE_CONT, "Cannot create /proc/opensound\n"); -+ return; -+ } -+ -+ if ((oss_proc_devfiles = -+ create_proc_entry ("devfiles", 0600, oss_proc_root)) == NULL) -+ { -+ oss_cmn_err (CE_CONT, "Cannot create /proc/opensound/devfiles\n"); -+ return; -+ } -+ -+ oss_proc_devfiles->proc_fops = &oss_proc_operations; -+ -+#else -+ -+ if ((oss_proc_root = -+ proc_mkdir ("opensound", NULL)) == NULL ) - { -- oss_cmn_err (CE_CONT, "Cannot create /proc/opensound\n"); -- return; -+ oss_cmn_err (CE_CONT, "Cannot create /proc/opensound\n"); -+ return; - } - - if ((oss_proc_devfiles = -- create_proc_entry ("devfiles", 0600, oss_proc_root)) == NULL) -+ proc_create ("devfiles", 0600, oss_proc_root, &fops)) == NULL) - { -- oss_cmn_err (CE_CONT, "Cannot create /proc/opensound/devfiles\n"); -- return; -+ oss_cmn_err (CE_CONT, "Cannot create /proc/opensound/devfiles\n"); -+ return; - } - -- oss_proc_devfiles->proc_fops = &oss_proc_operations; -+#endif -+ - } - - static void diff --git a/source/multimedia-extra/oss/kernel-3.14.patch b/source/multimedia-extra/oss/kernel-3.14.patch new file mode 100644 index 0000000..8b8d480 --- /dev/null +++ b/source/multimedia-extra/oss/kernel-3.14.patch @@ -0,0 +1,13 @@ +--- setup/Linux/oss/build/osscore.c 2014-02-14 22:59:55.000000000 +0000 ++++ setup/Linux/oss/build/osscore.c 2014-04-06 01:16:06.171974568 +0100 +@@ -472,7 +472,9 @@ + int + oss_get_uid (void) + { +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0) ++ return __kuid_val(current->cred->uid); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29) + return current->cred->uid; + #else + return current->uid; diff --git a/source/multimedia-extra/oss/kernel-3.8.patch b/source/multimedia-extra/oss/kernel-3.8.patch deleted file mode 100644 index cae0347..0000000 --- a/source/multimedia-extra/oss/kernel-3.8.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur a/setup/Linux/oss/build/pci_wrapper.inc b/setup/Linux/oss/build/pci_wrapper.inc ---- a/setup/Linux/oss/build/pci_wrapper.inc 2012-05-21 17:23:41.000000000 -0500 -+++ b/setup/Linux/oss/build/pci_wrapper.inc 2013-05-13 08:22:20.043243858 -0500 -@@ -17,7 +17,7 @@ - static dev_map_t dev_map[MAX_INSTANCE]; - static int n_devmap = 0; - --static int __devinit -+static int - osspci_probe (struct pci_dev *pcidev, const struct pci_device_id *pciid) - { - oss_device_t *osdev; -@@ -65,7 +65,7 @@ - return 0; - } - --static void __devexit -+static void - osspci_remove (struct pci_dev *pcidev) - { - int i; diff --git a/source/multimedia-extra/oss/oss-frugalware.patch b/source/multimedia-extra/oss/oss-frugalware.patch index 60e9edf..da7bad3 100644 --- a/source/multimedia-extra/oss/oss-frugalware.patch +++ b/source/multimedia-extra/oss/oss-frugalware.patch @@ -127,7 +127,7 @@ diff -aur a/setup/Linux/sbin/soundon b/setup/Linux/sbin/soundon echo >> $LOG echo '*** Loading OSS kernel modules ***' >> $LOG echo >> $LOG -@@ -230,116 +132,12 @@ +@@ -230,123 +139,19 @@ echo >> $LOG /usr/sbin/savemixer -L -v >> $LOG 2>&1 @@ -219,6 +219,13 @@ diff -aur a/setup/Linux/sbin/soundon b/setup/Linux/sbin/soundon $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 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
