+++ /dev/null
---- a/jdhuff.c
-+++ b/jdhuff.c
-@@ -820,3 +820,35 @@
- entropy->dc_derived_tbls[i] = entropy->ac_derived_tbls[i] = NULL;
- }
- }
-+/*
-+ * BEWARE OF KLUDGE: This subroutine is a hack for decoding illegal JPEG-in-
-+ * TIFF encapsulations produced by Microsoft's Wang Imaging
-+ * for Windows application with the public-domain TIFF Library. Based upon an
-+ * examination of selected output files, this program apparently divides a JPEG
-+ * bit-stream into consecutive horizontal TIFF "strips", such that the JPEG
-+ * encoder's/decoder's DC coefficients for each image component are reset before
-+ * each "strip". Moreover, a "strip" is not necessarily encoded in a multiple
-+ * of 8 bits, so one must sometimes discard 1-7 bits at the end of each "strip"
-+ * for alignment to the next input-Byte storage boundary. IJG JPEG Library
-+ * decoder state is not normally exposed to client applications, so this sub-
-+ * routine provides the TIFF Library with a "hook" to make these corrections.
-+ * It should be called after "jpeg_start_decompress()" and before
-+ * "jpeg_finish_decompress()", just before decoding each "strip" using
-+ * "jpeg_read_raw_data()" or "jpeg_read_scanlines()".
-+ *
-+ * This kludge is not sanctioned or supported by the Independent JPEG Group, and
-+ * future changes to the IJG JPEG Library might invalidate it. Do not send bug
-+ * reports about this code to IJG developers. Instead, contact the author for
-+ * advice: Scott B. Marovich <marovich@hpl.hp.com>, Hewlett-Packard Labs, 6/01.
-+ */
-+GLOBAL(void)
-+jpeg_reset_huff_decode (register j_decompress_ptr cinfo,register float *refbw)
-+{ register huff_entropy_ptr entropy = (huff_entropy_ptr)cinfo->entropy;
-+ register int ci = 0;
-+
-+ /* Re-initialize DC predictions */
-+ do entropy->saved.last_dc_val[ci] = -refbw[ci << 1];
-+ while (++ci < cinfo->comps_in_scan);
-+ /* Discard encoded input bits, up to the next Byte boundary */
-+ entropy->bitstate.bits_left &= ~7;
-+}
-
--- /dev/null
+--- a/jdhuff.c
++++ b/jdhuff.c
+@@ -820,3 +820,35 @@
+ entropy->dc_derived_tbls[i] = entropy->ac_derived_tbls[i] = NULL;
+ }
+ }
++/*
++ * BEWARE OF KLUDGE: This subroutine is a hack for decoding illegal JPEG-in-
++ * TIFF encapsulations produced by Microsoft's Wang Imaging
++ * for Windows application with the public-domain TIFF Library. Based upon an
++ * examination of selected output files, this program apparently divides a JPEG
++ * bit-stream into consecutive horizontal TIFF "strips", such that the JPEG
++ * encoder's/decoder's DC coefficients for each image component are reset before
++ * each "strip". Moreover, a "strip" is not necessarily encoded in a multiple
++ * of 8 bits, so one must sometimes discard 1-7 bits at the end of each "strip"
++ * for alignment to the next input-Byte storage boundary. IJG JPEG Library
++ * decoder state is not normally exposed to client applications, so this sub-
++ * routine provides the TIFF Library with a "hook" to make these corrections.
++ * It should be called after "jpeg_start_decompress()" and before
++ * "jpeg_finish_decompress()", just before decoding each "strip" using
++ * "jpeg_read_raw_data()" or "jpeg_read_scanlines()".
++ *
++ * This kludge is not sanctioned or supported by the Independent JPEG Group, and
++ * future changes to the IJG JPEG Library might invalidate it. Do not send bug
++ * reports about this code to IJG developers. Instead, contact the author for
++ * advice: Scott B. Marovich <marovich@hpl.hp.com>, Hewlett-Packard Labs, 6/01.
++ */
++GLOBAL(void)
++jpeg_reset_huff_decode (register j_decompress_ptr cinfo,register float *refbw)
++{ register huff_entropy_ptr entropy = (huff_entropy_ptr)cinfo->entropy;
++ register int ci = 0;
++
++ /* Re-initialize DC predictions */
++ do entropy->saved.last_dc_val[ci] = -refbw[ci << 1];
++ while (++ci < cinfo->comps_in_scan);
++ /* Discard encoded input bits, up to the next Byte boundary */
++ entropy->bitstate.bits_left &= ~7;
++}
+
--- /dev/null
+--- 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 <stdio.h>
+ EXTERN(void) jpeg_stdio_dest(j_compress_ptr cinfo, FILE *outfile);
+ EXTERN(void) jpeg_stdio_src(j_decompress_ptr cinfo, FILE *infile);
+
+++ /dev/null
---- 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
-
-
$(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
$(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) \
--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 \
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
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
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
projects / bs-cst-neutrino-hd.git / commitdiff