Replace libjpeg with libjpeg-turbo entirely

2026-06-22 12:54:20 +08:00 · 2025-06-13 11:00:31 -06:00 · 2025-06-13 11:00:31 -06:00 · c853efdeb2
commit c853efdeb2
parent b6f9f8b249
13 changed files with 22 additions and 26 deletions
--- a/recipes/dev/gdk-pixbuf/recipe.toml
+++ b/recipes/dev/gdk-pixbuf/recipe.toml
@ -9,7 +9,7 @@ dependencies = [
    "glib",
    "libffi",
    "libiconv",
-    "libjpeg-turbo",
+    "libjpeg",
    "libpng",
    "pcre2",
    "shared-mime-info",
--- a/recipes/libs/libjpeg/recipe.toml
+++ b/recipes/libs/libjpeg/recipe.toml
@ -1,7 +1,11 @@
-# libjpeg is now provided by libjpeg-turbo
+# libjpeg-turbo is compatible with libjpeg
+[source]
+tar = "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/3.1.0/libjpeg-turbo-3.1.0.tar.gz"
+blake3 = "3efc14da55c56fc0a6a50f109d9e1ee8a91f5ae7dd17a21d3aebe04a65f3ee96"
+
 [build]
 template = "custom"
-script = ""
-
-[package]
-dependencies = ["libjpeg-turbo"]
+script = """
+DYNAMIC_INIT
+cookbook_cmake
+"""
--- a/recipes/wip/graphics/other/gaffer/recipe.toml
+++ b/recipes/wip/graphics/other/gaffer/recipe.toml
@ -16,7 +16,7 @@ dependencies = [
    "llvm18",
    "lz4",
    "libffi",
-    "libjpeg-turbo",
+    "libjpeg",
    "libpng",
    "libtiff",
    "openexr",
--- a/recipes/wip/image/editors/inkscape/recipe.toml
+++ b/recipes/wip/image/editors/inkscape/recipe.toml
@ -38,7 +38,7 @@ dependencies = [
    "libcdr",
    "libgsl",
    "libgspell-gtk3",
-    "libjpeg-turbo",
+    "libjpeg",
    "liblcms",
    "liblapack",
 ]
--- a/recipes/wip/image/editors/krita/recipe.toml
+++ b/recipes/wip/image/editors/krita/recipe.toml
@ -24,7 +24,7 @@ dependencies = [
    "libmypaint",
    "boost",
    "libheif",
-    "libjpeg-turbo",
+    "libjpeg",
    "libjxl",
    "kf5-extra-cmake-modules",
    "kf5-completion",
--- a/recipes/wip/libs/gtk/gtk3/recipe.toml
+++ b/recipes/wip/libs/gtk/gtk3/recipe.toml
@ -20,7 +20,7 @@ dependencies = [
    "libepoxy",
    "libffi",
    "libiconv",
-    "libjpeg-turbo",
+    "libjpeg",
    "libpng",
    "libpthread-stubs",
    "libx11",
--- a/recipes/wip/libs/image/libjpeg-turbo/recipe.toml
+++ b/recipes/wip/libs/image/libjpeg-turbo/recipe.toml
@ -1,10 +0,0 @@
-[source]
-tar = "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/3.1.0/libjpeg-turbo-3.1.0.tar.gz"
-blake3 = "3efc14da55c56fc0a6a50f109d9e1ee8a91f5ae7dd17a21d3aebe04a65f3ee96"
-
-[build]
-template = "custom"
-script = """
-DYNAMIC_INIT
-cookbook_cmake
-"""
--- a/recipes/wip/libs/other/openimageio/recipe.toml
+++ b/recipes/wip/libs/other/openimageio/recipe.toml
@ -8,7 +8,7 @@ template = "custom"
 dependencies = [
    "imath",
    "libtiff",
-    "libjpeg-turbo",
+    "libjpeg",
    "openexr",
    "libfmt",
    #"libpng",
--- a/recipes/wip/libs/other/webkitgtk3/recipe.toml
+++ b/recipes/wip/libs/other/webkitgtk3/recipe.toml
@ -27,7 +27,7 @@ dependencies = [
    "libgpg-error",
    "libiconv",
    "libicu",
-    "libjpeg-turbo",
+    "libjpeg",
    "libpng",
    "libpsl",
    "libpthread-stubs",
@ -138,4 +138,6 @@ cookbook_cmake \
    -DUSE_WOFF2=OFF
 patchelf --replace-needed "${COOKBOOK_SYSROOT}/usr/lib/libsqlite3.so" "libsqlite3.so" "${COOKBOOK_STAGE}/usr/lib/libwebkit2gtk-4.1.so"
 patchelf --replace-needed "${COOKBOOK_SYSROOT}/usr/lib/libsqlite3.so" "libsqlite3.so" "${COOKBOOK_STAGE}/usr/libexec/webkit2gtk-4.1/MiniBrowser"
+mkdir -p "${COOKBOOK_STAGE}/usr/bin"
+ln -sr "${COOKBOOK_STAGE}/usr/libexec/webkit2gtk-4.1/MiniBrowser" "${COOKBOOK_STAGE}/usr/bin/MiniBrowser"
 """
--- a/recipes/wip/libs/qt5/qt5-webkit/recipe.toml
+++ b/recipes/wip/libs/qt5/qt5-webkit/recipe.toml
@ -19,7 +19,7 @@ dependencies = [
    "libhyphen",
    "libxml2",
    "libxslt",
-    "libjpeg-turbo",
+    "libjpeg",
    "libpng",
    "zlib",
    "glib",
--- a/recipes/wip/net/server/guacamole-server/recipe.toml
+++ b/recipes/wip/net/server/guacamole-server/recipe.toml
@ -6,7 +6,7 @@ tar = "https://apache.org/dyn/closer.lua/guacamole/1.5.5/source/guacamole-server
 template = "configure"
 dependencies = [
    "cairo",
-    "libjpeg-turbo",
+    "libjpeg",
    "libpng",
    "libuuid",
    "libssh2",
--- a/recipes/wip/text/emacs-pgtk/recipe.toml
+++ b/recipes/wip/text/emacs-pgtk/recipe.toml
@ -23,7 +23,7 @@ dependencies = [
    "glib",
    "gtk3",
    "harfbuzz",
-    "libjpeg-turbo",
+    "libjpeg",
    "pango",
    "libpng",
    "librsvg",
--- a/recipes/wip/video/converters/handbrake-cli/recipe.toml
+++ b/recipes/wip/video/converters/handbrake-cli/recipe.toml
@ -15,7 +15,7 @@ dependencies = [
    "lame",
    "libass",
    "libiconv",
-    "libjpeg-turbo",
+    "libjpeg",
    "libogg",
    "libsamplerate",
    "libtheora",