openjpeg2: update to 2.5.0.
This commit is contained in:
parent
9c700233f9
commit
dc0aac3d27
3 changed files with 5 additions and 65 deletions
|
@ -1,31 +0,0 @@
|
|||
From 14f4c27e7c91f745a1dda9991b5deea3cbef2072 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Thu, 7 Jan 2021 14:09:50 +0100
|
||||
Subject: [PATCH] Revert "Use INC_DIR for OPENJPEG_INCLUDE_DIRS (fixes
|
||||
uclouvain#1174)"
|
||||
|
||||
This reverts commit 65586374d639cfc0104419992f9022174b412594 which
|
||||
breaks cross-compilation of poppler under buildroot (because of
|
||||
DESTDIR usage).
|
||||
---
|
||||
cmake/OpenJPEGConfig.cmake.in | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git cmake/OpenJPEGConfig.cmake.in cmake/OpenJPEGConfig.cmake.in
|
||||
index 8a726697a..2925108ad 100644
|
||||
--- a/cmake/OpenJPEGConfig.cmake.in
|
||||
+++ b/cmake/OpenJPEGConfig.cmake.in
|
||||
@@ -27,8 +27,12 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
|
||||
# This is an install tree
|
||||
include(${SELF_DIR}/OpenJPEGTargets.cmake)
|
||||
|
||||
+ # We find a relative path from the PKG directory to header files.
|
||||
+ set(PKG_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_PACKAGE_DIR@")
|
||||
set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
|
||||
- get_filename_component(OPENJPEG_INCLUDE_DIRS "${INC_DIR}" ABSOLUTE)
|
||||
+ file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}")
|
||||
+
|
||||
+ get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE)
|
||||
|
||||
else()
|
||||
if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
|
|
@ -1,26 +0,0 @@
|
|||
From 4d0b49edad7fb31ebbf03c60a45b72aaa7b7412b Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Thu, 7 Jan 2021 14:11:26 +0100
|
||||
Subject: [PATCH] cmake/OpenJPEGConfig.cmake: replace ABSOLUTE by REALPATH
|
||||
|
||||
Fix #1174 by replacing ABSOLUTE by REALPATH which will resolve symlinks:
|
||||
https://cmake.org/cmake/help/latest/command/get_filename_component.html
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
cmake/OpenJPEGConfig.cmake.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git cmake/OpenJPEGConfig.cmake.in cmake/OpenJPEGConfig.cmake.in
|
||||
index 2925108ad..6e88036c6 100644
|
||||
--- a/cmake/OpenJPEGConfig.cmake.in
|
||||
+++ b/cmake/OpenJPEGConfig.cmake.in
|
||||
@@ -32,7 +32,7 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
|
||||
set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
|
||||
file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}")
|
||||
|
||||
- get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE)
|
||||
+ get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" REALPATH)
|
||||
|
||||
else()
|
||||
if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
|
|
@ -1,21 +1,16 @@
|
|||
# Template file for 'openjpeg2'
|
||||
pkgname=openjpeg2
|
||||
version=2.4.0
|
||||
revision=2
|
||||
version=2.5.0
|
||||
revision=1
|
||||
wrksrc="openjpeg-${version}"
|
||||
build_style=cmake
|
||||
configure_args="-DCMAKE_BUILD_TYPE=None"
|
||||
makedepends="libpng-devel lcms2-devel tiff-devel"
|
||||
short_desc="Open-source JPEG 2000 codec written in C language (Version 2)"
|
||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||
license="BSD-2-Clause"
|
||||
homepage="http://www.openjpeg.org/"
|
||||
distfiles="https://github.com/uclouvain/openjpeg/archive/v${version}.tar.gz"
|
||||
checksum=8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d
|
||||
|
||||
post_install() {
|
||||
vlicense LICENSE
|
||||
}
|
||||
checksum=0333806d6adecc6f7a91243b2b839ff4d2053823634d4f6ed7a59bc87409122a
|
||||
|
||||
libopenjpeg2-devel_package() {
|
||||
short_desc+=" - development files"
|
||||
|
@ -28,9 +23,11 @@ libopenjpeg2-devel_package() {
|
|||
vmove usr/lib/pkgconfig
|
||||
}
|
||||
}
|
||||
|
||||
libopenjpeg2_package() {
|
||||
short_desc+=" - library files"
|
||||
pkg_install() {
|
||||
vmove "usr/lib/*.so.*"
|
||||
vlicense LICENSE
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue