diff --git a/contrib/devtools/symbol-check.py b/contrib/devtools/symbol-check.py index 30197ab53c..b441a51d3c 100755 --- a/contrib/devtools/symbol-check.py +++ b/contrib/devtools/symbol-check.py @@ -138,6 +138,7 @@ 'Metal', # 3D graphics 'Security', # access control and authentication 'QuartzCore', # animation +'OpenGL', } PE_ALLOWED_LIBRARIES = { @@ -163,6 +164,7 @@ 'WTSAPI32.dll', 'd3d11.dll', 'dxgi.dll', +'OPENGL32.dll', } def check_version(max_versions, version, arch) -> bool: diff --git a/depends/packages/libglvnd.mk b/depends/packages/libglvnd.mk new file mode 100644 index 0000000000..5a17274e29 --- /dev/null +++ b/depends/packages/libglvnd.mk @@ -0,0 +1,28 @@ +package := libglvnd +$(package)_version := 1.4.0 +$(package)_download_path := https://gitlab.freedesktop.org/glvnd/$(package)/-/archive/v$($(package)_version) +$(package)_file_name := $(package)-v$($(package)_version).tar.bz2 +$(package)_sha256_hash := fdf395391d95f270528dbff6ce2ee54c186753d286ad62e0da5f62c6f67ba915 + +define $(package)_set_vars + $(package)_config_opts := --enable-option-checking --disable-dependency-tracking + $(package)_config_opts += --enable-shared --disable-static + $(package)_config_opts += --disable-x11 --disable-gles1 +endef + +define $(package)_config_cmds + ./autogen.sh && \ + $($(package)_autoconf) +endef + +define $(package)_build_cmds + $(MAKE) +endef + +define $(package)_stage_cmds + $(MAKE) DESTDIR=$($(package)_staging_dir) install +endef + +define $(package)_postprocess_cmds + rm lib/*.la +endef diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk index 998cc0221c..31a1fe0b59 100644 --- a/depends/packages/packages.mk +++ b/depends/packages/packages.mk @@ -5,7 +5,7 @@ qrencode_android_packages = qrencode qrencode_darwin_packages = qrencode qrencode_mingw32_packages = qrencode -qt_linux_packages:=qt expat libxcb xcb_proto libXau xproto freetype fontconfig libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm +qt_linux_packages:=qt expat libxcb xcb_proto libXau xproto freetype fontconfig libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm libglvnd qt_android_packages=qt qt_darwin_packages=qt qt_mingw32_packages=qt diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 5fcf3a463f..9e9b235f6f 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -4,7 +4,7 @@ $(package)_download_path=https://download.qt.io/official_releases/qt/5.15/$($(pa $(package)_suffix=everywhere-opensource-src-$($(package)_version).tar.xz $(package)_file_name=qtbase-$($(package)_suffix) $(package)_sha256_hash=26394ec9375d52c1592bd7b689b1619c6b8dbe9b6f91fdd5c355589787f3a0b6 -$(package)_linux_dependencies=freetype fontconfig libxcb libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm +$(package)_linux_dependencies=freetype fontconfig libxcb libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm libglvnd $(package)_qt_libs=corelib network widgets gui plugins testlib $(package)_linguist_tools = lrelease lupdate lconvert $(package)_patches = qt.pro @@ -154,7 +154,6 @@ $(package)_config_opts += -no-feature-qml-worker-script $(package)_config_opts += -no-feature-qml-xml-http-request $(package)_config_opts_darwin = -no-dbus -$(package)_config_opts_darwin += -no-opengl $(package)_config_opts_darwin += -pch $(package)_config_opts_darwin += -no-feature-corewlan $(package)_config_opts_darwin += -no-freetype @@ -179,7 +178,6 @@ $(package)_config_opts_linux += -no-xcb-xlib $(package)_config_opts_linux += -no-feature-xlib $(package)_config_opts_linux += -system-freetype $(package)_config_opts_linux += -fontconfig -$(package)_config_opts_linux += -no-opengl $(package)_config_opts_linux += -no-feature-vulkan $(package)_config_opts_linux += -dbus-runtime $(package)_config_opts_arm_linux += -platform linux-g++ -xplatform bitcoin-linux-g++ @@ -195,7 +193,7 @@ $(package)_config_opts_powerpc64le_linux = -platform linux-g++ -xplatform bitcoi $(package)_config_opts_riscv64_linux = -platform linux-g++ -xplatform bitcoin-linux-g++ $(package)_config_opts_s390x_linux = -platform linux-g++ -xplatform bitcoin-linux-g++ -$(package)_config_opts_mingw32 = -no-opengl +$(package)_config_opts_mingw32 = -opengl desktop $(package)_config_opts_mingw32 += -no-d3d12 $(package)_config_opts_mingw32 += -no-dbus $(package)_config_opts_mingw32 += -no-freetype