Created attachment 243464 [details] Patch for jpeg-turbo Compile and runtime tested on FreeBSD 13.2-RELEASE (aarch64) (make, make check-plist, make test) Compile and runtime tested on FreeBSD 13.2-RELEASE (amd64) (make, make check-plist, make test) Two tests are disabled, see https://github.com/libjpeg-turbo/libjpeg-turbo/issues/705 Update WWW entry in graphics/libjpeg-turbo Poudriere testport OK 13.2-RELEASE (amd64) Tested with following consumers in 13.2-RELEASE (amd64) using Poudriere: astro/astrometry astro/celestia astro/celestia-gtk astro/gnuastro astro/nightfall astro/openuniverse astro/qmapshack astro/siril astro/sunclock astro/xephem astro/xplanet audio/deadbeef audio/enscribe audio/ocp audio/zynaddsubfx benchmarks/glmark2 benchmarks/stress-ng biology/ncbi-toolkit biology/protomol biology/seaview cad/appcsxcad cad/csxcad cad/freecad cad/gmsh cad/ldview cad/openctm cad/openvsp cad/PrusaSlicer cad/py-gmsh cad/qcsxcad cad/sumo comms/flamp comms/fldigi comms/flmsg comms/flrig comms/spandsp comms/xastir converters/wkhtmltopdf databases/grass7 databases/grass8 deskutils/aspostit deskutils/coolreader deskutils/gnome-photos deskutils/spice-gtk deskutils/xfce4-tumbler devel/agar devel/allegro5 devel/cvsgraph devel/directfb devel/efl devel/electron22 devel/electron23 devel/electron24 devel/electron25 devel/indi devel/kyra devel/libspice-server devel/p5-SDL devel/py-game devel/py-game_sdl2 devel/qt6-base devel/root devel/sfml1 devel/simgear devel/smooth editors/abiword editors/calligra editors/diamond editors/emacs editors/emacs-devel editors/libreoffice editors/openoffice-4 editors/openoffice-devel editors/vscode emulators/aranym emulators/fuse-utils emulators/mame emulators/nestopia emulators/qemu emulators/qemu-devel emulators/qemu7 emulators/vice emulators/xsystem35 games/0ad games/alienarena games/allacrost games/armagetronad games/bumprace games/cake games/crrcsim games/darkplaces games/diaspora games/ecwolf games/edge games/egl games/endless-sky games/eureka games/ezquake games/flightgear games/freedroid games/freedroidrpg games/freeminer games/fs2open games/gracer games/gzdoom games/iortcw games/irrlamb games/jigzo games/joequake games/lugaru games/macopix games/megaglest games/minetest games/netradiant games/neverball games/nexuiz games/nxengine games/oblige games/onscripter games/onscripter-1byte games/openclonk games/openjk games/penguin-command games/q2p games/q2pro games/quake2max games/qudos games/r1q2 games/residualvm games/scummvm games/supertuxkart games/ufoai games/vavoom games/xglk games/xmoto games/xonotic games/xrick games/zdoom graphics/aaphoto graphics/aeskulap graphics/airsaned graphics/argyllcms graphics/art graphics/aseprite graphics/autopano-sift-c graphics/azpainter graphics/azpainterb graphics/blender graphics/blender-lts29 graphics/bmeps graphics/chafa graphics/cimg graphics/cloudcompare graphics/darktable graphics/dataplot graphics/dcmtk graphics/dcraw graphics/dcraw-m graphics/devil graphics/digikam graphics/djvulibre graphics/embree graphics/enblend graphics/eog graphics/eom graphics/epsonscan2 graphics/exiftran graphics/exrtools graphics/farbfeld graphics/filmulator graphics/flam3 graphics/fotoxx graphics/gd graphics/gdal graphics/gdchart graphics/gdk-pixbuf2 graphics/geeqie graphics/gegl graphics/gimageview graphics/gimp-app graphics/gmic graphics/gnash graphics/gphoto2 graphics/gpicview graphics/grads graphics/graphviz graphics/gstreamer1-plugins-jpeg graphics/gthumb graphics/gwenview graphics/hiptext graphics/hugin graphics/ida graphics/iiview graphics/imageindex graphics/ImageMagick6 graphics/ImageMagick7 graphics/imageworsener graphics/imlib2 graphics/imv graphics/inkscape graphics/ipe graphics/jasper graphics/jp2a graphics/jpeginfo graphics/jpegoptim graphics/jpgtn graphics/jslice graphics/kphotoalbum graphics/krita graphics/krita graphics/largetifftools graphics/lcms graphics/lcms2 graphics/leptonica graphics/libafterimage graphics/libavif graphics/libbpg graphics/libgeotiff graphics/libgfx graphics/libgphoto2 graphics/libgxps graphics/libheif graphics/libimg graphics/libjxl graphics/libkdcraw graphics/libmng graphics/libopenraw graphics/libpano13 graphics/librasterlite2 graphics/libraw graphics/libsvg graphics/libsvg-cairo graphics/libwmf graphics/libwmf-nox11 graphics/libyuv graphics/lightzone graphics/luminance-qt5 graphics/magnum-plugins graphics/maim graphics/mandelbulber graphics/mapcache graphics/mapnik graphics/mapserver graphics/matplotplusplus graphics/meh graphics/metapixel graphics/mscgen graphics/mtpaint graphics/mupdf graphics/netpbm graphics/ocaml-images graphics/okular graphics/open3d graphics/opencv graphics/openimageio graphics/openimageio graphics/openjpeg graphics/openmvs graphics/openrm graphics/openslide graphics/osg graphics/osg34 graphics/ossim graphics/oyranos graphics/p5-Image-Scale graphics/p5-Imager graphics/p5-Tk-JPEG-Lite graphics/pcl-pointclouds graphics/pfstools graphics/photivo graphics/php80-gd graphics/php81-gd graphics/php82-gd graphics/php83-gd graphics/podofo graphics/podofo09 graphics/poppler graphics/poppler-glib graphics/poppler-qt5 graphics/poppler-qt6 graphics/poppler-utils graphics/povray36 graphics/povray37 graphics/povray38 graphics/py-openimageio graphics/py-openimageio graphics/py-pillow graphics/qiv graphics/qt6-imageformats graphics/rawstudio graphics/rawtherapee graphics/ruby-gd graphics/sane-airscan graphics/sane-backends graphics/scantailor graphics/sdl2_image graphics/sdl_image graphics/sdump graphics/seejpeg graphics/simage graphics/simpleviewer graphics/sswf graphics/stamp graphics/swftools graphics/synfig graphics/tiff graphics/tiffgt graphics/timg graphics/tumble graphics/ufraw graphics/vigra graphics/vips graphics/vv graphics/wdune graphics/webp graphics/xfig graphics/xli graphics/xpaint graphics/xsane graphics/xv graphics/xv-m17n graphics/xviewer graphics/yafaray graphics/zathura-pdf-mupdf graphics/zbar graphics/zgv japanese/gd japanese/xv java/openjdk11 java/openjdk11-jre java/openjdk17 java/openjdk17-jre java/openjdk18 java/openjdk19 java/openjfx14 lang/racket lang/swi-pl mail/spamprobe mail/thunderbird math/giacxcas math/gnuplot math/grace math/mathgl math/openturns math/ploticus math/ploticus-nox11 math/R math/reduce math/sage math/vtk8 math/vtk9 misc/copperspice-examples misc/openmvg misc/visp misc/vxl misc/wmweather+ multimedia/butt multimedia/camserv multimedia/dvdstyler multimedia/ffmpegthumbnailer multimedia/fxtv multimedia/gmerlin multimedia/gpac-libgpac multimedia/handbrake multimedia/harvid multimedia/kodi multimedia/libuvc multimedia/libv4l multimedia/libxine multimedia/mencoder multimedia/mjpegtools multimedia/mjpg-streamer multimedia/motion multimedia/mplayer multimedia/mpv multimedia/opentoonz multimedia/opentoonz multimedia/pwcbsd multimedia/pwcview multimedia/ustreamer multimedia/v4l-utils multimedia/vlc multimedia/xawtv multimedia/xine multimedia/zoneminder net-im/ejabberd net-im/kopete net-im/sayaka net-im/signal-desktop net-im/telegram-desktop net-im/tg_owt net-mgmt/driftnet net-mgmt/nagios4 net-p2p/dclib net/boinc-client net/freeswitch net/guacamole-server net/iipsrv net/krfb net/libvncserver net/minidlna net/neatvnc net/remmina net/spiritvnc net/tigervnc-server net/tigervnc-viewer net/tigervnc-viewer-java net/tightvnc net/vino net/vncreflector net/wlvncc net/x11vnc net/xrdp net/xrdp-devel news/knews print/cups-filters print/fontforge print/ghostscript10 print/ghostscript9-agpl-base print/hplip print/miktex print/panda print/photoprint print/pslib print/qpdf print/scribus-devel print/sioyek russian/gd science/chrono science/dakota science/dlib-cpp science/elmerfem science/h5utils science/hdf science/InsightToolkit science/InsightToolkit501 science/lammps science/liggghts science/molscript science/octopus science/openems science/orthanc science/paraview science/py-dlib science/py-tensorflow science/zotero security/steghide sysutils/ascpu sysutils/graffer sysutils/logstalgia sysutils/pfstat sysutils/testdisk sysutils/tracker-miners textproc/fldiff textproc/htmldoc textproc/libextractor textproc/obsidian textproc/wv ukrainian/gd www/analog www/chromium www/dillo2 www/firefox www/firefox-esr www/ilias www/iridium www/kf5-khtml www/librewolf www/links www/netsurf www/nginx-full www/qt5-webengine www/qt5-webkit www/qt6-webengine www/swiggle www/tor-browser www/ungoogled-chromium www/webkit2-gtk3 www/webkit2-gtk4 x11-toolkits/blt x11-toolkits/copperspice x11-toolkits/fltk x11-toolkits/fox14 x11-toolkits/fox16 x11-toolkits/fox17 x11-toolkits/gnustep-back x11-toolkits/gnustep-gui x11-toolkits/gtk40 x11-toolkits/irrlicht x11-toolkits/libgdiplus x11-toolkits/ntk x11-toolkits/open-motif x11-toolkits/open-motif-devel x11-toolkits/p5-Prima x11-toolkits/p5-Tk x11-toolkits/pangolin x11-toolkits/qt5-gui x11-toolkits/wxgtk30 x11-toolkits/wxgtk32 x11-toolkits/xforms x11-toolkits/xmhtml x11-toolkits/xwallpaper x11-wm/afterstep-stable x11-wm/compiz-plugins-main x11-wm/ctwm x11-wm/jwm x11-wm/libwraster x11-wm/pekwm x11-wm/skippy-xd x11-wm/wayfire x11-wm/windowmaker x11/cde x11/cde-24 x11/cde-25 x11/cde-devel x11/eaglemode x11/grim x11/hyprpaper x11/hyprpicker x11/i3lock-color x11/mrxvt x11/mrxvt-devel x11/nxcomp x11/slim x11/swayimg x11/virtualgl x11/xloadimage x11/xscreensaver Failures: graphics/GraphicsMagick - coders/jpeg.c:1466:15: error: no member named 'process' in 'struct jpeg_decompress_struct' math/fricas - build/runaway (unrelated) graphics/chafa - ld: error: undefined symbol: WebPGetInfo (unrelated) graphics/blender-lts29 - Unrelated x11/cde-24 - dtdocbook fatal error: Error processing book.esis by instant (unrelated) science/lammps - error: static_assert failed "Including non-public Kokkos header files is not allowed." (unrelated) multimedia/motion - ld: error: undefined symbol: WebPConfigInitInternal (unrelated) textproc/libextractor - exiv2_extractor.cc:129:14: error: virtual function 'write' has a different return type ('long') than the function it overrides (which has return type 'size_t' (aka 'unsigned long')) (unrelated) graphics/ocaml-images - omake error: File OMyMakeroot: line 100, characters 24-56 unbound variable: global.shell-success-null (unrelated) net-im/signal-desktop - Error: spawn node-gyp ENOENT (unrelated) Summary: Only graphics/GraphicsMagick fails due to this change and there are no patches upstream availale yet
Moin moin Cool, thank you for the patch :) This will require a full exp-run before going in. mfg Tobias
It looks like this might be the work-around of ImageMagick for the problem seen in GraphicsMagick: https://github.com/ImageMagick/ImageMagick/commit/1175c9c3197cfcd21970772a62b1a6135c8d68f0
(In reply to Tobias C. Berner from comment #2) Looks similar to Gentoo's suggested patch https://bugs.gentoo.org/909834 --> https://909834.bugs.gentoo.org/attachment.cgi?id=865437 so I think that's the best solution.
Hi, I'd like to request an exp-run on behalf of desktop@ with PR 272605 also applied Best regards, Daniel
Exp-run looks fine
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=7e8ed677f176d1b351caf44f308cf3a2f58266e8 commit 7e8ed677f176d1b351caf44f308cf3a2f58266e8 Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2023-07-27 20:19:25 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> CommitDate: 2023-07-28 17:11:48 +0000 graphics/jpeg-turbo: Update to 3.0.0 Backport upstream commit 035ea386d1b6a99a8a1e2ab57cc1fc903569136c to fix regression test concurrency issues Changelog: https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/3.0.0 Reference: https://github.com/libjpeg-turbo/libjpeg-turbo/commit/035ea386d1b6a99a8a1e2ab57cc1fc903569136c PR: 272576 Reviewed by: desktop (tcberner) Sponsored by: Blinkinblox Exp-run by: antoine graphics/jpeg-turbo/Makefile | 7 ++++++- graphics/jpeg-turbo/distinfo | 8 +++++--- graphics/jpeg-turbo/pkg-plist | 4 ++-- graphics/libjpeg-turbo/Makefile | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-)