diff -Nru xserver-xorg-video-amdgpu-23.0.0+git2401241940.4d7a9a6~j~mesarc0/.gitlab-ci/debian-install.sh xserver-xorg-video-amdgpu-23.0.0+git2402250201.8df03a7~j~mesarc0/.gitlab-ci/debian-install.sh --- xserver-xorg-video-amdgpu-23.0.0+git2401241940.4d7a9a6~j~mesarc0/.gitlab-ci/debian-install.sh 2022-04-14 11:10:03.000000000 +0000 +++ xserver-xorg-video-amdgpu-23.0.0+git2402250201.8df03a7~j~mesarc0/.gitlab-ci/debian-install.sh 2024-03-14 07:37:32.000000000 +0000 @@ -20,48 +20,29 @@ git clone https://gitlab.freedesktop.org/xorg/xserver.git cd xserver -git checkout server-1.13-branch -./autogen.sh --prefix=/usr/local/xserver-1.13 --enable-dri2 -make -C include install-nodist_sdkHEADERS -make install-headers install-aclocalDATA install-pkgconfigDATA clean - -git checkout server-1.14-branch -./autogen.sh --prefix=/usr/local/xserver-1.14 --enable-dri2 -make -C include install-nodist_sdkHEADERS -make install-headers install-aclocalDATA install-pkgconfigDATA clean - -git checkout server-1.15-branch -./autogen.sh --prefix=/usr/local/xserver-1.15 --enable-dri2 -make -C include install-nodist_sdkHEADERS -make install-headers install-aclocalDATA install-pkgconfigDATA clean - -git checkout server-1.16-branch -./autogen.sh --prefix=/usr/local/xserver-1.16 --enable-dri2 --enable-dri3 --enable-glamor -make -C include install-nodist_sdkHEADERS -make install-headers install-aclocalDATA install-pkgconfigDATA clean - -git checkout server-1.17-branch -./autogen.sh --prefix=/usr/local/xserver-1.17 --enable-dri2 --enable-dri3 --enable-glamor -make -C include install-nodist_sdkHEADERS -make install-headers install-aclocalDATA install-pkgconfigDATA clean - -git checkout server-1.18-branch -./autogen.sh --prefix=/usr/local/xserver-1.18 --enable-dri2 --enable-dri3 --enable-glamor -make -C include install-nodist_sdkHEADERS -make install-headers install-aclocalDATA install-pkgconfigDATA clean - -git checkout server-1.19-branch -./autogen.sh --prefix=/usr/local/xserver-1.19 --enable-dri2 --enable-dri3 --enable-glamor -make -C include install-nodist_sdkHEADERS -make install-headers install-aclocalDATA install-pkgconfigDATA clean - -git checkout server-1.20-branch -./autogen.sh --prefix=/usr/local/xserver-1.20 --enable-dri2 --enable-dri3 --enable-glamor -make -C include install-nodist_sdkHEADERS -make install-headers install-aclocalDATA install-pkgconfigDATA clean -cd .. && rm -rf xserver +for VERSION in 1.13 1.14 1.15; do + git checkout server-${VERSION}-branch + # Workaround glvnd having reset the version in gl.pc from what Mesa used + # similar to xserver commit e6ef2b12404dfec7f23592a3524d2a63d9d25802 + sed -i -e 's/gl >= [79].[12].0/gl >= 1.2/' configure.ac + ./autogen.sh --prefix=/usr/local/xserver-$VERSION --enable-dri2 --disable-dmx + make -C include install-nodist_sdkHEADERS + make install-headers install-aclocalDATA install-pkgconfigDATA clean + git restore configure.ac +done + +for VERSION in 1.16 1.17 1.18 1.19 1.20 21.1; do + git checkout server-${VERSION}-branch + # Workaround glvnd having reset the version in gl.pc from what Mesa used + # similar to xserver commit e6ef2b12404dfec7f23592a3524d2a63d9d25802 + sed -i -e 's/gl >= [79].[12].0/gl >= 1.2/' configure.ac + ./autogen.sh --prefix=/usr/local/xserver-$VERSION --enable-dri2 --enable-dri3 --enable-glamor --disable-dmx + make -C include install-nodist_sdkHEADERS + make install-headers install-aclocalDATA install-pkgconfigDATA clean + git restore configure.ac +done apt-get install -y clang xutils-dev libdrm-dev libgl1-mesa-dev libgbm-dev libudev-dev \ - x11proto-dev libpixman-1-dev libpciaccess-dev + x11proto-dev libpixman-1-dev libpciaccess-dev mesa-common-dev libxcvt-dev apt-get purge -y git ca-certificates apt-get autoremove -y --purge diff -Nru xserver-xorg-video-amdgpu-23.0.0+git2401241940.4d7a9a6~j~mesarc0/.gitlab-ci.yml xserver-xorg-video-amdgpu-23.0.0+git2402250201.8df03a7~j~mesarc0/.gitlab-ci.yml --- xserver-xorg-video-amdgpu-23.0.0+git2401241940.4d7a9a6~j~mesarc0/.gitlab-ci.yml 2022-08-18 16:09:07.000000000 +0000 +++ xserver-xorg-video-amdgpu-23.0.0+git2402250201.8df03a7~j~mesarc0/.gitlab-ci.yml 2024-03-14 07:37:32.000000000 +0000 @@ -14,7 +14,7 @@ include: - project: 'freedesktop/ci-templates' - ref: 59de540b620c45739871d1a073d76d5521989d11 + ref: 9568e38927f9e9c48d4f586f84a071c3a4bdcd39 file: '/templates/debian.yml' - template: Security/SAST.gitlab-ci.yml @@ -27,7 +27,8 @@ variables: FDO_DISTRIBUTION_VERSION: testing-slim FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/debian-install.sh' - FDO_DISTRIBUTION_TAG: "2019-08-02" + FDO_DISTRIBUTION_PACKAGES: 'ca-certificates' + FDO_DISTRIBUTION_TAG: "2024-02-24" container-build: extends: @@ -49,7 +50,7 @@ ACLOCAL_PATH: /usr/local/xserver-$XSERVER_VERSION/share/aclocal PKG_CONFIG_PATH: /usr/local/xserver-$XSERVER_VERSION/lib/pkgconfig -xserver-1.20: +xserver-21.1: extends: .default_build script: - ./autogen.sh @@ -57,6 +58,17 @@ - make install V=1 - make -j$(nproc) distcheck variables: + XSERVER_VERSION: "21.1" + +xserver-21.1-clang: + extends: .default_build + variables: + CC: clang + XSERVER_VERSION: "21.1" + +xserver-1.20: + extends: .default_build + variables: XSERVER_VERSION: "1.20" xserver-1.20-clang: diff -Nru xserver-xorg-video-amdgpu-23.0.0+git2401241940.4d7a9a6~j~mesarc0/debian/changelog xserver-xorg-video-amdgpu-23.0.0+git2402250201.8df03a7~j~mesarc0/debian/changelog --- xserver-xorg-video-amdgpu-23.0.0+git2401241940.4d7a9a6~j~mesarc0/debian/changelog 2024-01-31 06:35:01.000000000 +0000 +++ xserver-xorg-video-amdgpu-23.0.0+git2402250201.8df03a7~j~mesarc0/debian/changelog 2024-03-14 07:37:37.000000000 +0000 @@ -1,8 +1,15 @@ -xserver-xorg-video-amdgpu (23.0.0+git2401241940.4d7a9a6~j~mesarc0) jammy; urgency=medium +xserver-xorg-video-amdgpu (23.0.0+git2402250201.8df03a7~j~mesarc0) jammy; urgency=medium * Build for jammy - -- Ernst Persson Wed, 31 Jan 2024 07:35:01 +0100 + -- Ernst Persson Thu, 14 Mar 2024 08:37:37 +0100 + +xserver-xorg-video-amdgpu (23.0.0+git2402250201.8df03a7~b~mesarc0) bionic; urgency=medium + + * New snapshot: + * 8df03a7 gitlab CI: add builds against server-21.1-branch + + -- Ernst Persson Thu, 14 Mar 2024 08:37:33 +0100 xserver-xorg-video-amdgpu (23.0.0+git2401241940.4d7a9a6~b~mesarc0) bionic; urgency=medium