From 2723304a1765e25b2190144af71457bd92a32e3c Mon Sep 17 00:00:00 2001 From: Markham Date: Sun, 28 Nov 2021 16:39:17 +0100 Subject: [PATCH] bump version libjpeg-turbo-2.1.2; add jpegtran --- make/applications.mk | 2 +- make/archives.mk | 4 ++-- make/libraries.mk | 18 ++++++++++-------- make/neutrino.mk | 2 +- make/plugins.mk | 2 +- make/versions.mk | 2 +- 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/make/applications.mk b/make/applications.mk index 8e5dc73..3beadb3 100755 --- a/make/applications.mk +++ b/make/applications.mk @@ -934,7 +934,7 @@ $(D)/ofgwrite: $(ARCHIVE)/ofgwrite-git-$(OFGWRITE_VER).tar.bz2 | $(TARGETPREFIX) # # aio-grab # -$(D)/aio-grab: $(D)/zlib $(D)/libpng $(D)/libjpeg-turbo | $(TARGETPREFIX) +$(D)/aio-grab: $(D)/zlib $(D)/libpng $(D)/libjpeg | $(TARGETPREFIX) $(START_BUILD) $(REMOVE)/aio-grab cd $(BUILD_TMP); \ diff --git a/make/archives.mk b/make/archives.mk index 6de6db0..adb643c 100755 --- a/make/archives.mk +++ b/make/archives.mk @@ -88,8 +88,8 @@ $(ARCHIVE)/fuse-$(FUSE_VER).tar.gz: $(ARCHIVE)/glib-$(LIBGLIB2_VER).tar.xz: $(WGET) https://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VER_MAJOR).$(LIBGLIB2_VER_MINOR)/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 7cc4f97..70fa0c1 100755 --- a/make/libraries.mk +++ b/make/libraries.mk @@ -590,10 +590,13 @@ $(D)/libpng: $(D)/zlib $(ARCHIVE)/libpng-$(LIBPNG_VER).tar.xz | $(TARGETPREFIX) # ----------------------------------------------------- -$(D)/libjpeg-turbo: $(ARCHIVE)/libjpeg-turbo-$(JPEG_TURBO_VER).tar.gz | $(TARGETPREFIX) +$(D)/libjpeg: $(D)/libjpeg-turbo2 + $(TOUCH) + +$(D)/libjpeg-turbo2: $(ARCHIVE)/libjpeg-turbo-$(JPEG_TURBO2_VER).tar.gz | $(TARGETPREFIX) $(START_BUILD) - $(UNTAR)/libjpeg-turbo-$(JPEG_TURBO_VER).tar.gz - pushd $(BUILD_TMP)/libjpeg-turbo-$(JPEG_TURBO_VER); \ + $(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=1 \ @@ -606,9 +609,8 @@ $(D)/libjpeg-turbo: $(ARCHIVE)/libjpeg-turbo-$(JPEG_TURBO_VER).tar.gz | $(TARGET $(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-$(JPEG_TURBO_VER) - $(TOUCH) + rm -f $(addprefix $(TARGETPREFIX)/bin/,cjpeg djpeg rdjpgcom tjbench wrjpgcom) + $(REMOVE)/libjpeg-turbo-$(JPEG_TURBO2_VER) #ifeq ($(PLATFORM), nevis) NEVIS_XML2_FLAGS = --without-iconv @@ -826,7 +828,7 @@ $(D)/libogg: $(ARCHIVE)/libogg-$(LIBOGG_VER).tar.gz | $(TARGETPREFIX) # # minidlna # -$(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) +$(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) $(START_BUILD) $(UNTAR)/minidlna-$(MINIDLNA_VER).tar.gz set -e; cd $(BUILD_TMP)/minidlna-$(MINIDLNA_VER); \ @@ -939,7 +941,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-turbo $(D)/freetype $(ARCHIVE)/libgd-$(GD_VER).tar.gz | $(TARGETPREFIX) +$(D)/libgd2: $(D)/zlib $(D)/libpng $(D)/libjpeg $(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 3a0cb3f..d06821a 100755 --- 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-turbo $(D)/freetype \ + $(D)/libcurl $(D)/libpng $(D)/libjpeg $(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 56fb9c2..cac58f2 100644 --- 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-turbo $(D)/openssl $(ARCHIVE)/links-$(LINKS_VER).tar.bz2 +$(D)/links: $(D)/libpng $(D)/libjpeg $(D)/openssl $(ARCHIVE)/links-$(LINKS_VER).tar.bz2 $(START_BUILD) $(REMOVE)/links-$(LINKS_VER) $(UNTAR)/links-$(LINKS_VER).tar.bz2 diff --git a/make/versions.mk b/make/versions.mk index abf4bde..dcc46d6 100644 --- a/make/versions.mk +++ b/make/versions.mk @@ -99,7 +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 = 2.1.1 +JPEG_TURBO2_VER = 2.1.2 # lcd4linux mod TangoCash LCD4LINUX_VER = 91cfbc2 -- 2.39.5