diff --git a/srcpkgs/renderdoc/patches/atomic.patch b/srcpkgs/renderdoc/patches/atomic.patch index 7e454fa369b..456572f5969 100644 --- a/srcpkgs/renderdoc/patches/atomic.patch +++ b/srcpkgs/renderdoc/patches/atomic.patch @@ -1,19 +1,6 @@ @q66: replace old __sync stuff with equivalent modern ones, so we can use libatomic on targets without atomic8 support ---- a/renderdoc/CMakeLists.txt -+++ b/renderdoc/CMakeLists.txt -@@ -59,6 +59,10 @@ elseif(UNIX) - PRIVATE -ldl - PRIVATE -lrt) - -+option(NEED_LIBATOMIC "need libatomic" OFF) -+if (NEED_LIBATOMIC) -+list(APPEND RDOC_LIBRARIES PRIVATE -latomic) -+endif() - if(ENABLE_XLIB) - find_package(X11 REQUIRED) - --- a/renderdoc/os/posix/posix_threading.cpp +++ b/renderdoc/os/posix/posix_threading.cpp @@ -43,32 +43,33 @@ namespace Atomic diff --git a/srcpkgs/renderdoc/template b/srcpkgs/renderdoc/template index b663608ce29..0bd41741328 100644 --- a/srcpkgs/renderdoc/template +++ b/srcpkgs/renderdoc/template @@ -8,8 +8,9 @@ configure_args="-DENABLE_GL=ON -DENABLE_GLES=ON -DENABLE_QRENDERDOC=ON -DENABLE_RENDERDOCCMD=ON -DENABLE_VULKAN=ON -DENABLE_XCB=ON -DENABLE_XLIB=ON -DBUILD_VERSION_STABLE=ON -DBUILD_VERSION_DIST_NAME=VoidLinux -DBUILD_VERSION_DIST_CONTACT=https://voidlinux.org + -DRENDERDOC_SWIG_PACKAGE=file://${XBPS_SRCDISTDIR}/${pkgname}-${version}/renderdoc-modified-7.zip -DENABLE_PYRENDERDOC=ON" -hostmakedepends="bison autoconf automake pkg-config python3 swig" +hostmakedepends="bison autoconf automake pkg-config python3" makedepends="libX11-devel libxcb-devel xcb-util-keysyms-devel qt5-devel libzstd-devel liblz4-devel pugixml-devel qt5-svg-devel qt5-x11extras-devel pcre-devel python3-devel" @@ -20,12 +21,14 @@ homepage="https://github.com/baldurk/renderdoc" distfiles="https://github.com/baldurk/${pkgname}/archive/v${version}.tar.gz https://raw.githubusercontent.com/kubo/plthook/${_plt_ver}/plthook.h https://raw.githubusercontent.com/kubo/plthook/${_plt_ver}/plthook_elf.c + https://github.com/baldurk/swig/archive/renderdoc-modified-7.zip " checksum="7c12546857ffd4521a859f45161224b0f89aa6f951cfbca2bfbe22db9c2f95a6 2a30a118858ba1d5753f365a375cc93020012a35e3f596dcdb490ad70519cdb5 - 68c858dcb829e07bb60d47fbb962b240797dd82960a53c25ac69513e90aff6fa" + 68c858dcb829e07bb60d47fbb962b240797dd82960a53c25ac69513e90aff6fa + 9d7e5013ada6c42ec95ab167a34db52c1cc8c09b89c8e9373631b1f10596c648" -skip_extraction="plthook.h plthook_elf.c" +skip_extraction="plthook.h plthook_elf.c renderdoc-modified-7.zip" if [ "$XBPS_TARGET_LIBC" = musl ]; then makedepends+=" libexecinfo-devel" @@ -33,17 +36,11 @@ if [ "$XBPS_TARGET_LIBC" = musl ]; then # broken="uses RTLD_DL_LINKMAP, RTLD_DEEPBIND, _r_debug" fi -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - configure_args+=" -DNEED_LIBATOMIC=ON" -fi - nocross="Cross-compilation can't find python3 interpreter" post_extract() { - for _f in $skip_extraction; do - cp $XBPS_SRCDISTDIR/${pkgname}-${version}/$_f \ - renderdoc/3rdparty/plthook - done + vsrccopy plthook.h renderdoc/3rdparty/plthook + vsrccopy plthook_elf.c renderdoc/3rdparty/plthook } post_install() {