diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index a884cfbd816..95646aba5c7 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -161,7 +161,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n | [`libiconv`](libiconv/) | GNU libiconv | 1.19 | https://www.gnu.org/software/libiconv/ | | [`libicu`](libicu/) | ICU | 78.3 | http://site.icu-project.org/ | | [`libjodycode`](libjodycode/) | libjodycode | 4.1.2 | https://codeberg.org/jbruchon/libjodycode | -| [`libjpeg`](libjpeg/) | libjpeg | 9e | https://ijg.org/ | +| [`libjpeg`](libjpeg/) | libjpeg | 10 | https://ijg.org/ | | [`libjxl`](libjxl/) | libjxl | 0.12.0 | https://github.com/libjxl/libjxl | | [`libksba`](libksba/) | libksba | 1.8.1 | https://gnupg.org/software/libksba/index.html | | [`liblzf`](liblzf/) | LibLZF is a very small data compression library | 3.6 | http://software.schmorp.de/pkg/liblzf.html | diff --git a/Ports/libjpeg/package.sh b/Ports/libjpeg/package.sh index 4ab1946dec1..5a0766b7e88 100755 --- a/Ports/libjpeg/package.sh +++ b/Ports/libjpeg/package.sh @@ -1,9 +1,9 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=libjpeg -version=9e +port='libjpeg' +version='10' useconfigure=true configopts=("--disable-static" "--enable-shared") files=( - "https://ijg.org/files/jpegsrc.v${version}.tar.gz#4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d" + "https://ijg.org/files/jpegsrc.v${version}.tar.gz#8b9eaa13242690ebd03e1728ab1edf97a81a78ed6e83624d493655f31ac95ab5" ) workdir="jpeg-$version" diff --git a/Ports/libjpeg/patches/0001-libtool-Enable-shared-library-support-for-SerenityOS.patch b/Ports/libjpeg/patches/0001-libtool-Enable-shared-library-support-for-SerenityOS.patch deleted file mode 100644 index 5263075b112..00000000000 --- a/Ports/libjpeg/patches/0001-libtool-Enable-shared-library-support-for-SerenityOS.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Tim Schumacher -Date: Sun, 29 May 2022 15:01:28 +0200 -Subject: [PATCH] libtool: Enable shared library support for SerenityOS - -For some odd reason, libtool handles the configuration for shared -libraries entirely statically and in its configure script. If no -shared library support is "present", building shared libraries is -disabled entirely. - -Fix that by just adding the appropriate configuration options for -`serenity`. This allows us to finally create dynamic libraries -automatically using libtool, without having to manually link the -static library into a shared library. ---- - configure | 23 +++++++++++++++++++++++ - 1 file changed, 23 insertions(+) - -diff --git a/configure b/configure -index 9e1d1fc..a95ac5d 100755 ---- a/configure -+++ b/configure -@@ -7089,6 +7089,10 @@ tpf*) - os2*) - lt_cv_deplibs_check_method=pass_all - ;; -+ -+serenity*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; - esac - - fi -@@ -10551,6 +10555,10 @@ lt_prog_compiler_static= - lt_prog_compiler_static='-Bstatic' - ;; - -+ serenity*) -+ lt_prog_compiler_can_build_shared=yes -+ ;; -+ - *) - lt_prog_compiler_can_build_shared=no - ;; -@@ -12081,6 +12089,10 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; } - hardcode_shlibpath_var=no - ;; - -+ serenity*) -+ ld_shlibs=yes -+ ;; -+ - *) - ld_shlibs=no - ;; -@@ -13153,6 +13165,17 @@ uts4*) - shlibpath_var=LD_LIBRARY_PATH - ;; - -+serenity*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}${versuffix} ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}${major}' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ dynamic_linker='SerenityOS LibELF' -+ ;; -+ - *) - dynamic_linker=no - ;; diff --git a/Ports/libjpeg/patches/ReadMe.md b/Ports/libjpeg/patches/ReadMe.md deleted file mode 100644 index 758ef88c10f..00000000000 --- a/Ports/libjpeg/patches/ReadMe.md +++ /dev/null @@ -1,16 +0,0 @@ -# Patches for libjpeg on SerenityOS - -## `0001-libtool-Enable-shared-library-support-for-SerenityOS.patch` - -libtool: Enable shared library support for SerenityOS - -For some odd reason, libtool handles the configuration for shared -libraries entirely statically and in its configure script. If no -shared library support is "present", building shared libraries is -disabled entirely. - -Fix that by just adding the appropriate configuration options for -`serenity`. This allows us to finally create dynamic libraries -automatically using libtool, without having to manually link the -static library into a shared library. -