Don't build cairo with LZO

TechSmith · Aug 1, 2023 · 6ae22f1 · 6ae22f1
1 parent de8087c
commit 6ae22f1
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/ports/cairo/disable-lzo.patch b/ports/cairo/disable-lzo.patch
@@ -0,0 +1,22 @@
+diff --git a/meson.build b/meson.build
+index 12512d115..aec6b003a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -201,7 +201,16 @@ else
+   endif
+ endif
+
+-lzo_dep = dependency('lzo2', required: false)
++# TSC patch: Never look for lzo (GPL-licensed), but keep lzo_dep around so
++# downstream meson.build files will still work
++#
++# From the docs at https://mesonbuild.com/Reference-manual_functions.html#dependency
++#
++# If dependency_name is '', the dependency is always not found. 
++# So with required: false, this always returns a dependency object 
++# for which the found() method returns false, and which can be passed 
++# like any other dependency to the dependencies: keyword argument of a build_target.
++lzo_dep = dependency('', required: false)
+ if lzo_dep.found()
+   conf.set('HAVE_LZO', 1)
+ endif
diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake
@@ -13,6 +13,7 @@ vcpkg_from_gitlab(
         disable-atomic-ops-check.patch # See https://gitlab.freedesktop.org/cairo/cairo/-/issues/554
         mingw-dllexport.patch
         fix-static-missing-lib-msimg32.patch
+        disable-lzo.patch
         ${PATCHES}
 )
 

diff --git a/ports/cairo/vcpkg.json b/ports/cairo/vcpkg.json
@@ -10,7 +10,6 @@
     "dirent",
     "expat",
     "libpng",
-    "lzo",
     "pixman",
     "pthread",
     {