From d60853f226ce4ea36f236d8363ffa7d4ed07d52c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 10 Jan 2022 18:16:00 +0700 Subject: [PATCH] arcan: fix build --- srcpkgs/arcan/patches/show-message.patch | 22 ++++++++++++++++++++++ srcpkgs/arcan/template | 5 +++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/arcan/patches/show-message.patch diff --git a/srcpkgs/arcan/patches/show-message.patch b/srcpkgs/arcan/patches/show-message.patch new file mode 100644 index 00000000000..34cbf3af88d --- /dev/null +++ b/srcpkgs/arcan/patches/show-message.patch @@ -0,0 +1,22 @@ +Index: a/src/CMakeLists.txt +=================================================================== +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,16 +1,8 @@ + # tried playing nice by using REQUIRE_QUIET but some built-in modules + # (CheckLibraryExists, ...) wouldn't listen so how about a nice cup + # of shut up. +-function(message) +- list(GET ARGV 0 TYPE) +- if (TYPE STREQUAL "FATAL_ERROR") +- list(REMOVE_AT ARGV 0) +- _message(${TYPE} ${CL_RED} "${ARGV}" ${CL_RST}) +- endif() +-endfunction() +- + function(amsg msg) +- _message("" ${msg}) ++ message("" ${msg}) + endfunction() + + if (CLIENT_LIBRARY_BUILD OR BUILD_PRESET STREQUAL "client") diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template index 2fcf11346b9..f33db1fadeb 100644 --- a/srcpkgs/arcan/template +++ b/srcpkgs/arcan/template @@ -12,7 +12,7 @@ hostmakedepends="pkg-config $(vopt_if wayland wayland-devel)" makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel - vlc-devel SDL2-devel + vlc-devel SDL2-devel xcb-util-devel xcb-util-wm-devel $(vopt_if tts 'libespeak-ng-devel') $(vopt_if luajit 'LuaJIT-devel' 'lua51-devel') $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel') @@ -48,7 +48,8 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then CFLAGS="-latomic" fi -pre_configure() { +post_patch() { + rm -f platform/cmake/modules/FindPkgConfig.cmake # provide patched openAL. the _lwa part of the build relies on a patched # openAL implementation that is statically linked ln -s ${XBPS_BUILDDIR}/openal-${_versionOpenal} ${XBPS_BUILDDIR}/arcan-${version}/external/git/openal