diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index b5aef12f545..1077e933b05 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -191,7 +191,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n | [`libuuid`](libuuid/) | libuuid (from util-linux) | 2.42.4 | https://github.com/karelzak/util-linux/tree/master/libuuid | | [`libuv`](libuv/) | libuv | 1.53.0 | https://github.com/libuv/libuv | | [`libvorbis`](libvorbis/) | libvorbis | 1.3.7 | https://github.com/xiph/vorbis | -| [`libwebp`](libwebp/) | libwebp | 1.3.1 | https://github.com/webmproject/libwebp | +| [`libwebp`](libwebp/) | libwebp | 1.6.0 | https://github.com/webmproject/libwebp | | [`libxml2`](libxml2/) | libxml2 | 2.15.4 | http://www.xmlsoft.org/ | | [`libxmp`](libxmp/) | libxmp | 4.7.3 | https://github.com/libxmp/libxmp | | [`libyaml`](libyaml/) | libyaml | 0.2.5 | https://pyyaml.org/wiki/LibYAML | diff --git a/Ports/libwebp/package.sh b/Ports/libwebp/package.sh index 44b8215860a..c31c907683d 100755 --- a/Ports/libwebp/package.sh +++ b/Ports/libwebp/package.sh @@ -1,9 +1,9 @@ #!/usr/bin/env -S bash ../.port_include.sh port='libwebp' -version='1.3.1' +version='1.6.0' useconfigure='true' files=( - "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${version}.tar.gz#b3779627c2dfd31e3d8c4485962c2efe17785ef975e2be5c8c0c9e6cd3c4ef66" + "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${version}.tar.gz#e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564" ) depends=( 'libjpeg' @@ -11,5 +11,6 @@ depends=( 'libtiff' ) configopts=( + "--with-sysroot=${SERENITY_INSTALL_ROOT}" "--with-pnglibdir=${SERENITY_INSTALL_ROOT}/usr/local/include" ) diff --git a/Ports/libwebp/patches/0001-libtool-Enable-shared-library-support-for-SerenityOS.patch b/Ports/libwebp/patches/0001-libtool-Enable-shared-library-support-for-SerenityOS.patch index 21051fe9293..3bf910699a2 100644 --- a/Ports/libwebp/patches/0001-libtool-Enable-shared-library-support-for-SerenityOS.patch +++ b/Ports/libwebp/patches/0001-libtool-Enable-shared-library-support-for-SerenityOS.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Liav A -Date: Fri, 1 Sep 2023 23:44:19 +0300 +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 @@ -12,57 +12,50 @@ 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. - -This patch here is a bit more elaborate for other ports, as libintl's -configure includes the code for detecting dynamic linker characteristics -twice, and it also queries the C++ compiler for shared library support. - -Co-Authored-By: Daniel Bertalan --- configure | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/configure b/configure -index d4507aa5761e23c732cc219af4c1c119055cb377..884c76f4da0d8d2640b9fa66cd869816ff35c927 100755 +index fbcdc842784b63e64dfa32f8a3f6724c6ddd0e5a..da69bf7aee57ee961722501c208426783ada3cb0 100755 --- a/configure +++ b/configure -@@ -5635,6 +5635,10 @@ else $as_nop - lt_cv_sys_max_cmd_len=8192 - ;; - -+ serenity*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not -@@ -9224,6 +9228,10 @@ lt_prog_compiler_static= - lt_prog_compiler_pic='-fPIC -shared' - ;; - -+ serenity) -+ lt_prog_compiler_can_build_shared=yes -+ ;; -+ - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic=-Kconform_pic -@@ -10067,6 +10075,10 @@ _LT_EOF - fi +@@ -6460,6 +6460,9 @@ tpf*) + os2*) + lt_cv_deplibs_check_method=pass_all + ;; ++serenity*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + esac + ;; + esac +@@ -9795,6 +9798,10 @@ lt_prog_compiler_static= + lt_prog_compiler_static='-Bstatic' ;; + serenity*) -+ ld_shlibs=no ++ lt_prog_compiler_can_build_shared=yes + ;; + - solaris*) - if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then - ld_shlibs=no -@@ -11474,6 +11486,16 @@ beos*) - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH + *) + lt_prog_compiler_can_build_shared=no + ;; +@@ -11352,6 +11359,10 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; } + hardcode_shlibpath_var=no + ;; + ++ serenity*) ++ ld_shlibs=yes ++ ;; ++ + *) + ld_shlibs=no + ;; +@@ -13006,6 +13017,17 @@ fi + no_undefined_flag= ;; + +serenity*) + version_type=linux + need_lib_prefix=no @@ -73,6 +66,7 @@ index d4507aa5761e23c732cc219af4c1c119055cb377..884c76f4da0d8d2640b9fa66cd869816 + shlibpath_overrides_runpath=no + dynamic_linker='SerenityOS LibELF' + ;; - - bsdi[45]*) - version_type=linux # correct to gnu/linux during the next big refactor ++ + *) + dynamic_linker=no + ;; diff --git a/Ports/libwebp/patches/ReadMe.md b/Ports/libwebp/patches/ReadMe.md index ffa3adc2c56..4f0c6c3fd59 100644 --- a/Ports/libwebp/patches/ReadMe.md +++ b/Ports/libwebp/patches/ReadMe.md @@ -14,8 +14,3 @@ Fix that by just adding the appropriate configuration options for automatically using libtool, without having to manually link the static library into a shared library. -This patch here is a bit more elaborate for other ports, as libintl's -configure includes the code for detecting dynamic linker characteristics -twice, and it also queries the C++ compiler for shared library support. - -