summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-03-29 00:25:34 +0100
committerCarl Hetherington <cth@carlh.net>2025-12-21 21:46:11 +0000
commit63dbc30d5278255ce589117c2bfd95154b1b2b8f (patch)
tree9c6951e121f68d6c1c30530d071672ee0ee1885d
parent30a2b743bd21d6029a01d33d3fbd55d14c538c82 (diff)
Add openjpeg dependency to .pc file.
-rw-r--r--libdcp-1.0.pc.in2
-rw-r--r--wscript4
2 files changed, 4 insertions, 2 deletions
diff --git a/libdcp-1.0.pc.in b/libdcp-1.0.pc.in
index 3cdda02e..a5be1249 100644
--- a/libdcp-1.0.pc.in
+++ b/libdcp-1.0.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@
Name: libdcp
Description: DCP reading and writing library
Version: @version@
-Requires: sigc++-2.0 openssl libxml++-2.6 xmlsec1 libasdcp-cth
+Requires: sigc++-2.0 openssl libxml++-2.6 xmlsec1 libasdcp-cth @openjpeg@
Libs: @libs@
Cflags: -I${includedir}
diff --git a/wscript b/wscript
index b10aaf28..dab35558 100644
--- a/wscript
+++ b/wscript
@@ -80,6 +80,7 @@ def configure(conf):
conf.env.DISABLE_EXAMPLES = conf.options.disable_examples
conf.env.STATIC = conf.options.static
conf.env.API_VERSION = API_VERSION
+ conf.env.JPEG = conf.options.jpeg
if conf.options.target_windows:
conf.env.append_value('CXXFLAGS', '-DLIBDCP_WINDOWS')
@@ -211,7 +212,8 @@ def build(bld):
version=VERSION,
includedir='%s/include/libdcp%s' % (bld.env.PREFIX, bld.env.API_VERSION),
libs="-L${libdir} -ldcp%s -lcxml -lboost_system%s" % (bld.env.API_VERSION, boost_lib_suffix),
- install_path='${LIBDIR}/pkgconfig')
+ install_path='${LIBDIR}/pkgconfig',
+ openjpeg='libopenjpeg1' if bld.env.JPEG == 'oj1' else 'libopenjp2')
bld.recurse('src')
bld.recurse('tools')