From bbda73d2a81277c709a0ff7ee81ff101091f6b40 Mon Sep 17 00:00:00 2001 From: Markham Date: Sun, 11 Feb 2024 13:32:34 +0100 Subject: [PATCH] bump version libpng-1.6.42; libjpeg-turbo2-2.1.5.1 --- .../0001-libjpeg-turbo-tiff-ojpeg.patch} | 0 .../0002-fix-unknown-type-name-FILE.patch | 11 +++++++++ .../libpng-1.26.x-disable-tools.patch | 22 ----------------- make/archives.mk | 2 +- make/libraries.mk | 24 +++++++++++-------- make/versions.mk | 4 ++-- 6 files changed, 28 insertions(+), 35 deletions(-) rename archive-patches/{libjpeg-turbo-tiff-ojpeg.patch => libjpeg-turbo/0001-libjpeg-turbo-tiff-ojpeg.patch} (100%) create mode 100644 archive-patches/libjpeg-turbo/0002-fix-unknown-type-name-FILE.patch delete mode 100644 archive-patches/libpng-1.26.x-disable-tools.patch diff --git a/archive-patches/libjpeg-turbo-tiff-ojpeg.patch b/archive-patches/libjpeg-turbo/0001-libjpeg-turbo-tiff-ojpeg.patch similarity index 100% rename from archive-patches/libjpeg-turbo-tiff-ojpeg.patch rename to archive-patches/libjpeg-turbo/0001-libjpeg-turbo-tiff-ojpeg.patch diff --git a/archive-patches/libjpeg-turbo/0002-fix-unknown-type-name-FILE.patch b/archive-patches/libjpeg-turbo/0002-fix-unknown-type-name-FILE.patch new file mode 100644 index 0000000..dcc616a --- /dev/null +++ b/archive-patches/libjpeg-turbo/0002-fix-unknown-type-name-FILE.patch @@ -0,0 +1,11 @@ +--- a/jpeglib.h ++++ b/jpeglib.h +@@ -965,6 +965,8 @@ + + /* Standard data source and destination managers: stdio streams. */ + /* Caller is responsible for opening the file before and closing after. */ ++/* fix unknown type name 'FILE' */ ++#include + EXTERN(void) jpeg_stdio_dest(j_compress_ptr cinfo, FILE *outfile); + EXTERN(void) jpeg_stdio_src(j_decompress_ptr cinfo, FILE *infile); + diff --git a/archive-patches/libpng-1.26.x-disable-tools.patch b/archive-patches/libpng-1.26.x-disable-tools.patch deleted file mode 100644 index 88bb962..0000000 --- a/archive-patches/libpng-1.26.x-disable-tools.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -18,7 +18,7 @@ - endif - - # Utilities - installed --bin_PROGRAMS= pngfix png-fix-itxt -+bin_PROGRAMS= - - # This ensures that pnglibconf.h gets built at the start of 'make all' or - # 'make check', but it does not add dependencies to the individual programs, ---- a/Makefile.in -+++ b/Makefile.in -@@ -104,7 +104,6 @@ - pngstest$(EXEEXT) pngvalid$(EXEEXT) pngimage$(EXEEXT) \ - pngcp$(EXEEXT) $(am__EXEEXT_1) - @HAVE_CLOCK_GETTIME_TRUE@am__append_1 = timepng --bin_PROGRAMS = pngfix$(EXEEXT) png-fix-itxt$(EXEEXT) - @PNG_ARM_NEON_TRUE@am__append_2 = arm/arm_init.c\ - @PNG_ARM_NEON_TRUE@ arm/filter_neon.S arm/filter_neon_intrinsics.c - - diff --git a/make/archives.mk b/make/archives.mk index 90cc25e..da08945 100755 --- a/make/archives.mk +++ b/make/archives.mk @@ -89,7 +89,7 @@ $(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_TURBO2_VER).tar.gz: - $(WGET) http://sourceforge.net/projects/libjpeg-turbo/files/$(JPEG_TURBO2_VER)/libjpeg-turbo-$(JPEG_TURBO2_VER).tar.gz + $(WGET) https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$(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 fee89ec..7b29dbf 100755 --- a/make/libraries.mk +++ b/make/libraries.mk @@ -598,8 +598,7 @@ $(D)/freetype: $(D)/zlib $(D)/libpng $(ARCHIVE)/freetype-$(FREETYPE_VER).tar.xz $(D)/libpng: $(D)/zlib $(ARCHIVE)/libpng-$(LIBPNG_VER).tar.xz | $(TARGETPREFIX) $(START_BUILD) $(UNTAR)/libpng-$(LIBPNG_VER).tar.xz - pushd $(BUILD_TMP)/libpng-$(LIBPNG_VER) && \ - $(PATCH)/libpng-1.26.x-disable-tools.patch && \ + pushd $(BUILD_TMP)/libpng-$(LIBPNG_VER); \ $(CONFIGURE) \ --prefix=$(TARGETPREFIX) \ --build=$(BUILD) \ @@ -607,27 +606,32 @@ $(D)/libpng: $(D)/zlib $(ARCHIVE)/libpng-$(LIBPNG_VER).tar.xz | $(TARGETPREFIX) --bindir=$(HOSTPREFIX)/bin \ --mandir=$(BUILD_TMP)/.remove \ --enable-silent-rules \ - --disable-arm-neon \ - --disable-static && \ - ECHO=echo $(MAKE) all && \ + --disable-tools \ + --disable-powerpc-vsx; \ + $(MAKE) all; \ make install $(REMOVE)/libpng-$(LIBPNG_VER) $(TOUCH) # ----------------------------------------------------- -$(D)/libjpeg: $(D)/libjpeg-turbo2 - @touch $@ +$(D)/libjpeg: + make libjpeg-turbo2 + $(TOUCH) + +JPEGTURBO_PATCH = 0001-libjpeg-turbo-tiff-ojpeg.patch +JPEGTURBO_PATCH += 0002-fix-unknown-type-name-FILE.patch $(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; \ + $(call apply_patches, $(addprefix libjpeg-turbo, $(JPEGTURBO_PATCH))); \ $(CMAKE) \ - -DWITH_SIMD=1 \ + -DWITH_SIMD=0 \ -DWITH_JPEG8=1 \ -DWITH_TURBOJPEG=0 \ + -DWITH_JAVA=0 \ -DCMAKE_INSTALL_BINDIR=/.remove \ -DCMAKE_INSTALL_DOCDIR=/.remove \ -DCMAKE_INSTALL_MANDIR=/.remove \ @@ -637,7 +641,7 @@ $(D)/libjpeg-turbo2: $(ARCHIVE)/libjpeg-turbo-$(JPEG_TURBO2_VER).tar.gz | $(TARG cp -a $(BUILD_TMP)/libjpeg-turbo-$(JPEG_TURBO2_VER)/jpegtran $(TARGETPREFIX)/bin $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libjpeg.pc $(REMOVE)/libjpeg-turbo-$(JPEG_TURBO2_VER) - $(TOUCH) + #ifeq ($(BOXFAMILY), nevis) NEVIS_XML2_FLAGS = --without-iconv diff --git a/make/versions.mk b/make/versions.mk index 79d9a59..a4bae2f 100644 --- a/make/versions.mk +++ b/make/versions.mk @@ -106,7 +106,7 @@ INADYN_VER=02.28.10 IRQBALANCE_VER = 1.9.0 # 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_TURBO2_VER = 2.1.4 +JPEG_TURBO2_VER = 2.1.5.1 # lcd4linux mod TangoCash LCD4LINUX_VER = 91cfbc2 @@ -139,7 +139,7 @@ LIBGLIB2_VER_MICRO = 3 LIBGLIB2_VER = $(LIBGLIB2_VER_MAJOR).$(LIBGLIB2_VER_MINOR).$(LIBGLIB2_VER_MICRO) # libpng; reference library for reading and writing PNGs -LIBPNG_VER=1.6.40 +LIBPNG_VER=1.6.42 # The libtirpc package contains libraries that support programs that use the Remote Procedure Call (RPC) API. It replaces the RPC, but not the NIS library entries that used to be in glibc. LIBTIRPC_VER = 1.3.3 -- 2.39.5