From: Markham <markham001@gmx.de>
Date: Tue, 26 Feb 2019 16:11:33 +0000 (+0100)
Subject: build libjpeg-turbo-2.0.2 for ARM
X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=3e77c7c415352b7c62092f87289576ad508c012e;p=bs-cst-neutrino-hd.git

build libjpeg-turbo-2.0.2 for ARM
---

diff --git a/make/archives.mk b/make/archives.mk
index bdfc792..62d09b4 100755
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -88,6 +88,9 @@ $(ARCHIVE)/glib-$(LIBGLIB2_VER).tar.xz:
 $(ARCHIVE)/libjpeg-turbo-$(JPEG_TURBO_VER).tar.gz:
 	$(WGET) http://sourceforge.net/projects/libjpeg-turbo/files/$(JPEG_TURBO_VER)/libjpeg-turbo-$(JPEG_TURBO_VER).tar.gz
 
+$(ARCHIVE)/libjpeg-turbo-$(JPEG_TURBO2_VER).tar.gz:
+	$(WGET) http://sourceforge.net/projects/libjpeg-turbo/files/$(JPEG_TURBO2_VER)/libjpeg-turbo-$(JPEG_TURBO2_VER).tar.gz
+
 $(ARCHIVE)/libbluray-0.5.0.tar.bz2:
 	$(WGET) http://www.fhloston-paradise.de/libbluray-0.5.0.tar.bz2
 
diff --git a/make/libraries.mk b/make/libraries.mk
index ff44925..5b8ed52 100755
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -542,7 +542,17 @@ $(D)/libpng: $(D)/zlib $(ARCHIVE)/libpng-$(LIBPNG_VER).tar.xz | $(TARGETPREFIX)
 	$(REMOVE)/libpng-$(LIBPNG_VER)
 	$(TOUCH)
 
-$(D)/libjpeg: $(ARCHIVE)/libjpeg-turbo-$(JPEG_TURBO_VER).tar.gz | $(TARGETPREFIX)
+# -----------------------------------------------------
+ifeq ($(BOXTYPE), armbox)
+  LIBJPEG-TURBO = libjpeg-turbo2
+else
+  LIBJPEG-TURBO = libjpeg-turbo
+endif
+
+$(D)/libjpeg: $(LIBJPEG-TURBO)
+	$(TOUCH)
+
+$(D)/libjpeg-turbo: $(ARCHIVE)/libjpeg-turbo-$(JPEG_TURBO_VER).tar.gz | $(TARGETPREFIX)
 	$(START_BUILD)
 	$(UNTAR)/libjpeg-turbo-$(JPEG_TURBO_VER).tar.gz
 	pushd $(BUILD_TMP)/libjpeg-turbo-$(JPEG_TURBO_VER) && \
@@ -561,6 +571,25 @@ $(D)/libjpeg: $(ARCHIVE)/libjpeg-turbo-$(JPEG_TURBO_VER).tar.gz | $(TARGETPREFIX
 	$(REMOVE)/libjpeg-turbo-$(JPEG_TURBO_VER)
 	$(TOUCH)
 
+$(D)/libjpeg-turbo2: $(ARCHIVE)/libjpeg-turbo-$(JPEG_TURBO2_VER).tar.gz | $(TARGETPREFIX)
+	$(START_BUILD)
+	$(UNTAR)/libjpeg-turbo-$(JPEG_TURBO2_VER).tar.gz
+	pushd $(BUILD_TMP)/libjpeg-turbo-$(JPEG_TURBO2_VER); \
+		$(PATCH)/libjpeg-turbo-tiff-ojpeg.patch; \
+		$(CMAKE) \
+			-DWITH_SIMD=False \
+			-DWITH_JPEG8=80 \
+			-DCMAKE_INSTALL_DOCDIR=/.remove \
+			-DCMAKE_INSTALL_MANDIR=/.remove \
+			; \
+		$(MAKE); \
+		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libturbojpeg.pc
+	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libjpeg.pc
+	rm -f $(addprefix $(TARGETPREFIX)/bin/,cjpeg djpeg jpegtran rdjpgcom tjbench wrjpgcom)
+#	$(REMOVE)/libjpeg-turbo-$(LIBJPEG-TURBO2_VER)
+#	$(TOUCH)
+
 #ifeq ($(PLATFORM), nevis)
 NEVIS_XML2_FLAGS  = --without-iconv
 NEVIS_XML2_FLAGS += --with-minimum
diff --git a/make/versions.mk b/make/versions.mk
index 5e6722c..74f85b1 100644
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -88,6 +88,7 @@ INADYN_VER=02.28.10
 
 # libjpeg-turbo; a derivative of libjpeg for x86 and x86-64 processors which uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG compression and decompression
 JPEG_TURBO_VER = 1.5.3
+JPEG_TURBO2_VER = 2.0.2
 
 # lcd4linux mod TangoCash
 LCD4LINUX_VER = ff5b5db