switch jpeg dependencies to libjpeg-turbo

Change jpeg port to install in a location that does not conflict with libjpeg-turbo or mozjpeg. Change all jpeg dependencies to use libjpeg-turbo by default while allowing mozjpeg as a drop-in replacement. Rev bump dependent ports due to differing library version. Fixes: https://trac.macports.org/ticket/38907
macports · Jan 18, 2021 · 0c3c5e7 · 0c3c5e7
1 parent b902d76
commit 0c3c5e7
Show file tree

Hide file tree

Showing 231 changed files with 489 additions and 439 deletions.
diff --git a/aqua/fltk/Portfile b/aqua/fltk/Portfile
@@ -35,7 +35,7 @@ if {${subport} eq ${name}} {
     checksums    rmd160 564a331014629299574925c43c1efb03da1a9ed1 \
                  sha256 49d03ea050a9d1c88be7d91a52ef5e4381cf34c65078742da78e47a3cb305f56 \
                  size   5099236
-    revision     0
+    revision     1
 
     patchfiles-append \
         patch-fluid-Makefile.release.diff
@@ -56,12 +56,12 @@ if {${subport} eq ${name}} {
     checksums       rmd160  1519ccfc1567e8f0e0323e6c7bd9c2224cc735ce \
                     sha256  a3bd2dfaf014a624e639af52927bbcc90d69774bdeec6a39476e459fb5336464 \
                     size    6190891
-    revision        0
+    revision        1
 
 }
 
 depends_build   port:autoconf
-depends_lib     port:jpeg \
+depends_lib     path:include/turbojpeg.h:libjpeg-turbo \
                 port:libpng \
                 port:zlib
 

diff --git a/aqua/luminance-hdr/Portfile b/aqua/luminance-hdr/Portfile
@@ -6,7 +6,7 @@ PortGroup               qt5 1.0
 
 name                    luminance-hdr
 version                 2.6.0
-revision                1
+revision                2
 categories              aqua graphics
 license                 GPL-2+
 maintainers             {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
@@ -26,7 +26,7 @@ depends_lib-append      port:exiv2         \
                         port:tiff          \
                         port:libraw        \
                         port:gsl           \
-                        port:jpeg          \
+                        path:include/turbojpeg.h:libjpeg-turbo          \
                         port:lcms2         \
                         port:boost         \
                         port:libpng        \

diff --git a/aqua/phantomjs-qt/Portfile b/aqua/phantomjs-qt/Portfile
@@ -70,12 +70,12 @@ array set modules {
         {
         }
         ""
-        "port:zlib port:libpng port:jpeg port:icu port:pcre port:openssl10 port:fontconfig port:freetype"
+        "port:zlib port:libpng path:include/turbojpeg.h:libjpeg-turbo port:icu port:pcre port:openssl10 port:fontconfig port:freetype"
         ""
         {"Qt Core"}
         ""
         "variant overrides: ~docs ~examples"
-        "revision 1"
+        "revision 2"
         "License: "
     }
     qtwebkit {

diff --git a/aqua/qt4-mac/Portfile b/aqua/qt4-mac/Portfile
@@ -11,7 +11,7 @@ PortGroup           compiler_blacklist_versions 1.0
 
 name                qt4-mac
 version             4.8.7
-revision            10
+revision            11
 set branch          [join [lrange [split ${version} .] 0 1] .]
 
 categories          aqua
@@ -44,7 +44,7 @@ depends_lib-append  port:zlib \
                     port:tiff \
                     port:libpng \
                     port:libmng \
-                    path:lib/libjpeg.dylib:jpeg
+                    path:include/turbojpeg.h:libjpeg-turbo
 
 # find a way to specify the OS MINOR version.  For OSX 10.X, this
 # value will be X.  The type is this variable is integer, so we can

diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
@@ -157,12 +157,12 @@ array set modules {
             50179672
         }
         ""
-        "port:zlib port:libpng port:jpeg port:freetype path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre2 port:harfbuzz port:double-conversion port:zstd"
+        "port:zlib port:libpng path:include/turbojpeg.h:libjpeg-turbo port:freetype path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre2 port:harfbuzz port:double-conversion port:zstd"
         ""
         {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
         ""
         "variant overrides: "
-        "revision 1"
+        "revision 2"
         "License: "
     }
     qtcharts {

diff --git a/aqua/qt511/Portfile b/aqua/qt511/Portfile
@@ -159,12 +159,12 @@ array set modules {
             46997676
         }
         ""
-        "port:zlib port:libpng port:jpeg port:freetype path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre2 port:harfbuzz"
+        "port:zlib port:libpng path:include/turbojpeg.h:libjpeg-turbo port:freetype path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre2 port:harfbuzz"
         ""
         {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
         ""
         "variant overrides: "
-        "revision 5"
+        "revision 6"
         "License: "
     }
     qtcanvas3d {

diff --git a/aqua/qt513/Portfile b/aqua/qt513/Portfile
@@ -159,12 +159,12 @@ array set modules {
             48735704
         }
         ""
-        "port:zlib port:libpng port:jpeg port:freetype path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre2 port:harfbuzz port:double-conversion"
+        "port:zlib port:libpng path:include/turbojpeg.h:libjpeg-turbo port:freetype path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre2 port:harfbuzz port:double-conversion"
         ""
         {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
         ""
         "variant overrides: "
-        "revision 1"
+        "revision 2"
         "License: "
     }
     qtcharts {

diff --git a/aqua/qt53/Portfile b/aqua/qt53/Portfile
@@ -135,12 +135,12 @@ array set modules {
             46694044
         }
         ""
-        "port:zlib port:libpng port:jpeg path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:harfbuzz"
+        "port:zlib port:libpng path:include/turbojpeg.h:libjpeg-turbo path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:harfbuzz"
         ""
         {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
         ""
         "variant overrides: "
-        "revision 3"
+        "revision 4"
         "License: "
     }
     qtconnectivity {

diff --git a/aqua/qt55/Portfile b/aqua/qt55/Portfile
@@ -147,12 +147,12 @@ array set modules {
             46389212
         }
         ""
-        "port:zlib port:libpng port:jpeg path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:harfbuzz"
+        "port:zlib port:libpng path:include/turbojpeg.h:libjpeg-turbo path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:harfbuzz"
         ""
         {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
         ""
         "variant overrides: "
-        "revision 16"
+        "revision 17"
         "License: "
     }
     qtcanvas3d {

diff --git a/aqua/qt56/Portfile b/aqua/qt56/Portfile
@@ -153,12 +153,12 @@ array set modules {
             47840424
         }
         ""
-        "port:zlib port:libpng port:jpeg port:freetype path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:harfbuzz"
+        "port:zlib port:libpng path:include/turbojpeg.h:libjpeg-turbo port:freetype path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:harfbuzz"
         ""
         {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
         ""
         "variant overrides: "
-        "revision 9"
+        "revision 10"
         "License: "
     }
     qtcanvas3d {

diff --git a/aqua/qt57/Portfile b/aqua/qt57/Portfile
@@ -155,12 +155,12 @@ array set modules {
             44992616
         }
         ""
-        "port:zlib port:libpng port:jpeg port:freetype path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:harfbuzz"
+        "port:zlib port:libpng path:include/turbojpeg.h:libjpeg-turbo port:freetype path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:harfbuzz"
         ""
         {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
         ""
         "variant overrides: "
-        "revision 9"
+        "revision 10"
         "License: "
     }
     qtcanvas3d {

diff --git a/aqua/qt58/Portfile b/aqua/qt58/Portfile
@@ -153,12 +153,12 @@ array set modules {
             44318700
         }
         ""
-        "port:zlib port:libpng port:jpeg port:freetype path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:harfbuzz"
+        "port:zlib port:libpng path:include/turbojpeg.h:libjpeg-turbo port:freetype path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:harfbuzz"
         ""
         {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
         ""
         "variant overrides: "
-        "revision 8"
+        "revision 9"
         "License: "
     }
     qtcanvas3d {

diff --git a/aqua/qt59/Portfile b/aqua/qt59/Portfile
@@ -157,12 +157,12 @@ array set modules {
             45219440
         }
         ""
-        "port:zlib port:libpng port:jpeg port:freetype path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre2 port:harfbuzz"
+        "port:zlib port:libpng path:include/turbojpeg.h:libjpeg-turbo port:freetype path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre2 port:harfbuzz"
         ""
         {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
         ""
         "variant overrides: "
-        "revision 1"
+        "revision 2"
         "License: "
     }
     qtcanvas3d {

diff --git a/devel/LibVNCServer/Portfile b/devel/LibVNCServer/Portfile
@@ -5,7 +5,7 @@ PortGroup                   cmake 1.1
 PortGroup                   github 1.0
 
 github.setup                LibVNC libvncserver 0.9.13 LibVNCServer-
-revision                    0
+revision                    1
 checksums                   rmd160  3fb7d82b4cbf77ee2eb5e1c55d7aeb535d17506b \
                             sha256  0ae5bb9175dc0a602fe85c1cf591ac47ee5247b87f2bf164c16b05f87cbfa81a \
                             size    567491
@@ -29,7 +29,7 @@ depends_build-append        port:pkgconfig
 
 depends_lib-append          port:cyrus-sasl2 \
                             port:gnutls \
-                            port:jpeg \
+                            path:include/turbojpeg.h:libjpeg-turbo \
                             port:libgcrypt \
                             port:libpng \
                             port:zlib

diff --git a/devel/ResIL/Portfile b/devel/ResIL/Portfile
@@ -6,7 +6,7 @@ PortGroup muniversal 1.0
 name                ResIL
 conflicts           libdevil
 version             1.7.9
-revision            4
+revision            5
 categories          devel multimedia
 platforms           darwin
 license             LGPL-2.1
@@ -34,7 +34,7 @@ checksums           rmd160  7a0e5a15df4af3db735234db8789909f2097deac \
 depends_lib         port:lcms \
                     port:libmng \
                     port:libpng \
-                    port:jpeg \
+                    path:include/turbojpeg.h:libjpeg-turbo \
                     port:tiff \
                     port:jasper \
                     port:xrender \

diff --git a/devel/eet/Portfile b/devel/eet/Portfile
@@ -5,7 +5,7 @@ PortSystem              1.0
 name                    eet
 epoch                   2
 version                 1.7.10
-revision                2
+revision                3
 maintainers             ryandesign openmaintainer
 categories              devel x11
 platforms               darwin
@@ -30,7 +30,7 @@ checksums               rmd160  c748ab6f2d088f05657f87f3c6b77b1d0e527067 \
                         sha256  c3de7be3b0f72f154e40fb2ef794e26541722b9d9d93d5a356dc76c42f5d7c13
 
 depends_build           port:pkgconfig
-depends_lib             port:jpeg port:zlib port:eina path:lib/libssl.dylib:openssl
+depends_lib             path:include/turbojpeg.h:libjpeg-turbo port:zlib port:eina path:lib/libssl.dylib:openssl
 
 configure.args          --disable-doc \
                         --disable-gnutls \

diff --git a/devel/gource/Portfile b/devel/gource/Portfile
@@ -5,7 +5,7 @@ PortGroup           github 1.0
 
 github.setup        acaudwell Gource 0.50 gource-
 name                gource
-revision            1
+revision            2
 categories          devel
 platforms           darwin
 license             GPL-3+
@@ -33,7 +33,7 @@ depends_lib         port:ftgl \
                     port:libsdl2_image \
                     port:pcre \
                     port:libpng \
-                    port:jpeg \
+                    path:include/turbojpeg.h:libjpeg-turbo \
                     port:glew \
                     port:boost \
                     port:freetype

diff --git a/devel/inventor/Portfile b/devel/inventor/Portfile
@@ -2,7 +2,7 @@ PortSystem 1.0
 
 name	   inventor
 version	   2.1.5-10
-revision	10
+revision	11
 categories	devel graphics x11
 platforms	darwin
 maintainers	nomaintainer
@@ -27,7 +27,7 @@ depends_lib	    port:xorg-libXi \
 		    port:xorg-libXt \
 		    port:libGLU \
 		    port:freetype \
-		    port:jpeg \
+		    path:include/turbojpeg.h:libjpeg-turbo \
 		    port:glw
 
 patchfiles	    patch-BarChart-GNUmakefile.diff \

diff --git a/devel/libdevil/Portfile b/devel/libdevil/Portfile
@@ -7,7 +7,7 @@ PortGroup           muniversal 1.0
 name                libdevil
 conflicts           ResIL
 version             1.8.0
-revision            0
+revision            1
 checksums           rmd160  411efa9982a1dfd9075536a80c1eb3d8c2ed15e8 \
                     sha256  0075973ee7dd89f0507873e2580ac78336452d29d34a07134b208f44e2feb709 \
                     size    3084833
@@ -37,7 +37,7 @@ distname            DevIL-${version}
 worksrcdir          DevIL/DevIL
 
 depends_lib         port:jasper \
-                    port:jpeg \
+                    path:include/turbojpeg.h:libjpeg-turbo \
                     port:lcms2 \
                     port:libmng \
                     port:libpng \

diff --git a/devel/libextractor/Portfile b/devel/libextractor/Portfile
@@ -4,7 +4,7 @@ PortSystem          1.0
 
 name                libextractor
 version             1.4
-revision            2
+revision            3
 categories          devel
 license             GPL-3+
 maintainers         {ryandesign @ryandesign} openmaintainer
@@ -37,7 +37,7 @@ depends_lib         port:bzip2 \
                     port:gtk2 \
                     port:gstreamer1 \
                     port:gstreamer1-gst-plugins-base \
-                    port:jpeg \
+                    path:include/turbojpeg.h:libjpeg-turbo \
                     port:libarchive \
                     port:libgsf \
                     port:libiconv \

diff --git a/devel/libgdiplus/Portfile b/devel/libgdiplus/Portfile
@@ -5,7 +5,7 @@ PortGroup               active_variants 1.1
 
 name                    libgdiplus
 version                 6.0.5
-revision                0
+revision                1
 categories              devel
 platforms               darwin
 maintainers             {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
@@ -24,7 +24,7 @@ checksums               rmd160  dca604e6298a95d55a5e4d45d0186c4e0e592b38 \
 
 depends_build           port:pkgconfig
 
-depends_lib             port:jpeg \
+depends_lib             path:include/turbojpeg.h:libjpeg-turbo \
                         port:tiff \
                         port:giflib \
                         port:libpng \

diff --git a/devel/libgphoto2/Portfile b/devel/libgphoto2/Portfile
@@ -4,7 +4,7 @@ PortSystem          1.0
 
 name                libgphoto2
 version             2.5.26
-revision            0
+revision            1
 checksums           rmd160  7376f7180d2aa68bce281d641b03ee9c74c63534 \
                     sha256  7740fea3cbb78489071cdfec06c07fab528e69e27ac82734eae6a73eaeeabcd4 \
                     size    7572381
@@ -27,7 +27,7 @@ depends_build       port:pkgconfig
 
 depends_lib         path:bin/dbus-daemon:dbus \
                     port:gettext \
-                    port:jpeg \
+                    path:include/turbojpeg.h:libjpeg-turbo \
                     port:libexif \
                     port:libiconv \
                     port:libusb-compat \

diff --git a/devel/libhsplasma/Portfile b/devel/libhsplasma/Portfile
@@ -5,7 +5,7 @@ PortGroup                   cmake 1.0
 
 name                        libhsplasma
 version                     0.0-20111023
-revision        3
+revision        4
 categories                  devel
 platforms                   darwin
 maintainers                 ryandesign
@@ -24,7 +24,7 @@ git.url                     https://github.com/H-uru/libhsplasma.git
 git.branch                  7b8df5940eeecfcd91ab3922a65303a0cadf3e24
 
 depends_lib                 port:zlib \
-                            port:jpeg \
+                            path:include/turbojpeg.h:libjpeg-turbo \
                             path:lib/libssl.dylib:openssl \
                             port:python26