GraphicsMagick/libjpeg-turbo

[Greg Troxel <gdt%lexort.com@localhost>]

I have had
  JPEG_DEFAULT=libjpeg-turbo
in mk.conf for a long time.

I am rebuilding packages as usual along the branch, and found that
GraphicsMagick fails to build:

  libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I/tmp/work/graphics/GraphicsMagick/work/.buildlink/include -I/tmp/work/graphics/GraphicsMagick/work/.x11-buildlink/include -I/tmp/work/graphics/GraphicsMagick/work/.buildlink/include/freetype2 -I/tmp/work/graphics/GraphicsMagick/work/.buildlink/include/libxml2 -fopenmp -O2 -Wall -pthread -MT coders/jpeg_la-jpeg.lo -MD -MP -MF coders/.deps/jpeg_la-jpeg.Tpo -c coders/jpeg.c  -fPIC -DPIC -o coders/.libs/jpeg_la-jpeg.o
  coders/jpeg.c: In function 'ReadJPEGImage':
  coders/jpeg.c:1466:15: error: 'struct jpeg_decompress_struct' has no member named 'process'; did you mean 'progress'?
       jpeg_info.process == JPROC_PROGRESSIVE ? LineInterlace : NoInterlace;
                 ^~~~~~~
                 progress
  coders/jpeg.c:1466:26: error: 'JPROC_PROGRESSIVE' undeclared (first use in this function); did you mean 'JERR_BAD_PROGRESSION'?
       jpeg_info.process == JPROC_PROGRESSIVE ? LineInterlace : NoInterlace;
                            ^~~~~~~~~~~~~~~~~
                            JERR_BAD_PROGRESSION
  coders/jpeg.c:1466:26: note: each undeclared identifier is reported only once for each function it appears in
  coders/jpeg.c:1467:32: error: 'struct jpeg_decompress_struct' has no member named 'process'; did you mean 'progress'?
     image->compression=jpeg_info.process == JPROC_LOSSLESS ?
                                  ^~~~~~~
                                  progress
  coders/jpeg.c:1467:43: error: 'JPROC_LOSSLESS' undeclared (first use in this function); did you mean 'JPROC_PROGRESSIVE'?
     image->compression=jpeg_info.process == JPROC_LOSSLESS ?
                                             ^~~~~~~~~~~~~~
                                             JPROC_PROGRESSIVE
  coders/jpeg.c: In function 'WriteJPEGImage':
  coders/jpeg.c:2911:11: warning: implicit declaration of function 'jpeg_simple_lossless'; did you mean 'jpeg_enable_lossless'? [-Wimplicit-function-declaration]
             jpeg_simple_lossless(&jpeg_info,predictor,point_transform);
             ^~~~~~~~~~~~~~~~~~~~
             jpeg_enable_lossless
  gmake[1]: *** [Makefile:7084: coders/jpeg_la-jpeg.lo] Error 1
  gmake[1]: Leaving directory '/tmp/work/graphics/GraphicsMagick/work/GraphicsMagick-1.3.40'
  gmake: *** [Makefile:4956: all] Error 2
  *** Error code 2

  Stop.
  make[1]: stopped in /home/n0/gdt/pkgsrc-current/pkgsrc/graphics/GraphicsMagick
  *** Error code 1

  Stop.
  make: stopped in /usr/pkgsrc/graphics/GraphicsMagick

I am guessing this is related to the July 5 update of libjpeg-turbo to
3.0.0. GraphicsMagick's README does say it works with libjpeg-turbo.

Any insight into what changed and what is likely the right path to take
is welcome.