[Git][xorg-team/lib/mesa][debian-experimental] control, rules. LLVM is available on s390x these days, so simplify the packaging…

[Timo Aaltonen]

Timo Aaltonen pushed to branch debian-experimental at X Strike Force / lib / mesa


Commits:
3990aeba by Timo Aaltonen at 2018-12-04T09:29:52Z
control, rules. LLVM is available on s390x these days, so simplify the packaging and let s390x build the same package set as other release archs.

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+mesa (18.3.0~rc5-3) UNRELEASED; urgency=medium
+
+ * control, rules. LLVM is available on s390x these days, so simplify
+ the packaging and let s390x build the same package set as other release
+ archs.
+
+ -- Timo Aaltonen <***@debian.org> Tue, 04 Dec 2018 11:29:20 +0200
+
mesa (18.3.0~rc5-2) experimental; urgency=medium

* rules: Drop virgl, va/vdpau from s390x.


=====================================
debian/control
=====================================
@@ -19,7 +19,7 @@ Build-Depends:
libxext-dev,
libva-dev (>= 1.6.0) [linux-any kfreebsd-any],
libvdpau-dev (>= 1.1.1) [linux-any kfreebsd-any],
- libvulkan-dev [amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64 ppc64el sparc64 x32],
+ libvulkan-dev [amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64 x32],
libtool,
x11proto-dev,
linux-libc-dev (>= 2.6.31) [linux-any],
@@ -38,12 +38,12 @@ Build-Depends:
python3-mako,
flex,
bison,
- llvm-7-dev (>= 1:7~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 sparc64 ppc64el],
- libelf-dev [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 sparc64 ppc64el],
+ llvm-7-dev (>= 1:7~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
+ libelf-dev [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
libwayland-dev (>= 1.15.0) [linux-any],
libwayland-egl-backend-dev (>= 1.15.0) [linux-any],
- libclang-7-dev (>= 1:7~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 sparc64 ppc64el],
- libclc-dev (>= 0.2.0+git20180917-1~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 sparc64 ppc64el],
+ libclang-7-dev (>= 1:7~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
+ libclc-dev (>= 0.2.0+git20180917-1~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
wayland-protocols (>= 1.9),
zlib1g-dev,
libglvnd-core-dev,
@@ -442,7 +442,7 @@ Description: Mesa VDPAU video acceleration drivers

Package: mesa-vulkan-drivers
Section: libs
-Architecture: amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64 ppc64el sparc64 x32
+Architecture: amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64 x32
Pre-Depends: ${misc:Pre-Depends}
Depends:
libvulkan1,
@@ -455,7 +455,7 @@ Description: Mesa Vulkan graphics drivers

Package: mesa-opencl-icd
Section: libs
-Architecture: amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 sparc64 ppc64el
+Architecture: amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64
Pre-Depends: ${misc:Pre-Depends}
Depends:
libclc-r600 (>= 0.2.0+git20180312-1~),


=====================================
debian/rules
=====================================
@@ -49,11 +49,9 @@ else

ifeq ($(DEB_HOST_ARCH_OS), linux)
confflags_DRI3 = -Ddri3=true
- ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
- DRI_DRIVERS += nouveau,
- # Gallium drivers which require kernel support, not yet ported to non-Linux
- GALLIUM_DRIVERS += nouveau, virgl,
- endif
+ DRI_DRIVERS += nouveau,
+ # Gallium drivers which require kernel support, not yet ported to non-Linux
+ GALLIUM_DRIVERS += nouveau, virgl,

# Freedreno requires arm in addition
ifneq (,$(filter arm arm64,$(DEB_HOST_ARCH_CPU)))
@@ -84,16 +82,12 @@ else
DRI_DRIVERS += i915, i965,
endif

- ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
DRI_DRIVERS += r200, r100,
GALLIUM_DRIVERS += r600, r300,
- confflags_GALLIUM += -Dgallium-va=true
- confflags_GALLIUM += -Dgallium-vdpau=true
- endif

# LLVM is required for building r300g, radeonsi and llvmpipe drivers.
# It's also required for building OpenCL support.
- ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 sparc64 ppc64el))
+ ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64))
GALLIUM_DRIVERS += radeonsi, swrast
confflags_GALLIUM += -Dllvm=true
confflags_GALLIUM += -Dgallium-opencl=icd
@@ -111,13 +105,15 @@ else

# radv needs LLVM and the Vulkan loader, so only build on the subset of
# arches where we have LLVM enabled and where the Vulkan loader is built.
- ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64 sparc64 ppc64el))
+ ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64))
VULKAN_DRIVERS += amd,
endif

confflags_DIRECT_RENDERING = -Dglx-direct=true
confflags_GBM = -Dgbm=true
confflags_GALLIUM += -Dgallium-extra-hud=true
+ confflags_GALLIUM += -Dgallium-va=true
+ confflags_GALLIUM += -Dgallium-vdpau=true
confflags_GALLIUM += -Dlmsensors=true
with_libva = ,libva
endif



View it on GitLab: https://salsa.debian.org/xorg-team/lib/mesa/commit/3990aebafbd4daffcba46111f43a359f53e22345