wrap: libopenjp2: use patch version 7
authorStéphane Cerveau <scerveau@collabora.com>
Fri, 22 Oct 2021 16:13:46 +0000 (18:13 +0200)
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>
Fri, 22 Oct 2021 19:47:27 +0000 (19:47 +0000)
Add support for win32 build
Disable the binary to avoid the thirdparty
dependency to be checked.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1229>

subprojects/gst-plugins-bad/ext/openjpeg/meson.build
subprojects/libopenjp2.wrap

index 94597fb..0c343cf 100644 (file)
@@ -8,7 +8,8 @@ openjpeg_cargs = []
 
 openjpeg_dep = dependency('libopenjp2', version : '>=2.2',
                           fallback : ['libopenjp2', 'libopenjp2_dep'],
-                          required : get_option('openjpeg'))
+                          required : get_option('openjpeg'),
+                          default_options: ['build_codec=false'])
 
 if openjpeg_dep.found()
   gstopenjpeg = library('gstopenjpeg',
index e8cf13a..b472361 100644 (file)
@@ -3,10 +3,9 @@ directory = openjpeg-2.3.1
 source_url = https://github.com/uclouvain/openjpeg/archive/v2.3.1.tar.gz
 source_filename = openjpeg-2.3.1.tar.gz
 source_hash = 63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9
-patch_filename = libopenjp2_2.3.1-6_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/libopenjp2_2.3.1-6/get_patch
-patch_hash = 153e4b6a0addb20ceceac9f1562588c7f4b03c91282ac55d3b63df8743f6e873
+patch_filename = libopenjp2_2.3.1-7_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/libopenjp2_2.3.1-7/get_patch
+patch_hash = 3da9db76ca3591842f33e732fd7112e05c0fe8e97313fdcf11f1d3ea147f1933
 
 [provide]
 libopenjp2 = libopenjp2_dep
-