diff --git a/repos/libports/run/qt5.run b/repos/libports/run/qt5.run index 48823f7c7b..4092e655b6 100644 --- a/repos/libports/run/qt5.run +++ b/repos/libports/run/qt5.run @@ -1,12 +1,12 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc -import_from_depot genodelabs/src/qt5_component \ - genodelabs/src/qt5_calculatorform \ - genodelabs/src/qt5_launchpad \ - genodelabs/src/qt5_scriptclassic \ - genodelabs/src/qt5_tetrix \ - genodelabs/src/qt5_ui_tools \ - genodelabs/src/qt5_widgets +import_from_depot [depot_user]/src/qt5_component \ + [depot_user]/src/qt5_calculatorform \ + [depot_user]/src/qt5_launchpad \ + [depot_user]/src/qt5_scriptclassic \ + [depot_user]/src/qt5_tetrix \ + [depot_user]/src/qt5_ui_tools \ + [depot_user]/src/qt5_widgets # # Build diff --git a/repos/libports/run/qt5_avplay.run b/repos/libports/run/qt5_avplay.run index c5c3327d7a..0ef384b465 100644 --- a/repos/libports/run/qt5_avplay.run +++ b/repos/libports/run/qt5_avplay.run @@ -1,13 +1,13 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc -import_from_depot genodelabs/raw/qt5_avplay \ - genodelabs/src/avplay \ - genodelabs/src/libav \ - genodelabs/src/qt5_avplay \ - genodelabs/src/qt5_qnitpickerviewwidget \ - genodelabs/src/qt5_widgets \ - genodelabs/src/qt5_xml \ - genodelabs/src/sdl +import_from_depot [depot_user]/raw/qt5_avplay \ + [depot_user]/src/avplay \ + [depot_user]/src/libav \ + [depot_user]/src/qt5_avplay \ + [depot_user]/src/qt5_qnitpickerviewwidget \ + [depot_user]/src/qt5_widgets \ + [depot_user]/src/qt5_xml \ + [depot_user]/src/sdl set feature(Audio_out) 1 diff --git a/repos/libports/run/qt5_calculatorform.run b/repos/libports/run/qt5_calculatorform.run index 548dcd1d4a..0afa7a6ffc 100644 --- a/repos/libports/run/qt5_calculatorform.run +++ b/repos/libports/run/qt5_calculatorform.run @@ -1,8 +1,8 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc -import_from_depot genodelabs/src/qt5_component \ - genodelabs/src/qt5_widgets \ - genodelabs/src/qt5_calculatorform +import_from_depot [depot_user]/src/qt5_component \ + [depot_user]/src/qt5_widgets \ + [depot_user]/src/qt5_calculatorform # # Build diff --git a/repos/libports/run/qt5_common.inc b/repos/libports/run/qt5_common.inc index 1cc17e0dad..979ca45275 100644 --- a/repos/libports/run/qt5_common.inc +++ b/repos/libports/run/qt5_common.inc @@ -1,3 +1,6 @@ + +proc depot_user {} { return [get_cmd_arg --depot-user genodelabs] } + source ${genode_dir}/repos/libports/run/qt5_drivers.inc set feature(Input) 1 @@ -6,28 +9,28 @@ set feature(Timer) 1 create_boot_directory -import_from_depot genodelabs/src/[base_src] \ - genodelabs/src/decorator \ - genodelabs/src/expat \ - genodelabs/src/floating_window_layouter \ - genodelabs/src/freetype \ - genodelabs/src/init \ - genodelabs/src/jpeg \ - genodelabs/src/libc \ - genodelabs/src/libpng \ - genodelabs/src/mesa \ - genodelabs/src/nitpicker \ - genodelabs/src/pcre16 \ - genodelabs/src/qt5_core \ - genodelabs/src/qt5_gui \ - genodelabs/src/qt5_qjpeg \ - genodelabs/src/qt5_qpa_nitpicker \ - genodelabs/src/report_rom \ - genodelabs/src/stdcxx \ - genodelabs/src/vfs \ - genodelabs/src/wm \ - genodelabs/src/zlib \ - genodelabs/raw/qt5_dejavusans +import_from_depot [depot_user]/src/[base_src] \ + [depot_user]/src/decorator \ + [depot_user]/src/expat \ + [depot_user]/src/floating_window_layouter \ + [depot_user]/src/freetype \ + [depot_user]/src/init \ + [depot_user]/src/jpeg \ + [depot_user]/src/libc \ + [depot_user]/src/libpng \ + [depot_user]/src/mesa \ + [depot_user]/src/nitpicker \ + [depot_user]/src/pcre16 \ + [depot_user]/src/qt5_core \ + [depot_user]/src/qt5_gui \ + [depot_user]/src/qt5_qjpeg \ + [depot_user]/src/qt5_qpa_nitpicker \ + [depot_user]/src/report_rom \ + [depot_user]/src/stdcxx \ + [depot_user]/src/vfs \ + [depot_user]/src/wm \ + [depot_user]/src/zlib \ + [depot_user]/raw/qt5_dejavusans # # Build diff --git a/repos/libports/run/qt5_core.run b/repos/libports/run/qt5_core.run index 66b3e708aa..f1dcd4c258 100644 --- a/repos/libports/run/qt5_core.run +++ b/repos/libports/run/qt5_core.run @@ -1,15 +1,17 @@ create_boot_directory -import_from_depot genodelabs/src/[base_src] \ - genodelabs/src/init \ - genodelabs/src/libc \ - genodelabs/src/pcre16 \ - genodelabs/src/qt5_component \ - genodelabs/src/qt5_core \ - genodelabs/src/stdcxx \ - genodelabs/src/vfs \ - genodelabs/src/zlib \ - genodelabs/src/test-qt_core +proc depot_user {} { return [get_cmd_arg --depot-user genodelabs] } + +import_from_depot [depot_user]/src/[base_src] \ + [depot_user]/src/init \ + [depot_user]/src/libc \ + [depot_user]/src/pcre16 \ + [depot_user]/src/qt5_component \ + [depot_user]/src/qt5_core \ + [depot_user]/src/stdcxx \ + [depot_user]/src/vfs \ + [depot_user]/src/zlib \ + [depot_user]/src/test-qt_core install_config { diff --git a/repos/libports/run/qt5_openglwindow.run b/repos/libports/run/qt5_openglwindow.run index 0707f610c2..577a4ee485 100644 --- a/repos/libports/run/qt5_openglwindow.run +++ b/repos/libports/run/qt5_openglwindow.run @@ -1,7 +1,7 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc -import_from_depot genodelabs/src/qt5_component \ - genodelabs/src/qt5_openglwindow +import_from_depot [depot_user]/src/qt5_component \ + [depot_user]/src/qt5_openglwindow # # Build diff --git a/repos/libports/run/qt5_qpluginwidget.run b/repos/libports/run/qt5_qpluginwidget.run index 1f82cdfd64..1c85d08bb7 100644 --- a/repos/libports/run/qt5_qpluginwidget.run +++ b/repos/libports/run/qt5_qpluginwidget.run @@ -1,13 +1,13 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc -import_from_depot genodelabs/src/libcrypto \ - genodelabs/src/libssl \ - genodelabs/src/qt5_component \ - genodelabs/src/qt5_network \ - genodelabs/src/qt5_qnitpickerviewwidget \ - genodelabs/src/qt5_qpluginwidget \ - genodelabs/src/qt5_widgets \ - genodelabs/src/test-qpluginwidget +import_from_depot [depot_user]/src/libcrypto \ + [depot_user]/src/libssl \ + [depot_user]/src/qt5_component \ + [depot_user]/src/qt5_network \ + [depot_user]/src/qt5_qnitpickerviewwidget \ + [depot_user]/src/qt5_qpluginwidget \ + [depot_user]/src/qt5_widgets \ + [depot_user]/src/test-qpluginwidget # # Build diff --git a/repos/libports/run/qt5_quicktest.run b/repos/libports/run/qt5_quicktest.run index 97fba2573f..81c4508802 100644 --- a/repos/libports/run/qt5_quicktest.run +++ b/repos/libports/run/qt5_quicktest.run @@ -1,15 +1,15 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc -import_from_depot genodelabs/raw/qt5_qtquick2 \ - genodelabs/src/libcrypto \ - genodelabs/src/libssl \ - genodelabs/src/qt5_component \ - genodelabs/src/qt5_network \ - genodelabs/src/qt5_qml \ - genodelabs/src/qt5_qtquick2 \ - genodelabs/src/qt5_quick \ - genodelabs/src/qt5_widgets \ - genodelabs/src/test-qt_quick +import_from_depot [depot_user]/raw/qt5_qtquick2 \ + [depot_user]/src/libcrypto \ + [depot_user]/src/libssl \ + [depot_user]/src/qt5_component \ + [depot_user]/src/qt5_network \ + [depot_user]/src/qt5_qml \ + [depot_user]/src/qt5_qtquick2 \ + [depot_user]/src/qt5_quick \ + [depot_user]/src/qt5_widgets \ + [depot_user]/src/test-qt_quick # # Build diff --git a/repos/libports/run/qt5_samegame.run b/repos/libports/run/qt5_samegame.run index 3ce67bdd49..9ea38f4ae2 100644 --- a/repos/libports/run/qt5_samegame.run +++ b/repos/libports/run/qt5_samegame.run @@ -1,15 +1,15 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc -import_from_depot genodelabs/raw/qt5_qtquick2 \ - genodelabs/raw/qt5_samegame \ - genodelabs/src/libcrypto \ - genodelabs/src/libssl \ - genodelabs/src/qt5_component \ - genodelabs/src/qt5_network \ - genodelabs/src/qt5_qml \ - genodelabs/src/qt5_qtquick2 \ - genodelabs/src/qt5_quick \ - genodelabs/src/qt5_samegame +import_from_depot [depot_user]/raw/qt5_qtquick2 \ + [depot_user]/raw/qt5_samegame \ + [depot_user]/src/libcrypto \ + [depot_user]/src/libssl \ + [depot_user]/src/qt5_component \ + [depot_user]/src/qt5_network \ + [depot_user]/src/qt5_qml \ + [depot_user]/src/qt5_qtquick2 \ + [depot_user]/src/qt5_quick \ + [depot_user]/src/qt5_samegame # # Build diff --git a/repos/libports/run/qt5_tetrix.run b/repos/libports/run/qt5_tetrix.run index 9c21f4a572..8e4375348d 100644 --- a/repos/libports/run/qt5_tetrix.run +++ b/repos/libports/run/qt5_tetrix.run @@ -1,10 +1,10 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc -import_from_depot genodelabs/src/qt5_component \ - genodelabs/src/qt5_scriptclassic \ - genodelabs/src/qt5_tetrix \ - genodelabs/src/qt5_ui_tools \ - genodelabs/src/qt5_widgets +import_from_depot [depot_user]/src/qt5_component \ + [depot_user]/src/qt5_scriptclassic \ + [depot_user]/src/qt5_tetrix \ + [depot_user]/src/qt5_ui_tools \ + [depot_user]/src/qt5_widgets # # Build diff --git a/repos/libports/run/qt5_textedit.run b/repos/libports/run/qt5_textedit.run index d98c0b5962..bba9bff31a 100644 --- a/repos/libports/run/qt5_textedit.run +++ b/repos/libports/run/qt5_textedit.run @@ -1,9 +1,9 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc -import_from_depot genodelabs/src/qt5_component \ - genodelabs/src/qt5_printsupport \ - genodelabs/src/qt5_textedit \ - genodelabs/src/qt5_widgets +import_from_depot [depot_user]/src/qt5_component \ + [depot_user]/src/qt5_printsupport \ + [depot_user]/src/qt5_textedit \ + [depot_user]/src/qt5_widgets # # Build diff --git a/repos/libports/run/qt5_virtualkeyboard.run b/repos/libports/run/qt5_virtualkeyboard.run index 5b955df0eb..2c114d4aab 100644 --- a/repos/libports/run/qt5_virtualkeyboard.run +++ b/repos/libports/run/qt5_virtualkeyboard.run @@ -1,24 +1,24 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc -import_from_depot genodelabs/raw/qt5_qt_labs_folderlistmodel \ - genodelabs/raw/qt5_qtquick_layouts \ - genodelabs/raw/qt5_qtquick_virtualkeyboard \ - genodelabs/raw/qt5_qtquick_window \ - genodelabs/raw/qt5_qtquick2 \ - genodelabs/src/libcrypto \ - genodelabs/src/libssl \ - genodelabs/src/qt5_component \ - genodelabs/src/qt5_network \ - genodelabs/src/qt5_qml \ - genodelabs/src/qt5_qt_labs_folderlistmodel \ - genodelabs/src/qt5_qtquick_layouts \ - genodelabs/src/qt5_qtquick_virtualkeyboard \ - genodelabs/src/qt5_qtquick_window \ - genodelabs/src/qt5_qtquick2 \ - genodelabs/src/qt5_quick \ - genodelabs/src/qt5_svg \ - genodelabs/src/qt5_virtualkeyboard \ - genodelabs/src/qt5_widgets +import_from_depot [depot_user]/raw/qt5_qt_labs_folderlistmodel \ + [depot_user]/raw/qt5_qtquick_layouts \ + [depot_user]/raw/qt5_qtquick_virtualkeyboard \ + [depot_user]/raw/qt5_qtquick_window \ + [depot_user]/raw/qt5_qtquick2 \ + [depot_user]/src/libcrypto \ + [depot_user]/src/libssl \ + [depot_user]/src/qt5_component \ + [depot_user]/src/qt5_network \ + [depot_user]/src/qt5_qml \ + [depot_user]/src/qt5_qt_labs_folderlistmodel \ + [depot_user]/src/qt5_qtquick_layouts \ + [depot_user]/src/qt5_qtquick_virtualkeyboard \ + [depot_user]/src/qt5_qtquick_window \ + [depot_user]/src/qt5_qtquick2 \ + [depot_user]/src/qt5_quick \ + [depot_user]/src/qt5_svg \ + [depot_user]/src/qt5_virtualkeyboard \ + [depot_user]/src/qt5_widgets # # Build