qt6: split port into modules

Fixes #5402
This commit is contained in:
Christian Prochaska 2024-12-09 08:36:53 +01:00 committed by Christian Helmuth
parent d3002b26ac
commit dd64164ed6
39 changed files with 174 additions and 68 deletions

View File

@ -13,13 +13,11 @@ $(error Error: unsupported platform)
endif
ifeq ($(CONTRIB_DIR),)
QT_DIR = $(call select_from_repositories,src/lib/qt6)
QT_API_DIR = $(call select_from_repositories,mkspecs)/..
QT_API_DIR = $(abspath $(call select_from_repositories,lib/import/import-qt6.inc)/../../..)
abi_symbol_path = $(wildcard $(call select_from_repositories,lib/symbols/$1))
else
QT_PORT_DIR := $(call select_from_ports,qt6)
QT_DIR = $(QT_PORT_DIR)/src/lib/qt6
QT_API_DIR = $(QT_DIR)/genode/api
QT_API_PORT_DIR := $(call select_from_ports,qt6_api)
QT_API_DIR = $(QT_API_PORT_DIR)/src/lib/qt6_api
abi_symbol_path = $(wildcard $(addprefix $(QT_API_DIR)/lib/symbols/,$1))
endif

View File

@ -1 +0,0 @@
80566257f49fe4c8a44fd699b544e0b4e38fe38a

View File

@ -1,8 +0,0 @@
LICENSE := GPL
VERSION := 6.6.2
DOWNLOADS := qt6.git
URL(qt6) := https://github.com/cproc/qt6.git
REV(qt6) := issue5372
DIR(qt6) := src/lib/qt6

View File

@ -0,0 +1 @@
f1114bb5e6cdf5a3dcb071e067d8ef16b05b3e28

View File

@ -0,0 +1,8 @@
LICENSE := LGPL
VERSION := 6.6.2
DOWNLOADS := qt6_api.git
URL(qt6_api) := https://github.com/cproc/qt6_api.git
REV(qt6_api) := issue5402
DIR(qt6_api) := src/lib/qt6_api

View File

@ -0,0 +1 @@
c646a46cfe1589a347d520bbbabbbd09d02d2fc2

View File

@ -0,0 +1,8 @@
LICENSE := LGPL
VERSION := 6.6.2
DOWNLOADS := qt6_base.git
URL(qt6_base) := https://github.com/cproc/qt6_base.git
REV(qt6_base) := issue5402
DIR(qt6_base) := src/lib/qt6_base

View File

@ -0,0 +1 @@
2bcee8ddd2456a084c91e32d01387fa7392d3997

View File

@ -0,0 +1,8 @@
LICENSE := LGPL
VERSION := 6.6.2
DOWNLOADS := qt6_declarative.git
URL(qt6_declarative) := https://github.com/cproc/qt6_declarative.git
REV(qt6_declarative) := issue5402
DIR(qt6_declarative) := src/lib/qt6_declarative

View File

@ -0,0 +1 @@
ec9f67054cfafae32e1e811a738f9a0ae2f333d1

View File

@ -0,0 +1,8 @@
LICENSE := LGPL
VERSION := 6.6.2
DOWNLOADS := qt6_shadertools.archive
URL(qt6_shadertools) := https://download.qt.io/archive/qt/6.6/6.6.2/submodules/qtshadertools-everywhere-src-6.6.2.tar.xz
SHA(qt6_shadertools) := 628bead7ff4e7f42cb910f47d2adefbdea0d8c71a0234baef8ca709bf467b92f
DIR(qt6_shadertools) := src/lib/qt6_shadertools

View File

@ -0,0 +1 @@
30ec422bd2a6d26bd70a4e9d609a53e0cd45392d

View File

@ -0,0 +1,8 @@
LICENSE := LGPL
VERSION := 6.6.2
DOWNLOADS := qt6_svg.archive
URL(qt6_svg) := https://download.qt.io/archive/qt/6.6/6.6.2/submodules/qtsvg-everywhere-src-6.6.2.tar.xz
SHA(qt6_svg) := 5a231d59ef1b42bfbaa5174d4ff39f8e1b4ba070ef984a70b069b4b2576d8181
DIR(qt6_svg) := src/lib/qt6_svg

View File

@ -0,0 +1 @@
178b2eaa49d51ac12313e755a2cb51957256cbfb

View File

@ -0,0 +1,8 @@
LICENSE := LGPL
VERSION := 6.6.2
DOWNLOADS := qt6_tools.archive
URL(qt6_tools) := https://download.qt.io/archive/qt/6.6/6.6.2/submodules/qttools-everywhere-src-6.6.2.tar.xz
SHA(qt6_tools) := e6d49e9f52111287f77878ecb8b708cce682f10b03ba2476d9247603bc6c4746
DIR(qt6_tools) := src/lib/qt6_tools

View File

@ -9,8 +9,8 @@ content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
API_DIR := $(PORT_DIR)/src/lib/qt6/genode/api
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_api)
API_DIR := $(PORT_DIR)/src/lib/qt6_api
MIRROR_FROM_PORT_DIR := include \
metatypes \
@ -45,4 +45,4 @@ $(MIRROR_SYMBOLS):
content: LICENSE
LICENSE:
cp $(PORT_DIR)/src/lib/qt6/LICENSE.LGPL3 $@
cp $(PORT_DIR)/src/lib/qt6_api/LICENSE.LGPL3 $@

View File

@ -1,4 +1,4 @@
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_api)
MIRROR_LIB_SYMBOLS := libQt6LabsAnimation \
libQt6LabsFolderListModel \
@ -31,9 +31,9 @@ content: $(MIRROR_LIB_SYMBOLS)
$(MIRROR_LIB_SYMBOLS):
mkdir -p lib/symbols
cp $(PORT_DIR)/src/lib/qt6/genode/api/lib/symbols/$@ lib/symbols/
cp $(PORT_DIR)/src/lib/qt6_api/lib/symbols/$@ lib/symbols/
content: LICENSE
LICENSE:
cp $(PORT_DIR)/src/lib/qt6/LICENSE.LGPL3 $@
cp $(PORT_DIR)/src/lib/qt6_api/LICENSE.LGPL3 $@

View File

@ -1,4 +1,4 @@
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_api)
MIRROR_LIB_SYMBOLS := libQt6ShaderTools
@ -6,9 +6,9 @@ content: $(MIRROR_LIB_SYMBOLS)
$(MIRROR_LIB_SYMBOLS):
mkdir -p lib/symbols
cp $(PORT_DIR)/src/lib/qt6/genode/api/lib/symbols/$@ lib/symbols/
cp $(PORT_DIR)/src/lib/qt6_api/lib/symbols/$@ lib/symbols/
content: LICENSE
LICENSE:
cp $(PORT_DIR)/src/lib/qt6/LICENSE.LGPL3 $@
cp $(PORT_DIR)/src/lib/qt6_api/LICENSE.LGPL3 $@

View File

@ -1,4 +1,4 @@
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_api)
MIRROR_LIB_SYMBOLS := libQt6Svg
@ -6,9 +6,9 @@ content: $(MIRROR_LIB_SYMBOLS)
$(MIRROR_LIB_SYMBOLS):
mkdir -p lib/symbols
cp $(PORT_DIR)/src/lib/qt6/genode/api/lib/symbols/$@ lib/symbols/
cp $(PORT_DIR)/src/lib/qt6_api/lib/symbols/$@ lib/symbols/
content: LICENSE
LICENSE:
cp $(PORT_DIR)/src/lib/qt6/LICENSE.LGPL3 $@
cp $(PORT_DIR)/src/lib/qt6_api/LICENSE.LGPL3 $@

View File

@ -1,14 +1,14 @@
content: qt6_dejavusans.tar LICENSE
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_base)
qt/lib/fonts/DejaVuSans.ttf:
mkdir -p $(dir $@)
cp $(PORT_DIR)/src/lib/qt6/qtbase/src/3rdparty/wasm/$(notdir $@) $@
cp $(PORT_DIR)/src/lib/qt6_base/src/3rdparty/wasm/$(notdir $@) $@
qt6_dejavusans.tar: qt/lib/fonts/DejaVuSans.ttf
tar --owner=0 --group=0 --numeric-owner --mode='go=' --mtime='1970-01-01 00:00+00' -cf $@ qt
rm -rf qt
LICENSE:
cp $(PORT_DIR)/src/lib/qt6/qtbase/src/3rdparty/wasm/DEJAVU-LICENSE $@
cp $(PORT_DIR)/src/lib/qt6_base/src/3rdparty/wasm/DEJAVU-LICENSE $@

View File

@ -1,6 +1,6 @@
content: qt6_samegame.tar
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_declarative)
SAMEGAME3_RESOURCES := samegame.qml \
Dialog.qml \
@ -20,10 +20,10 @@ samegame/pics:
mkdir -p $@
$(addprefix samegame/, $(SAMEGAME3_RESOURCES)): samegame
cp $(PORT_DIR)/src/lib/qt6/qtdeclarative/examples/quick/tutorials/samegame/samegame3/$(notdir $@) $@
cp $(PORT_DIR)/src/lib/qt6_declarative/examples/quick/tutorials/samegame/samegame3/$(notdir $@) $@
$(addprefix samegame/pics/, $(SAMEGAME_RESOURCES)): samegame/pics
cp $(PORT_DIR)/src/lib/qt6/qtdeclarative/examples/quick/tutorials/samegame/samegame3/pics/$(notdir $@) $@
cp $(PORT_DIR)/src/lib/qt6_declarative/examples/quick/tutorials/samegame/samegame3/pics/$(notdir $@) $@
qt6_samegame.tar: $(addprefix samegame/, $(SAMEGAME3_RESOURCES)) \

View File

@ -5,9 +5,9 @@ content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_base)
MIRROR_FROM_PORT_DIR := src/lib/qt6/qtbase
MIRROR_FROM_PORT_DIR := src/lib/qt6_base
content: $(MIRROR_FROM_PORT_DIR)
@ -26,4 +26,4 @@ $(MIRROR_FROM_OS):
content: LICENSE
LICENSE:
cp $(PORT_DIR)/src/lib/qt6/LICENSE.LGPL3 $@
cp $(PORT_DIR)/src/lib/qt6_base/LICENSES/LGPL-3.0-only.txt $@

View File

@ -5,9 +5,9 @@ content: $(MIRROR_FROM_REP_DIR) LICENSE
$(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_tools)
MIRROR_FROM_PORT_DIR := src/lib/qt6/qttools/examples/designer/calculatorform
MIRROR_FROM_PORT_DIR := src/lib/qt6_tools/examples/designer/calculatorform
content: $(MIRROR_FROM_PORT_DIR)
@ -16,5 +16,5 @@ $(MIRROR_FROM_PORT_DIR):
cp -r $(PORT_DIR)/$@ $(dir $@)
LICENSE:
cp $(PORT_DIR)/src/lib/qt6/LICENSE.GPL3 $@
cp $(PORT_DIR)/src/lib/qt6_tools/LICENSES/GPL-3.0-only.txt $@

View File

@ -5,9 +5,9 @@ content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_declarative)
MIRROR_FROM_PORT_DIR := src/lib/qt6/qtdeclarative
MIRROR_FROM_PORT_DIR := src/lib/qt6_declarative
content: $(MIRROR_FROM_PORT_DIR)
@ -18,4 +18,4 @@ $(MIRROR_FROM_PORT_DIR):
content: LICENSE
LICENSE:
cp $(PORT_DIR)/src/lib/qt6/LICENSE.LGPL3 $@
cp $(PORT_DIR)/src/lib/qt6_declarative/LICENSES/LGPL-3.0-only.txt $@

View File

@ -5,9 +5,9 @@ content: $(MIRROR_FROM_REP_DIR) LICENSE
$(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_base)
MIRROR_FROM_PORT_DIR := src/lib/qt6/qtbase/examples/opengl/openglwindow
MIRROR_FROM_PORT_DIR := src/lib/qt6_base/examples/opengl/openglwindow
content: $(MIRROR_FROM_PORT_DIR)
@ -16,5 +16,5 @@ $(MIRROR_FROM_PORT_DIR):
cp -r $(PORT_DIR)/$@ $(dir $@)
LICENSE:
cp $(PORT_DIR)/src/lib/qt6/LICENSE.GPL3 $@
cp $(PORT_DIR)/src/lib/qt6_base/LICENSES/GPL-3.0-only.txt $@

View File

@ -5,9 +5,9 @@ content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_shadertools)
MIRROR_FROM_PORT_DIR := src/lib/qt6/qtshadertools
MIRROR_FROM_PORT_DIR := src/lib/qt6_shadertools
content: $(MIRROR_FROM_PORT_DIR)
@ -18,4 +18,4 @@ $(MIRROR_FROM_PORT_DIR):
content: LICENSE
LICENSE:
cp $(PORT_DIR)/src/lib/qt6/LICENSE.LGPL3 $@
cp $(PORT_DIR)/src/lib/qt6_shadertools/LICENSES/LGPL-3.0-only.txt $@

View File

@ -5,9 +5,9 @@ content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_svg)
MIRROR_FROM_PORT_DIR := src/lib/qt6/qtsvg
MIRROR_FROM_PORT_DIR := src/lib/qt6_svg
content: $(MIRROR_FROM_PORT_DIR)
@ -18,4 +18,4 @@ $(MIRROR_FROM_PORT_DIR):
content: LICENSE
LICENSE:
cp $(PORT_DIR)/src/lib/qt6/LICENSE.LGPL3 $@
cp $(PORT_DIR)/src/lib/qt6_svg/LICENSES/LGPL-3.0-only.txt $@

View File

@ -5,9 +5,9 @@ content: $(MIRROR_FROM_REP_DIR) LICENSE
$(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_base)
MIRROR_FROM_PORT_DIR := src/lib/qt6/qtbase/examples/qtestlib/tutorial1
MIRROR_FROM_PORT_DIR := src/lib/qt6_base/examples/qtestlib/tutorial1
content: $(MIRROR_FROM_PORT_DIR)
@ -16,5 +16,5 @@ $(MIRROR_FROM_PORT_DIR):
cp -r $(PORT_DIR)/$@ $(dir $@)
LICENSE:
cp $(PORT_DIR)/src/lib/qt6/LICENSE.GPL3 $@
cp $(PORT_DIR)/src/lib/qt6_base/LICENSES/GPL-3.0-only.txt $@

View File

@ -5,9 +5,9 @@ content: $(MIRROR_FROM_REP_DIR) LICENSE
$(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_base)
MIRROR_FROM_PORT_DIR := src/lib/qt6/qtbase/tests/manual/examples/widgets/widgets/tetrix
MIRROR_FROM_PORT_DIR := src/lib/qt6_base/tests/manual/examples/widgets/widgets/tetrix
content: $(MIRROR_FROM_PORT_DIR)
@ -16,4 +16,4 @@ $(MIRROR_FROM_PORT_DIR):
cp -r $(PORT_DIR)/$@ $(dir $@)
LICENSE:
cp $(PORT_DIR)/src/lib/qt6/LICENSE.GPL3 $@
cp $(PORT_DIR)/src/lib/qt6_base/LICENSES/GPL-3.0-only.txt $@

View File

@ -5,9 +5,9 @@ content: $(MIRROR_FROM_REP_DIR) LICENSE
$(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_base)
MIRROR_FROM_PORT_DIR := src/lib/qt6/qtbase/tests/manual/examples/widgets/richtext/textedit
MIRROR_FROM_PORT_DIR := src/lib/qt6_base/tests/manual/examples/widgets/richtext/textedit
content: $(MIRROR_FROM_PORT_DIR)
@ -16,5 +16,5 @@ $(MIRROR_FROM_PORT_DIR):
cp -r $(PORT_DIR)/$@ $(dir $@)
LICENSE:
cp $(PORT_DIR)/src/lib/qt6/LICENSE.GPL3 $@
cp $(PORT_DIR)/src/lib/qt6_base/LICENSES/GPL-3.0-only.txt $@

View File

@ -1,4 +1,11 @@
QMAKE_PROJECT_FILE = $(QT_DIR)/qttools/examples/designer/calculatorform/calculatorform.pro
ifeq ($(CONTRIB_DIR),)
QT6_TOOLS_DIR = $(call select_from_repositories,src/lib/qt6_tools)
else
QT6_TOOLS_PORT_DIR := $(call select_from_ports,qt6_tools)
QT6_TOOLS_DIR = $(QT6_TOOLS_PORT_DIR)/src/lib/qt6_tools
endif
QMAKE_PROJECT_FILE = $(QT6_TOOLS_DIR)/examples/designer/calculatorform/calculatorform.pro
QMAKE_TARGET_BINARIES = calculatorform

View File

@ -1,4 +1,11 @@
QMAKE_PROJECT_FILE = $(QT_DIR)/qtbase/examples/opengl/openglwindow/openglwindow.pro
ifeq ($(CONTRIB_DIR),)
QT6_BASE_DIR = $(call select_from_repositories,src/lib/qt6_base)
else
QT6_BASE_PORT_DIR := $(call select_from_ports,qt6_base)
QT6_BASE_DIR = $(QT6_BASE_PORT_DIR)/src/lib/qt6_base
endif
QMAKE_PROJECT_FILE = $(QT6_BASE_DIR)/examples/opengl/openglwindow/openglwindow.pro
QMAKE_TARGET_BINARIES = openglwindow

View File

@ -1,4 +1,11 @@
QMAKE_PROJECT_FILE = $(QT_DIR)/qtbase/examples/qtestlib/tutorial1
ifeq ($(CONTRIB_DIR),)
QT6_BASE_DIR = $(call select_from_repositories,src/lib/qt6_base)
else
QT6_BASE_PORT_DIR := $(call select_from_ports,qt6_base)
QT6_BASE_DIR = $(QT6_BASE_PORT_DIR)/src/lib/qt6_base
endif
QMAKE_PROJECT_FILE = $(QT6_BASE_DIR)/examples/qtestlib/tutorial1
QMAKE_TARGET_BINARIES = tutorial1

View File

@ -1,4 +1,11 @@
QMAKE_PROJECT_FILE = $(QT_DIR)/qtbase/tests/manual/examples/widgets/widgets/tetrix/tetrix.pro
ifeq ($(CONTRIB_DIR),)
QT6_BASE_DIR = $(call select_from_repositories,src/lib/qt6_base)
else
QT6_BASE_PORT_DIR := $(call select_from_ports,qt6_base)
QT6_BASE_DIR = $(QT6_BASE_PORT_DIR)/src/lib/qt6_base
endif
QMAKE_PROJECT_FILE = $(QT6_BASE_DIR)/tests/manual/examples/widgets/widgets/tetrix/tetrix.pro
QMAKE_TARGET_BINARIES = tetrix

View File

@ -1,4 +1,11 @@
QMAKE_PROJECT_FILE = $(QT_DIR)/qtbase/tests/manual/examples/widgets/richtext/textedit/textedit.pro
ifeq ($(CONTRIB_DIR),)
QT6_BASE_DIR = $(call select_from_repositories,src/lib/qt6_base)
else
QT6_BASE_PORT_DIR := $(call select_from_ports,qt6_base)
QT6_BASE_DIR = $(QT6_BASE_PORT_DIR)/src/lib/qt6_base
endif
QMAKE_PROJECT_FILE = $(QT6_BASE_DIR)/tests/manual/examples/widgets/richtext/textedit/textedit.pro
QMAKE_TARGET_BINARIES = textedit

View File

@ -1,5 +1,12 @@
TARGET = qt6_base.cmake_target
ifeq ($(CONTRIB_DIR),)
QT6_BASE_DIR = $(call select_from_repositories,src/lib/qt6_base)
else
QT6_BASE_PORT_DIR := $(call select_from_ports,qt6_base)
QT6_BASE_DIR = $(QT6_BASE_PORT_DIR)/src/lib/qt6_base
endif
LIBS = qt6_cmake ldso_so_support libc libm stdcxx qt6_component egl mesa base qoost
INSTALL_LIBS = lib/libQt6Concurrent.lib.so \
@ -68,7 +75,7 @@ build: cmake_prepared.tag
-DFEATURE_vulkan=OFF \
-DFEATURE_reduce_relocations=OFF \
-DFEATURE_pkg_config=OFF \
$(QT_DIR)/qtbase \
$(QT6_BASE_DIR) \
$(QT6_OUTPUT_FILTER)
@#

View File

@ -1,5 +1,12 @@
TARGET = qt6_declarative.cmake_target
ifeq ($(CONTRIB_DIR),)
QT6_DECLARATIVE_DIR = $(call select_from_repositories,src/lib/qt6_declarative)
else
QT6_DECLARATIVE_PORT_DIR := $(call select_from_ports,qt6_declarative)
QT6_DECLARATIVE_DIR = $(QT6_DECLARATIVE_PORT_DIR)/src/lib/qt6_declarative
endif
QT6_PORT_LIBS = libQt6Core libQt6Gui libQt6OpenGL libQt6Network libQt6Sql libQt6Test libQt6Widgets
LIBS = qt6_cmake ldso_so_support libc libm mesa egl qt6_component stdcxx
@ -92,7 +99,7 @@ build: cmake_prepared.tag qt6_so_files
-DCMAKE_MODULE_LINKER_FLAGS="$(GENODE_CMAKE_LFLAGS_SHLIB)" \
-DQT_QMAKE_TARGET_MKSPEC=$(QT_PLATFORM) \
-DCMAKE_INSTALL_PREFIX=/qt \
$(QT_DIR)/qtdeclarative \
$(QT6_DECLARATIVE_DIR) \
$(QT6_OUTPUT_FILTER)
@#

View File

@ -1,5 +1,12 @@
TARGET = qt6_shadertools.cmake_target
ifeq ($(CONTRIB_DIR),)
QT6_SHADERTOOLS_DIR = $(call select_from_repositories,src/lib/qt6_shadertools)
else
QT6_SHADERTOOLS_PORT_DIR := $(call select_from_ports,qt6_shadertools)
QT6_SHADERTOOLS_DIR = $(QT6_SHADERTOOLS_PORT_DIR)/src/lib/qt6_shadertools
endif
QT6_PORT_LIBS = libQt6Core libQt6Gui
LIBS = qt6_cmake ldso_so_support libc libm egl mesa qt6_component stdcxx
@ -29,7 +36,7 @@ build: cmake_prepared.tag qt6_so_files
-DCMAKE_MODULE_LINKER_FLAGS="$(GENODE_CMAKE_LFLAGS_SHLIB)" \
-DQT_QMAKE_TARGET_MKSPEC=$(QT_PLATFORM) \
-DCMAKE_INSTALL_PREFIX=/qt \
$(QT_DIR)/qtshadertools \
$(QT6_SHADERTOOLS_DIR) \
$(QT6_OUTPUT_FILTER)
@#

View File

@ -1,5 +1,12 @@
TARGET = qt6_svg.cmake_target
ifeq ($(CONTRIB_DIR),)
QT6_SVG_DIR = $(call select_from_repositories,src/lib/qt6_svg)
else
QT6_SVG_PORT_DIR := $(call select_from_ports,qt6_svg)
QT6_SVG_DIR = $(QT6_SVG_PORT_DIR)/src/lib/qt6_svg
endif
QT6_PORT_LIBS = libQt6Core libQt6Gui libQt6Widgets
LIBS = qt6_cmake ldso_so_support libc libm egl mesa qt6_component stdcxx
@ -29,7 +36,7 @@ build: cmake_prepared.tag qt6_so_files
-DCMAKE_MODULE_LINKER_FLAGS="$(GENODE_CMAKE_LFLAGS_SHLIB)" \
-DQT_QMAKE_TARGET_MKSPEC=$(QT_PLATFORM) \
-DCMAKE_INSTALL_PREFIX=/qt \
$(QT_DIR)/qtsvg \
$(QT6_SVG_DIR) \
$(QT6_OUTPUT_FILTER)
@#