diff options
author | galaxy001 | 2019-11-02 01:02:54 +0800 |
---|---|---|
committer | GitHub | 2019-11-02 01:02:54 +0800 |
commit | d65e4271040f157253f851e4dccb029e88b9c4b1 (patch) | |
tree | eae1cd84680f7e98cabda73935cb14c55716658d | |
parent | 3306fd00b2cd1ca5d466b5fcd9df060d8c8a4b33 (diff) | |
parent | b26368fddc52e67d5db44ccd0f1b3a221c831725 (diff) | |
download | aur-d65e4271040f157253f851e4dccb029e88b9c4b1.tar.gz |
Merge pull request #5 from seawright/master
Following upstream commit 3e7a6c (Fixes for Linux kernel version 5.2.1)
Added libogg & libvorbis to optdepends for oggvorbis support in ossplay.
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | PKGBUILD | 13 | ||||
-rw-r--r-- | README.md | 2 |
3 files changed, 11 insertions, 6 deletions
@@ -35,6 +35,8 @@ pkgname = oss-git install = oss.install depends = linux-headers optdepends = gtk2: for graphical mixer (ossxmix) + optdepends = libogg: for Ogg Vorbis support in ossplay + optdepends = libvorbis: for Ogg Vorbis support in ossplay optdepends = libflashsupport-oss: Adobe flash plugin support provides = oss conflicts = oss @@ -63,11 +63,13 @@ prepare() { # - no longer required (from commit 891ddd) # patch -p0 < "$srcdir/linux-4.8-usercopy.patch" patch -p1 < "$srcdir/ossvermagic.patch" - patch -p1 < "$srcdir/seawright.patch" + # - no longer required (from commit 3e7a6c) + # patch -p1 < "$srcdir/seawright.patch" patch -p1 < "$srcdir/galaxy.patch" # make OSS compile with glibc >= 2.23 - patch -p1 < "$srcdir/oss4_sys-libs_glibc-2.23_ossdetect_fix_git.patch" + # - no longer required (from commit 3e7a6c) + # patch -p1 < "$srcdir/oss4_sys-libs_glibc-2.23_ossdetect_fix_git.patch" # make OSS compile with gcc-5 # - no longer required (from commit b3dc64) @@ -82,9 +84,10 @@ prepare() { patch -p1 < "$srcdir/soundon.patch" # FS#35672 - mv oss/build/{osscore.c,osscore_wrapper.c} - patch -p3 < "$srcdir/kmod-link2.patch" - patch -p2 < "$srcdir/kmod-link.patch" + # - no longer required (from commit 3e7a6c) + # mv oss/build/{osscore.c,osscore_wrapper.c} + # patch -p3 < "$srcdir/kmod-link2.patch" + # patch -p2 < "$srcdir/kmod-link.patch" cd ../.. } diff --git a/README.md b/README.md index babbfbbb8f96..9ef40ddc7445 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Some part of the package, not the kernel module, requires GAWK4 (below 5.0) to m Original Source: <https://aur.archlinux.org/packages/oss-git>. -Fix Compile error with ossdetect with glibc starting with version 2.23 accroding to <http://ossnext.trueinstruments.com/forum/viewtopic.php?t=5855>. +Fix Compile error with ossdetect with glibc starting with version 2.23 according to <http://ossnext.trueinstruments.com/forum/viewtopic.php?t=5855>. Also added patch from seawright [commented on 2018-07-23 00:08](https://aur.archlinux.org/pkgbase/oss-git/#comment-655283). |