arcan: fix wayland build_options, proper cleanup

No revision bump since wayland is not the default
This commit is contained in:
Đoàn Trần Công Danh 2021-09-19 20:14:42 +07:00
parent cdeced06f9
commit 5cce250d72
2 changed files with 11 additions and 9 deletions

View file

@ -1,7 +1,7 @@
Index: a/src/CMakeLists.txt Index: a/arcan/src/CMakeLists.txt
=================================================================== ===================================================================
--- a/src/CMakeLists.txt --- a/arcan/src/CMakeLists.txt
+++ b/src/CMakeLists.txt +++ b/arcan/src/CMakeLists.txt
@@ -1,16 +1,8 @@ @@ -1,16 +1,8 @@
# tried playing nice by using REQUIRE_QUIET but some built-in modules # tried playing nice by using REQUIRE_QUIET but some built-in modules
# (CheckLibraryExists, ...) wouldn't listen so how about a nice cup # (CheckLibraryExists, ...) wouldn't listen so how about a nice cup

View file

@ -3,11 +3,12 @@
pkgname=arcan pkgname=arcan
version=0.6.2 version=0.6.2
revision=1 revision=1
build_wrksrc=src create_wrksrc=yes
build_wrksrc=arcan/src
build_style=cmake build_style=cmake
make_cmd=make make_cmd=make
configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
-DHYBRID_SDL=On -DHYBRID_SDL=On -DDISABLE_WAYLAND=$(vopt_if wayland OFF ON)
$(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')" $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
hostmakedepends="pkg-config hostmakedepends="pkg-config
$(vopt_if wayland wayland-devel)" $(vopt_if wayland wayland-devel)"
@ -24,7 +25,7 @@ maintainer="Piraty <piraty1@inbox.ru>"
license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause" license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause"
homepage="https://arcan-fe.com/" homepage="https://arcan-fe.com/"
_versionOpenal=0.5.4 _versionOpenal=0.5.4
distfiles="https://github.com/letoram/${pkgname}/archive/${version}.tar.gz distfiles="https://github.com/letoram/arcan/archive/${version}.tar.gz
https://github.com/letoram/openal/archive/${_versionOpenal}.tar.gz>openal_arcan.${_versionOpenal}.tar.gz" https://github.com/letoram/openal/archive/${_versionOpenal}.tar.gz>openal_arcan.${_versionOpenal}.tar.gz"
checksum="635c447c341c7b803fd13317d3027ce438e8965803943a213a8f4409352d889c checksum="635c447c341c7b803fd13317d3027ce438e8965803943a213a8f4409352d889c
3a50a87c05b67c466a868cc77f8dc7f9cfc9466aeeafcd823daca0d108c504da" 3a50a87c05b67c466a868cc77f8dc7f9cfc9466aeeafcd823daca0d108c504da"
@ -49,11 +50,12 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
CFLAGS="-latomic" CFLAGS="-latomic"
fi fi
post_patch() { post_extract() {
rm -f platform/cmake/modules/FindPkgConfig.cmake mv arcan-$version arcan
rm arcan/src/platform/cmake/modules/FindPkgConfig.cmake
# provide patched openAL. the _lwa part of the build relies on a patched # provide patched openAL. the _lwa part of the build relies on a patched
# openAL implementation that is statically linked # openAL implementation that is statically linked
ln -s ${XBPS_BUILDDIR}/openal-${_versionOpenal} ${XBPS_BUILDDIR}/arcan-${version}/external/git/openal mv openal-$_versionOpenal arcan/external/git/openal
} }
post_install() { post_install() {