Update WPE WebKit to 2.48.2

packages/base-system-1.0.package

@@ -36,3 +36,5 @@ class Package(custom.GStreamer, package.Package):
                 'glib:libs:lang:schemas', 'orc:libs', 'bzip2:libs',
                 'json-glib:libs',
             ]
+        elif self.config.target_platform == Platform.ANDROID:
+            self.files.remove('librsvg:libs')

packages/wpewebkit-core.package

@@ -2,7 +2,7 @@
 
 class Package(package.Package):
     name = 'wpewebkit-core'
-    version = '2.46.7'
+    version = '2.48.2'
     shortdesc = 'Web Platform for Embedded'
     longdesc = 'WPE WebKit allows embedders to create simple and performant \
         systems based on Web platform technologies. It is a WebKit port designed \
@@ -19,6 +19,7 @@ class Package(package.Package):
         '.scenario',
         '.conf',
         '.py',
+        '.gresource',
         'gst-env',
         'gst-shell',
         'gst-validate-launcher',

packages/wpewebkit.package

@@ -2,7 +2,7 @@
 
 class SDKPackage(package.SDKPackage):
     name = 'wpewebkit'
-    version = '2.46.7'
+    version = '2.48.2'
     shortdesc = 'Web Platform for Embedded'
     longdesc = 'WPE WebKit allows embedders to create simple and performant \
         systems based on Web platform technologies. It is a WebKit port designed \

recipes/build-tools/icu-tools.recipe

@@ -25,9 +25,9 @@
 
 class Recipe(recipe.Recipe):
     name = 'icu-tools'
-    version = '68.2'
-    url = 'https://github.com/unicode-org/icu/releases/download/release-68-2/icu4c-68_2-src.tgz'
-    tarball_checksum = 'c79193dee3907a2199b8296a93b52c5cb74332c26f3d167269487680d479d625'
+    version = '70.1'
+    url = 'https://github.com/unicode-org/icu/releases/download/release-70-1/icu4c-70_1-src.tgz'
+    tarball_checksum = '8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5'
     stype = SourceType.TARBALL
     tarball_dirname = 'icu'
     srcdir = 'source'

recipes/gst-plugins-bad-1.0.recipe

@@ -626,6 +626,8 @@ class Recipe(custom.GStreamer):
             self.disable_plugin('amfcodec', 'codecs')
             self.disable_plugin('nvcodec', 'codecs')
             self.disable_plugin('qsv', 'codecs')
+        elif self.config.target_platform == Platform.ANDROID:
+            self.disable_plugin('rsvg', 'codecs', dep='librsvg')
 
         if self.meson_options['nvcodec'] == 'enabled':
             self.files_libs += ['libgstcuda-1.0']

recipes/harfbuzz.recipe

@@ -4,32 +4,31 @@ from cerbero.tools.libtool import LibtoolLibrary
 
 class Recipe(recipe.Recipe):
     name = 'harfbuzz'
-    version = '8.3.0'
+    version = '10.4.0'
     stype = SourceType.TARBALL
     btype = BuildType.MESON
     url = 'https://github.com/%(name)s/%(name)s/releases/download/%(version)s/%(name)s-%(version)s.tar.xz'
-    tarball_checksum = '109501eaeb8bde3eadb25fab4164e993fbace29c3d775bcaa1c1e58e2f15f847'
+    tarball_checksum = '480b6d25014169300669aa1fc39fb356c142d5028324ea52b3a27648b9beaad8'
     licenses = [{License.BSD_like: ['COPYING']}]
     deps = ['fontconfig', 'cairo', 'glib', 'icu']
     meson_options = {'icu': 'enabled',
                      'glib': 'enabled',
-                     'cairo': 'enabled', # Is this needed? Is it only used for cmd line utils?
-                     'gobject': 'disabled',
+                     'cairo': 'enabled',  # needed for hb-view
+                     'gobject': 'enabled',
                      'icu_builtin': 'false',
-                     'introspection': 'disabled',
                      'tests': 'disabled'}
 
-    patches = []
-
     files_bins = ['hb-ot-shape-closure', 'hb-view', 'hb-shape']
-    files_libs = ['libharfbuzz', 'libharfbuzz-icu']
-    files_devel = ['include/harfbuzz/*.h', '%(libdir)s/pkgconfig/harfbuzz.pc']
+    files_libs = ['libharfbuzz', 'libharfbuzz-icu', 'libharfbuzz-gobject']
+    files_devel = [
+        'include/harfbuzz/*.h',
+        '%(libdir)s/pkgconfig/harfbuzz.pc',
+        '%(libdir)s/pkgconfig/harfbuzz-icu.pc',
+        '%(libdir)s/pkgconfig/harfbuzz-gobject.pc',
+    ]
+    files_typelibs = ['HarfBuzz-0.0']
 
     def prepare(self):
-        # Disable werror from pragmas. Currently fails building on macOS 12.3
-        # and should actually be controlled by the build system.
-        self.append_env('CFLAGS', '-DHB_NO_PRAGMA_GCC_DIAGNOSTIC_ERROR')
-
         if self.config.target_platform == Platform.DARWIN:
             self.meson_options['coretext'] = 'enabled'
 
@@ -38,7 +37,7 @@ class Recipe(recipe.Recipe):
         LibtoolLibrary('harfbuzz', None, None, None,
                 self.config.libdir, self.config.target_platform,
                 deps=['glib-2.0', 'freetype', 'fontconfig']).save()
-        LibtoolLibrary('harfbuzz-subset', None, None, None,
+        LibtoolLibrary('harfbuzz-gobject', None, None, None,
                 self.config.libdir, self.config.target_platform,
-                deps=['harfbuzz']).save()
+                deps=['gobject-2.0', 'harfbuzz']).save()
         super().post_install()

recipes/icu.recipe

@@ -31,12 +31,11 @@ from pathlib import Path
 
 class Recipe(recipe.Recipe):
     name = 'icu'
-    version = '68.2'
+    version = '70.1'
     (major_ver, minor_ver) = version.split('.')
-    url = 'https://github.com/unicode-org/icu/releases/download/release-68-2/icu4c-68_2-src.tgz'
-    tarball_checksum = 'c79193dee3907a2199b8296a93b52c5cb74332c26f3d167269487680d479d625'
+    url = f'https://github.com/unicode-org/icu/releases/download/release-{major_ver}-{minor_ver}/icu4c-{major_ver}_{minor_ver}-src.tgz'
+    tarball_checksum = '8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5'
     stype = SourceType.TARBALL
-    autoreconf = True
     tarball_dirname = 'icu'
     srcdir = 'source'
     configure_options = '\

recipes/libxml2.recipe

@@ -1,28 +1,35 @@
 # -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
-
+from cerbero.tools.libtool import LibtoolLibrary
 
 class Recipe(recipe.Recipe):
     name = 'libxml2'
-    version = '2.9.9'
+    version = '2.14.2'
     stype = SourceType.TARBALL
-    # Upstream still has a broken SSL certificate, use our mirror
-    #url = 'https://xmlsoft.org/sources/libxml2-%(version)s.tar.gz'
-    url = 'https://gstreamer.freedesktop.org/src/mirror/libxml2-%(version)s.tar.gz'
-    tarball_checksum = '94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871'
-    licenses = [{License.MIT: ['COPYING']}]
-    configure_options = '--with-python=no'
+    btype = BuildType.MESON
+    url = 'gnome://'
+    tarball_checksum = '353f3c83535d4224a4e5f1e88c90b5d4563ea8fec11f6407df640fd28fc8b8c6'
+    licenses = [{License.MIT: ['Copyright']}]
+
+    # Tests require API level 28 on Android
+    meson_options = {
+        'python': 'disabled',
+        'zlib': 'enabled',
+        'iconv': 'disabled',
+        'tests': 'false'
+    }
 
     deps = [ 'zlib' ]
 
-    files_libs = ['libxml2']
-    files_devel = ['include/libxml2', '%(libdir)s/xml2Conf.sh', 'bin/xml2-config',
-                   '%(libdir)s/pkgconfig/libxml-2.0.pc', 'bin/xmllint%(bext)s']
+    patches = [
+        f'{name}/0001-meson-Make-tests-optional.patch',
+    ]
 
-    def prepare(self):
-        if self.config.target_platform == Platform.WINDOWS:
-            self.configure_options += ' --without-threads'
-        elif self.config.target_platform == Platform.ANDROID:
-            v = DistroVersion.get_android_api_version(self.config.target_distro_version)
-            if v < 21:
-                self.append_env('CFLAGS', '-D_FILE_OFFSET_BITS=32')
-                self.append_env('CPPFLAGS', '-D_FILE_OFFSET_BITS=32')
+    files_libs = ['libxml2']
+    files_devel = ['include/libxml2', '%(libdir)s/pkgconfig/libxml-2.0.pc', 'bin/xmllint%(bext)s']
+
+    def post_install(self):
+        LibtoolLibrary(self.name, None, None, None,
+                        self.config.libdir, self.config.target_platform,
+                        deps=['z'],
+                        static_only=self.library_type == LibraryType.STATIC).save()
+        super().post_install()

recipes/libxml2/0001-meson-Make-tests-optional.patch

@@ -0,0 +1,51 @@
+From a1c3a1aa10e6477fbe97a5b1bf4c63c13c8d7901 Mon Sep 17 00:00:00 2001
+From: "L. E. Segovia" <[email protected]>
+Date: Tue, 13 Aug 2024 17:28:13 +0000
+Subject: [PATCH] meson: Make tests optional
+
+---
+ meson.build       | 6 ++++--
+ meson_options.txt | 6 ++++++
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 988d7ec..5cea50b 100644
+--- a/meson.build
++++ b/meson.build
+@@ -542,7 +542,8 @@ checks = {
+     'testrecurse': [],
+ }
+
+-foreach check, deps : checks
++if get_option('tests')
++  foreach check, deps : checks
+     exe = executable(
+         check,
+         files(check + '.c'),
+@@ -552,7 +553,8 @@ foreach check, deps : checks
+     if check != 'testlimits'
+         test(check, exe, timeout: 0, workdir: meson.current_source_dir())
+     endif
+-endforeach
++  endforeach
++endif
+
+ sh = find_program('sh', required: false)
+
+diff --git a/meson_options.txt b/meson_options.txt
+index 0bfbebb..e8feb0a 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -204,3 +204,9 @@ option('minimum',
+   value: false,
+   description: 'build a minimally sized library'
+ )
++
++option('tests',
++  type: 'boolean',
++  value: false,
++  description: 'build tests'
++)
+-- 
+2.49.0
+

recipes/libxslt.recipe

@@ -2,11 +2,10 @@
 
 class Recipe(recipe.Recipe):
     name = 'libxslt'
-    version = 'v1.1.34'
+    version = '1.1.42'
     stype = SourceType.TARBALL
-    url = 'https://gitlab.gnome.org/GNOME/libxslt/-/archive/{0}/libxslt-{0}.tar.gz'.format(version)
-    tarball_checksum = 'c61af4c898a93c2862f3f06bba8e5de5e352463febc94a2642d732f21e5d5641'
-    autoreconf = True
+    url = f'https://download.gnome.org/sources/libxslt/1.1/libxslt-{version}.tar.xz'
+    tarball_checksum = '85ca62cac0d41fc77d3f6033da9df6fd73d20ea2fc18b0a3609ffb4110e1baeb'
     configure_options = '--without-python --without-crypto'
     deps = ['libxml2']