diff options
| author | seawright | 2019-10-31 20:33:05 +0000 |
|---|---|---|
| committer | seawright | 2019-10-31 20:33:05 +0000 |
| commit | b26368fddc52e67d5db44ccd0f1b3a221c831725 (patch) | |
| tree | eae1cd84680f7e98cabda73935cb14c55716658d | |
| parent | 3306fd00b2cd1ca5d466b5fcd9df060d8c8a4b33 (diff) | |
| download | aur-b26368fddc52e67d5db44ccd0f1b3a221c831725.tar.gz | |
Squashed commit of the following:
commit 7fc3cb3e31147eb48633aef2f77d3df8dceb8d1a
Author: seawright <23202295+seawright@users.noreply.github.com>
Date: Thu Oct 31 19:11:14 2019 +0000
modified: PKGBUILD following upstream commit 3e7a6c
commit f1968f74956153bbf11e15ebe1000b187a5bf499
Author: seawright <23202295+seawright@users.noreply.github.com>
Date: Tue Oct 29 13:09:25 2019 +0000
Updated .SRCINFO
commit 49330ee03898db48a16fcb45d430340cb6dec954
Author: seawright <23202295+seawright@users.noreply.github.com>
Date: Tue Oct 29 12:54:30 2019 +0000
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). |