From 9b81d5ab0cfe05c63dbdcd4133b4a9a710211b3a Mon Sep 17 00:00:00 2001 From: vanhofen <vanhofen@gmx.de> Date: Sun, 11 Nov 2018 11:55:44 +0100 Subject: [PATCH] - add target for libjpeg-turbo 2.0.0 and use this lib on armbox --- make/archives.mk | 4 ---- make/system-libs.mk | 43 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/make/archives.mk b/make/archives.mk index 27efa320..39a09112 100644 --- a/make/archives.mk +++ b/make/archives.mk @@ -154,10 +154,6 @@ LIBICONV_VER=1.13.1 $(ARCHIVE)/libiconv-$(LIBICONV_VER).tar.gz: $(WGET) http://ftp.gnu.org/gnu/libiconv/libiconv-$(LIBICONV_VER).tar.gz -LIBJPEG-TURBO_VER=1.5.3 -$(ARCHIVE)/libjpeg-turbo-$(LIBJPEG-TURBO_VER).tar.gz: - $(WGET) https://sourceforge.net/projects/libjpeg-turbo/files/$(LIBJPEG-TURBO_VER)/libjpeg-turbo-$(LIBJPEG-TURBO_VER).tar.gz - GIFLIB_VER=5.1.4 $(ARCHIVE)/giflib-$(GIFLIB_VER).tar.bz2: $(WGET) http://sourceforge.net/projects/giflib/files/giflib-$(GIFLIB_VER).tar.bz2 diff --git a/make/system-libs.mk b/make/system-libs.mk index 53a0f331..126d7b56 100644 --- a/make/system-libs.mk +++ b/make/system-libs.mk @@ -229,7 +229,23 @@ $(D)/freetype: $(D)/zlib $(D)/libpng $(ARCHIVE)/freetype-$(FREETYPE_VER).tar.bz2 # ----------------------------------------------------------------------------- -$(D)/libjpeg: $(ARCHIVE)/libjpeg-turbo-$(LIBJPEG-TURBO_VER).tar.gz | $(TARGET_DIR) +ifeq ($(BOXTYPE), armbox) + LIBJPEG-TURBO = libjpeg-turbo2 +else + LIBJPEG-TURBO = libjpeg-turbo +endif + +$(D)/libjpeg: $(LIBJPEG-TURBO) + $(TOUCH) + +# ----------------------------------------------------------------------------- + +LIBJPEG-TURBO_VER = 1.5.3 + +$(ARCHIVE)/libjpeg-turbo-$(LIBJPEG-TURBO_VER).tar.gz: + $(WGET) https://sourceforge.net/projects/libjpeg-turbo/files/$(LIBJPEG-TURBO_VER)/libjpeg-turbo-$(LIBJPEG-TURBO_VER).tar.gz + +$(D)/libjpeg-turbo: $(ARCHIVE)/libjpeg-turbo-$(LIBJPEG-TURBO_VER).tar.gz | $(TARGET_DIR) $(REMOVE)/libjpeg-turbo-$(LIBJPEG-TURBO_VER) $(UNTAR)/libjpeg-turbo-$(LIBJPEG-TURBO_VER).tar.gz $(CHDIR)/libjpeg-turbo-$(LIBJPEG-TURBO_VER); \ @@ -252,6 +268,31 @@ $(D)/libjpeg: $(ARCHIVE)/libjpeg-turbo-$(LIBJPEG-TURBO_VER).tar.gz | $(TARGET_DI # ----------------------------------------------------------------------------- +LIBJPEG-TURBO2_VER = 2.0.0 +LIBJPEG-TURBO2_SOURCE = libjpeg-turbo-$(LIBJPEG-TURBO2_VER).tar.gz + +$(ARCHIVE)/$(LIBJPEG-TURBO2_SOURCE): + $(WGET) https://sourceforge.net/projects/libjpeg-turbo/files/$(LIBJPEG-TURBO2_VER)/$(LIBJPEG-TURBO2_SOURCE) + +LIBJPEG-TURBO2_PATCH = libjpeg-turbo-tiff-ojpeg.patch + +$(D)/libjpeg-turbo2: $(ARCHIVE)/$(LIBJPEG-TURBO2_SOURCE) | $(TARGET_DIR) + $(REMOVE)/libjpeg-turbo-$(LIBJPEG-TURBO2_VER) + $(UNTAR)/$(LIBJPEG-TURBO2_SOURCE) + $(CHDIR)/libjpeg-turbo-$(LIBJPEG-TURBO2_VER); \ + $(call apply_patches,$(LIBJPEG-TURBO2_PATCH)); \ + $(CMAKE) \ + -DWITH_SIMD=False \ + -DENABLE_STATIC=OFF \ + ; \ + $(MAKE); \ + $(MAKE) install DESTDIR=$(TARGET_DIR) + rm -f $(addprefix $(TARGET_DIR)/bin/,cjpeg djpeg jpegtran rdjpgcom wrjpgcom tjbench) + $(REMOVE)/libjpeg-turbo-$(LIBJPEG-TURBO2_VER) + $(TOUCH) + +# ----------------------------------------------------------------------------- + OPENSSL_PATCH = openssl-add-ni-specific-target.patch OPENSSLFLAGS = CC=$(TARGET)-gcc \