From 6dbd403bac9fa159b71cf66768dd61278ce5a370 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf <jb@videolan.org> Date: Wed, 28 Mar 2012 13:04:40 +0200 Subject: [PATCH] Contribs: update openjpeg to 1.5.0 It is supposed to be a bit less slow --- contrib/src/openjpeg/SHA512SUMS | 2 +- contrib/src/openjpeg/pkg-config.patch | 11 ----------- contrib/src/openjpeg/rules.mak | 15 +++++++-------- 3 files changed, 8 insertions(+), 20 deletions(-) delete mode 100644 contrib/src/openjpeg/pkg-config.patch diff --git a/contrib/src/openjpeg/SHA512SUMS b/contrib/src/openjpeg/SHA512SUMS index d5a4716c6ee2..40f897f090d0 100644 --- a/contrib/src/openjpeg/SHA512SUMS +++ b/contrib/src/openjpeg/SHA512SUMS @@ -1 +1 @@ -3b7e07f9c41b007b45e607806073a42ee736d1fea7ab4286ed5046710adac910f656e5b40b420849852100b0fa1fd241597be90e0b2eb58e336fb73b757e1417 openjpeg_v1_4_sources_r697.tgz +59501fde86a7f0ab5a1b7e369feb9c4dcb8ea67ead8ffd706592cbba1e0ee7b2a2a9aaa32778632febe0c3dc4171c7af738c5899c732eb420358df3b16d7cf47 openjpeg-1.5.0.tar.gz diff --git a/contrib/src/openjpeg/pkg-config.patch b/contrib/src/openjpeg/pkg-config.patch deleted file mode 100644 index 573fbd80d488..000000000000 --- a/contrib/src/openjpeg/pkg-config.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- openjpeg/Makefile.am 2011-01-02 19:14:55.000000000 +0100 -+++ openjpeg.new/Makefile.am 2011-09-15 13:07:38.002469677 +0200 -@@ -9,7 +9,7 @@ - - distclean-local: clean-local - --pkgconf_dir = /usr/lib/pkgconfig -+pkgconf_dir = $(libdir)/pkgconfig - - install-data-hook: - @echo "" diff --git a/contrib/src/openjpeg/rules.mak b/contrib/src/openjpeg/rules.mak index 6a76e8567fc3..f9d4316737b1 100644 --- a/contrib/src/openjpeg/rules.mak +++ b/contrib/src/openjpeg/rules.mak @@ -1,22 +1,21 @@ # jpeg -OPENJPEG_VERSION := 1_4_sources_r697 -OPENJPEG_URL := http://openjpeg.googlecode.com/files/openjpeg_v$(OPENJPEG_VERSION).tgz +OPENJPEG_VERSION := 1.5.0 +OPENJPEG_URL := http://openjpeg.googlecode.com/files/openjpeg-$(OPENJPEG_VERSION).tar.gz -$(TARBALLS)/openjpeg_v$(OPENJPEG_VERSION).tgz: +$(TARBALLS)/openjpeg-$(OPENJPEG_VERSION).tar.gz: $(call download,$(OPENJPEG_URL)) -.sum-openjpeg: openjpeg_v$(OPENJPEG_VERSION).tgz +.sum-openjpeg: openjpeg-$(OPENJPEG_VERSION).tar.gz -openjpeg: openjpeg_v$(OPENJPEG_VERSION).tgz .sum-openjpeg +openjpeg: openjpeg-$(OPENJPEG_VERSION).tar.gz .sum-openjpeg $(UNPACK) - $(APPLY) $(SRC)/openjpeg/pkg-config.patch $(APPLY) $(SRC)/openjpeg/freebsd.patch $(UPDATE_AUTOCONFIG) $(MOVE) .openjpeg: openjpeg $(RECONF) - cd $< && $(HOSTVARS) ./configure --enable-png=no --enable-tiff=no $(HOSTCONF) - cd $< && $(MAKE) -j1 install + cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -DOPJ_STATIC" ./configure --enable-png=no --enable-tiff=no $(HOSTCONF) + cd $< && $(MAKE) -C libopenjpeg -j1 install touch $@ -- GitLab