Date: Friday, April 14, 2023 @ 09:59:41 Author: dvzrv Revision: 1446015
upgpkg: openvkl 1.3.2-1: Upgrade to 1.3.2. Remove unneeded dependencies. Sort dependencies alphabetically. Move ispc to makedepends as it is only required during build time and not linked against. Add upstream patch for not installing version.h twice. Added: openvkl/trunk/openvkl-1.3.2-duplicate_header.patch Modified: openvkl/trunk/PKGBUILD --------------------------------------+ PKGBUILD | 22 +++++++++++++++------ openvkl-1.3.2-duplicate_header.patch | 34 +++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-04-14 09:09:03 UTC (rev 1446014) +++ PKGBUILD 2023-04-14 09:59:41 UTC (rev 1446015) @@ -1,17 +1,27 @@ # Maintainer: Bruno Pagani <[email protected]> pkgname=openvkl -pkgver=1.3.1 +pkgver=1.3.2 pkgrel=1 pkgdesc="Intel® Open Volume Kernel Library" arch=(x86_64) url="https://www.openvkl.org/"; license=(Apache) -depends=(embree ispc glfw libglvnd imath openvdb rkcommon tbb zlib) -makedepends=(boost cmake) -source=(https://github.com/openvkl/openvkl/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz) -sha256sums=('c9cefb6c313f2b4c0331e9629931759a6bc204ec00deed6ec0becad1670a1933') +depends=(embree gcc-libs glibc onetbb openvdb rkcommon) +makedepends=(boost cmake ispc) +source=( + https://github.com/openvkl/openvkl/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz + $pkgname-1.3.2-duplicate_header.patch +) +sha256sums=('7704736566bf17497a3e51c067bd575316895fda96eccc682dae4aac7fb07b28' + 'e228a8bfb95bb7fb8bfae100b22b529c29cec16594f8ef5a63373dc138988a37') +prepare() { + # prevent version.h to be installed twice (and to the wrong location) + # https://github.com/openvkl/openvkl/issues/19 + patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-1.3.2-duplicate_header.patch +} + build() { cmake -B build -S ${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=None \ @@ -19,7 +29,7 @@ -DBUILD_EXAMPLES=OFF \ -DOpenVDB_ROOT=/usr \ -Wno-dev - cmake --build build + cmake --build build --verbose } check() { Added: openvkl-1.3.2-duplicate_header.patch =================================================================== --- openvkl-1.3.2-duplicate_header.patch (rev 0) +++ openvkl-1.3.2-duplicate_header.patch 2023-04-14 09:59:41 UTC (rev 1446015) @@ -0,0 +1,34 @@ +From 67fcc3f8c34cf1fc7983b1acc4752eb9e2cfe769 Mon Sep 17 00:00:00 2001 +From: Ruoyu Zhong <[email protected]> +Date: Thu, 9 Mar 2023 17:54:12 +0800 +Subject: [PATCH] Fix CMake install location + +`GNUInstallDirs` needs to be included before `CMAKE_INSTALL_INCLUDEDIR` +can be used. + +Signed-off-by: Ruoyu Zhong <[email protected]> +--- + CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 75a80e28..97829743 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,6 +39,8 @@ configure_file( + + include_directories_ispc(${CMAKE_CURRENT_BINARY_DIR}/openvkl/include/${PROJECT_NAME}) + ++include(GNUInstallDirs) ++ + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/openvkl/include/${PROJECT_NAME}/version.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} + ) +@@ -48,7 +50,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/openvkl/include/${PROJECT_NAME}/versio + option(BUILD_EXAMPLES "Build example applications." ON) + option(BUILD_BENCHMARKS "Build benchmark applications." OFF) + +-include(GNUInstallDirs) + include(CTest) # Adds 'BUILD_TESTING' variable + + if (BUILD_TESTING)
