From c853efdeb24d7a2c31f25d0a391350954d7c2bb4 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 13 Jun 2025 11:00:31 -0600 Subject: [PATCH] Replace libjpeg with libjpeg-turbo entirely --- recipes/dev/gdk-pixbuf/recipe.toml | 2 +- recipes/libs/libjpeg/recipe.toml | 14 +++++++++----- recipes/wip/graphics/other/gaffer/recipe.toml | 2 +- recipes/wip/image/editors/inkscape/recipe.toml | 2 +- recipes/wip/image/editors/krita/recipe.toml | 2 +- recipes/wip/libs/gtk/gtk3/recipe.toml | 2 +- recipes/wip/libs/image/libjpeg-turbo/recipe.toml | 10 ---------- recipes/wip/libs/other/openimageio/recipe.toml | 2 +- recipes/wip/libs/other/webkitgtk3/recipe.toml | 4 +++- recipes/wip/libs/qt5/qt5-webkit/recipe.toml | 2 +- .../wip/net/server/guacamole-server/recipe.toml | 2 +- recipes/wip/text/emacs-pgtk/recipe.toml | 2 +- .../wip/video/converters/handbrake-cli/recipe.toml | 2 +- 13 files changed, 22 insertions(+), 26 deletions(-) delete mode 100644 recipes/wip/libs/image/libjpeg-turbo/recipe.toml diff --git a/recipes/dev/gdk-pixbuf/recipe.toml b/recipes/dev/gdk-pixbuf/recipe.toml index 6764fbc3b..afa8bff21 100644 --- 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", diff --git a/recipes/libs/libjpeg/recipe.toml b/recipes/libs/libjpeg/recipe.toml index fb743a17c..646a06b7f 100644 --- 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 +""" diff --git a/recipes/wip/graphics/other/gaffer/recipe.toml b/recipes/wip/graphics/other/gaffer/recipe.toml index 8a8ec0f55..a4496f948 100644 --- 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", diff --git a/recipes/wip/image/editors/inkscape/recipe.toml b/recipes/wip/image/editors/inkscape/recipe.toml index 6ff6b083f..743d46e88 100644 --- 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", ] diff --git a/recipes/wip/image/editors/krita/recipe.toml b/recipes/wip/image/editors/krita/recipe.toml index 85a196557..5d74f339a 100644 --- 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", diff --git a/recipes/wip/libs/gtk/gtk3/recipe.toml b/recipes/wip/libs/gtk/gtk3/recipe.toml index e0682d842..63def6794 100644 --- 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", diff --git a/recipes/wip/libs/image/libjpeg-turbo/recipe.toml b/recipes/wip/libs/image/libjpeg-turbo/recipe.toml deleted file mode 100644 index 7b89d807c..000000000 --- a/recipes/wip/libs/image/libjpeg-turbo/recipe.toml +++ /dev/null @@ -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 -""" diff --git a/recipes/wip/libs/other/openimageio/recipe.toml b/recipes/wip/libs/other/openimageio/recipe.toml index e88f3a4f4..667a1a890 100644 --- 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", diff --git a/recipes/wip/libs/other/webkitgtk3/recipe.toml b/recipes/wip/libs/other/webkitgtk3/recipe.toml index 38c2c7147..b5c74545d 100644 --- 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" """ diff --git a/recipes/wip/libs/qt5/qt5-webkit/recipe.toml b/recipes/wip/libs/qt5/qt5-webkit/recipe.toml index 450cdd695..cf71dd2e0 100644 --- 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", diff --git a/recipes/wip/net/server/guacamole-server/recipe.toml b/recipes/wip/net/server/guacamole-server/recipe.toml index 90faa903b..2a81bff60 100644 --- 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", diff --git a/recipes/wip/text/emacs-pgtk/recipe.toml b/recipes/wip/text/emacs-pgtk/recipe.toml index e72ad0d06..825fa2e33 100644 --- 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", diff --git a/recipes/wip/video/converters/handbrake-cli/recipe.toml b/recipes/wip/video/converters/handbrake-cli/recipe.toml index 96fef2761..9a9e7e779 100644 --- 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",