CVS commit: pkgsrc/graphics/jpeg

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/graphics/jpeg
From: "Ryo ONODERA" <ryoon%netbsd.org@localhost>
Date: Mon, 20 Jan 2020 14:59:48 +0000

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Mon Jan 20 14:59:48 UTC 2020

Modified Files:
        pkgsrc/graphics/jpeg: Makefile distinfo
        pkgsrc/graphics/jpeg/patches: patch-ag
Removed Files:
        pkgsrc/graphics/jpeg/patches: patch-rdtarga.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 pkgsrc/graphics/jpeg/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/graphics/jpeg/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/jpeg/patches/patch-ag
cvs rdiff -u -r1.1 -r0 pkgsrc/graphics/jpeg/patches/patch-rdtarga.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/jpeg/Makefile
diff -u pkgsrc/graphics/jpeg/Makefile:1.55 pkgsrc/graphics/jpeg/Makefile:1.56
--- pkgsrc/graphics/jpeg/Makefile:1.55  Sun Mar 10 11:22:43 2019
+++ pkgsrc/graphics/jpeg/Makefile       Mon Jan 20 14:59:48 2020
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.55 2019/03/10 11:22:43 spz Exp $
+# $NetBSD: Makefile,v 1.56 2020/01/20 14:59:48 ryoon Exp $
 
-DISTNAME=      jpegsrc.v9c
+DISTNAME=      jpegsrc.v9d
 PKGNAME=       ${DISTNAME:S/src.v/-/}
 CATEGORIES=    graphics
 MASTER_SITES=  http://www.ijg.org/files/
-DIST_SUBDIR=   jpeg-9c-v2
-PKGREVISION=   1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.ijg.org/

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

Index: pkgsrc/graphics/jpeg/patches/patch-ag
diff -u pkgsrc/graphics/jpeg/patches/patch-ag:1.4 pkgsrc/graphics/jpeg/patches/patch-ag:1.5
--- pkgsrc/graphics/jpeg/patches/patch-ag:1.4   Mon Feb  1 09:22:53 2016
+++ pkgsrc/graphics/jpeg/patches/patch-ag       Mon Jan 20 14:59:48 2020
@@ -1,10 +1,10 @@
-$NetBSD: patch-ag,v 1.4 2016/02/01 09:22:53 wiz Exp $
+$NetBSD: patch-ag,v 1.5 2020/01/20 14:59:48 ryoon Exp $
 
 Build and install jpegexiforient.
 
---- Makefile.in.orig   2015-09-10 08:04:54.000000000 +0000
+--- Makefile.in.orig   2019-04-29 14:05:54.000000000 +0000
 +++ Makefile.in
-@@ -99,7 +99,7 @@ host_triplet = @host@
+@@ -100,7 +100,7 @@ host_triplet = @host@
  target_triplet = @target@
  @HAVE_LD_VERSION_SCRIPT_TRUE@am__append_1 = -Wl,--version-script=$(srcdir)/libjpeg.map
  bin_PROGRAMS = cjpeg$(EXEEXT) djpeg$(EXEEXT) jpegtran$(EXEEXT) \
@@ -13,7 +13,7 @@ Build and install jpegexiforient.
  subdir = .
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-@@ -184,6 +184,9 @@ rdjpgcom_LDADD = $(LDADD)
+@@ -186,6 +186,9 @@ rdjpgcom_LDADD = $(LDADD)
  am_wrjpgcom_OBJECTS = wrjpgcom.$(OBJEXT)
  wrjpgcom_OBJECTS = $(am_wrjpgcom_OBJECTS)
  wrjpgcom_LDADD = $(LDADD)
@@ -23,7 +23,15 @@ Build and install jpegexiforient.
  AM_V_P = $(am__v_P_@AM_V@)
  am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
  am__v_P_0 = false
-@@ -219,7 +222,8 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V
+@@ -226,6 +229,7 @@ am__depfiles_remade = ./$(DEPDIR)/@MEMOR
+       ./$(DEPDIR)/jidctfst.Plo ./$(DEPDIR)/jidctint.Plo \
+       ./$(DEPDIR)/jmemmgr.Plo ./$(DEPDIR)/jpegtran.Po \
+       ./$(DEPDIR)/jquant1.Plo ./$(DEPDIR)/jquant2.Plo \
++      ./$(DEPDIR)/jpegexiforient.Plo ./$(DEPDIR)/jpegexiforient.Po \
+       ./$(DEPDIR)/jutils.Plo ./$(DEPDIR)/rdbmp.Po \
+       ./$(DEPDIR)/rdcolmap.Po ./$(DEPDIR)/rdgif.Po \
+       ./$(DEPDIR)/rdjpgcom.Po ./$(DEPDIR)/rdppm.Po \
+@@ -254,7 +258,8 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V
  am__v_CCLD_0 = @echo "  CCLD    " $@;
  am__v_CCLD_1 = 
  SOURCES = $(libjpeg_la_SOURCES) $(cjpeg_SOURCES) $(djpeg_SOURCES) \
@@ -33,7 +41,7 @@ Build and install jpegexiforient.
  am__can_run_installinfo = \
    case $$AM_UPDATE_INFO_DIR in \
      n|no|NO) false;; \
-@@ -461,6 +465,8 @@ jpegtran_SOURCES = jpegtran.c rdswitch.c
+@@ -499,6 +504,8 @@ jpegtran_SOURCES = jpegtran.c rdswitch.c
  jpegtran_LDADD = libjpeg.la
  rdjpgcom_SOURCES = rdjpgcom.c
  wrjpgcom_SOURCES = wrjpgcom.c
@@ -42,7 +50,7 @@ Build and install jpegexiforient.
  
  # Manual pages to install
  man_MANS = $(DISTMANS)
-@@ -640,6 +646,9 @@ rdjpgcom$(EXEEXT): $(rdjpgcom_OBJECTS) $
+@@ -684,6 +691,9 @@ rdjpgcom$(EXEEXT): $(rdjpgcom_OBJECTS) $
  wrjpgcom$(EXEEXT): $(wrjpgcom_OBJECTS) $(wrjpgcom_DEPENDENCIES) $(EXTRA_wrjpgcom_DEPENDENCIES) 
        @rm -f wrjpgcom$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(wrjpgcom_OBJECTS) $(wrjpgcom_LDADD) $(LIBS)
@@ -52,11 +60,3 @@ Build and install jpegexiforient.
  
  mostlyclean-compile:
        -rm -f *.$(OBJEXT)
-@@ -693,6 +702,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jidctfst.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jidctint.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmemmgr.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jpegexiforient.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jpegtran.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jquant1.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jquant2.Plo@am__quote@

Prev by Date: CVS commit: pkgsrc/mk
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/mk
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index