diff options
author | Matt Scheirer | 2020-04-19 19:14:15 -0400 |
---|---|---|
committer | Matt Scheirer | 2020-04-19 19:14:15 -0400 |
commit | a97dcc72b9a87df3fe03c9d4aa8c7b59d1830866 (patch) | |
tree | 9c0413f32c3c43709643ab7d0fb13564f321d30e | |
parent | 4ef476cfa8ae012595caeb43e97c613ac5f1cfe5 (diff) | |
download | aur-a97dcc72b9a87df3fe03c9d4aa8c7b59d1830866.tar.gz |
Patch the broken cmake sdl2 config
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 20 | ||||
-rw-r--r-- | sdl2-cmake.patch | 15 |
3 files changed, 31 insertions, 12 deletions
@@ -20,9 +20,11 @@ pkgbase = rbdoom3-bfg-git source = rbdoom3-bfg-git::git+https://github.com/RobertBeckebans/RBDOOM-3-BFG.git source = rbdoom3-bfg-git.desktop source = doom3bfg.png - md5sums = SKIP - md5sums = f5458e6cc915282aec2406dbdc824f9f - md5sums = 86455bb86d4267b447bd882dbde35231 + source = sdl2-cmake.patch + sha256sums = SKIP + sha256sums = a651aa2e71a8a525e66173a8f76b907712b73c950c88f5468ccab79f7533361f + sha256sums = 0fb6a3bb9b47cad65d5012ba20dc9de3b1487f4ac1908ee847e6087511b7f09e + sha256sums = 438993ae976453143d1055fd851e3fd0d48c5309818d485b276e1cfcd6701ce9 pkgname = rbdoom3-bfg-git @@ -13,25 +13,27 @@ optdepends=('doom3bfg-data: packaged game data files') provides=('rbdoom3-bfg') conflicts=('rbdoom-3-bfg') install=rbdoom3-bfg-git.install -source=('rbdoom3-bfg-git::git+https://github.com/RobertBeckebans/RBDOOM-3-BFG.git' +source=("$pkgname::git+https://github.com/RobertBeckebans/RBDOOM-3-BFG.git" 'rbdoom3-bfg-git.desktop' - 'doom3bfg.png') -md5sums=('SKIP' - 'f5458e6cc915282aec2406dbdc824f9f' - '86455bb86d4267b447bd882dbde35231') + 'doom3bfg.png' + 'sdl2-cmake.patch') +sha256sums=('SKIP' + 'a651aa2e71a8a525e66173a8f76b907712b73c950c88f5468ccab79f7533361f' + '0fb6a3bb9b47cad65d5012ba20dc9de3b1487f4ac1908ee847e6087511b7f09e' + '438993ae976453143d1055fd851e3fd0d48c5309818d485b276e1cfcd6701ce9') pkgver() { - cd "$srcdir/$pkgname" + cd "$pkgname" printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } prepare() { - cd "$srcdir/$pkgname" - git revert 988420 -n --no-edit + cd "$pkgname" + patch -p1 -i "$srcdir/sdl2-cmake.patch" } build() { - cd "$srcdir/$pkgname/neo" + cd "$pkgname/neo" cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DUSE_SYSTEM_ZLIB=1 \ -DUSE_SYSTEM_LIBPNG=0 \ diff --git a/sdl2-cmake.patch b/sdl2-cmake.patch new file mode 100644 index 000000000000..87b0863b7d89 --- /dev/null +++ b/sdl2-cmake.patch @@ -0,0 +1,15 @@ +diff --git a/neo/CMakeLists.txt b/neo/CMakeLists.txt +index 1a36eef..ba149df 100644 +--- a/neo/CMakeLists.txt ++++ b/neo/CMakeLists.txt +@@ -1599,8 +1599,8 @@ else() + + if(SDL2) + find_package(SDL2 REQUIRED) +- include_directories(${SDL2_INCLUDE_DIRS}) +- set(SDLx_LIBRARY ${SDL2_LIBRARIES}) ++ include_directories(SDL2::SDL2) ++ set(SDLx_LIBRARY SDL2::SDL2) + else() + find_package(SDL REQUIRED) + include_directories(${SDL_INCLUDE_DIR}) |