vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Sun Apr  9 
12:49:50 2017 +0200| [8d7674dee8da0206b9fb4dd16eec301be0502cee] | committer: 
Jean-Baptiste Kempf

Contribs: update openjpeg to 1.5.2

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8d7674dee8da0206b9fb4dd16eec301be0502cee
---

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

diff --git a/contrib/src/openjpeg/SHA512SUMS b/contrib/src/openjpeg/SHA512SUMS
index 1906eac458..753a2be74a 100644
--- a/contrib/src/openjpeg/SHA512SUMS
+++ b/contrib/src/openjpeg/SHA512SUMS
@@ -1 +1 @@
-dca4f3006119673e3c0ef68f2847bb67bf5a406caf30bf7f2e08904eff013f79af9302e25fc6077cb593b80760deb324dfb9326b40ccc172401ae7dd91b9db20
  openjpeg-version.1.5.tar.gz
+25e31ae377626cc3e28f1faad5a5762d031af47a598f571c96dc29635a69026d299ff9c299a44cdfce3d1c94f4a301559bc485847f932748b77c99c314d07a3e
  openjpeg-version.1.5.2.tar.gz
diff --git a/contrib/src/openjpeg/rules.mak b/contrib/src/openjpeg/rules.mak
index 343e3411dc..56ea5e5be9 100644
--- a/contrib/src/openjpeg/rules.mak
+++ b/contrib/src/openjpeg/rules.mak
@@ -1,6 +1,6 @@
 # jpeg
 
-OPENJPEG_VERSION := version.1.5
+OPENJPEG_VERSION := version.1.5.2
 OPENJPEG_URL := 
https://github.com/uclouvain/openjpeg/archive/$(OPENJPEG_VERSION).tar.gz
 
 $(TARBALLS)/openjpeg-$(OPENJPEG_VERSION).tar.gz:
@@ -10,7 +10,6 @@ $(TARBALLS)/openjpeg-$(OPENJPEG_VERSION).tar.gz:
 
 openjpeg: openjpeg-$(OPENJPEG_VERSION).tar.gz .sum-openjpeg
        $(UNPACK)
-       $(APPLY) $(SRC)/openjpeg/freebsd.patch
 ifdef HAVE_VISUALSTUDIO
        $(APPLY) $(SRC)/openjpeg/msvc.patch
 endif
@@ -22,4 +21,5 @@ endif
        $(RECONF)
        cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -DOPJ_STATIC" ./configure 
--enable-png=no --enable-tiff=no $(HOSTCONF)
        cd $< && $(MAKE) -C libopenjpeg -j1 install
+       cd $< && $(MAKE) install-data
        touch $@

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to