.gitlab-ci.yml

@@ -22,6 +22,7 @@ include:
     ref: *ci-templates-commit
     file:
       - '/templates/debian.yml'
+      - '/templates/fedora.yml'
   - local: '.gitlab-ci/lava/lava-gitlab-ci.yml'
   - local: '.gitlab-ci/test-source-dep.yml'
   - local: 'src/amd/ci/gitlab-ci.yml'
@@ -43,7 +44,7 @@ stages:
   - container
   - container-2
   - git-archive
-  - meson-x86_64
+  - build-x86_64
   - build-misc
   - amd
   - intel
@@ -285,7 +286,7 @@ success:
     - when: never
   variables:
     FDO_DISTRIBUTION_VERSION: bullseye-slim
-    FDO_REPO_SUFFIX: "debian/$CI_JOB_NAME"
+    FDO_REPO_SUFFIX: $CI_JOB_NAME
     FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
     # no need to pull the whole repo to build the container image
     GIT_STRATEGY: none
@@ -299,158 +300,178 @@ success:
   stage: container-2
 
 # Debian 11 based x86 build image base
-x86_build-base:
+debian/x86_build-base:
   extends:
     - .fdo.container-build@debian
     - .container
   variables:
-    MESA_IMAGE_TAG: &x86_build-base "2021-07-02-bump-libdrm"
+    MESA_IMAGE_TAG: &debian-x86_build-base "2021-07-02-bump-libdrm"
 
-.use-x86_build-base:
+.use-debian/x86_build-base:
   extends:
     - .fdo.container-build@debian
     - .use-base-image
   variables:
     MESA_BASE_IMAGE: "debian/x86_build-base"
-    MESA_BASE_TAG: *x86_build-base
-    MESA_ARTIFACTS_BASE_TAG: *x86_build-base
+    MESA_BASE_TAG: *debian-x86_build-base
+    MESA_ARTIFACTS_BASE_TAG: *debian-x86_build-base
   needs:
-    - x86_build-base
+    - debian/x86_build-base
 
 # Debian 11 based x86 main build image
-x86_build:
+debian/x86_build:
   extends:
-    - .use-x86_build-base
+    - .use-debian/x86_build-base
   variables:
-    MESA_IMAGE_TAG: &x86_build "2021-07-02-bump-libdrm"
+    MESA_IMAGE_TAG: &debian-x86_build "2021-07-02-bump-libdrm"
 
-.use-x86_build:
+.use-debian/x86_build:
   extends:
     - .set-image-base-tag
   variables:
-    MESA_BASE_TAG: *x86_build-base
+    MESA_BASE_TAG: *debian-x86_build-base
     MESA_IMAGE_PATH: "debian/x86_build"
-    MESA_IMAGE_TAG: *x86_build
+    MESA_IMAGE_TAG: *debian-x86_build
   needs:
-    - x86_build
+    - debian/x86_build
 
 # Debian 11 based i386 cross-build image
-i386_build:
+debian/i386_build:
   extends:
-    - .use-x86_build-base
+    - .use-debian/x86_build-base
   variables:
-    MESA_IMAGE_TAG: &i386_build "2021-07-02-bump-libdrm"
+    MESA_IMAGE_TAG: &debian-i386_build "2021-07-02-bump-libdrm"
 
-.use-i386_build:
+.use-debian/i386_build:
   extends:
     - .set-image-base-tag
   variables:
-    MESA_BASE_TAG: *x86_build-base
+    MESA_BASE_TAG: *debian-x86_build-base
     MESA_IMAGE_PATH: "debian/i386_build"
-    MESA_IMAGE_TAG: *i386_build
+    MESA_IMAGE_TAG: *debian-i386_build
   needs:
-    - i386_build
+    - debian/i386_build
 
 # Debian 11 based ppc64el cross-build image
-ppc64el_build:
+debian/ppc64el_build:
   extends:
-    - .use-x86_build-base
+    - .use-debian/x86_build-base
   variables:
-    MESA_IMAGE_TAG: &ppc64el_build "2021-07-02-bump-libdrm"
+    MESA_IMAGE_TAG: &debian-ppc64el_build "2021-07-02-bump-libdrm"
 
-.use-ppc64el_build:
+.use-debian/ppc64el_build:
   extends:
     - .set-image-base-tag
   variables:
-    MESA_BASE_TAG: *x86_build-base
+    MESA_BASE_TAG: *debian-x86_build-base
     MESA_IMAGE_PATH: "debian/ppc64el_build"
-    MESA_IMAGE_TAG: *ppc64el_build
+    MESA_IMAGE_TAG: *debian-ppc64el_build
   needs:
-    - ppc64el_build
+    - debian/ppc64el_build
 
 # Debian 11 based s390x cross-build image
-s390x_build:
+debian/s390x_build:
   extends:
-    - .use-x86_build-base
+    - .use-debian/x86_build-base
   variables:
-    MESA_IMAGE_TAG: &s390x_build "2021-07-02-bump-libdrm"
+    MESA_IMAGE_TAG: &debian-s390x_build "2021-07-02-bump-libdrm"
 
-.use-s390x_build:
+.use-debian/s390x_build:
   extends:
     - .set-image-base-tag
   variables:
-    MESA_BASE_TAG: *x86_build-base
+    MESA_BASE_TAG: *debian-x86_build-base
     MESA_IMAGE_PATH: "debian/s390x_build"
-    MESA_IMAGE_TAG: *s390x_build
+    MESA_IMAGE_TAG: *debian-s390x_build
   needs:
-    - s390x_build
+    - debian/s390x_build
 
 # Android NDK cross-build image
-android_build:
+debian/android_build:
   extends:
-    - .use-x86_build-base
+    - .use-debian/x86_build-base
   variables:
-    MESA_IMAGE_TAG: &android_build "2021-07-02-bump-libdrm"
+    MESA_IMAGE_TAG: &debian-android_build "2021-07-02-bump-libdrm"
 
-.use-android_build:
+.use-debian/android_build:
   extends:
     - .set-image-base-tag
   variables:
-    MESA_BASE_TAG: *x86_build-base
+    MESA_BASE_TAG: *debian-x86_build-base
     MESA_IMAGE_PATH: "debian/android_build"
-    MESA_IMAGE_TAG: *android_build
+    MESA_IMAGE_TAG: *debian-android_build
   needs:
-    - android_build
+    - debian/android_build
 
 # Debian 11 based x86 test image base
-x86_test-base:
-  extends: x86_build-base
+debian/x86_test-base:
+  extends: debian/x86_build-base
   variables:
-    MESA_IMAGE_TAG: &x86_test-base "2021-07-02-bump-libdrm"
+    MESA_IMAGE_TAG: &debian-x86_test-base "2021-07-02-bump-libdrm"
 
-.use-x86_test-base:
+.use-debian/x86_test-base:
   extends:
     - .fdo.container-build@debian
     - .use-base-image
   variables:
     MESA_BASE_IMAGE: "debian/x86_test-base"
-    MESA_BASE_TAG: *x86_test-base
+    MESA_BASE_TAG: *debian-x86_test-base
   needs:
-    - x86_test-base
+    - debian/x86_test-base
 
 # Debian 11 based x86 test image for GL
-x86_test-gl:
-  extends: .use-x86_test-base
+debian/x86_test-gl:
+  extends: .use-debian/x86_test-base
   variables:
     FDO_DISTRIBUTION_EXEC: 'env KERNEL_URL=${KERNEL_URL} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
     KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.13-rc5-for-mesa-ci-27df41f1e0cf/linux-v5.13-rc5-for-mesa-ci-27df41f1e0cf.tar.bz2"
-    MESA_IMAGE_TAG: &x86_test-gl "2021-07-06-latest-virglrenderer"
+    MESA_IMAGE_TAG: &debian-x86_test-gl "2021-07-06-latest-virglrenderer"
 
 # Debian 11 based x86 test image for VK
-x86_test-vk:
-  extends: .use-x86_test-base
+debian/x86_test-vk:
+  extends: .use-debian/x86_test-base
   variables:
-    MESA_IMAGE_TAG: &x86_test-vk "2021-07-02-bump-libdrm"
+    MESA_IMAGE_TAG: &debian-x86_test-vk "2021-07-02-bump-libdrm"
 
 # Debian 11 based ARM build image
-arm_build:
+debian/arm_build:
   extends:
     - .fdo.container-build@debian
     - .container
   tags:
     - aarch64
   variables:
-    MESA_IMAGE_TAG: &arm_build "2021-07-02-bump-libdrm"
+    MESA_IMAGE_TAG: &debian-arm_build "2021-07-02-bump-libdrm"
 
-.use-arm_build:
+.use-debian/arm_build:
   extends:
     - .set-image
   variables:
     MESA_IMAGE_PATH: "debian/arm_build"
-    MESA_IMAGE_TAG: *arm_build
-    MESA_ARTIFACTS_TAG: *arm_build
+    MESA_IMAGE_TAG: *debian-arm_build
+    MESA_ARTIFACTS_TAG: *debian-arm_build
   needs:
-    - arm_build
+    - debian/arm_build
+
+
+# Fedora 34 based x86 build image
+fedora/x86_build:
+  extends:
+    - .fdo.container-build@fedora
+    - .container
+  variables:
+    FDO_DISTRIBUTION_VERSION: 34
+    MESA_IMAGE_TAG: &fedora-x86_build "2021-07-08-bump-libdrm"
+
+.use-fedora/x86_build:
+  extends:
+    - .set-image
+  variables:
+    MESA_IMAGE_PATH: "fedora/x86_build"
+    MESA_IMAGE_TAG: *fedora-x86_build
+  needs:
+    - fedora/x86_build
+
 
 .kernel+rootfs:
   extends:
@@ -466,7 +487,7 @@ arm_build:
 
 kernel+rootfs_amd64:
   extends:
-    - .use-x86_build-base
+    - .use-debian/x86_build-base
     - .kernel+rootfs
   image: "$FDO_BASE_IMAGE"
   variables:
@@ -475,7 +496,7 @@ kernel+rootfs_amd64:
 
 kernel+rootfs_arm64:
   extends:
-    - .use-arm_build
+    - .use-debian/arm_build
     - .kernel+rootfs
   tags:
     - aarch64
@@ -500,7 +521,7 @@ kernel+rootfs_armhf:
     MESA_ROOTFS_TAG: *kernel-rootfs
 
 # x86 image with ARM64 & armhf kernel & rootfs for baremetal testing
-arm_test:
+debian/arm_test:
   extends:
     - .fdo.container-build@debian
     - .container
@@ -513,19 +534,19 @@ arm_test:
   variables:
     FDO_DISTRIBUTION_EXEC: 'env ARTIFACTS_PREFIX=https://${MINIO_HOST}/mesa-lava ARTIFACTS_SUFFIX=${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT} CI_PROJECT_PATH=${CI_PROJECT_PATH} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} FDO_UPSTREAM_REPO=${FDO_UPSTREAM_REPO} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
     FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}"
-    MESA_ARM_BUILD_TAG: *arm_build
-    MESA_IMAGE_TAG: &arm_test "2021-07-02-bump-libdrm"
+    MESA_ARM_BUILD_TAG: *debian-arm_build
+    MESA_IMAGE_TAG: &debian-arm_test "2021-07-02-bump-libdrm"
     MESA_ROOTFS_TAG: *kernel-rootfs
 
-.use-arm_test:
+.use-debian/arm_test:
   image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}"
   variables:
-    MESA_ARM_BUILD_TAG: *arm_build
+    MESA_ARM_BUILD_TAG: *debian-arm_build
     MESA_IMAGE_PATH: "debian/arm_test"
-    MESA_IMAGE_TAG: *arm_test
+    MESA_IMAGE_TAG: *debian-arm_test
     MESA_ROOTFS_TAG: *kernel-rootfs
   needs:
-    - arm_test
+    - debian/arm_test
 
 # Native Windows docker builds
 #
@@ -659,14 +680,14 @@ sanity:
 .meson-build:
   extends:
     - .build-linux
-    - .use-x86_build
-  stage: meson-x86_64
+    - .use-debian/x86_build
+  stage: build-x86_64
   variables:
     LLVM_VERSION: 11
   script:
     - .gitlab-ci/meson/build.sh
 
-meson-testing:
+debian-testing:
   extends:
     - .meson-build
     - .ci-deqp-artifacts
@@ -689,9 +710,9 @@ meson-testing:
     - .gitlab-ci/meson/build.sh
     - .gitlab-ci/prepare-artifacts.sh
 
-meson-testing-asan:
+debian-testing-asan:
   extends:
-    - meson-testing
+    - debian-testing
   variables:
     C_ARGS: >
       -Wno-error=stringop-truncation
@@ -701,7 +722,7 @@ meson-testing-asan:
     MINIO_ARTIFACT_NAME: ""
     ARTIFACTS_DEBUG_SYMBOLS: 1
 
-meson-clover-testing:
+debian-clover-testing:
   extends:
     - .meson-build
     - .ci-deqp-artifacts
@@ -722,7 +743,7 @@ meson-clover-testing:
     - .gitlab-ci/meson/build.sh
     - .gitlab-ci/prepare-artifacts.sh
 
-meson-gallium:
+debian-gallium:
   extends: .meson-build
   variables:
     UNWIND: "enabled"
@@ -752,7 +773,7 @@ meson-gallium:
     - src/freedreno/.gitlab-ci/run-fdtools.sh
 
 # Test a release build with -Werror so new warnings don't sneak in.
-meson-release:
+debian-release:
   extends: .meson-build
   variables:
     UNWIND: "enabled"
@@ -780,10 +801,57 @@ meson-release:
   script:
     - .gitlab-ci/meson/build.sh
 
-meson-android:
+fedora-release:
+  extends:
+    - .meson-build
+    - .use-fedora/x86_build
+  variables:
+    BUILDTYPE: "release"
+    C_ARGS: >
+      -Wno-error=array-bounds
+      -Wno-error=maybe-uninitialized
+      -Wno-error=stringop-overread
+      -Wno-error=uninitialized
+    CPP_ARGS: >
+      -Wno-error=array-bounds
+    DRI_DRIVERS: "nouveau,i915,i965,r100,r200"
+    DRI_LOADERS: >
+      -D glx=dri
+      -D gbm=enabled
+      -D egl=enabled
+      -D glvnd=true
+      -D platforms=x11,wayland
+    EXTRA_OPTION: >
+      -D osmesa=true
+      -D selinux=true
+      -D tools=drm-shim,etnaviv,freedreno,glsl,intel,nir,nouveau,lima,panfrost
+    GALLIUM_DRIVERS: "crocus,etnaviv,freedreno,iris,kmsro,lima,nouveau,panfrost,r300,r600,radeonsi,svga,swrast,tegra,v3d,vc4,virgl,zink"
+    GALLIUM_ST: >
+      -D dri3=enabled
+      -D gallium-extra-hud=true
+      -D gallium-vdpau=enabled
+      -D gallium-xvmc=disabled
+      -D gallium-omx=disabled
+      -D gallium-va=enabled
+      -D gallium-xa=enabled
+      -D gallium-nine=false
+      -D gallium-opencl=icd
+      -D gles1=disabled
+      -D gles2=enabled
+      -D llvm=enabled
+      -D microsoft-clc=disabled
+      -D shared-llvm=enabled
+      -D vulkan-device-select-layer=true
+    LLVM_VERSION: ""
+    UNWIND: "disabled"
+    VULKAN_DRIVERS: "amd,broadcom,freedreno,intel"
+  script:
+    - .gitlab-ci/meson/build.sh
+
+debian-android:
   extends:
     - .meson-cross
-    - .use-android_build
+    - .use-debian/android_build
   variables:
     UNWIND: "disabled"
     C_ARGS: >
@@ -854,9 +922,9 @@ meson-android:
 .meson-arm:
   extends:
     - .meson-cross
-    - .use-arm_build
+    - .use-debian/arm_build
   needs:
-    - arm_build
+    - debian/arm_build
   variables:
     VULKAN_DRIVERS: freedreno,broadcom
     GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,swrast,tegra,v3d,vc4"
@@ -864,7 +932,7 @@ meson-android:
   tags:
     - aarch64
 
-meson-armhf:
+debian-armhf:
   extends:
     - .meson-arm
     - .ci-deqp-artifacts
@@ -878,7 +946,7 @@ meson-armhf:
     - .gitlab-ci/meson/build.sh
     - .gitlab-ci/prepare-artifacts.sh
 
-meson-arm64:
+debian-arm64:
   extends:
     - .meson-arm
     - .ci-deqp-artifacts
@@ -892,9 +960,9 @@ meson-arm64:
     - .gitlab-ci/meson/build.sh
     - .gitlab-ci/prepare-artifacts.sh
 
-meson-arm64-asan:
+debian-arm64-asan:
   extends:
-    - meson-arm64
+    - debian-arm64
   variables:
     C_ARGS: >
       -Wno-error=stringop-truncation
@@ -906,7 +974,7 @@ meson-arm64-asan:
     MINIO_ARTIFACT_NAME: mesa-arm64-asan
     MESON_TEST_ARGS: "--no-suite mesa:compiler"
 
-meson-arm64-build-test:
+debian-arm64-build-test:
   extends:
     - .meson-arm
     - .ci-deqp-artifacts
@@ -917,7 +985,7 @@ meson-arm64-build-test:
   script:
     - .gitlab-ci/meson/build.sh
 
-meson-clang:
+debian-clang:
   extends: .meson-build
   variables:
     UNWIND: "enabled"
@@ -965,7 +1033,7 @@ meson-clang:
     CC: clang
     CXX: clang++
 
-meson-windows-vs2019:
+windows-vs2019:
   extends:
     - .build-windows
     - .use-windows_build_vs2019
@@ -985,9 +1053,9 @@ test-d3d12-windows:
     - .windows-test-rules
   stage: layered-backends
   dependencies:
-    - meson-windows-vs2019
+    - windows-vs2019
   needs:
-    - meson-windows-vs2019
+    - windows-vs2019
   variables:
     GIT_STRATEGY: none # testing doesn't build anything from source
     GALLIUM_DRIVER: d3d12
@@ -1001,7 +1069,7 @@ test-d3d12-windows:
     paths:
       - summary/
 
-meson-clover:
+debian-clover:
   extends: .meson-build
   variables:
     UNWIND: "enabled"
@@ -1025,7 +1093,7 @@ meson-clover:
     - LLVM_VERSION=9 GALLIUM_DRIVERS=r600,swrast .gitlab-ci/meson/build.sh
     - .gitlab-ci/meson/build.sh
 
-meson-vulkan:
+debian-vulkan:
   extends: .meson-build
   variables:
     UNWIND: "disabled"
@@ -1053,10 +1121,10 @@ meson-vulkan:
       -D vulkan-layers=device-select,overlay
       -D build-aco-tests=true
 
-meson-i386:
+debian-i386:
   extends:
     - .meson-cross
-    - .use-i386_build
+    - .use-debian/i386_build
   variables:
     CROSS: i386
     VULKAN_DRIVERS: intel,amd,swrast,virtio-experimental
@@ -1065,10 +1133,10 @@ meson-i386:
     EXTRA_OPTION: >
       -D vulkan-layers=device-select,overlay
 
-meson-s390x:
+debian-s390x:
   extends:
-    - meson-ppc64el
-    - .use-s390x_build
+    - debian-ppc64el
+    - .use-debian/s390x_build
     - .s390x-rules
   tags:
     - kvm
@@ -1079,17 +1147,17 @@ meson-s390x:
     LLVM_VERSION: 9
     VULKAN_DRIVERS: "swrast"
 
-meson-ppc64el:
+debian-ppc64el:
   extends:
     - .meson-cross
-    - .use-ppc64el_build
+    - .use-debian/ppc64el_build
     - .ppc64el-rules
   variables:
     CROSS: ppc64el
     GALLIUM_DRIVERS: "nouveau,radeonsi,swrast,virgl,zink"
     VULKAN_DRIVERS: "amd,swrast"
 
-meson-mingw32-x86_64:
+debian-mingw32-x86_64:
   extends: .meson-build
   stage: build-misc
   variables:
@@ -1124,42 +1192,42 @@ meson-mingw32-x86_64:
     paths:
       - results/
 
-.use-x86_test-gl:
+.use-debian/x86_test-gl:
   extends:
     - .test
     - .set-image-base-tag
   variables:
-    MESA_BASE_TAG: *x86_test-base
+    MESA_BASE_TAG: *debian-x86_test-base
     MESA_IMAGE_PATH: "debian/x86_test-gl"
-    MESA_IMAGE_TAG: *x86_test-gl
+    MESA_IMAGE_TAG: *debian-x86_test-gl
   needs:
-    - x86_test-gl
+    - debian/x86_test-gl
 
 .test-gl:
   extends:
-    - .use-x86_test-gl
+    - .use-debian/x86_test-gl
   needs:
-    - x86_test-gl
-    - meson-testing
+    - debian/x86_test-gl
+    - debian-testing
 
 .test-vk:
   extends:
     - .test
     - .set-image-base-tag
   variables:
-    MESA_BASE_TAG: *x86_test-base
+    MESA_BASE_TAG: *debian-x86_test-base
     MESA_IMAGE_PATH: "debian/x86_test-vk"
-    MESA_IMAGE_TAG: *x86_test-vk
+    MESA_IMAGE_TAG: *debian-x86_test-vk
   needs:
-    - meson-testing
-    - x86_test-vk
+    - debian-testing
+    - debian/x86_test-vk
 
 .test-cl:
   extends:
-    - .use-x86_test-gl
+    - .use-debian/x86_test-gl
   needs:
-    - x86_test-gl
-    - meson-clover-testing
+    - debian/x86_test-gl
+    - debian-clover-testing
 
 .vkd3d-proton-test:
   artifacts:
@@ -1288,8 +1356,8 @@ meson-mingw32-x86_64:
     TEST_LD_PRELOAD: libasan.so.6
     MINIO_ARTIFACT_NAME: mesa-arm64-asan
   needs:
-    - arm_test
-    - job: meson-arm64-asan
+    - debian/arm_test
+    - job: debian-arm64-asan
       artifacts: false
 
 .baremetal-deqp-test:

.gitlab-ci/container/container_post_build.sh

 #!/bin/sh
 
-apt-get autoremove -y --purge
+if test -f /etc/debian_version; then
+    apt-get autoremove -y --purge
+fi
 
 # Clean up any build cache for rust.
 rm -rf /.cargo

.gitlab-ci/container/container_pre_build.sh

 #!/bin/sh
 
+if test -f /etc/debian_version; then
+    CCACHE_PATH=/usr/lib/ccache
+else
+    CCACHE_PATH=/usr/lib64/ccache
+fi
+
 # Common setup among container builds before we get to building code.
 
 export CCACHE_COMPILERCHECK=content
 export CCACHE_COMPRESS=true
 export CCACHE_DIR=/cache/mesa/ccache
-export PATH=/usr/lib/ccache:$PATH
+export PATH=$CCACHE_PATH:$PATH
 
 # CMake ignores $PATH, so we have to force CC/GCC to the ccache versions.
-export CC="/usr/lib/ccache/gcc"
-export CXX="/usr/lib/ccache/g++"
+export CC="${CCACHE_PATH}/gcc"
+export CXX="${CCACHE_PATH}/g++"
 
 # Force linkers to gold, since it's so much faster for building.  We can't use
 # lld because we're on old debian and it's buggy.  ming fails meson builds

.gitlab-ci/container/fedora/x86_build.sh

+#!/bin/bash
+
+set -e
+set -o xtrace
+
+
+EPHEMERAL="
+        autoconf
+        automake
+        bzip2
+        git
+        libtool
+        pkgconfig(epoxy)
+        pkgconfig(gbm)
+        unzip
+        wget
+        xz
+        "
+
+dnf install -y --setopt=install_weak_deps=False \
+    bison \
+    ccache \
+    clang-devel \
+    flex \
+    gcc \
+    gcc-c++ \
+    gettext \
+    kernel-headers \
+    llvm-devel \
+    meson \
+    "pkgconfig(dri2proto)" \
+    "pkgconfig(expat)" \
+    "pkgconfig(glproto)" \
+    "pkgconfig(libclc)" \
+    "pkgconfig(libelf)" \
+    "pkgconfig(libglvnd)" \
+    "pkgconfig(libomxil-bellagio)" \
+    "pkgconfig(libselinux)" \
+    "pkgconfig(libva)" \
+    "pkgconfig(pciaccess)" \
+    "pkgconfig(vdpau)" \
+    "pkgconfig(vulkan)" \
+    "pkgconfig(wayland-egl-backend)" \
+    "pkgconfig(wayland-protocols)" \
+    "pkgconfig(wayland-scanner)" \
+    "pkgconfig(x11)" \
+    "pkgconfig(x11-xcb)" \
+    "pkgconfig(xcb)" \
+    "pkgconfig(xcb-dri2)" \
+    "pkgconfig(xcb-dri3)" \
+    "pkgconfig(xcb-glx)" \
+    "pkgconfig(xcb-present)" \
+    "pkgconfig(xcb-randr)" \
+    "pkgconfig(xcb-sync)" \
+    "pkgconfig(xcb-xfixes)" \
+    "pkgconfig(xdamage)" \
+    "pkgconfig(xext)" \
+    "pkgconfig(xfixes)" \
+    "pkgconfig(xrandr)" \
+    "pkgconfig(xshmfence)" \
+    "pkgconfig(xxf86vm)" \
+    "pkgconfig(zlib)" \
+    python-unversioned-command \
+    python3-devel \
+    python3-mako \
+    python3-devel \
+    python3-mako \
+    vulkan-headers \
+    $EPHEMERAL
+
+
+. .gitlab-ci/container/container_pre_build.sh
+
+
+# dependencies where we want a specific version
+export              XORG_RELEASES=https://xorg.freedesktop.org/releases/individual
+export           WAYLAND_RELEASES=https://wayland.freedesktop.org/releases
+
+export         XORGMACROS_VERSION=util-macros-1.19.0
+export         LIBWAYLAND_VERSION=wayland-1.18.0
+
+wget $XORG_RELEASES/util/$XORGMACROS_VERSION.tar.bz2
+tar -xvf $XORGMACROS_VERSION.tar.bz2 && rm $XORGMACROS_VERSION.tar.bz2
+cd $XORGMACROS_VERSION; ./configure; make install; cd ..
+rm -rf $XORGMACROS_VERSION
+
+. .gitlab-ci/container/build-libdrm.sh
+
+wget $WAYLAND_RELEASES/$LIBWAYLAND_VERSION.tar.xz
+tar -xvf $LIBWAYLAND_VERSION.tar.xz && rm $LIBWAYLAND_VERSION.tar.xz
+cd $LIBWAYLAND_VERSION; ./configure --enable-libraries --without-host-scanner --disable-documentation --disable-dtd-validation; make install; cd ..
+rm -rf $LIBWAYLAND_VERSION
+
+
+pushd /usr/local
+git clone https://gitlab.freedesktop.org/mesa/shader-db.git --depth 1
+rm -rf shader-db/.git
+cd shader-db
+make
+popd
+
+
+############### Uninstall the build software
+
+dnf remove -y $EPHEMERAL
+
+. .gitlab-ci/container/container_post_build.sh

.gitlab-ci/lava/lava-gitlab-ci.yml

@@ -39,14 +39,14 @@
     BOOT_METHOD: u-boot
     HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
   extends:
-    - .use-arm_build # for same $MESA_ARTIFACTS_TAG as in kernel+rootfs_armhf
-    - .use-x86_build
+    - .use-debian/arm_build # for same $MESA_ARTIFACTS_TAG as in kernel+rootfs_armhf
+    - .use-debian/x86_build
     - .lava-test
     - .use-kernel+rootfs-arm
   needs:
     - kernel+rootfs_armhf
-    - x86_build
-    - meson-armhf
+    - debian/x86_build
+    - debian-armhf
 
 .lava-test:arm64:
   variables:
@@ -56,16 +56,16 @@
     BOOT_METHOD: u-boot
     HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
   extends:
-    - .use-arm_build # for same $MESA_ARTIFACTS_TAG as in kernel+rootfs_arm64
-    - .use-x86_build
+    - .use-debian/arm_build # for same $MESA_ARTIFACTS_TAG as in kernel+rootfs_arm64
+    - .use-debian/x86_build
     - .lava-test
     - .use-kernel+rootfs-arm
   dependencies:
-    - meson-arm64
+    - debian-arm64
   needs:
     - kernel+rootfs_arm64
-    - x86_build
-    - meson-arm64
+    - debian/x86_build
+    - debian-arm64
 
 .lava-test:amd64:
   variables:
@@ -75,13 +75,13 @@
     BOOT_METHOD: u-boot
     HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
   extends:
-    - .use-x86_build-base # for same $MESA_ARTIFACTS_BASE_TAG as in kernel+rootfs_amd64
-    - .use-x86_build
+    - .use-debian/x86_build-base # for same $MESA_ARTIFACTS_BASE_TAG as in kernel+rootfs_amd64
+    - .use-debian/x86_build
     - .lava-test
     - .use-kernel+rootfs-amd64
   needs:
     - kernel+rootfs_amd64
-    - meson-testing
+    - debian-testing
 
 .lava-traces-base:
   variables:

.gitlab-ci/meson/build.sh

@@ -44,7 +44,7 @@ fi
 case $CI_JOB_NAME in
     # strace and wine don't seem to mix well
     # ASAN leak detection is incompatible with strace
-    meson-mingw32-x86_64|*-asan*)
+    debian-mingw32-x86_64|*-asan*)
         if test -f /usr/bin/time; then
             MESON_TEST_ARGS+=--wrapper=$PWD/.gitlab-ci/meson/time.sh
         fi

Android.common.mk

-# Mesa 3-D graphics library
-#
-# Copyright (C) 2010-2011 Chia-I Wu <olvaffe@gmail.com>
-# Copyright (C) 2010-2011 LunarG Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-
-ifeq ($(LOCAL_IS_HOST_MODULE),true)
-LOCAL_CFLAGS += -D_GNU_SOURCE
-endif
-
-LOCAL_C_INCLUDES += \
-	$(MESA_TOP)/src \
-	$(MESA_TOP)/include
-
-MESA_VERSION := $(shell cat $(MESA_TOP)/VERSION)
-LOCAL_CFLAGS += \
-	-Wno-error \
-	-Werror=incompatible-pointer-types \
-	-Wno-unused-parameter \
-	-Wno-pointer-arith \
-	-Wno-missing-field-initializers \
-	-Wno-initializer-overrides \
-	-Wno-mismatched-tags \
-	-DPACKAGE_VERSION=\"$(MESA_VERSION)\" \
-	-DPACKAGE_BUGREPORT=\"https://gitlab.freedesktop.org/mesa/mesa/-/issues\"
-
-# XXX: The following __STDC_*_MACROS defines should not be needed.
-# It's likely due to a bug elsewhere, but let's temporarily add them
-# here to fix the radeonsi build.
-LOCAL_CFLAGS += \
-	-DANDROID_API_LEVEL=$(PLATFORM_SDK_VERSION) \
-	-DENABLE_SHADER_CACHE \
-	-D__STDC_CONSTANT_MACROS \
-	-D__STDC_LIMIT_MACROS \
-	-DHAVE___BUILTIN_EXPECT \
-	-DHAVE___BUILTIN_FFS \
-	-DHAVE___BUILTIN_FFSLL \
-	-DHAVE_DLFCN_H \
-	-DHAVE_FUNC_ATTRIBUTE_FLATTEN \
-	-DHAVE_FUNC_ATTRIBUTE_UNUSED \
-	-DHAVE_FUNC_ATTRIBUTE_FORMAT \
-	-DHAVE_FUNC_ATTRIBUTE_PACKED \
-	-DHAVE_FUNC_ATTRIBUTE_ALIAS \
-	-DHAVE_FUNC_ATTRIBUTE_NORETURN \
-	-DHAVE_FUNC_ATTRIBUTE_RETURNS_NONNULL \
-	-DHAVE_FUNC_ATTRIBUTE_WARN_UNUSED_RESULT \
-	-DHAVE___BUILTIN_CTZ \
-	-DHAVE___BUILTIN_POPCOUNT \
-	-DHAVE___BUILTIN_POPCOUNTLL \
-	-DHAVE___BUILTIN_CLZ \
-	-DHAVE___BUILTIN_CLZLL \
-	-DHAVE___BUILTIN_UNREACHABLE \
-	-DHAVE_PTHREAD=1 \
-	-DHAVE_DLADDR \
-	-DHAVE_DL_ITERATE_PHDR \
-	-DHAVE_LINUX_FUTEX_H \
-	-DHAVE_ENDIAN_H \
-	-DHAVE_ZLIB \
-	-DHAVE_COMPRESSION \
-	-DMAJOR_IN_SYSMACROS \
-	-DVK_USE_PLATFORM_ANDROID_KHR \
-	-fvisibility=hidden \
-	-fno-math-errno \
-	-fno-trapping-math \
-	-Wno-sign-compare
-
-LOCAL_CPPFLAGS += \
-	-D__STDC_CONSTANT_MACROS \
-	-D__STDC_FORMAT_MACROS \
-	-D__STDC_LIMIT_MACROS \
-	-Wno-error=non-virtual-dtor \
-	-Wno-non-virtual-dtor
-
-# mesa requires at least c99 compiler
-LOCAL_CONLYFLAGS += \
-	-std=c99
-
-# c11 timespec_get is part of bionic as well
-# https://android-review.googlesource.com/c/718518
-# This means releases from P and earlier won't need this
-ifeq ($(filter 5 6 7 8 9, $(MESA_ANDROID_MAJOR_VERSION)),)
-LOCAL_CFLAGS += -DHAVE_TIMESPEC_GET
-endif
-
-# Android's libc began supporting shm in Oreo
-ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo true),true)
-LOCAL_CFLAGS += -DHAVE_SYS_SHM_H
-endif
-
-ifeq ($(TARGET_ARCH),x86)
-LOCAL_CFLAGS += \
-	-DUSE_X86_ASM
-endif
-ifeq ($(ARCH_ARM_HAVE_NEON),true)
-LOCAL_CFLAGS_arm += -DUSE_ARM_ASM
-endif
-LOCAL_CFLAGS_arm64 += -DUSE_AARCH64_ASM
-
-ifneq ($(LOCAL_IS_HOST_MODULE),true)
-LOCAL_CFLAGS += -DHAVE_LIBDRM
-LOCAL_SHARED_LIBRARIES += libdrm
-endif
-
-LOCAL_CFLAGS_32 += -DDEFAULT_BACKENDS_PATH=\"/vendor/lib/gbm\"
-LOCAL_CFLAGS_64 += -DDEFAULT_BACKENDS_PATH=\"/vendor/lib64/gbm\"
-
-LOCAL_CFLAGS_32 += -DDEFAULT_DRIVER_DIR=\"/vendor/lib/$(MESA_DRI_MODULE_REL_PATH)\"
-LOCAL_CFLAGS_64 += -DDEFAULT_DRIVER_DIR=\"/vendor/lib64/$(MESA_DRI_MODULE_REL_PATH)\"
-LOCAL_PROPRIETARY_MODULE := true
-
-# uncomment to keep the debug symbols
-#LOCAL_STRIP_MODULE := false
-
-ifeq ($(strip $(LOCAL_MODULE_TAGS)),)
-LOCAL_MODULE_TAGS := optional
-endif
-
-# Quiet down the build system and remove any .h files from the sources
-LOCAL_SRC_FILES := $(patsubst %.h, , $(LOCAL_SRC_FILES))

Android.mk

-# Mesa 3-D graphics library
-#
-# Copyright (C) 2010-2011 Chia-I Wu <olvaffe@gmail.com>
-# Copyright (C) 2010-2011 LunarG Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-
-ifneq ($(filter true, $(BOARD_MESA3D_USES_MESON_BUILD)),)
-
-include $(call my-dir)/android/Android.mk
-
-else
-
-# BOARD_GPU_DRIVERS should be defined.  The valid values are
-#
-#   classic drivers: i915 i965
-#   gallium drivers: swrast freedreno i915g nouveau kmsro r300g r600g radeonsi vc4 virgl vmwgfx etnaviv iris lima panfrost
-#
-# The main target is libGLES_mesa.  For each classic driver enabled, a DRI
-# module will also be built.  DRI modules will be loaded by libGLES_mesa.
-
-MESA_TOP := $(call my-dir)
-
-MESA_ANDROID_MAJOR_VERSION := $(word 1, $(subst ., , $(PLATFORM_VERSION)))
-ifneq ($(filter 2 4, $(MESA_ANDROID_MAJOR_VERSION)),)
-$(error "Android 4.4 and earlier not supported")
-endif
-
-MESA_DRI_MODULE_REL_PATH := dri
-MESA_DRI_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/$(MESA_DRI_MODULE_REL_PATH)
-MESA_DRI_MODULE_UNSTRIPPED_PATH := $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/$(MESA_DRI_MODULE_REL_PATH)
-MESA_DRI_LDFLAGS := -Wl,--build-id=sha1
-
-MESA_COMMON_MK := $(MESA_TOP)/Android.common.mk
-MESA_PYTHON2 := python
-MESA_PYTHON3 := python3
-ifeq ($(filter 5 6 7 8 9 10, $(MESA_ANDROID_MAJOR_VERSION)),)
-MESA_LEX     := M4=$(M4) $(LEX)
-else
-MESA_LEX     := $(LEX)
-endif
-
-# Lists to convert driver names to boolean variables
-# in form of <driver name>.<boolean make variable>
-classic_drivers := i915.HAVE_I915_DRI i965.HAVE_I965_DRI
-gallium_drivers := \
-	swrast.HAVE_GALLIUM_SOFTPIPE \
-	freedreno.HAVE_GALLIUM_FREEDRENO \
-	i915g.HAVE_GALLIUM_I915 \
-	nouveau.HAVE_GALLIUM_NOUVEAU \
-	kmsro.HAVE_GALLIUM_KMSRO \
-	r300g.HAVE_GALLIUM_R300 \
-	r600g.HAVE_GALLIUM_R600 \
-	radeonsi.HAVE_GALLIUM_RADEONSI \
-	vmwgfx.HAVE_GALLIUM_VMWGFX \
-	vc4.HAVE_GALLIUM_VC4 \
-	virgl.HAVE_GALLIUM_VIRGL \
-	etnaviv.HAVE_GALLIUM_ETNAVIV \
-	iris.HAVE_GALLIUM_IRIS \
-	lima.HAVE_GALLIUM_LIMA \
-	panfrost.HAVE_GALLIUM_PANFROST
-
-ifeq ($(BOARD_GPU_DRIVERS),all)
-MESA_BUILD_CLASSIC := $(filter HAVE_%, $(subst ., , $(classic_drivers)))
-MESA_BUILD_GALLIUM := $(filter HAVE_%, $(subst ., , $(gallium_drivers)))
-else
-# Warn if we have any invalid driver names
-$(foreach d, $(BOARD_GPU_DRIVERS), \
-	$(if $(findstring $(d).,$(classic_drivers) $(gallium_drivers)), \
-		, \
-		$(warning invalid GPU driver: $(d)) \
-	) \
-)
-MESA_BUILD_CLASSIC := $(strip $(foreach d, $(BOARD_GPU_DRIVERS), $(patsubst $(d).%,%, $(filter $(d).%, $(classic_drivers)))))
-MESA_BUILD_GALLIUM := $(strip $(foreach d, $(BOARD_GPU_DRIVERS), $(patsubst $(d).%,%, $(filter $(d).%, $(gallium_drivers)))))
-endif
-ifeq ($(filter x86%,$(TARGET_ARCH)),)
-	MESA_BUILD_CLASSIC :=
-endif
-
-$(foreach d, $(MESA_BUILD_CLASSIC) $(MESA_BUILD_GALLIUM), $(eval $(d) := true))
-
-ifneq ($(filter true, $(HAVE_GALLIUM_RADEONSI)),)
-MESA_ENABLE_LLVM := true
-endif
-
-define mesa-build-with-llvm
-  $(if $(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7), \
-    $(warning Unsupported LLVM version in Android $(MESA_ANDROID_MAJOR_VERSION)),) \
-  $(eval LOCAL_CFLAGS += -DLLVM_AVAILABLE -DDRAW_LLVM_AVAILABLE -DLLVM_IS_SHARED=1 -DMESA_LLVM_VERSION_STRING=\"3.9\") \
-  $(eval LOCAL_SHARED_LIBRARIES += libLLVM)
-endef
-
-# add subdirectories
-SUBDIRS := \
-	src/etnaviv \
-	src/freedreno \
-	src/gbm \
-	src/loader \
-	src/mapi \
-	src/compiler \
-	src/mesa \
-	src/util \
-	src/egl \
-	src/amd \
-	src/broadcom \
-	src/intel \
-	src/mesa/drivers/dri \
-	src/vulkan \
-	src/panfrost \
-
-INC_DIRS := $(call all-named-subdir-makefiles,$(SUBDIRS))
-INC_DIRS += $(call all-named-subdir-makefiles,src/gallium)
-include $(INC_DIRS)
-
-endif

CleanSpec.mk

-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libmesa_*_intermediates)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/i9*5_dri_intermediates)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libglapi_intermediates)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libGLES_mesa_intermediates)
-$(call add-clean-step, rm -rf $(OUT_DIR)/host/$(HOST_OS)-$(HOST_ARCH)/obj/EXECUTABLES/mesa_*_intermediates)
-$(call add-clean-step, rm -rf $(OUT_DIR)/host/$(HOST_OS)-$(HOST_ARCH)/obj/EXECUTABLES/glsl_compiler_intermediates)
-$(call add-clean-step, rm -rf $(OUT_DIR)/host/$(HOST_OS)-$(HOST_ARCH)/obj/STATIC_LIBRARIES/libmesa_glsl_utils_intermediates)
-
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/STATIC_LIBRARIES/libmesa_*_intermediates)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/SHARED_LIBRARIES/i9?5_dri_intermediates)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/SHARED_LIBRARIES/libglapi_intermediates)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/SHARED_LIBRARIES/libGLES_mesa_intermediates)
-$(call add-clean-step, rm -rf $(HOST_OUT)/*/EXECUTABLES/mesa_*_intermediates)
-$(call add-clean-step, rm -rf $(HOST_OUT)/*/EXECUTABLES/glsl_compiler_intermediates)
-$(call add-clean-step, rm -rf $(HOST_OUT)/*/STATIC_LIBRARIES/libmesa_*_intermediates)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/SHARED_LIBRARIES/*_dri_intermediates)