aboutsummaryrefslogtreecommitdiff
path: root/ports/jasper
diff options
context:
space:
mode:
authorStefano Sinigardi <stesinigardi@hotmail.com>2019-06-21 04:11:54 +0200
committerCurtis J Bezault <curtbezault@gmail.com>2019-06-20 19:11:54 -0700
commit47d206e149e88201333b5ca8fe55c30e2b1a8177 (patch)
treec0620a39116333a6cb6ffc092983ba7114c6daf2 /ports/jasper
parente16efa4d6aa6f36247eb6dfd646fdf81af0c36e0 (diff)
downloadvcpkg-47d206e149e88201333b5ca8fe55c30e2b1a8177.tar.gz
vcpkg-47d206e149e88201333b5ca8fe55c30e2b1a8177.zip
[many ports] improvements for linux/wsl (#6730)
* [many ports] improve compatibility with WSL and mixed case filesystems * [treehopper] express dependency on libusb, which was not working on non-win32 platforms and is still broken there * [libharu] add compatibility with non-win32 platforms * [geogram] fix openblas on linux [clapack] better integration with linux environment [visit-struct] put cmake config file in the expected folder [geogram] remove trailing underscore to enable compatibility with OpenBLAS * [openblas] playing with underscore, without success * [openblas/lapack] fix library integration * [clapack] improve target handling in cmake module * [openblas] promote self-generated config to default cmake module, otherwise internal ones thinks wrongly that openblas can also solve lapack libs * [clapack,openblas] improve libraries integration * [many ports] fix cmake unnecessary target paths, wrong config paths, empty default dependencies, unnecessary [core] tags * [suitesparse] improve integration with new lapack/openblas mechanism * [suitesparse] add no underscore postfix also for linux * [ceres] fix integration with newer openblas/lapack configs * [aws-c-event-stream] fix regression * [systemc] fix regression * [libwebp,geogram] trigger rebuild * [libwebp,pthread4w] fix regressions * [glbinding] fix cmake module installation * [globjects] disentangle unnecessary dependency from qt5 * [jasper] remove broken and unnecessary patches * [libwebp] fix regression * [many ports] avoid using BUILD_SHARED_LIBS which is uninitialized in port files * [clapack] correctly find dlls * [clapack] use a generic blas as dependency * [fizz,g2o] restore expected version * fix mistake * [many ports] remove WIN32, APPLE and UNIX (again, they keep creeping in) from ports since they are broken and usually break non-win32 ports * [libressl,openssl] do not try to build one if the other is already installed * [itk] update ref and patch to avoid regression * [libressl,openssl] implement full strategy to fix CI * [libwebp] disable components that are broken on macOS * [ogre] enable macOS build * [freeimage,jxrlib,ogre,openexr,protobuf] port patches from #5169 * [ogre] add missing install command * [ffmpeg] enable wrapper for cmake module * [ffmpeg] add avresample module finder * [ffmpeg] improve module detection and exported symbols * [ffmpeg] add variables to cache * [thrift] remove unnecessary build option * [allegro5] fix shared/static inversion * [protobuf] cleanup * [libressl] cleanup * [moos-core] cleanup * commented features must not be separated from other features, otherwise vcpkg complains * [itk] fix regression * [shogun,itk] fix regressions * [ogre] fix regression * [opusfile] add compatibility with non-win32 * [itk] fix regression * [sndfile,libsndfile] remove duplicate, redirect sndfile to libsndfile * add missing dependencies * [ismrmrd] fix regression * [ffmpeg] trigger rebuild * [clapack,openblas,libogg] fix regressions on macOS * [libtins] fix regression * force rebuild windows regressions, unable to reproduce locally * [mosquitto] enable non-win32 builds * [json-dto] force rebuild, unable to reproduce regression locally * [many ports] uniform naming and path length requests * fix regression * fix regression * [ffmpeg] fixes for downstream projects * clean up - thanks to reviewers * trigger rebuild of regressions on macOS * trigger rebuild of regressions on macOS - part2 * Add core back * Use VCPKG_CONCURRENCY * Add core back to suitesparse * Add core back to curl * Add core back to magnum * Add core back to magnum * Add core back to magnum * Add core back to cgal
Diffstat (limited to 'ports/jasper')
-rw-r--r--ports/jasper/CONTROL4
-rw-r--r--ports/jasper/jasper-fix-uwp.patch32
-rw-r--r--ports/jasper/opengl-not-required.patch14
-rw-r--r--ports/jasper/portfile.cmake12
4 files changed, 4 insertions, 58 deletions
diff --git a/ports/jasper/CONTROL b/ports/jasper/CONTROL
index 858264411..43c657dd4 100644
--- a/ports/jasper/CONTROL
+++ b/ports/jasper/CONTROL
@@ -1,5 +1,5 @@
Source: jasper
-Version: 2.0.16-1
+Version: 2.0.16-2
Homepage: https://github.com/mdadams/jasper
Description: Open source implementation of the JPEG-2000 Part-1 standard
-Build-Depends: libjpeg-turbo
+Build-Depends: libjpeg-turbo, opengl, freeglut
diff --git a/ports/jasper/jasper-fix-uwp.patch b/ports/jasper/jasper-fix-uwp.patch
deleted file mode 100644
index 2b67d6c93..000000000
--- a/ports/jasper/jasper-fix-uwp.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From bad33461a302ed8db02e0d9875e7b59b9e8f6032 Mon Sep 17 00:00:00 2001
-From: Mikhail Paulyshka <me@mixaill.tk>
-Date: Tue, 7 Nov 2017 20:10:31 +0300
-Subject: [PATCH] Fixed build for Windows 10 UWP
-
----
- src/libjasper/CMakeLists.txt | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/libjasper/CMakeLists.txt b/src/libjasper/CMakeLists.txt
-index 234ae67..9d0a522 100644
---- a/src/libjasper/CMakeLists.txt
-+++ b/src/libjasper/CMakeLists.txt
-@@ -145,6 +145,15 @@ target_include_directories(libjasper BEFORE PRIVATE
- set_target_properties(libjasper PROPERTIES OUTPUT_NAME jasper)
- set_target_properties(libjasper PROPERTIES LINKER_LANGUAGE C)
-
-+if(MSVC)
-+ target_compile_definitions(libjasper PRIVATE
-+ "-D_CRT_SECURE_NO_WARNINGS")
-+ target_compile_definitions(libjasper PRIVATE
-+ "-D_CRT_SECURE_NO_DEPRECATE")
-+ target_compile_definitions(libjasper PRIVATE
-+ "-D_CRT_NONSTDC_NO_DEPRECATE")
-+endif()
-+
- if (UNIX)
- set_target_properties(libjasper PROPERTIES
- VERSION ${JAS_SO_NAME} SOVERSION ${JAS_SO_VERSION})
---
-2.14.1.windows.1
-
diff --git a/ports/jasper/opengl-not-required.patch b/ports/jasper/opengl-not-required.patch
deleted file mode 100644
index 5c40a6b67..000000000
--- a/ports/jasper/opengl-not-required.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c432ba2..c67598f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -267,7 +267,9 @@ message("JAS_HAVE_LIBJPEG: ${JAS_HAVE_LIBJPEG}")
- # Check for the OpenGL and GLUT libraries.
- ################################################################################
-
-+if(JAS_ENABLE_OPENGL)
- find_package(OpenGL ${JAS_REQUIRED})
-+endif()
- message("JAS_ENABLE_OPENGL: ${JAS_ENABLE_OPENGL}")
- message("OpenGL library found: ${OPENGL_FOUND}")
- if (JAS_ENABLE_OPENGL AND OPENGL_FOUND)
diff --git a/ports/jasper/portfile.cmake b/ports/jasper/portfile.cmake
index 6d11d166b..ae42d2a22 100644
--- a/ports/jasper/portfile.cmake
+++ b/ports/jasper/portfile.cmake
@@ -5,13 +5,7 @@ vcpkg_from_github(
REPO mdadams/jasper
REF version-2.0.16
SHA512 b3bca227f833567c9061c4a29c0599784ed6a131b5cceddfd1696542d19add821eda445ce6d83782b454b266723b24d0f028cbc644a25c0e3a75304e615b34ee
- HEAD_REF master)
-
-vcpkg_apply_patches(
- SOURCE_PATH ${SOURCE_PATH}
- PATCHES
- ${CMAKE_CURRENT_LIST_DIR}/jasper-fix-uwp.patch
- ${CMAKE_CURRENT_LIST_DIR}/opengl-not-required.patch
+ HEAD_REF master
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
@@ -26,7 +20,6 @@ vcpkg_configure_cmake(
OPTIONS
-DJAS_ENABLE_AUTOMATIC_DEPENDENCIES=OFF
-DJAS_ENABLE_LIBJPEG=ON
- -DJAS_ENABLE_OPENGL=OFF # not needed for the library
-DJAS_ENABLE_DOC=OFF
-DJAS_ENABLE_PROGRAMS=OFF
-DJAS_ENABLE_SHARED=${JAS_ENABLE_SHARED}
@@ -43,5 +36,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share)
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/jasper)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/jasper/LICENSE ${CURRENT_PACKAGES_DIR}/share/jasper/copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/jasper RENAME copyright)