bump version libjpeg-turbo-2.1.1

diff --git a/make/archives.mk b/make/archives.mk
index be15d56b588c1090ed30acf402dff20db4b7f13f..6de6db018fad777c98663aa2e810efa6d303e3c3 100755 (executable)
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -91,9 +91,6 @@ $(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) https://get.videolan.org/libbluray/0.5.0/libbluray-0.5.0.tar.bz2
 

diff --git a/make/libraries.mk b/make/libraries.mk
index faad1a86a2b76bdb2dbed40b047e4f17eea1ec04..7cc4f97460465d8ac6fb9bdfc51d603eb73e8fe7 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -589,42 +589,16 @@ $(D)/libpng: $(D)/zlib $(ARCHIVE)/libpng-$(LIBPNG_VER).tar.xz | $(TARGETPREFIX)
        $(TOUCH)
 
 # -----------------------------------------------------
-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) && \
-               export CC=$(TARGET)-gcc && \
-               $(CONFIGURE) \
-                       --prefix= \
-                       --build=$(BUILD) \
-                       --host=$(TARGET) \
-                       --enable-shared \
-                       --with-jpeg8 \
-                       --mandir=/.remove --docdir=/.remove --bindir=/.remove && \
-               $(MAKE)  && \
-               $(MAKE) install DESTDIR=$(TARGETPREFIX)
-       $(REWRITE_LIBTOOL)/libjpeg.la
-       rm -f $(TARGETPREFIX)/lib/libturbojpeg* $(TARGETPREFIX)/include/turbojpeg.h
-       $(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); \
+       pushd $(BUILD_TMP)/libjpeg-turbo-$(JPEG_TURBO_VER); \
                $(PATCH)/libjpeg-turbo-tiff-ojpeg.patch; \
                $(CMAKE) \
-                       -DWITH_SIMD=False \
-                       -DWITH_JPEG8=80 \
+                       -DWITH_SIMD=1 \
+                       -DWITH_JPEG8=1 \
+                       -DWITH_TURBOJPEG=0 \
                        -DCMAKE_INSTALL_DOCDIR=/.remove \
                        -DCMAKE_INSTALL_MANDIR=/.remove \
                        ; \
@@ -633,7 +607,7 @@ $(D)/libjpeg-turbo2: $(ARCHIVE)/libjpeg-turbo-$(JPEG_TURBO2_VER).tar.gz | $(TARG
        $(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-$(JPEG_TURBO2_VER)
+       $(REMOVE)/libjpeg-turbo-$(JPEG_TURBO_VER)
        $(TOUCH)
 
 #ifeq ($(PLATFORM), nevis)
@@ -852,7 +826,7 @@ $(D)/libogg: $(ARCHIVE)/libogg-$(LIBOGG_VER).tar.gz | $(TARGETPREFIX)
 #
 # minidlna
 #
-$(D)/minidlna: $(D)/zlib $(D)/sqlite $(D)/libexif $(D)/libjpeg $(D)/libid3tag $(D)/libogg $(D)/libvorbis $(D)/flac $(D)/ffmpeg $(ARCHIVE)/minidlna-$(MINIDLNA_VER).tar.gz | $(TARGETPREFIX)
+$(D)/minidlna: $(D)/zlib $(D)/sqlite $(D)/libexif $(D)/libjpeg-turbo $(D)/libid3tag $(D)/libogg $(D)/libvorbis $(D)/flac $(D)/ffmpeg $(ARCHIVE)/minidlna-$(MINIDLNA_VER).tar.gz | $(TARGETPREFIX)
        $(START_BUILD)
        $(UNTAR)/minidlna-$(MINIDLNA_VER).tar.gz
        set -e; cd $(BUILD_TMP)/minidlna-$(MINIDLNA_VER); \
@@ -965,7 +939,7 @@ $(D)/libusb_compat: $(ARCHIVE)/libusb-compat-$(LIBUSB_COMPAT_VER).tar.bz2 $(D)/l
        $(REMOVE)/libusb-compat-$(LIBUSB_COMPAT_VER)
        $(TOUCH)
 
-$(D)/libgd2: $(D)/zlib $(D)/libpng $(D)/libjpeg $(D)/freetype $(ARCHIVE)/libgd-$(GD_VER).tar.gz | $(TARGETPREFIX)
+$(D)/libgd2: $(D)/zlib $(D)/libpng $(D)/libjpeg-turbo $(D)/freetype $(ARCHIVE)/libgd-$(GD_VER).tar.gz | $(TARGETPREFIX)
        $(START_BUILD)
        $(REMOVE)/libgd-$(GD_VER)
        $(UNTAR)/libgd-$(GD_VER).tar.gz

diff --git a/make/neutrino.mk b/make/neutrino.mk
index d06821a77f2dc756c8068c30b550842cc7adade9..3a0cb3fd1932925e54482870937fb2e77e0c057a 100755 (executable)
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@@ -213,7 +213,7 @@ neutrino-version: $(TARGETPREFIX)/bin/neutrino
 $(D)/neutrino-hd-libs:
        $(START_BUILD)
        $(MAKE) $(D)/libsigc $(D)/giflib $(D)/openssl \
-                       $(D)/libcurl $(D)/libpng $(D)/libjpeg $(D)/freetype \
+                       $(D)/libcurl $(D)/libpng $(D)/libjpeg-turbo $(D)/freetype \
                        $(D)/libdvbsi++ $(D)/pugixml $(D)/libbluray $(D)/libopenthreads \
                        $(D)/ffmpeg $(D)/libusb $(D)/libfribidi \
                        $(D)/luaposix $(D)/luacurl $(D)/luasocket $(D)/lua-expat $(D)/lua-feedparser

diff --git a/make/plugins.mk b/make/plugins.mk
index f378d5a021295bc07cd868233de05e2eb511b7b7..56fb9c2a374866ee9a4c84447a1629c84b3d39a3 100644 (file)
--- a/make/plugins.mk
+++ b/make/plugins.mk
@@ -139,7 +139,7 @@ ifeq ($(BOXSERIES), $(filter $(BOXSERIES), h7 hd51 bre2ze4k))
 LINKS_PATCH += links-$(LINKS_VER)-hd51-input.patch
 endif
 
-$(D)/links: $(D)/libpng $(D)/libjpeg $(D)/openssl $(ARCHIVE)/links-$(LINKS_VER).tar.bz2
+$(D)/links: $(D)/libpng $(D)/libjpeg-turbo $(D)/openssl $(ARCHIVE)/links-$(LINKS_VER).tar.bz2
        $(START_BUILD)
        $(REMOVE)/links-$(LINKS_VER)
        $(UNTAR)/links-$(LINKS_VER).tar.bz2
@@ -557,4 +557,3 @@ $(D)/formel1:
        cp -f f1kalender $(VARPLUG)/ && \
        cp -f formel1wmtab $(VARPLUG)/
        $(TOUCH)
-

diff --git a/make/versions.mk b/make/versions.mk
index 475190229818acff24dd2d309532c78380ca5225..abf4bde53551e3f56d9217b5122a88d52db766fc 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -99,8 +99,7 @@ HD_IDLE_VER=1.05
 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
+JPEG_TURBO_VER = 2.1.1
 
 # lcd4linux mod TangoCash
 LCD4LINUX_VER = 91cfbc2