[vlc-commits] Contribs: update openjpeg to 2.3.0

[Jean-Baptiste Kempf]

vlc/vlc-3.0 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Dec  4 02:05:41 2017 +0100| [92f88013d60f89c0b5ccb9cd10d1b28674f915bf] | committer: Jean-Baptiste Kempf

Contribs: update openjpeg to 2.3.0

And switch to CMake

(cherry picked from commit de37944f020d532418722da1bbf368472439da4e)
(cherry picked from commit 68af3d0e2d5d5a02fe5d906b9e4a2d252b428441)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=92f88013d60f89c0b5ccb9cd10d1b28674f915bf
---

 contrib/src/openjpeg/SHA512SUMS |  2 +-
 contrib/src/openjpeg/rules.mak  | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/contrib/src/openjpeg/SHA512SUMS b/contrib/src/openjpeg/SHA512SUMS
index 753a2be74a..e10685ef68 100644
--- a/contrib/src/openjpeg/SHA512SUMS
+++ b/contrib/src/openjpeg/SHA512SUMS
@@ -1 +1 @@
-25e31ae377626cc3e28f1faad5a5762d031af47a598f571c96dc29635a69026d299ff9c299a44cdfce3d1c94f4a301559bc485847f932748b77c99c314d07a3e  openjpeg-version.1.5.2.tar.gz
+0a9d427be4a820b1d759fca4b50e293721b45fe4885aa61ca1ae09e099f75ed93520448090c780d62f51076d575cc03618cd6d5181bdb6b34e4fc07b4cfdd568  openjpeg-v2.3.0.tar.gz
diff --git a/contrib/src/openjpeg/rules.mak b/contrib/src/openjpeg/rules.mak
index 5f12860593..b505ca062c 100644
--- a/contrib/src/openjpeg/rules.mak
+++ b/contrib/src/openjpeg/rules.mak
@@ -1,26 +1,26 @@
 # jpeg
 
-OPENJPEG_VERSION := version.1.5.2
-OPENJPEG_URL := https://github.com/uclouvain/openjpeg/archive/$(OPENJPEG_VERSION).tar.gz
+OPENJPEG_VERSION := 2.3.0
+OPENJPEG_URL := https://github.com/uclouvain/openjpeg/archive/v$(OPENJPEG_VERSION).tar.gz
 
-$(TARBALLS)/openjpeg-$(OPENJPEG_VERSION).tar.gz:
+$(TARBALLS)/openjpeg-v$(OPENJPEG_VERSION).tar.gz:
 	$(call download_pkg,$(OPENJPEG_URL),openjpeg)
 
-.sum-openjpeg: openjpeg-$(OPENJPEG_VERSION).tar.gz
+.sum-openjpeg: openjpeg-v$(OPENJPEG_VERSION).tar.gz
 
-openjpeg: openjpeg-$(OPENJPEG_VERSION).tar.gz .sum-openjpeg
+openjpeg: openjpeg-v$(OPENJPEG_VERSION).tar.gz .sum-openjpeg
 	$(UNPACK)
+	mv openjpeg-$(OPENJPEG_VERSION) openjpeg-v$(OPENJPEG_VERSION)
 ifdef HAVE_VISUALSTUDIO
-	$(APPLY) $(SRC)/openjpeg/msvc.patch
+#	$(APPLY) $(SRC)/openjpeg/msvc.patch
 endif
-	$(APPLY) $(SRC)/openjpeg/restrict.patch
-	$(UPDATE_AUTOCONFIG)
+#	$(APPLY) $(SRC)/openjpeg/restrict.patch
+	$(call pkg_static,"./src/lib/openjp2/libopenjp2.pc.cmake.in")
 	$(MOVE)
 
 .openjpeg: openjpeg
-	$(RECONF)
-	cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -DOPJ_STATIC" ./configure --enable-png=no --enable-tiff=no $(HOSTCONF)
-	cd $< && $(MAKE) -C libopenjpeg -j1 install
-	cd $< && ../../../contrib/src/pkg-static.sh libopenjpeg1.pc
-	cd $< && $(MAKE) install-data
+	cd $< && $(HOSTVARS) $(CMAKE) \
+		-DBUILD_SHARED_LIBS=OFF -DBUILD_PKGCONFIG_FILES=ON \
+		.
+	cd $< && $(MAKE) install
 	touch $@