summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Whatson2019-08-02 15:01:33 +1000
committerAndrew Whatson2019-08-02 15:01:33 +1000
commit74121f224c8e08eeb546154e846720aeccb4b644 (patch)
tree79f8d45525c1e34c03d14976d8add7c262cf9a26
parent29eb376f5ef9e6ea4fdee71bd1310356aef32cf3 (diff)
downloadaur-74121f224c8e08eeb546154e846720aeccb4b644.tar.gz
Fix force-lib32-sdl2.patch
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--force-lib32-sdl2.patch20
3 files changed, 13 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 37e3d5e3282..c946bda5f75 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = lib32-faudio-git
pkgdesc = XAudio2 reimplementation
- pkgver = 19.05.r13.g3dd4e04
+ pkgver = 19.08.r0.g2cc0ee5
pkgrel = 1
url = https://github.com/FNA-XNA/FAudio/
arch = x86_64
@@ -16,7 +16,7 @@ pkgbase = lib32-faudio-git
source = force-lib32-sdl2.patch
sha256sums = SKIP
sha256sums = 10b0d2bd3a5e415971b36abf6bf6b853d7e3cd0dc316b6e4c773815a56b4a26f
- sha256sums = 14762bf049e8de0675d297e174a6b4c31de65d543e738a1c400747aa155d57ae
+ sha256sums = 13fbcb9ef210db64bc73e3193b7c3a89cb2fac98fd4a1251389523dfb118c3bc
pkgname = lib32-faudio-git
diff --git a/PKGBUILD b/PKGBUILD
index 52051196449..7b4cbd0bc3e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_pkgbase=faudio
_pkgname=lib32-${_pkgbase}
pkgname=${_pkgname}-git
-pkgver=19.05.r13.g3dd4e04
+pkgver=19.08.r0.g2cc0ee5
pkgrel=1
pkgdesc="XAudio2 reimplementation"
arch=(x86_64)
@@ -17,7 +17,7 @@ source=('git+https://github.com/FNA-XNA/FAudio'
'force-lib32-sdl2.patch')
sha256sums=('SKIP'
'10b0d2bd3a5e415971b36abf6bf6b853d7e3cd0dc316b6e4c773815a56b4a26f'
- '14762bf049e8de0675d297e174a6b4c31de65d543e738a1c400747aa155d57ae')
+ '13fbcb9ef210db64bc73e3193b7c3a89cb2fac98fd4a1251389523dfb118c3bc')
pkgver() {
cd FAudio
diff --git a/force-lib32-sdl2.patch b/force-lib32-sdl2.patch
index 439dd11cf75..3f9b56ce583 100644
--- a/force-lib32-sdl2.patch
+++ b/force-lib32-sdl2.patch
@@ -1,15 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bb2b6b3..db2afa9 100644
+index 1d2580f..f7f8026 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -154,9 +154,7 @@ if(FFMPEG)
- endif(FFMPEG)
-
- # SDL2 Dependency
--if (NOT DEFINED SDL2_INCLUDE_DIRS AND NOT DEFINED SDL2_LIBRARIES)
+@@ -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)
--endif()
-+include(/usr/lib32/cmake/SDL2/SDL2Config.cmake)
- if (TARGET SDL2::SDL2)
- message(STATUS "using TARGET SDL2::SDL2")
- target_link_libraries(FAudio PUBLIC SDL2::SDL2)
++ include(/usr/lib32/cmake/SDL2/SDL2Config.cmake)
+ if (TARGET SDL2::SDL2)
+ message(STATUS "using TARGET SDL2::SDL2")
+ target_link_libraries(FAudio PUBLIC SDL2::SDL2)