[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

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

Title: GitLab

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

Commits:

3 changed files:

Changes:

  • debian/changelog
    No preview for this file type
  • debian/control
    ... ... @@ -19,7 +19,7 @@ Build-Depends:
    19 19 
      libxext-dev,
    20 20 
      libva-dev (>= 1.6.0) [linux-any kfreebsd-any],
    21 21 
      libvdpau-dev (>= 1.1.1) [linux-any kfreebsd-any],
    22 
    - libvulkan-dev [amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64 ppc64el sparc64 x32],
    22 
    + libvulkan-dev [amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64 x32],
    23 23 
      libtool,
    24 24 
      x11proto-dev,
    25 25 
      linux-libc-dev (>= 2.6.31) [linux-any],
    ... ... @@ -38,12 +38,12 @@ Build-Depends:
    38 38 
      python3-mako,
    39 39 
      flex,
    40 40 
      bison,
    41 
    - llvm-7-dev (>= 1:7~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 sparc64 ppc64el],
    42 
    - libelf-dev [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 sparc64 ppc64el],
    41 
    + llvm-7-dev (>= 1:7~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
    42 
    + libelf-dev [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
    43 43 
      libwayland-dev (>= 1.15.0) [linux-any],
    44 44 
      libwayland-egl-backend-dev (>= 1.15.0) [linux-any],
    45 
    - libclang-7-dev (>= 1:7~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 sparc64 ppc64el],
    46 
    - libclc-dev (>= 0.2.0+git20180917-1~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 sparc64 ppc64el],
    45 
    + libclang-7-dev (>= 1:7~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
    46 
    + libclc-dev (>= 0.2.0+git20180917-1~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
    47 47 
      wayland-protocols (>= 1.9),
    48 48 
      zlib1g-dev,
    49 49 
      libglvnd-core-dev,
    ... ... @@ -442,7 +442,7 @@ Description: Mesa VDPAU video acceleration drivers
    442 442
    443 443 
     Package: mesa-vulkan-drivers
    444 444 
     Section: libs
    445 
    -Architecture: amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64 ppc64el sparc64 x32
    445 
    +Architecture: amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64 x32
    446 446 
     Pre-Depends: ${misc:Pre-Depends}
    447 447 
     Depends:
    448 448 
      libvulkan1,
    ... ... @@ -455,7 +455,7 @@ Description: Mesa Vulkan graphics drivers
    455 455
    456 456 
     Package: mesa-opencl-icd
    457 457 
     Section: libs
    458 
    -Architecture: amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 sparc64 ppc64el
    458 
    +Architecture: amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64
    459 459 
     Pre-Depends: ${misc:Pre-Depends}
    460 460 
     Depends:
    461 461 
      libclc-r600 (>= 0.2.0+git20180312-1~),

  • debian/rules
    ... ... @@ -49,11 +49,9 @@ else
    49 49
    50 50 
       ifeq ($(DEB_HOST_ARCH_OS), linux)
    51 51 
     	confflags_DRI3 = -Ddri3=true
    52 
    -	ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
    53 
    -		DRI_DRIVERS += nouveau,
    54 
    -		# Gallium drivers which require kernel support, not yet ported to non-Linux
    55 
    -		GALLIUM_DRIVERS += nouveau, virgl,
    56 
    -	endif
    52 
    +	DRI_DRIVERS += nouveau,
    53 
    +	# Gallium drivers which require kernel support, not yet ported to non-Linux
    54 
    +	GALLIUM_DRIVERS += nouveau, virgl,
    57 55
    58 56 
     	# Freedreno requires arm in addition
    59 57 
     	ifneq (,$(filter arm arm64,$(DEB_HOST_ARCH_CPU)))
    ... ... @@ -84,16 +82,12 @@ else
    84 82 
     	DRI_DRIVERS += i915, i965,
    85 83 
       endif
    86 84
    87 
    -  ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
    88 85 
     	DRI_DRIVERS += r200, r100,
    89 86 
     	GALLIUM_DRIVERS += r600, r300,
    90 
    -	confflags_GALLIUM += -Dgallium-va=true
    91 
    -	confflags_GALLIUM += -Dgallium-vdpau=true
    92 
    -  endif
    93 87
    94 88 
       # LLVM is required for building r300g, radeonsi and llvmpipe drivers.
    95 89 
       # It's also required for building OpenCL support.
    96 
    -  ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 sparc64 ppc64el))
    90 
    +  ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64))
    97 91 
     	GALLIUM_DRIVERS += radeonsi, swrast
    98 92 
     	confflags_GALLIUM += -Dllvm=true
    99 93 
     	confflags_GALLIUM += -Dgallium-opencl=icd
    ... ... @@ -111,13 +105,15 @@ else
    111 105
    112 106 
       # radv needs LLVM and the Vulkan loader, so only build on the subset of
    113 107 
       # arches where we have LLVM enabled and where the Vulkan loader is built.
    114 
    -  ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64 sparc64 ppc64el))
    108 
    +  ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64))
    115 109 
     	VULKAN_DRIVERS += amd,
    116 110 
       endif
    117 111
    118 112 
     	confflags_DIRECT_RENDERING = -Dglx-direct=true
    119 113 
     	confflags_GBM = -Dgbm=true
    120 114 
     	confflags_GALLIUM += -Dgallium-extra-hud=true
    115 
    +	confflags_GALLIUM += -Dgallium-va=true
    116 
    +	confflags_GALLIUM += -Dgallium-vdpau=true
    121 117 
     	confflags_GALLIUM += -Dlmsensors=true
    122 118 
     	with_libva = ,libva
    123 119 
     endif

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.

    Reply to: