Mon Jan 20 14:59:48 2020 UTC ()
jpeg: Update to 9d

Changelog:
Version 9d  12-Jan-2020
-----------------------

Optimize the optimal Huffman code table generation to produce
slightly smaller files.  Thank to John Korejwa for suggestion.
Note: Requires rebuild of testimgp.jpg.

Decoding Huffman: Use default tables if tables are not defined.
Thank to Simone Azzalin for report (Motion JPEG),
and to Martin Strunz for hint.

Add sanity check in optimal Huffman code table generation.
Thank to Adam Farley for suggestion.

rdtarga.c: use read_byte(), with EOF check, instead of getc()
in read_*_pixel().
Thank to Chijin Zhou for cjpeg potential vulnerability report.

jmemnobs.c: respect the max_memory_to_use setting in
jpeg_mem_available() computation.  Thank to Sheng Shu and
Dongdong She for djpeg potential vulnerability report.

jdarith.c, jdhuff.c: avoid left shift of negative value
compiler warning in decode_mcu_AC_refine().
Thank to Indu Bhagat for suggestion.

Add x64 (64-bit) platform support, avoid compiler warnings.
Thank to Jonathan Potter, Feiyun Wang, and Sheng Shu for suggestion.

Adjust libjpeg version specification for pkg-config file.
Thank to Chen Chen for suggestion.

Restore GIF read and write support from libjpeg version 6a.
Thank to Wolfgang Werner (W.W.) Heinz for suggestion.

Improve consistency in raw (downsampled) image data processing mode.
Thank to Zhongyuan Zhou for hint.

Avoid out of bounds array read (AC derived table pointers)
in start pass in jdhuff.c.  Thank to Peng Li for report.

Improve code sanity (jdhuff.c).
Thank to Reza Mirzazade farkhani for reports.

Add jpegtran -drop option; add options to the crop extension and wipe
to fill the extra area with content from the source image region,
instead of gray out.


(ryoon)
diff -r1.55 -r1.56 pkgsrc/graphics/jpeg/Makefile
diff -r1.24 -r1.25 pkgsrc/graphics/jpeg/distinfo
diff -r1.4 -r1.5 pkgsrc/graphics/jpeg/patches/patch-ag
diff -r1.1 -r0 pkgsrc/graphics/jpeg/patches/patch-rdtarga.c
cvs diff -r1.55 -r1.56 pkgsrc/graphics/jpeg/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/jpeg/Makefile 2019/03/10 11:22:43 1.55
+++ pkgsrc/graphics/jpeg/Makefile 2020/01/20 14:59:48 1.56
@@ -1,21 +1,19 @@ @@ -1,21 +1,19 @@
1# $NetBSD: Makefile,v 1.55 2019/03/10 11:22:43 spz Exp $ 1# $NetBSD: Makefile,v 1.56 2020/01/20 14:59:48 ryoon Exp $
2 2
3DISTNAME= jpegsrc.v9c 3DISTNAME= jpegsrc.v9d
4PKGNAME= ${DISTNAME:S/src.v/-/} 4PKGNAME= ${DISTNAME:S/src.v/-/}
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= http://www.ijg.org/files/ 6MASTER_SITES= http://www.ijg.org/files/
7DIST_SUBDIR= jpeg-9c-v2 
8PKGREVISION= 1 
9 7
10MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.ijg.org/ 9HOMEPAGE= http://www.ijg.org/
12COMMENT= IJG's jpeg compression utilities 10COMMENT= IJG's jpeg compression utilities
13 11
14CONFLICTS= libjpeg-turbo-[0-9]* 12CONFLICTS= libjpeg-turbo-[0-9]*
15 13
16WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 14WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
17USE_LIBTOOL= yes 15USE_LIBTOOL= yes
18GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
19CONFIGURE_ARGS+= --disable-ld-version-script 17CONFIGURE_ARGS+= --disable-ld-version-script
20 18
21INSTALLATION_DIRS= bin include share/doc/jpeg 19INSTALLATION_DIRS= bin include share/doc/jpeg
cvs diff -r1.24 -r1.25 pkgsrc/graphics/jpeg/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/jpeg/distinfo 2019/03/10 11:22:43 1.24
+++ pkgsrc/graphics/jpeg/distinfo 2020/01/20 14:59:48 1.25
@@ -1,11 +1,10 @@ @@ -1,11 +1,10 @@
1$NetBSD: distinfo,v 1.24 2019/03/10 11:22:43 spz Exp $ 1$NetBSD: distinfo,v 1.25 2020/01/20 14:59:48 ryoon Exp $
2 2
3SHA1 (jpeg-9c-v2/jpegsrc.v9c.tar.gz) = 2ce111c8c0ac828a44b13ad28c265e954a342d07 3SHA1 (jpegsrc.v9d.tar.gz) = 0bf0fbc3f6f1b5f7d5ad4734eae8cbb148517d6f
4RMD160 (jpeg-9c-v2/jpegsrc.v9c.tar.gz) = c181cc66d03d96ffcca85724938551bb089fd519 4RMD160 (jpegsrc.v9d.tar.gz) = 3c0f971f4b5eb836bb3a7da62db9cabcf1b18a9f
5SHA512 (jpeg-9c-v2/jpegsrc.v9c.tar.gz) = 2b581c60ae401a79bbbe748ff2deeda5acd50bfd2ea22e5926e36d34b9ebcffb6580b0ff48e972c1441583e30e21e1ea821ca0423f9c67ce08a31dffabdbe6b7 5SHA512 (jpegsrc.v9d.tar.gz) = c425cf413e679e4112b428592e6facc813cadf92e42a6b850c5d348b3dd47b0599e2f4a119d7ff543b762cdcadd42a77ed1429a08874e73f64a54fb869714357
6Size (jpeg-9c-v2/jpegsrc.v9c.tar.gz) = 1028134 bytes 6Size (jpegsrc.v9d.tar.gz) = 1070160 bytes
7SHA1 (patch-af) = 925604706574009aacd452dab2d736039b0654e9 7SHA1 (patch-af) = 925604706574009aacd452dab2d736039b0654e9
8SHA1 (patch-ag) = 46164c00386d1968356f1b61d144bc9168410654 8SHA1 (patch-ag) = bffff318a2db88a0b6c1691549b0f01da5c1906c
9SHA1 (patch-jmorecfg.h) = c00f81ba94e2ad6b55ca9892553eedbe4eca3ad1 9SHA1 (patch-jmorecfg.h) = c00f81ba94e2ad6b55ca9892553eedbe4eca3ad1
10SHA1 (patch-jpeglib.h) = 635453c5a2b1223ef5af729edcbfcfa3ed78a8b5 10SHA1 (patch-jpeglib.h) = 635453c5a2b1223ef5af729edcbfcfa3ed78a8b5
11SHA1 (patch-rdtarga.c) = eaec399d67ffb5d33b32131d01a052132bb5bae2 
cvs diff -r1.4 -r1.5 pkgsrc/graphics/jpeg/patches/patch-ag (expand / switch to unified diff)

--- pkgsrc/graphics/jpeg/patches/patch-ag 2016/02/01 09:22:53 1.4
+++ pkgsrc/graphics/jpeg/patches/patch-ag 2020/01/20 14:59:48 1.5
@@ -1,62 +1,62 @@ @@ -1,62 +1,62 @@
1$NetBSD: patch-ag,v 1.4 2016/02/01 09:22:53 wiz Exp $ 1$NetBSD: patch-ag,v 1.5 2020/01/20 14:59:48 ryoon Exp $
2 2
3Build and install jpegexiforient. 3Build and install jpegexiforient.
4 4
5--- Makefile.in.orig 2015-09-10 08:04:54.000000000 +0000 5--- Makefile.in.orig 2019-04-29 14:05:54.000000000 +0000
6+++ Makefile.in 6+++ Makefile.in
7@@ -99,7 +99,7 @@ host_triplet = @host@ 7@@ -100,7 +100,7 @@ host_triplet = @host@
8 target_triplet = @target@ 8 target_triplet = @target@
9 @HAVE_LD_VERSION_SCRIPT_TRUE@am__append_1 = -Wl,--version-script=$(srcdir)/libjpeg.map 9 @HAVE_LD_VERSION_SCRIPT_TRUE@am__append_1 = -Wl,--version-script=$(srcdir)/libjpeg.map
10 bin_PROGRAMS = cjpeg$(EXEEXT) djpeg$(EXEEXT) jpegtran$(EXEEXT) \ 10 bin_PROGRAMS = cjpeg$(EXEEXT) djpeg$(EXEEXT) jpegtran$(EXEEXT) \
11- rdjpgcom$(EXEEXT) wrjpgcom$(EXEEXT) 11- rdjpgcom$(EXEEXT) wrjpgcom$(EXEEXT)
12+ rdjpgcom$(EXEEXT) wrjpgcom$(EXEEXT) jpegexiforient$(EXEEXT) 12+ rdjpgcom$(EXEEXT) wrjpgcom$(EXEEXT) jpegexiforient$(EXEEXT)
13 subdir = . 13 subdir = .
14 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 14 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
15 am__aclocal_m4_deps = $(top_srcdir)/configure.ac 15 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
16@@ -184,6 +184,9 @@ rdjpgcom_LDADD = $(LDADD) 16@@ -186,6 +186,9 @@ rdjpgcom_LDADD = $(LDADD)
17 am_wrjpgcom_OBJECTS = wrjpgcom.$(OBJEXT) 17 am_wrjpgcom_OBJECTS = wrjpgcom.$(OBJEXT)
18 wrjpgcom_OBJECTS = $(am_wrjpgcom_OBJECTS) 18 wrjpgcom_OBJECTS = $(am_wrjpgcom_OBJECTS)
19 wrjpgcom_LDADD = $(LDADD) 19 wrjpgcom_LDADD = $(LDADD)
20+am_jpegexiforient_OBJECTS = jpegexiforient.$(OBJEXT) 20+am_jpegexiforient_OBJECTS = jpegexiforient.$(OBJEXT)
21+jpegexiforient_OBJECTS = $(am_jpegexiforient_OBJECTS) 21+jpegexiforient_OBJECTS = $(am_jpegexiforient_OBJECTS)
22+jpegexiforient_DEPENDENCIES = libjpeg.la 22+jpegexiforient_DEPENDENCIES = libjpeg.la
23 AM_V_P = $(am__v_P_@AM_V@) 23 AM_V_P = $(am__v_P_@AM_V@)
24 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) 24 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
25 am__v_P_0 = false 25 am__v_P_0 = false
26@@ -219,7 +222,8 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V 26@@ -226,6 +229,7 @@ am__depfiles_remade = ./$(DEPDIR)/@MEMOR
 27 ./$(DEPDIR)/jidctfst.Plo ./$(DEPDIR)/jidctint.Plo \
 28 ./$(DEPDIR)/jmemmgr.Plo ./$(DEPDIR)/jpegtran.Po \
 29 ./$(DEPDIR)/jquant1.Plo ./$(DEPDIR)/jquant2.Plo \
 30+ ./$(DEPDIR)/jpegexiforient.Plo ./$(DEPDIR)/jpegexiforient.Po \
 31 ./$(DEPDIR)/jutils.Plo ./$(DEPDIR)/rdbmp.Po \
 32 ./$(DEPDIR)/rdcolmap.Po ./$(DEPDIR)/rdgif.Po \
 33 ./$(DEPDIR)/rdjpgcom.Po ./$(DEPDIR)/rdppm.Po \
 34@@ -254,7 +258,8 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V
27 am__v_CCLD_0 = @echo " CCLD " $@; 35 am__v_CCLD_0 = @echo " CCLD " $@;
28 am__v_CCLD_1 =  36 am__v_CCLD_1 =
29 SOURCES = $(libjpeg_la_SOURCES) $(cjpeg_SOURCES) $(djpeg_SOURCES) \ 37 SOURCES = $(libjpeg_la_SOURCES) $(cjpeg_SOURCES) $(djpeg_SOURCES) \
30- $(jpegtran_SOURCES) $(rdjpgcom_SOURCES) $(wrjpgcom_SOURCES) 38- $(jpegtran_SOURCES) $(rdjpgcom_SOURCES) $(wrjpgcom_SOURCES)
31+ $(jpegtran_SOURCES) $(rdjpgcom_SOURCES) $(wrjpgcom_SOURCES) \ 39+ $(jpegtran_SOURCES) $(rdjpgcom_SOURCES) $(wrjpgcom_SOURCES) \
32+ $(jpegexiforient_SOURCES) 40+ $(jpegexiforient_SOURCES)
33 am__can_run_installinfo = \ 41 am__can_run_installinfo = \
34 case $$AM_UPDATE_INFO_DIR in \ 42 case $$AM_UPDATE_INFO_DIR in \
35 n|no|NO) false;; \ 43 n|no|NO) false;; \
36@@ -461,6 +465,8 @@ jpegtran_SOURCES = jpegtran.c rdswitch.c 44@@ -499,6 +504,8 @@ jpegtran_SOURCES = jpegtran.c rdswitch.c
37 jpegtran_LDADD = libjpeg.la 45 jpegtran_LDADD = libjpeg.la
38 rdjpgcom_SOURCES = rdjpgcom.c 46 rdjpgcom_SOURCES = rdjpgcom.c
39 wrjpgcom_SOURCES = wrjpgcom.c 47 wrjpgcom_SOURCES = wrjpgcom.c
40+jpegexiforient_SOURCES = jpegexiforient.c 48+jpegexiforient_SOURCES = jpegexiforient.c
41+jpegexiforient_LDADD = libjpeg.la 49+jpegexiforient_LDADD = libjpeg.la
42  50
43 # Manual pages to install 51 # Manual pages to install
44 man_MANS = $(DISTMANS) 52 man_MANS = $(DISTMANS)
45@@ -640,6 +646,9 @@ rdjpgcom$(EXEEXT): $(rdjpgcom_OBJECTS) $ 53@@ -684,6 +691,9 @@ rdjpgcom$(EXEEXT): $(rdjpgcom_OBJECTS) $
46 wrjpgcom$(EXEEXT): $(wrjpgcom_OBJECTS) $(wrjpgcom_DEPENDENCIES) $(EXTRA_wrjpgcom_DEPENDENCIES)  54 wrjpgcom$(EXEEXT): $(wrjpgcom_OBJECTS) $(wrjpgcom_DEPENDENCIES) $(EXTRA_wrjpgcom_DEPENDENCIES)
47 @rm -f wrjpgcom$(EXEEXT) 55 @rm -f wrjpgcom$(EXEEXT)
48 $(AM_V_CCLD)$(LINK) $(wrjpgcom_OBJECTS) $(wrjpgcom_LDADD) $(LIBS) 56 $(AM_V_CCLD)$(LINK) $(wrjpgcom_OBJECTS) $(wrjpgcom_LDADD) $(LIBS)
49+jpegexiforient$(EXEEXT): $(jpegexiforient_OBJECTS) $(jpegexiforient_DEPENDENCIES)  57+jpegexiforient$(EXEEXT): $(jpegexiforient_OBJECTS) $(jpegexiforient_DEPENDENCIES)
50+ @rm -f jpegexiforient$(EXEEXT) 58+ @rm -f jpegexiforient$(EXEEXT)
51+ $(AM_V_CCLD)$(LINK) $(jpegexiforient_OBJECTS) $(jpegexiforient_LDADD) $(LIBS) 59+ $(AM_V_CCLD)$(LINK) $(jpegexiforient_OBJECTS) $(jpegexiforient_LDADD) $(LIBS)
52  60
53 mostlyclean-compile: 61 mostlyclean-compile:
54 -rm -f *.$(OBJEXT) 62 -rm -f *.$(OBJEXT)
55@@ -693,6 +702,7 @@ distclean-compile: 
56 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jidctfst.Plo@am__quote@ 
57 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jidctint.Plo@am__quote@ 
58 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmemmgr.Plo@am__quote@ 
59+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jpegexiforient.Po@am__quote@ 
60 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jpegtran.Po@am__quote@ 
61 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jquant1.Plo@am__quote@ 
62 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jquant2.Plo@am__quote@ 
File Deleted: pkgsrc/graphics/jpeg/patches/Attic/patch-rdtarga.c