summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartino Pilia2021-03-20 17:23:37 +0100
committerMartino Pilia2021-03-20 17:23:37 +0100
commit5c34e3358bab1d26b81643448809b1d0783eaead (patch)
tree5f927bb137f8b5936f7428a2aa7d642102a49d22
parent52f72016b6196b9a76989f4a502fea90d000a954 (diff)
downloadaur-teem.tar.gz
Fix CMake config
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD40
-rw-r--r--cmake.patch38
3 files changed, 66 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1f3e873fcb81..b069708aafe3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,15 @@
pkgbase = teem
pkgdesc = Group of libraries for processing scientific raster data.
pkgver = 1.11.0
- pkgrel = 3
+ pkgrel = 4
url = http://teem.sourceforge.net/index.html
arch = x86_64
license = LGPL
makedepends = cmake
source = https://sourceforge.net/projects/teem/files/teem/1.11.0/teem-1.11.0-src.tar.gz/download
- sha512sums = 48b171a12db0f02dcfdaa87aa84464c651d661fa66201dc966b3cd5a8134c5bad1dad8987ffcc5d7c21c5d14c2eb617d48200410a1bda19008ef743c093ed575
+ source = cmake.patch
+ sha256sums = a01386021dfa802b3e7b4defced2f3c8235860d500c1fa2f347483775d4c8def
+ sha256sums = e7dac798204c7a832839f52a7e339d46ed3207a6c762c2e4c8b12e842685c66c
pkgname = teem
diff --git a/PKGBUILD b/PKGBUILD
index 2bda3c3b863f..161ffa0b0160 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
# Maintainer of this PKGBUILD file: Martino Pilia <martino.pilia@gmail.com>
+# Contributor: bartus <szczepaniak.bartek+github@gmail.com>
pkgname=teem
pkgver=1.11.0
-pkgrel=3
+pkgrel=4
pkgdesc='Group of libraries for processing scientific raster data.'
arch=('x86_64')
url='http://teem.sourceforge.net/index.html'
@@ -9,33 +10,40 @@ license=('LGPL')
depends=()
optdepends=()
makedepends=('cmake')
-source=("https://sourceforge.net/projects/teem/files/teem/${pkgver}/teem-${pkgver}-src.tar.gz/download")
-sha512sums=('48b171a12db0f02dcfdaa87aa84464c651d661fa66201dc966b3cd5a8134c5bad1dad8987ffcc5d7c21c5d14c2eb617d48200410a1bda19008ef743c093ed575')
+source=(
+ "https://sourceforge.net/projects/teem/files/teem/${pkgver}/teem-${pkgver}-src.tar.gz/download"
+ "cmake.patch"
+)
+sha256sums=('a01386021dfa802b3e7b4defced2f3c8235860d500c1fa2f347483775d4c8def'
+ 'e7dac798204c7a832839f52a7e339d46ed3207a6c762c2e4c8b12e842685c66c')
prepare() {
- cd "$srcdir/$pkgname-$pkgver-src"
+ cd "$srcdir/$pkgname-$pkgver-src"
- mkdir build || :
- cd build
+ # Fix CMake config to install CMake files in the right place
+ patch -Np1 -i "$srcdir"/cmake.patch
- cmake \
- -DCMAKE_INSTALL_PREFIX:PATH="/usr" \
- -DCMAKE_BUILD_TYPE:STRING=Release \
- -DBUILD_SHARED_LIBS:BOOL=ON \
- ..
+ mkdir build || :
+ cd build
+
+ cmake \
+ -DCMAKE_INSTALL_PREFIX:PATH="/usr" \
+ -DCMAKE_BUILD_TYPE:STRING=Release \
+ -DBUILD_SHARED_LIBS:BOOL=ON \
+ ..
}
build() {
cd "$srcdir/$pkgname-$pkgver-src/build"
- make
+ make
}
package() {
cd "$srcdir/$pkgname-$pkgver-src/build"
- make install DESTDIR="$pkgdir"
+ make install DESTDIR="$pkgdir"
- install -D -m644 \
- "${srcdir}/$pkgname-$pkgver-src/LICENSE.txt" \
- "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ install -D -m644 \
+ "${srcdir}/$pkgname-$pkgver-src/LICENSE.txt" \
+ "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
diff --git a/cmake.patch b/cmake.patch
new file mode 100644
index 000000000000..8cfe6ebc30ba
--- /dev/null
+++ b/cmake.patch
@@ -0,0 +1,38 @@
+diff -Naur teem-1.11.0-src/CMake/TeemConfig.cmake.in teem-1.11.0-src.new/CMake/TeemConfig.cmake.in
+--- teem-1.11.0-src/CMake/TeemConfig.cmake.in 2012-12-20 15:07:08.000000000 +0100
++++ teem-1.11.0-src.new/CMake/TeemConfig.cmake.in 2021-02-18 08:06:30.652417084 +0100
+@@ -32,7 +32,7 @@
+ # (this_dir == Teem_DIR)
+ #
+ GET_FILENAME_COMPONENT(this_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
+-GET_FILENAME_COMPONENT(Teem_ROOT_DIR "${this_dir}/@Teem_CV_CONFIG_TO_ROOT@" ABSOLUTE)
++GET_FILENAME_COMPONENT(Teem_ROOT_DIR "${this_dir}/../../@Teem_CV_CONFIG_TO_ROOT@" ABSOLUTE)
+
+ # CMake files required to build client applications that use Teem.
+ SET(Teem_BUILD_SETTINGS_FILE "@Teem_CV_BUILD_SETTINGS_FILE@")
+diff -Naur teem-1.11.0-src/CMakeLists.txt teem-1.11.0-src.new/CMakeLists.txt
+--- teem-1.11.0-src/CMakeLists.txt 2012-12-20 15:12:22.000000000 +0100
++++ teem-1.11.0-src.new/CMakeLists.txt 2021-02-18 08:10:39.483776036 +0100
+@@ -492,12 +492,12 @@
+ SET(Teem_CV_CONFIG_TO_ROOT "..")
+ ENDIF(Teem_USE_LIB_INSTALL_SUBDIR)
+
+-SET(Teem_CV_LIBRARY_DEPENDS_FILE "\${Teem_ROOT_DIR}/lib${EXTRA_INSTALL_PATH}/TeemLibraryDepends.cmake")
++SET(Teem_CV_LIBRARY_DEPENDS_FILE "\${Teem_ROOT_DIR}/lib${EXTRA_INSTALL_PATH}/cmake/teem/TeemLibraryDepends.cmake")
+ SET(Teem_CV_EXECUTABLE_DIRS "\${Teem_ROOT_DIR}/bin")
+ SET(Teem_CV_LIBRARY_DIRS "\${Teem_ROOT_DIR}/lib${EXTRA_INSTALL_PATH}")
+-SET(Teem_CV_USE_FILE "\${Teem_ROOT_DIR}/lib${EXTRA_INSTALL_PATH}/TeemUse.cmake")
++SET(Teem_CV_USE_FILE "\${Teem_ROOT_DIR}/lib${EXTRA_INSTALL_PATH}/cmake/teem/TeemUse.cmake")
+ SET(Teem_CV_INCLUDE_DIRS "\${Teem_ROOT_DIR}/include")
+-SET(Teem_CV_BUILD_SETTINGS_FILE "\${Teem_ROOT_DIR}/lib${EXTRA_INSTALL_PATH}/TeemBuildSettings.cmake")
++SET(Teem_CV_BUILD_SETTINGS_FILE "\${Teem_ROOT_DIR}/lib${EXTRA_INSTALL_PATH}/cmake/teem/TeemBuildSettings.cmake")
+ SET(Teem_CV_BUILT_LIBRARIES teem) # The libraries built by teem. Currently we only build the mega library.
+
+ CONFIGURE_FILE("${Teem_SOURCE_DIR}/CMake/TeemConfig.cmake.in"
+@@ -513,5 +513,5 @@
+ "${Teem_SOURCE_DIR}/CMake/TeemUse.cmake"
+ "${Teem_BINARY_DIR}/TeemBuildSettings.cmake"
+ "${Teem_BINARY_DIR}/TeemLibraryDepends.cmake"
+- DESTINATION lib${EXTRA_INSTALL_PATH}
++ DESTINATION lib${EXTRA_INSTALL_PATH}/cmake/teem
+ )