[vlc-devel] [vlc-commits] Contribs: update openjpeg to 2.3.0

[David Fuhrmann]

> Am 04.12.2017 um 02:07 schrieb Jean-Baptiste Kempf <git at videolan.org>:
> 
> vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Dec  4 02:05:41 2017 +0100| [de37944f020d532418722da1bbf368472439da4e] | committer: Jean-Baptiste Kempf
> 
> Contribs: update openjpeg to 2.3.0
> 
> And switch to CMake
> 
>> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=de37944f020d532418722da1bbf368472439da4e
> ---
> 
> contrib/src/openjpeg/SHA512SUMS |  2 +-
> contrib/src/openjpeg/rules.mak  | 28 ++++++++++++++--------------
> 2 files changed, 15 insertions(+), 15 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..8adab31934 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:
> -	$(call download_pkg,$(OPENJPEG_URL),openjpeg)
> +$(TARBALLS)/openjpeg-v$(OPENJPEG_VERSION).tar.gz:
> +	$(call download_pkg,v$(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 $@


Hi j-b,

Shouldn’t you also depend on toolchain.cmake, if you switch to cmake?

BR. David