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

[Git][xorg-team/lib/mesa][debian-experimental] 3 commits: rules: Drop virgl, va/vdpau from s390x.

Title: GitLab

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

Commits:

4 changed files:

Changes:

  • debian/changelog
    1 
    +mesa (18.3.0~rc5-2) experimental; urgency=medium
    2 
    +
    3 
    +  * rules: Drop virgl, va/vdpau from s390x.
    4 
    +  * meson-fix-hurd-build.diff: Hurd needs -D_GNU_SOURCE.
    5 
    +
    6 
    + -- Timo Aaltonen <tjaalton@debian.org>  Mon, 03 Dec 2018 20:43:45 +0200
    7 
    +
    1 8 
     mesa (18.3.0~rc5-1) experimental; urgency=medium
    2 9
    3 10 
       * New upstream release candidate.

  • debian/patches/meson-fix-hurd-build.diff
    1 
    +--- a/meson.build
    2 
    ++++ b/meson.build
    3 
    +@@ -779,7 +779,7 @@ if cc.compiles('int foo(void) __attribut
    4 
    + endif
    5 
    +
    6 
    + # TODO: this is very incomplete
    7 
    +-if ['linux', 'cygwin'].contains(host_machine.system())
    8 
    ++if ['linux', 'linux-gnu', 'cygwin', 'gnu'].contains(host_machine.system())
    9 
    +   pre_args += '-D_GNU_SOURCE'
    10 
    + endif
    11 
    +

  • debian/patches/series
    1 1 
     07_gallium-fix-build-failure-on-powerpcspe.diff
    2 2 
     meson-add-glx-direct-toggle.diff
    3 
    +meson-fix-hurd-build.diff

  • debian/rules
    ... ... @@ -49,8 +49,11 @@ else
    49 49
    50 50 
       ifeq ($(DEB_HOST_ARCH_OS), linux)
    51 51 
     	confflags_DRI3 = -Ddri3=true
    52 
    -	# Gallium drivers which require kernel support, not yet ported to non-Linux
    53 
    -	GALLIUM_DRIVERS += virgl,
    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
    54 57
    55 58 
     	# Freedreno requires arm in addition
    56 59 
     	ifneq (,$(filter arm arm64,$(DEB_HOST_ARCH_CPU)))
    ... ... @@ -72,10 +75,6 @@ else
    72 75 
     	# Non-Linux ports also lack *_CLOEXEC and epoll, so wayland isn't ready yet:
    73 76 
     	EGL_PLATFORMS += wayland,
    74 77
    75 
    -	ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
    76 
    -		DRI_DRIVERS += nouveau,
    77 
    -		GALLIUM_DRIVERS += nouveau,
    78 
    -	endif
    79 78 
       endif
    80 79
    81 80 
     	EGL_PLATFORMS += drm,
    ... ... @@ -88,6 +87,8 @@ else
    88 87 
       ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
    89 88 
     	DRI_DRIVERS += r200, r100,
    90 89 
     	GALLIUM_DRIVERS += r600, r300,
    90 
    +	confflags_GALLIUM += -Dgallium-va=true
    91 
    +	confflags_GALLIUM += -Dgallium-vdpau=true
    91 92 
       endif
    92 93
    93 94 
       # LLVM is required for building r300g, radeonsi and llvmpipe drivers.
    ... ... @@ -116,8 +117,6 @@ else
    116 117
    117 118 
     	confflags_DIRECT_RENDERING = -Dglx-direct=true
    118 119 
     	confflags_GBM = -Dgbm=true
    119 
    -	confflags_GALLIUM += -Dgallium-vdpau=true
    120 
    -	confflags_GALLIUM += -Dgallium-va=true
    121 120 
     	confflags_GALLIUM += -Dgallium-extra-hud=true
    122 121 
     	confflags_GALLIUM += -Dlmsensors=true
    123 122 
     	with_libva = ,libva

    • —
    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: