Add libraqm to build

QuLogic · QuLogic · commit 64ebd00da00a · 2025-04-02T06:03:43.000-04:00
diff --git a/extern/meson.build b/extern/meson.build
@@ -30,6 +30,27 @@ else
   freetype_dep = freetype_proj.get_variable('freetype_dep')
 endif
 
+if get_option('system-libraqm')
+  libraqm_dep = dependency('raqm', version: '>=0.10.2')
+else
+  LOCAL_LIBRAQM_VERSION = '0.10.2'
+
+  subproject('harfbuzz',
+    default_options: [
+        'freetype=enabled',
+        'glib=disabled',
+        'gobject=disabled',
+        'cairo=disabled',
+        'icu=disabled',
+        'tests=disabled',
+    ])
+  subproject('fribidi', default_options: ['docs=false', 'tests=false'])
+  libraqm_proj = subproject(
+    f'libraqm-@LOCAL_LIBRAQM_VERSION@',
+    default_options: ['default_library=static'])
+  libraqm_dep = libraqm_proj.get_variable('libraqm_dep')
+endif
+
 if get_option('system-qhull')
   qhull_dep = dependency('qhull_r', version: '>=8.0.2', required: false)
   if not qhull_dep.found()
diff --git a/meson.options b/meson.options
@@ -7,6 +7,8 @@
 # FreeType on AIX.
 option('system-freetype', type: 'boolean', value: false,
        description: 'Build against system version of FreeType')
+option('system-libraqm', type: 'boolean', value: false,
+       description: 'Build against system version of libraqm')
 option('system-qhull', type: 'boolean', value: false,
        description: 'Build against system version of Qhull')
 
diff --git a/src/ft2font.h b/src/ft2font.h
@@ -22,6 +22,8 @@ extern "C" {
 #include FT_TRUETYPE_TABLES_H
 }
 
+#include <raqm.h>
+
 /*
  By definition, FT_FIXED as 2 16bit values stored in a single long.
  */
diff --git a/src/ft2font_wrapper.cpp b/src/ft2font_wrapper.cpp
@@ -1824,5 +1824,6 @@ PYBIND11_MODULE(ft2font, m, py::mod_gil_not_used())
 
     m.attr("__freetype_version__") = version_string;
     m.attr("__freetype_build_type__") = FREETYPE_BUILD_TYPE;
+    m.attr("__libraqm_version__") = raqm_version_string();
     m.def("__getattr__", ft2font__getattr__);
 }
diff --git a/src/meson.build b/src/meson.build
@@ -53,7 +53,7 @@ extension_data = {
       'ft2font_wrapper.cpp',
     ),
     'dependencies': [
-      freetype_dep, pybind11_dep, agg_dep.partial_dependency(includes: true),
+      freetype_dep, libraqm_dep, pybind11_dep, agg_dep.partial_dependency(includes: true),
     ],
     'cpp_args': [
       '-DFREETYPE_BUILD_TYPE="@0@"'.format(
diff --git a/subprojects/fribidi.wrap b/subprojects/fribidi.wrap
@@ -0,0 +1,5 @@
+[wrap-file]
+directory = fribidi-1.0.10
+source_url = https://github.com/fribidi/fribidi/releases/download/v1.0.10/fribidi-1.0.10.tar.xz
+source_filename = fribidi-1.0.10.tar.xz
+source_hash = 7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01
diff --git a/subprojects/harfbuzz.wrap b/subprojects/harfbuzz.wrap
@@ -0,0 +1,5 @@
+[wrap-file]
+directory = harfbuzz-3.0.0
+source_url = https://github.com/harfbuzz/harfbuzz/releases/download/3.0.0/harfbuzz-3.0.0.tar.xz
+source_filename = harfbuzz-3.0.0.tar.xz
+source_hash = 036b0ee118451539783ec7864148bb4106be42a2eb964df4e83e6703ec46f3d9
diff --git a/subprojects/libraqm-0.10.2.wrap b/subprojects/libraqm-0.10.2.wrap
@@ -0,0 +1,10 @@
+[wrap-file]
+source_url = https://github.com/HOST-Oman/libraqm/archive/v0.10.2/libraqm-0.10.2.tar.gz
+source_filename = libraqm-0.10.2.tar.gz
+source_hash = db68fd9f034fc40ece103e511ffdf941d69f5e935c48ded8a31590468e42ba72
+
+# This patch allows using our bundled FreeType.
+diff_files = libraqm-0.7.2-older-freetype.patch
+
+[provide]
+libraqm-0.10.2 = libraqm_dep
diff --git a/subprojects/packagefiles/libraqm-0.7.2-older-freetype.patch b/subprojects/packagefiles/libraqm-0.7.2-older-freetype.patch
@@ -0,0 +1,25 @@
+--- a/meson.build	2025-03-26 03:32:12.444735795 -0400
++++ b/meson.build	2025-03-26 03:32:16.117435140 -0400
+@@ -45,8 +45,7 @@
+ if not freetype.found()
+     freetype = dependency(
+         'freetype2',
+         version: '>= @0@'.format(freetype_version[0]),
+-        method: 'pkg-config',
+         fallback: ['freetype2', 'freetype_dep'],
+         default_options: [
+             'png=disabled',
+--- a/src/meson.build	2025-03-26 03:59:08.651929905 -0400
++++ b/src/meson.build	2025-03-26 04:00:09.537615893 -0400
+@@ -42,6 +42,11 @@
+     install: true,
+ )
+ 
++libraqm_dep = declare_dependency(
++    include_directories: include_directories('.'),
++    link_with: libraqm,
++)
++
+ libraqm_test = static_library(
+     'raqm-test',
+     'raqm.c',

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@ extern "C" {`
`22`	`22`	`#include FT_TRUETYPE_TABLES_H`
`23`	`23`	`}`
`24`	`24`
	`25`	`+#include <raqm.h>`
	`26`	`+`
`25`	`27`	`/*`
`26`	`28`	`By definition, FT_FIXED as 2 16bit values stored in a single long.`
`27`	`29`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -1824,5 +1824,6 @@ PYBIND11_MODULE(ft2font, m, py::mod_gil_not_used())`
`1824`	`1824`
`1825`	`1825`	`m.attr("__freetype_version__") = version_string;`
`1826`	`1826`	`m.attr("__freetype_build_type__") = FREETYPE_BUILD_TYPE;`
	`1827`	`+ m.attr("__libraqm_version__") = raqm_version_string();`
`1827`	`1828`	`m.def("__getattr__", ft2font__getattr__);`
`1828`	`1829`	`}`