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

[Git][xorg-team/lib/mesa][debian-experimental] 3 commits: control: Bump llvm/clang build-dep.



Title: GitLab

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

Commits:

3 changed files:

Changes:

  • debian/changelog
    1
    -mesa (19.2.0~rc2-1) UNRELEASED; urgency=medium
    
    1
    +mesa (19.2.0~rc2-2) UNRELEASED; urgency=medium
    
    2
    +
    
    3
    +  * control,rules: Restore libva-dev build-dep and nolibva build
    
    4
    +    profile.
    
    5
    +
    
    6
    + -- Timo Aaltonen <tjaalton@debian.org>  Tue, 10 Sep 2019 14:50:21 +0300
    
    7
    +
    
    8
    +mesa (19.2.0~rc2-1) experimental; urgency=medium
    
    2 9
     
    
    3 10
       * New upstream release candidate.
    
    4 11
       * Migrate to llvm/clang-9. (Closes: #935768)
    
    ... ... @@ -7,8 +14,9 @@ mesa (19.2.0~rc2-1) UNRELEASED; urgency=medium
    7 14
       * control, rules: Drop libva-dev from build-depends, don't use
    
    8 15
         dh_libva and drop pkg.mesa.nolibva build profile, libva2 transition
    
    9 16
         is done.
    
    17
    +  * control: Bump llvm/clang build-dep.
    
    10 18
     
    
    11
    - -- Timo Aaltonen <tjaalton@debian.org>  Tue, 27 Aug 2019 10:51:47 +0300
    
    19
    + -- Timo Aaltonen <tjaalton@debian.org>  Mon, 09 Sep 2019 14:36:14 +0300
    
    12 20
     
    
    13 21
     mesa (19.2.0~rc1-1) experimental; urgency=medium
    
    14 22
     
    

  • debian/control
    ... ... @@ -18,6 +18,7 @@ Build-Depends:
    18 18
      libxfixes-dev,
    
    19 19
      libxdamage-dev,
    
    20 20
      libxext-dev,
    
    21
    + libva-dev (>= 1.6.0) [linux-any kfreebsd-any] <!pkg.mesa.nolibva>,
    
    21 22
      libvdpau-dev (>= 1.1.1) [linux-any kfreebsd-any],
    
    22 23
      libvulkan-dev [amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64 x32],
    
    23 24
      x11proto-dev,
    
    ... ... @@ -37,11 +38,11 @@ Build-Depends:
    37 38
      python3-setuptools,
    
    38 39
      flex,
    
    39 40
      bison,
    
    40
    - llvm-9-dev (>= 1:9~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
    
    41
    + llvm-9-dev (>= 1:9~+rc3-1~exp3) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
    
    41 42
      libelf-dev [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
    
    42 43
      libwayland-dev (>= 1.15.0) [linux-any],
    
    43 44
      libwayland-egl-backend-dev (>= 1.15.0) [linux-any],
    
    44
    - libclang-9-dev (>= 1:9~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
    
    45
    + libclang-9-dev (>= 1:9~+rc3-1~exp3) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
    
    45 46
      libclc-dev (>= 0.2.0+git20190827-1~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
    
    46 47
      wayland-protocols (>= 1.9),
    
    47 48
      zlib1g-dev,
    
    ... ... @@ -401,6 +402,7 @@ Description: Mesa Off-screen rendering extension -- development files
    401 402
     Package: mesa-va-drivers
    
    402 403
     Section: libs
    
    403 404
     Architecture: linux-any kfreebsd-any
    
    405
    +Build-Profiles: <!pkg.mesa.nolibva>
    
    404 406
     Depends:
    
    405 407
      ${shlibs:Depends},
    
    406 408
      ${misc:Depends},
    

  • debian/rules
    ... ... @@ -111,9 +111,12 @@ else
    111 111
     	confflags_DIRECT_RENDERING = -Dglx-direct=true
    
    112 112
     	confflags_GBM = -Dgbm=true
    
    113 113
     	confflags_GALLIUM += -Dgallium-extra-hud=true
    
    114
    -	confflags_GALLIUM += -Dgallium-va=true
    
    115 114
     	confflags_GALLIUM += -Dgallium-vdpau=true
    
    116 115
     	confflags_GALLIUM += -Dlmsensors=true
    
    116
    +
    
    117
    +  ifeq (,$(filter pkg.mesa.nolibva,$(DEB_BUILD_PROFILES)))
    
    118
    +        confflags_GALLIUM += -Dgallium-va=true
    
    119
    +  endif
    
    117 120
     endif
    
    118 121
     
    
    119 122
     # Disable assembly usage on x32 otherwise Mesa defaults to x86_64 assembly
    
    ... ... @@ -212,10 +215,12 @@ override_dh_install:
    212 215
     	mv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/libvdpau*.so* \
    
    213 216
     	   debian/mesa-vdpau-drivers/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/
    
    214 217
     
    
    218
    +    ifeq (,$(filter pkg.mesa.nolibva,$(DEB_BUILD_PROFILES)))
    
    215 219
     	# Copy the hardlinked va drivers correctly.
    
    216 220
     	install -m755 -d debian/mesa-va-drivers/usr/lib/${DEB_HOST_MULTIARCH}/dri/
    
    217 221
     	mv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/dri/*_drv_video.so \
    
    218 222
     	   debian/mesa-va-drivers/usr/lib/${DEB_HOST_MULTIARCH}/dri/
    
    223
    +    endif
    
    219 224
       endif
    
    220 225
     
    
    221 226
     	dh_install -a
    


  • Reply to: