summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Whatson2019-08-02 15:05:36 +1000
committerAndrew Whatson2019-08-02 15:05:36 +1000
commit873eaec29b394b561d9ce3e7de9bcafb701b19f5 (patch)
tree86c9168d3544c0dbe9830c72cd18edce0b05c82e
parent74121f224c8e08eeb546154e846720aeccb4b644 (diff)
downloadaur-873eaec29b394b561d9ce3e7de9bcafb701b19f5.tar.gz
Remove redundant force-lib32-sdl2.patch
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD11
-rw-r--r--force-lib32-sdl2.patch13
3 files changed, 4 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c946bda5f75..a06ec9d0c5b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = lib32-faudio-git
pkgdesc = XAudio2 reimplementation
pkgver = 19.08.r0.g2cc0ee5
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/FNA-XNA/FAudio/
arch = x86_64
license = custom:zlib
@@ -13,10 +13,8 @@ pkgbase = lib32-faudio-git
provides = lib32-faudio
source = git+https://github.com/FNA-XNA/FAudio
source = faudio.pc
- source = force-lib32-sdl2.patch
sha256sums = SKIP
sha256sums = 10b0d2bd3a5e415971b36abf6bf6b853d7e3cd0dc316b6e4c773815a56b4a26f
- sha256sums = 13fbcb9ef210db64bc73e3193b7c3a89cb2fac98fd4a1251389523dfb118c3bc
pkgname = lib32-faudio-git
diff --git a/PKGBUILD b/PKGBUILD
index 7b4cbd0bc3e..a648f47dfba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _pkgbase=faudio
_pkgname=lib32-${_pkgbase}
pkgname=${_pkgname}-git
pkgver=19.08.r0.g2cc0ee5
-pkgrel=1
+pkgrel=2
pkgdesc="XAudio2 reimplementation"
arch=(x86_64)
url="https://github.com/FNA-XNA/FAudio/"
@@ -13,11 +13,9 @@ provides=("${_pkgname}")
depends=("${_pkgbase}" 'lib32-sdl2' 'lib32-ffmpeg')
makedepends=('git' 'cmake')
source=('git+https://github.com/FNA-XNA/FAudio'
- 'faudio.pc'
- 'force-lib32-sdl2.patch')
+ 'faudio.pc')
sha256sums=('SKIP'
- '10b0d2bd3a5e415971b36abf6bf6b853d7e3cd0dc316b6e4c773815a56b4a26f'
- '13fbcb9ef210db64bc73e3193b7c3a89cb2fac98fd4a1251389523dfb118c3bc')
+ '10b0d2bd3a5e415971b36abf6bf6b853d7e3cd0dc316b6e4c773815a56b4a26f')
pkgver() {
cd FAudio
@@ -26,9 +24,6 @@ pkgver() {
prepare() {
mkdir -p build
-
- cd FAudio
- patch -p1 -i ../force-lib32-sdl2.patch
}
build() {
diff --git a/force-lib32-sdl2.patch b/force-lib32-sdl2.patch
deleted file mode 100644
index 3f9b56ce583..00000000000
--- a/force-lib32-sdl2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1d2580f..f7f8026 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -165,7 +165,7 @@ if (DEFINED SDL2_INCLUDE_DIRS AND DEFINED SDL2_LIBRARIES)
- endif()
- else()
- # Only try to autodetect if both SDL2 variables aren't explicitly set
-- find_package(SDL2 CONFIG)
-+ include(/usr/lib32/cmake/SDL2/SDL2Config.cmake)
- if (TARGET SDL2::SDL2)
- message(STATUS "using TARGET SDL2::SDL2")
- target_link_libraries(FAudio PUBLIC SDL2::SDL2)