diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-21-armv7 b/.github/config/ubuntu-22.04/conan/profiles/android-21-armv7 index 137d4d9..a6261f0 100644 --- a/.github/config/ubuntu-22.04/conan/profiles/android-21-armv7 +++ b/.github/config/ubuntu-22.04/conan/profiles/android-21-armv7 @@ -33,3 +33,28 @@ CC={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bi CXX={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}}++ LD={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/ld STRIP={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip + +[options] +# gobject introspection not yet available for conan 2 +poppler/*:with_gobject_introspection=False + +# We are not using xorg functionality in cairo +cairo/*:with_xlib=False +cairo/*:with_xlib_xrender=False +cairo/*:with_xcb=False +cairo/*:with_symbol_lookup=False + +# Unused functionality in GLib +glib/*:with_elf=False +glib/*:with_mount=False +glib/*:with_selinux=False + +# @TODO: These dependencies are currently problematic +freetype/*:with_bzip2=False +freetype/*:with_brotli=False +poppler/*:with_tiff=False +fontforge/*:with_tiff=False + +[replace_requires] +libjpeg/9e: libjpeg/9f +libdeflate/1.19: libdeflate/1.20 diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-21-armv8 b/.github/config/ubuntu-22.04/conan/profiles/android-21-armv8 index 8d61005..590e8ba 100644 --- a/.github/config/ubuntu-22.04/conan/profiles/android-21-armv8 +++ b/.github/config/ubuntu-22.04/conan/profiles/android-21-armv8 @@ -33,3 +33,28 @@ CC={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bi CXX={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}}++ LD={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/ld STRIP={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip + +[options] +# gobject introspection not yet available for conan 2 +poppler/*:with_gobject_introspection=False + +# We are not using xorg functionality in cairo +cairo/*:with_xlib=False +cairo/*:with_xlib_xrender=False +cairo/*:with_xcb=False +cairo/*:with_symbol_lookup=False + +# Unused functionality in GLib +glib/*:with_elf=False +glib/*:with_mount=False +glib/*:with_selinux=False + +# @TODO: These dependencies are currently problematic +freetype/*:with_bzip2=False +freetype/*:with_brotli=False +poppler/*:with_tiff=False +fontforge/*:with_tiff=False + +[replace_requires] +libjpeg/9e: libjpeg/9f +libdeflate/1.19: libdeflate/1.20 diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-21-x86 b/.github/config/ubuntu-22.04/conan/profiles/android-21-x86 index ca567b4..f58b8e7 100644 --- a/.github/config/ubuntu-22.04/conan/profiles/android-21-x86 +++ b/.github/config/ubuntu-22.04/conan/profiles/android-21-x86 @@ -33,3 +33,28 @@ CC={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bi CXX={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}}++ LD={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/ld STRIP={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip + +[options] +# gobject introspection not yet available for conan 2 +poppler/*:with_gobject_introspection=False + +# We are not using xorg functionality in cairo +cairo/*:with_xlib=False +cairo/*:with_xlib_xrender=False +cairo/*:with_xcb=False +cairo/*:with_symbol_lookup=False + +# Unused functionality in GLib +glib/*:with_elf=False +glib/*:with_mount=False +glib/*:with_selinux=False + +# @TODO: These dependencies are currently problematic +freetype/*:with_bzip2=False +freetype/*:with_brotli=False +poppler/*:with_tiff=False +fontforge/*:with_tiff=False + +[replace_requires] +libjpeg/9e: libjpeg/9f +libdeflate/1.19: libdeflate/1.20 diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-21-x86_64 b/.github/config/ubuntu-22.04/conan/profiles/android-21-x86_64 index cf42ab4..f16a9a0 100644 --- a/.github/config/ubuntu-22.04/conan/profiles/android-21-x86_64 +++ b/.github/config/ubuntu-22.04/conan/profiles/android-21-x86_64 @@ -33,3 +33,28 @@ CC={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bi CXX={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}}++ LD={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/ld STRIP={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip + +[options] +# gobject introspection not yet available for conan 2 +poppler/*:with_gobject_introspection=False + +# We are not using xorg functionality in cairo +cairo/*:with_xlib=False +cairo/*:with_xlib_xrender=False +cairo/*:with_xcb=False +cairo/*:with_symbol_lookup=False + +# Unused functionality in GLib +glib/*:with_elf=False +glib/*:with_mount=False +glib/*:with_selinux=False + +# @TODO: These dependencies are currently problematic +freetype/*:with_bzip2=False +freetype/*:with_brotli=False +poppler/*:with_tiff=False +fontforge/*:with_tiff=False + +[replace_requires] +libjpeg/9e: libjpeg/9f +libdeflate/1.19: libdeflate/1.20 diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-23-armv7 b/.github/config/ubuntu-22.04/conan/profiles/android-23-armv7 index f2516e6..e281340 100644 --- a/.github/config/ubuntu-22.04/conan/profiles/android-23-armv7 +++ b/.github/config/ubuntu-22.04/conan/profiles/android-23-armv7 @@ -33,3 +33,28 @@ CC={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bi CXX={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}}++ LD={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/ld STRIP={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip + +[options] +# gobject introspection not yet available for conan 2 +poppler/*:with_gobject_introspection=False + +# We are not using xorg functionality in cairo +cairo/*:with_xlib=False +cairo/*:with_xlib_xrender=False +cairo/*:with_xcb=False +cairo/*:with_symbol_lookup=False + +# Unused functionality in GLib +glib/*:with_elf=False +glib/*:with_mount=False +glib/*:with_selinux=False + +# @TODO: These dependencies are currently problematic +freetype/*:with_bzip2=False +freetype/*:with_brotli=False +poppler/*:with_tiff=False +fontforge/*:with_tiff=False + +[replace_requires] +libjpeg/9e: libjpeg/9f +libdeflate/1.19: libdeflate/1.20 diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-23-armv8 b/.github/config/ubuntu-22.04/conan/profiles/android-23-armv8 index ac6edae..400b48e 100644 --- a/.github/config/ubuntu-22.04/conan/profiles/android-23-armv8 +++ b/.github/config/ubuntu-22.04/conan/profiles/android-23-armv8 @@ -33,3 +33,28 @@ CC={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bi CXX={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}}++ LD={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/ld STRIP={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip + +[options] +# gobject introspection not yet available for conan 2 +poppler/*:with_gobject_introspection=False + +# We are not using xorg functionality in cairo +cairo/*:with_xlib=False +cairo/*:with_xlib_xrender=False +cairo/*:with_xcb=False +cairo/*:with_symbol_lookup=False + +# Unused functionality in GLib +glib/*:with_elf=False +glib/*:with_mount=False +glib/*:with_selinux=False + +# @TODO: These dependencies are currently problematic +freetype/*:with_bzip2=False +freetype/*:with_brotli=False +poppler/*:with_tiff=False +fontforge/*:with_tiff=False + +[replace_requires] +libjpeg/9e: libjpeg/9f +libdeflate/1.19: libdeflate/1.20 diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-23-x86 b/.github/config/ubuntu-22.04/conan/profiles/android-23-x86 index b4c4f2f..1b0e643 100644 --- a/.github/config/ubuntu-22.04/conan/profiles/android-23-x86 +++ b/.github/config/ubuntu-22.04/conan/profiles/android-23-x86 @@ -33,3 +33,28 @@ CC={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bi CXX={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}}++ LD={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/ld STRIP={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip + +[options] +# gobject introspection not yet available for conan 2 +poppler/*:with_gobject_introspection=False + +# We are not using xorg functionality in cairo +cairo/*:with_xlib=False +cairo/*:with_xlib_xrender=False +cairo/*:with_xcb=False +cairo/*:with_symbol_lookup=False + +# Unused functionality in GLib +glib/*:with_elf=False +glib/*:with_mount=False +glib/*:with_selinux=False + +# @TODO: These dependencies are currently problematic +freetype/*:with_bzip2=False +freetype/*:with_brotli=False +poppler/*:with_tiff=False +fontforge/*:with_tiff=False + +[replace_requires] +libjpeg/9e: libjpeg/9f +libdeflate/1.19: libdeflate/1.20 diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-23-x86_64 b/.github/config/ubuntu-22.04/conan/profiles/android-23-x86_64 index 19d8260..db411bf 100644 --- a/.github/config/ubuntu-22.04/conan/profiles/android-23-x86_64 +++ b/.github/config/ubuntu-22.04/conan/profiles/android-23-x86_64 @@ -33,3 +33,28 @@ CC={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bi CXX={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}}++ LD={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/ld STRIP={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip + +[options] +# gobject introspection not yet available for conan 2 +poppler/*:with_gobject_introspection=False + +# We are not using xorg functionality in cairo +cairo/*:with_xlib=False +cairo/*:with_xlib_xrender=False +cairo/*:with_xcb=False +cairo/*:with_symbol_lookup=False + +# Unused functionality in GLib +glib/*:with_elf=False +glib/*:with_mount=False +glib/*:with_selinux=False + +# @TODO: These dependencies are currently problematic +freetype/*:with_bzip2=False +freetype/*:with_brotli=False +poppler/*:with_tiff=False +fontforge/*:with_tiff=False + +[replace_requires] +libjpeg/9e: libjpeg/9f +libdeflate/1.19: libdeflate/1.20 diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-armv7 b/.github/config/ubuntu-22.04/conan/profiles/android-armv7 deleted file mode 100644 index e281340..0000000 --- a/.github/config/ubuntu-22.04/conan/profiles/android-armv7 +++ /dev/null @@ -1,60 +0,0 @@ -{% set android_home = os.getenv("ANDROID_HOME") %} -{% set ndk_version = "26.3.11579264" %} -{% set api_level = "23" %} -{% set arch = "armv7" %} - -[settings] -os=Android -os.api_level={{api_level}} -arch={{arch}} -build_type=RelWithDebInfo -compiler=clang -compiler.version=17 -compiler.cppstd=20 -compiler.libcxx=c++_static - -[conf] -tools.android:ndk_path={{android_home}}/ndk/{{ndk_version}} - -[buildenv] -# Cross compile toolchain evn vars are required to build -# libffi, libgettext, libiconv, libxml2 and other autotools packages for Android -# https://github.com/conan-io/conan/issues/16493 -AR={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar -AS={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-as -RANLIB={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib -{% set cc = { - "armv7": "armv7a-linux-androideabi" + api_level + "-clang", - "armv8": "aarch64-linux-android" + api_level + "-clang", - "x86": "i686-linux-android" + api_level + "-clang", - "x86_64": "x86_64-linux-android" + api_level + "-clang", -}[arch] %} -CC={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}} -CXX={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}}++ -LD={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/ld -STRIP={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip - -[options] -# gobject introspection not yet available for conan 2 -poppler/*:with_gobject_introspection=False - -# We are not using xorg functionality in cairo -cairo/*:with_xlib=False -cairo/*:with_xlib_xrender=False -cairo/*:with_xcb=False -cairo/*:with_symbol_lookup=False - -# Unused functionality in GLib -glib/*:with_elf=False -glib/*:with_mount=False -glib/*:with_selinux=False - -# @TODO: These dependencies are currently problematic -freetype/*:with_bzip2=False -freetype/*:with_brotli=False -poppler/*:with_tiff=False -fontforge/*:with_tiff=False - -[replace_requires] -libjpeg/9e: libjpeg/9f -libdeflate/1.19: libdeflate/1.20 diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-armv8 b/.github/config/ubuntu-22.04/conan/profiles/android-armv8 deleted file mode 100644 index 400b48e..0000000 --- a/.github/config/ubuntu-22.04/conan/profiles/android-armv8 +++ /dev/null @@ -1,60 +0,0 @@ -{% set android_home = os.getenv("ANDROID_HOME") %} -{% set ndk_version = "26.3.11579264" %} -{% set api_level = "23" %} -{% set arch = "armv8" %} - -[settings] -os=Android -os.api_level={{api_level}} -arch={{arch}} -build_type=RelWithDebInfo -compiler=clang -compiler.version=17 -compiler.cppstd=20 -compiler.libcxx=c++_static - -[conf] -tools.android:ndk_path={{android_home}}/ndk/{{ndk_version}} - -[buildenv] -# Cross compile toolchain evn vars are required to build -# libffi, libgettext, libiconv, libxml2 and other autotools packages for Android -# https://github.com/conan-io/conan/issues/16493 -AR={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar -AS={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-as -RANLIB={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib -{% set cc = { - "armv7": "armv7a-linux-androideabi" + api_level + "-clang", - "armv8": "aarch64-linux-android" + api_level + "-clang", - "x86": "i686-linux-android" + api_level + "-clang", - "x86_64": "x86_64-linux-android" + api_level + "-clang", -}[arch] %} -CC={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}} -CXX={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}}++ -LD={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/ld -STRIP={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip - -[options] -# gobject introspection not yet available for conan 2 -poppler/*:with_gobject_introspection=False - -# We are not using xorg functionality in cairo -cairo/*:with_xlib=False -cairo/*:with_xlib_xrender=False -cairo/*:with_xcb=False -cairo/*:with_symbol_lookup=False - -# Unused functionality in GLib -glib/*:with_elf=False -glib/*:with_mount=False -glib/*:with_selinux=False - -# @TODO: These dependencies are currently problematic -freetype/*:with_bzip2=False -freetype/*:with_brotli=False -poppler/*:with_tiff=False -fontforge/*:with_tiff=False - -[replace_requires] -libjpeg/9e: libjpeg/9f -libdeflate/1.19: libdeflate/1.20 diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-x86 b/.github/config/ubuntu-22.04/conan/profiles/android-x86 deleted file mode 100644 index 1b0e643..0000000 --- a/.github/config/ubuntu-22.04/conan/profiles/android-x86 +++ /dev/null @@ -1,60 +0,0 @@ -{% set android_home = os.getenv("ANDROID_HOME") %} -{% set ndk_version = "26.3.11579264" %} -{% set api_level = "23" %} -{% set arch = "x86" %} - -[settings] -os=Android -os.api_level={{api_level}} -arch={{arch}} -build_type=RelWithDebInfo -compiler=clang -compiler.version=17 -compiler.cppstd=20 -compiler.libcxx=c++_static - -[conf] -tools.android:ndk_path={{android_home}}/ndk/{{ndk_version}} - -[buildenv] -# Cross compile toolchain evn vars are required to build -# libffi, libgettext, libiconv, libxml2 and other autotools packages for Android -# https://github.com/conan-io/conan/issues/16493 -AR={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar -AS={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-as -RANLIB={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib -{% set cc = { - "armv7": "armv7a-linux-androideabi" + api_level + "-clang", - "armv8": "aarch64-linux-android" + api_level + "-clang", - "x86": "i686-linux-android" + api_level + "-clang", - "x86_64": "x86_64-linux-android" + api_level + "-clang", -}[arch] %} -CC={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}} -CXX={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}}++ -LD={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/ld -STRIP={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip - -[options] -# gobject introspection not yet available for conan 2 -poppler/*:with_gobject_introspection=False - -# We are not using xorg functionality in cairo -cairo/*:with_xlib=False -cairo/*:with_xlib_xrender=False -cairo/*:with_xcb=False -cairo/*:with_symbol_lookup=False - -# Unused functionality in GLib -glib/*:with_elf=False -glib/*:with_mount=False -glib/*:with_selinux=False - -# @TODO: These dependencies are currently problematic -freetype/*:with_bzip2=False -freetype/*:with_brotli=False -poppler/*:with_tiff=False -fontforge/*:with_tiff=False - -[replace_requires] -libjpeg/9e: libjpeg/9f -libdeflate/1.19: libdeflate/1.20 diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-x86_64 b/.github/config/ubuntu-22.04/conan/profiles/android-x86_64 deleted file mode 100644 index db411bf..0000000 --- a/.github/config/ubuntu-22.04/conan/profiles/android-x86_64 +++ /dev/null @@ -1,60 +0,0 @@ -{% set android_home = os.getenv("ANDROID_HOME") %} -{% set ndk_version = "26.3.11579264" %} -{% set api_level = "23" %} -{% set arch = "x86_64" %} - -[settings] -os=Android -os.api_level={{api_level}} -arch={{arch}} -build_type=RelWithDebInfo -compiler=clang -compiler.version=17 -compiler.cppstd=20 -compiler.libcxx=c++_static - -[conf] -tools.android:ndk_path={{android_home}}/ndk/{{ndk_version}} - -[buildenv] -# Cross compile toolchain evn vars are required to build -# libffi, libgettext, libiconv, libxml2 and other autotools packages for Android -# https://github.com/conan-io/conan/issues/16493 -AR={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar -AS={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-as -RANLIB={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib -{% set cc = { - "armv7": "armv7a-linux-androideabi" + api_level + "-clang", - "armv8": "aarch64-linux-android" + api_level + "-clang", - "x86": "i686-linux-android" + api_level + "-clang", - "x86_64": "x86_64-linux-android" + api_level + "-clang", -}[arch] %} -CC={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}} -CXX={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}}++ -LD={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/ld -STRIP={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip - -[options] -# gobject introspection not yet available for conan 2 -poppler/*:with_gobject_introspection=False - -# We are not using xorg functionality in cairo -cairo/*:with_xlib=False -cairo/*:with_xlib_xrender=False -cairo/*:with_xcb=False -cairo/*:with_symbol_lookup=False - -# Unused functionality in GLib -glib/*:with_elf=False -glib/*:with_mount=False -glib/*:with_selinux=False - -# @TODO: These dependencies are currently problematic -freetype/*:with_bzip2=False -freetype/*:with_brotli=False -poppler/*:with_tiff=False -fontforge/*:with_tiff=False - -[replace_requires] -libjpeg/9e: libjpeg/9f -libdeflate/1.19: libdeflate/1.20 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 560d5ea..0d849db 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,10 +56,8 @@ jobs: exclude: - package: { "package_reference": "odrcore/1.0.0", "package": "odrcore", "version": "1.0.0", "conanfile": "recipes/odrcore/all/conanfile.py" } config: { build_machine: ubuntu-22.04, host_profile: android-23-armv8, ndk_version: 26.3.11579264 } - - package: { "package_reference": "odrcore/1.0.0", "package": "odrcore", "version": "1.0.0", "conanfile": "recipes/odrcore/all/conanfile.py" } - config: { build_machine: ubuntu-22.04, host_profile: android-armv8, ndk_version: 26.3.11579264 } - package: { "package_reference": "openlibm/0.8.2", "package": "openlibm", "version": "0.8.2", "conanfile": "recipes/openlibm/all/conanfile.py" } - config: { build_machine: ubuntu-22.04, host_profile: android-x86, ndk_version: 26.3.11579264 } + config: { build_machine: ubuntu-22.04, host_profile: android-23-x86, ndk_version: 26.3.11579264 } steps: - name: checkout uses: actions/checkout@v4