Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
6d854372
Commit
6d854372
authored
Dec 05, 2017
by
Konstantin Pavlov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: openjpeg: added patch to fix install.
While at it, use upstream-preferred cmake parameters.
parent
facf4da2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
1 deletion
+25
-1
contrib/src/openjpeg/install.patch
contrib/src/openjpeg/install.patch
+23
-0
contrib/src/openjpeg/rules.mak
contrib/src/openjpeg/rules.mak
+2
-1
No files found.
contrib/src/openjpeg/install.patch
0 → 100644
View file @
6d854372
From 66297f07a43d2770a97c8456d20202f3d051d980 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 9 Oct 2017 11:40:43 +0200
Subject: [PATCH] Unix build: fix regression of 2.3.0 where a shared-only or
static-only build lacks the installation target for the library (#1019, fixes
regression introduced by 3dfc6ca2bcf06fd1adb6b6b4cecc6c092f08ba0b)
---
src/lib/openjp2/CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt
index 0b4520384..f8990ccf0 100644
--- a/src/lib/openjp2/CMakeLists.txt
+++ b/src/lib/openjp2/CMakeLists.txt
@@ -99,6 +99,7 @@
else()
set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME} openjp2_static)
else()
add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS})
+ set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME})
endif()
endif()
contrib/src/openjpeg/rules.mak
View file @
6d854372
...
...
@@ -15,12 +15,13 @@ ifdef HAVE_VISUALSTUDIO
# $(APPLY) $(SRC)/openjpeg/msvc.patch
endif
# $(APPLY) $(SRC)/openjpeg/restrict.patch
$(APPLY)
$(SRC)/openjpeg/install.patch
$(call
pkg_static,
"./src/lib/openjp2/libopenjp2.pc.cmake.in"
)
$(MOVE)
.openjpeg
:
openjpeg
cd
$<
&&
$(HOSTVARS)
$(CMAKE)
\
-DBUILD_SHARED_LIBS
=
OFF
-DBUILD_PKGCONFIG_FILES
=
ON
\
-DBUILD_SHARED_LIBS
:bool
=
off
-DBUILD_PKGCONFIG_FILES
=
ON
-DCMAKE_BUILD_TYPE
=
Release
\
.
cd
$<
&&
$(MAKE)
install
touch
$@
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment