diff options
6 files changed, 221 insertions, 20 deletions
diff --git a/modulesetparser.py b/modulesetparser.py index ccc3466..a26ff14 100755 --- a/modulesetparser.py +++ b/modulesetparser.py @@ -328,7 +328,7 @@ def BuilderList(slaves): 'xf86-video-dummy' : '--disable-dga', # config check needs fixing to default to auto, not yes 'xts' : '--disable-shared', 'fontconfig' : '--with-default-fonts=' + os.path.join(prefix, 'share', 'fonts'), - 'xserver-meson' : '-Dudev=false -Dpciaccess=false -Dint10=false -Dsystemd_logind=false -Ddmx=true -Dxephyr=true -Ddefault_font_path=catalogue:/etc/X11/fontpath.d,built-ins -Dxkb_default_rules=base', + 'xserver-meson' : '-Dudev=false -Dpciaccess=false -Dint10=false -Dsystemd_logind=false -Ddmx=true -Dxephyr=true -Dglamor=false -Ddefault_font_path=catalogue:/etc/X11/fontpath.d,built-ins -Dxkb_default_rules=base', 'mesa-mesa-meson' : '-Degl=false -Dbuild-tests=true', } diff --git a/patches/fontconfig/0001-Only-use-wrapper-script-if-host-is-MinGW.patch b/patches/fontconfig/0001-Only-use-wrapper-script-if-host-is-MinGW.patch new file mode 100644 index 0000000..161c7b0 --- /dev/null +++ b/patches/fontconfig/0001-Only-use-wrapper-script-if-host-is-MinGW.patch @@ -0,0 +1,44 @@ +From c81fc168f3ba3f1878e8a6e86c94a4e64c5391d5 Mon Sep 17 00:00:00 2001 +From: Jon Turney <jon.turney@dronecode.org.uk> +Date: Mon, 15 Apr 2019 20:01:22 +0100 +Subject: [PATCH] Only use wrapper-script if host is MinGW + +Currently it fails if the executable extension is .exe, but wine isn't +available (e.g. on Cygwin) + +Possibly the check to use this wrapper should be even more restrictive +e.g. checking if cross-building and/or if wine is available. +--- + test/Makefile.am | 2 ++ + test/run-test.sh | 1 - + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/test/Makefile.am b/test/Makefile.am +index fc47a50..8176d99 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -11,7 +11,9 @@ AM_TESTS_ENVIRONMENT= \ + BUILT_SOURCES = $(builddir)/out.expected + + SH_LOG_COMPILER = sh ++if OS_WIN32 + LOG_COMPILER = ${srcdir}/wrapper-script.sh ++endif + TESTS=run-test.sh + + TESTDATA = \ +diff --git a/test/run-test.sh b/test/run-test.sh +index b55efcb..12198ff 100644 +--- a/test/run-test.sh ++++ b/test/run-test.sh +@@ -32,7 +32,6 @@ BASEDIR=`mktemp -d --tmpdir fontconfig.XXXXXXXX` + FONTDIR="$BASEDIR"/fonts + CACHEDIR="$BASEDIR"/cache.dir + EXPECTED=${EXPECTED-"out.expected"} +-LOG_COMPILER=${LOG_COMPILER-"$TESTDIR/wrapper-script.sh"} + + ECHO=true + +-- +2.17.0 + diff --git a/patches/mesa-mesa-meson/0003-meson-Force-.so-extension-for-megadriver-modules.patch b/patches/mesa-mesa-meson/0003-meson-Force-.so-extension-for-megadriver-modules.patch new file mode 100644 index 0000000..5397aa7 --- /dev/null +++ b/patches/mesa-mesa-meson/0003-meson-Force-.so-extension-for-megadriver-modules.patch @@ -0,0 +1,85 @@ +From 43c96ce6768f855fdb0cb9647fb12d14bafe47bc Mon Sep 17 00:00:00 2001 +From: Jon Turney <jon.turney@dronecode.org.uk> +Date: Sun, 14 Apr 2019 20:46:39 +0100 +Subject: [PATCH] meson: Force '.so' extension for megadriver modules + +DRI driver loadable modules are always installed with +install_megadriver.py with names ending with '.so', irrespective of +platform. + +Force the name the loadable module is built with to match, so +install_megadriver.py doesn't spin trying to remove non-existent +symlinks. + +Fixes: c77acc3c "meson: remove meson-created megadrivers symlinks" +--- + src/gallium/targets/dri/meson.build | 1 + + src/gallium/targets/va/meson.build | 1 + + src/gallium/targets/vdpau/meson.build | 1 + + src/gallium/targets/xvmc/meson.build | 1 + + src/mesa/drivers/dri/meson.build | 1 + + 5 files changed, 5 insertions(+) + +diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build +index 5b4b4bc1ab7..dd40969a166 100644 +--- a/src/gallium/targets/dri/meson.build ++++ b/src/gallium/targets/dri/meson.build +@@ -63,6 +63,7 @@ libgallium_dri = shared_library( + # Will be deleted during installation, see install_megadrivers.py + install : true, + install_dir : dri_drivers_path, ++ name_suffix : 'so', + ) + + foreach d : [[with_gallium_kmsro, [ +diff --git a/src/gallium/targets/va/meson.build b/src/gallium/targets/va/meson.build +index 827cfb8d829..4bfb5cbab7a 100644 +--- a/src/gallium/targets/va/meson.build ++++ b/src/gallium/targets/va/meson.build +@@ -52,6 +52,7 @@ libva_gallium = shared_library( + # Will be deleted during installation, see install_megadrivers.py + install : true, + install_dir : va_drivers_path, ++ name_suffix : 'so', + ) + + foreach d : [[with_gallium_r600, 'r600'], +diff --git a/src/gallium/targets/vdpau/meson.build b/src/gallium/targets/vdpau/meson.build +index 3017721bda0..48f01ffba6c 100644 +--- a/src/gallium/targets/vdpau/meson.build ++++ b/src/gallium/targets/vdpau/meson.build +@@ -58,6 +58,7 @@ libvdpau_gallium = shared_library( + # Will be deleted during installation, see install_megadrivers.py + install : true, + install_dir : vdpau_drivers_path, ++ name_suffix : 'so', + ) + foreach d : [[with_gallium_r300, 'r300'], + [with_gallium_r600, 'r600'], +diff --git a/src/gallium/targets/xvmc/meson.build b/src/gallium/targets/xvmc/meson.build +index 845f3a421b7..537275aab57 100644 +--- a/src/gallium/targets/xvmc/meson.build ++++ b/src/gallium/targets/xvmc/meson.build +@@ -50,6 +50,7 @@ libxvmc_gallium = shared_library( + # Will be deleted during installation, see install_megadrivers.py + install : true, + install_dir : xvmc_drivers_path, ++ name_suffix : 'so', + ) + + foreach d : [[with_gallium_r600, 'r600'], [with_gallium_nouveau, 'nouveau']] +diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build +index a0f47bbecee..dddc4ae3dfd 100644 +--- a/src/mesa/drivers/dri/meson.build ++++ b/src/mesa/drivers/dri/meson.build +@@ -57,6 +57,7 @@ if dri_drivers != [] + # Will be deleted during installation, see install_megadrivers.py + install : true, + install_dir : dri_drivers_path, ++ name_suffix : 'so', + ) + + meson.add_install_script( +-- +2.17.0 + diff --git a/patches/xserver-meson/0001-Ensure-tests-don-t-get-run-in-parallel.patch b/patches/xserver-meson/0001-Ensure-tests-don-t-get-run-in-parallel.patch index c9c42c1..5f41f24 100644 --- a/patches/xserver-meson/0001-Ensure-tests-don-t-get-run-in-parallel.patch +++ b/patches/xserver-meson/0001-Ensure-tests-don-t-get-run-in-parallel.patch @@ -1,31 +1,58 @@ -From f6843f4c9707fa098edded26004d2c8d969b27ca Mon Sep 17 00:00:00 2001 +From c6cdbc4e6a2067e1289785a01de46428097ef5a4 Mon Sep 17 00:00:00 2001 From: Jon Turney <jon.turney@dronecode.org.uk> Date: Thu, 27 Sep 2018 17:15:49 +0100 Subject: [PATCH xserver] Ensure tests don't get run in parallel --- - test/meson.build | 2 ++ - 1 file changed, 2 insertions(+) + test/meson.build | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/test/meson.build b/test/meson.build -index 33b7941e0..a59cde782 100644 +index 690298b77..401225b52 100644 --- a/test/meson.build +++ b/test/meson.build -@@ -12,6 +12,7 @@ if get_option('xvfb') - test('xvfb-piglit', find_program('scripts/xvfb-piglit.sh'), +@@ -48,7 +48,8 @@ if get_option('xvfb') + find_program('scripts/xvfb-piglit.sh'), env: piglit_env, timeout: 1200, +- suite: 'xvfb' ++ suite: 'xvfb', + is_parallel: false, ) - if get_option('xephyr') and build_glamor -@@ -19,6 +20,7 @@ if get_option('xvfb') - find_program('scripts/xephyr-glamor-piglit.sh'), + if rendercheck.found() +@@ -63,7 +64,8 @@ if get_option('xvfb') + '--', + xvfb_args, + ], +- suite: 'xvfb' ++ suite: 'xvfb', ++ is_parallel: false, + ) + endforeach + endif +@@ -74,6 +76,7 @@ if get_option('xvfb') env: piglit_env, timeout: 1200, + suite: 'xephr-glamor', + is_parallel: false, ) - endif + + if rendercheck.found() +@@ -93,6 +96,7 @@ if get_option('xvfb') + ], + suite: 'xephr-glamor', + timeout: 300, ++ is_parallel: false, + ) + endforeach + endif +@@ -170,5 +174,5 @@ if build_xorg + link_with: xorg_link, + ) + +- test('unit', unit) ++ test('unit', unit, is_parallel: false) endif -- 2.17.0 diff --git a/patches/xserver-meson/0001-meson-Increase-timeout-for-unit-test.patch b/patches/xserver-meson/0001-meson-Increase-timeout-for-unit-test.patch index b03d4f3..1426316 100644 --- a/patches/xserver-meson/0001-meson-Increase-timeout-for-unit-test.patch +++ b/patches/xserver-meson/0001-meson-Increase-timeout-for-unit-test.patch @@ -1,23 +1,32 @@ -From 2c903b2a54e5d54d6656d6da2aee55f5960bfa3f Mon Sep 17 00:00:00 2001 +From f700aa6c5cec22b22f02c3cdc5a2f209f7a32265 Mon Sep 17 00:00:00 2001 From: Jon Turney <jon.turney@dronecode.org.uk> Date: Thu, 14 Mar 2019 22:48:36 +0000 -Subject: [PATCH xserver] meson: Increase timeout for unit test +Subject: [PATCH xserver] meson: Increase timeout for tests -Increase timeout for unit test +Increase timeout for various tests --- - test/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + test/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/meson.build b/test/meson.build -index 26503ce0c..90048e05c 100644 +index 401225b52..c16eb434b 100644 --- a/test/meson.build +++ b/test/meson.build -@@ -94,5 +94,5 @@ if build_xorg +@@ -95,7 +95,7 @@ if get_option('xvfb') + xvfb_args, + ], + suite: 'xephr-glamor', +- timeout: 300, ++ timeout: 1200, + is_parallel: false, + ) + endforeach +@@ -174,5 +174,5 @@ if build_xorg link_with: xorg_link, ) -- test('unit', unit) -+ test('unit', unit, timeout: 240) +- test('unit', unit, is_parallel: false) ++ test('unit', unit, is_parallel: false, timeout: 240) endif -- 2.17.0 diff --git a/patches/xserver-meson/0001-tests-Always-separate-rendercheck-f-and-o-options-wi.patch b/patches/xserver-meson/0001-tests-Always-separate-rendercheck-f-and-o-options-wi.patch new file mode 100644 index 0000000..5cca9d1 --- /dev/null +++ b/patches/xserver-meson/0001-tests-Always-separate-rendercheck-f-and-o-options-wi.patch @@ -0,0 +1,36 @@ +From cdfc399788e56ec2a1943a88f53d00534704fb96 Mon Sep 17 00:00:00 2001 +From: Jon Turney <jon.turney@dronecode.org.uk> +Date: Sun, 31 Mar 2019 16:35:16 +0100 +Subject: [PATCH xserver] tests: Always separate rendercheck -f and -o options + with a space + +--- + test/meson.build | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/test/meson.build b/test/meson.build +index c16eb434b..4f0711b08 100644 +--- a/test/meson.build ++++ b/test/meson.build +@@ -17,12 +17,12 @@ rendercheck_tests = [ + ['blend/Src', '-t blend -o src'], + ['blend/Over', '-t blend -o over'], + ['composite/Some/a8r8g8b8', '-t composite -f a8r8g8b8 ' + some_ops], +- ['composite/Some/x8r8g8b8', '-t composite -f a8r8g8b8,x8r8g8b8' + some_ops], +- ['composite/Some/a2r10g10b10', '-t composite -f a8r8g8b8,a2r10g10b10' + some_ops], +- ['ca composite/Some/a8r8g8b8', '-t cacomposite -f a8r8g8b8' + some_ops], +- ['ca composite/Some/a8', '-t cacomposite -f a8r8g8b8,a8' + some_ops], +- ['ca composite/Some/x8r8g8b8', '-t cacomposite -f a8r8g8b8,x8r8g8b8' + some_ops], +- ['ca composite/Some/a2r10g10b10', '-t cacomposite -f a8r8g8b8,a2r10g10b10' + some_ops], ++ ['composite/Some/x8r8g8b8', '-t composite -f a8r8g8b8,x8r8g8b8 ' + some_ops], ++ ['composite/Some/a2r10g10b10', '-t composite -f a8r8g8b8,a2r10g10b10 ' + some_ops], ++ ['ca composite/Some/a8r8g8b8', '-t cacomposite -f a8r8g8b8 ' + some_ops], ++ ['ca composite/Some/a8', '-t cacomposite -f a8r8g8b8,a8 ' + some_ops], ++ ['ca composite/Some/x8r8g8b8', '-t cacomposite -f a8r8g8b8,x8r8g8b8 ' + some_ops], ++ ['ca composite/Some/a2r10g10b10', '-t cacomposite -f a8r8g8b8,a2r10g10b10 ' + some_ops], + ['fill', '-t fill'], + ['bug7366', '-t bug7366'], + ['destination coordinates', '-t dcoords'], +-- +2.17.0 + |