diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-09-06 00:44:14 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-09-06 00:54:39 +0000 |
| commit | 871ad3508b122dea18c12864f4218f7d3f711b53 (patch) | |
| tree | 613170f36898016a7c1827add85a6d55e66c72f0 | |
| parent | 6f5b1ce73cb5bea8b35e1926851f7e298ead6320 (diff) | |
| download | packages-871ad3508b122dea18c12864f4218f7d3f711b53.tar.gz packages-871ad3508b122dea18c12864f4218f7d3f711b53.tar.bz2 packages-871ad3508b122dea18c12864f4218f7d3f711b53.tar.xz packages-871ad3508b122dea18c12864f4218f7d3f711b53.zip | |
user/openjpeg: fix building against OpenJPEG
- CMake files require -tools now
- CMake relative path was broken because we put it in /usr/lib/cmake/
instead of /usr/lib/
| -rw-r--r-- | user/openjpeg/APKBUILD | 10 | ||||
| -rw-r--r-- | user/openjpeg/fix-include-path.patch | 11 |
2 files changed, 18 insertions, 3 deletions
diff --git a/user/openjpeg/APKBUILD b/user/openjpeg/APKBUILD index e73ac3911..3b4c6dc49 100644 --- a/user/openjpeg/APKBUILD +++ b/user/openjpeg/APKBUILD @@ -2,15 +2,18 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=openjpeg pkgver=2.3.0 -pkgrel=0 +pkgrel=1 pkgdesc="Open-source implementation of JPEG 2000 image codec" url="http://www.openjpeg.org/" arch="all" options="!check" # No test suite. license="BSD-2-Clause-NetBSD" +depends_dev="$pkgname-tools" makedepends="libpng-dev tiff-dev lcms2-dev doxygen cmake" subpackages="$pkgname-dev $pkgname-tools" -source="$pkgname-$pkgver.tar.gz::https://github.com/uclouvain/openjpeg/archive/v$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/uclouvain/openjpeg/archive/v$pkgver.tar.gz + fix-include-path.patch + " build() { cd "$builddir" @@ -48,4 +51,5 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="0a9d427be4a820b1d759fca4b50e293721b45fe4885aa61ca1ae09e099f75ed93520448090c780d62f51076d575cc03618cd6d5181bdb6b34e4fc07b4cfdd568 openjpeg-2.3.0.tar.gz" +sha512sums="0a9d427be4a820b1d759fca4b50e293721b45fe4885aa61ca1ae09e099f75ed93520448090c780d62f51076d575cc03618cd6d5181bdb6b34e4fc07b4cfdd568 openjpeg-2.3.0.tar.gz +354fb181a25eeabe231d28216bcb8e401648cf8e71ba476cabd25e297f46bbc1ea5b091b4d2d4450501422b8b20649bf109ff5b3f3b49f1492650dbb46ed6e22 fix-include-path.patch" diff --git a/user/openjpeg/fix-include-path.patch b/user/openjpeg/fix-include-path.patch new file mode 100644 index 000000000..f5ff1e60d --- /dev/null +++ b/user/openjpeg/fix-include-path.patch @@ -0,0 +1,11 @@ +--- openjpeg-2.3.0/cmake/OpenJPEGConfig.cmake.in.old 2017-10-04 22:23:14.000000000 +0000 ++++ openjpeg-2.3.0/cmake/OpenJPEGConfig.cmake.in 2018-09-06 00:53:22.860000000 +0000 +@@ -26,7 +26,7 @@ + if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake) + # This is an install tree + include(${SELF_DIR}/OpenJPEGTargets.cmake) +- get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE) ++ get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE) + set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_ROOT}) + + else() |