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

[Git][xorg-team/lib/mesa][debian-unstable] 2 commits: Merge mesa-va-drivers and mesa-vdpau-drivers into mesa-libgallium (LP: #2135270)

Title: GitLab

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

Commits:

  • 6f0f050e
    by Mario Limonciello (AMD) at 2025-12-18T08:03:46-06:00 
    Merge mesa-va-drivers and mesa-vdpau-drivers into mesa-libgallium (LP: #2135270)

Upstream mesa merged the code already, so these are just dangling
symlinks.

Link: https://gitlab.freedesktop.org/mesa/mesa/-/commit/b51ea6a445b4c1f386e992c894f85f262456db26
Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org>
  • 5e695f9b
    by Mario Limonciello (AMD) at 2025-12-18T08:34:40-06:00 
    Drop conflicts on mesa-va-drivers and mesa-vdpau-drivers

This should be case 11 on https://wiki.debian.org/PackageTransition

3 changed files:

Changes:

  • debian/control
    ... ... @@ -28,7 +28,7 @@ Build-Depends:
    28 28 
      librust-rustc-hash-2-dev [amd64 arm64 armhf i386 ppc64 riscv64 x32],
    29 29 
      librust-syn-dev (>= 2.0.48) [amd64 arm64 armhf i386 ppc64 riscv64 x32],
    30 30 
      libsensors-dev [!hurd-any],
    31 
    - libva-dev (>= 1.6.0) [linux-any] <!pkg.mesa.nolibva>,
    31 
    + libva-dev (>= 1.6.0) [linux-any],
    32 32 
      libvulkan-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    33 33 
      libwayland-dev (>= 1.15.0) [linux-any],
    34 34 
      libwayland-egl-backend-dev (>= 1.15.0) [linux-any],
    ... ... @@ -216,8 +216,15 @@ Section: libs
    216 216 
     Architecture: linux-any
    217 217 
     Depends: ${misc:Depends}, ${shlibs:Depends}
    218 218 
     Pre-Depends: ${misc:Pre-Depends}
    219 
    -Provides: libglapi-mesa
    220 219 
     Multi-Arch: same
    220 
    +Enhances:
    221 
    + libva2,
    222 
    +Provides:
    223 
    + libglapi-mesa
    224 
    + mesa-va-drivers,
    225 
    + va-driver,
    226 
    +Breaks: mesa-va-drivers (<< 25.2.8-3), mesa-vdpau-drivers (<< 25.2.8-3)
    227 
    +Replaces: mesa-va-drivers (<< 25.2.8-3), mesa-vdpau-drivers (<< 25.2.8-3)
    221 228 
     Description: shared infrastructure for Mesa drivers
    222 229 
      This package contains libgallium, a private library shared between
    223 230 
      multiple Mesa drivers. This library is an implementation detail of Mesa
    ... ... @@ -234,28 +241,6 @@ Description: Mesa TensorFlow Lite external delegate
    234 241 
      inference. It is implemented in the form of a external delegate, a shared
    235 242 
      library which the TensorFlow Lite runtime can load at startup.
    236 243
    237 
    -Package: mesa-va-drivers
    238 
    -Section: libs
    239 
    -Architecture: linux-any
    240 
    -Build-Profiles: <!pkg.mesa.nolibva>
    241 
    -Depends:
    242 
    - mesa-libgallium (= ${binary:Version}),
    243 
    - ${misc:Depends},
    244 
    - ${shlibs:Depends}
    245 
    -Enhances: libva2
    246 
    -Provides: va-driver, mesa-vdpau-drivers
    247 
    -Breaks: vdpau-va-driver (<< 0.7.4-5)
    248 
    -Replaces: vdpau-va-driver (<< 0.7.4-5), mesa-vdpau-drivers
    249 
    -Conflicts: mesa-vdpau-drivers
    250 
    -Multi-Arch: same
    251 
    -Pre-Depends: ${misc:Pre-Depends}
    252 
    -Description: Mesa VA-API video acceleration drivers
    253 
    - These libraries provide the Video Acceleration API (VA-API) for Unix.
    254 
    - They provide accelerated video playback (incl. H.264) and video
    255 
    - post-processing for the supported graphics cards.
    256 
    - .
    257 
    - This package enables support for VA-API for some gallium drivers.
    258 
    -
    259 244 
     Package: mesa-vulkan-drivers
    260 245 
     Section: libs
    261 246 
     Architecture: amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32

  • debian/control.in
    ... ... @@ -28,7 +28,7 @@ Build-Depends:
    28 28 
      librust-rustc-hash-2-dev [@NVK_ARCHS@],
    29 29 
      librust-syn-dev (>= 2.0.48) [@NVK_ARCHS@],
    30 30 
      libsensors-dev [!hurd-any],
    31 
    - libva-dev (>= 1.6.0) [linux-any] <!pkg.mesa.nolibva>,
    31 
    + libva-dev (>= 1.6.0) [linux-any],
    32 32 
      libvulkan-dev [@LLVM_ARCHS@],
    33 33 
      libwayland-dev (>= 1.15.0) [linux-any],
    34 34 
      libwayland-egl-backend-dev (>= 1.15.0) [linux-any],
    ... ... @@ -216,8 +216,15 @@ Section: libs
    216 216 
     Architecture: linux-any
    217 217 
     Depends: ${misc:Depends}, ${shlibs:Depends}
    218 218 
     Pre-Depends: ${misc:Pre-Depends}
    219 
    -Provides: libglapi-mesa
    220 219 
     Multi-Arch: same
    220 
    +Enhances:
    221 
    + libva2,
    222 
    +Provides:
    223 
    + libglapi-mesa
    224 
    + mesa-va-drivers,
    225 
    + va-driver,
    226 
    +Breaks: mesa-va-drivers (<< 25.2.8-3), mesa-vdpau-drivers (<< 25.2.8-3)
    227 
    +Replaces: mesa-va-drivers (<< 25.2.8-3), mesa-vdpau-drivers (<< 25.2.8-3)
    221 228 
     Description: shared infrastructure for Mesa drivers
    222 229 
      This package contains libgallium, a private library shared between
    223 230 
      multiple Mesa drivers. This library is an implementation detail of Mesa
    ... ... @@ -234,28 +241,6 @@ Description: Mesa TensorFlow Lite external delegate
    234 241 
      inference. It is implemented in the form of a external delegate, a shared
    235 242 
      library which the TensorFlow Lite runtime can load at startup.
    236 243
    237 
    -Package: mesa-va-drivers
    238 
    -Section: libs
    239 
    -Architecture: linux-any
    240 
    -Build-Profiles: <!pkg.mesa.nolibva>
    241 
    -Depends:
    242 
    - mesa-libgallium (= ${binary:Version}),
    243 
    - ${misc:Depends},
    244 
    - ${shlibs:Depends}
    245 
    -Enhances: libva2
    246 
    -Provides: va-driver, mesa-vdpau-drivers
    247 
    -Breaks: vdpau-va-driver (<< 0.7.4-5)
    248 
    -Replaces: vdpau-va-driver (<< 0.7.4-5), mesa-vdpau-drivers
    249 
    -Conflicts: mesa-vdpau-drivers
    250 
    -Multi-Arch: same
    251 
    -Pre-Depends: ${misc:Pre-Depends}
    252 
    -Description: Mesa VA-API video acceleration drivers
    253 
    - These libraries provide the Video Acceleration API (VA-API) for Unix.
    254 
    - They provide accelerated video playback (incl. H.264) and video
    255 
    - post-processing for the supported graphics cards.
    256 
    - .
    257 
    - This package enables support for VA-API for some gallium drivers.
    258 
    -
    259 244 
     Package: mesa-vulkan-drivers
    260 245 
     Section: libs
    261 246 
     Architecture: @LLVM_ARCHS@

  • debian/rules
    ... ... @@ -69,6 +69,9 @@ else
    69 69 
       confflags_GBM = -Dgbm=enabled
    70 70 
       confflags_GALLIUM += -Dgallium-extra-hud=true
    71 71 
       confflags_GALLIUM += -Dlmsensors=enabled
    72 
    +  confflags_GALLIUM += -Dgallium-va=enabled
    73 
    +  confflags_GALLIUM += -Dvideo-codecs="all"
    74 
    +
    72 75
    73 76 
       # Freedreno requires arm in addition
    74 77 
       ifneq (,$(filter arm arm64,$(DEB_HOST_ARCH_CPU)))
    ... ... @@ -149,11 +152,6 @@ else
    149 152 
       else
    150 153 
     	confflags_GALLIUM += -Dllvm=disabled
    151 154 
       endif
    152 
    -
    153 
    -  ifeq (,$(filter pkg.mesa.nolibva,$(DEB_BUILD_PROFILES)))
    154 
    -	confflags_GALLIUM += -Dgallium-va=enabled
    155 
    -	confflags_GALLIUM += -Dvideo-codecs="all"
    156 
    -  endif
    157 155 
     endif
    158 156
    159 157 
     empty:=
    ... ... @@ -250,12 +248,10 @@ override_dh_install:
    250 248 
     	   debian/libgl1-mesa-dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/
    251 249
    252 250 
       ifneq ($(DEB_HOST_ARCH_OS), hurd)
    253 
    -    ifeq (,$(filter pkg.mesa.nolibva,$(DEB_BUILD_PROFILES)))
    254 251 
     	# Copy the hardlinked va drivers correctly.
    255 
    -	install -m755 -d debian/mesa-va-drivers/usr/lib/${DEB_HOST_MULTIARCH}/dri/
    252 
    +	install -m755 -d debian/mesa-libgallium/usr/lib/${DEB_HOST_MULTIARCH}/dri/
    256 253 
     	mv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/dri/*_drv_video.so \
    257 
    -	   debian/mesa-va-drivers/usr/lib/${DEB_HOST_MULTIARCH}/dri/
    258 
    -    endif
    254 
    +	   debian/mesa-libgallium/usr/lib/${DEB_HOST_MULTIARCH}/dri/
    259 255 
       endif
    260 256
    261 257 
     	dh_install -a

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. Manage all notifications · Help Notification message regarding https://salsa.debian.org/xorg-team/lib/mesa/-/compare/e0820aa7eb9b0bbc92a47d186c72e2700e580b3f...5e695f9b0b020df2edc3214dcd525247238b3c86 at 1766068762

    Reply to: