Emilio Pozuelo Monfort pushed to branch debian-unstable at X Strike Force / lib
/ mesa
Commits:
f0ce92d8 by James Clarke at 2019-01-17T20:59:17Z
Add pkg.mesa.nolibva build profile
Currently there is a mesa -> libva-dev -> libva-glx1 -> libgl1-mesa-glx
dependency loop; this build profile allows the loop to be broken for
bootstrapping.
- - - - -
2 changed files:
- debian/control
- debian/rules
Changes:
=====================================
debian/control
=====================================
@@ -17,7 +17,7 @@ Build-Depends:
libxfixes-dev,
libxdamage-dev,
libxext-dev,
- libva-dev (>= 1.6.0) [linux-any kfreebsd-any],
+ libva-dev (>= 1.6.0) [linux-any kfreebsd-any] <!pkg.mesa.nolibva>,
libvdpau-dev (>= 1.1.1) [linux-any kfreebsd-any],
libvulkan-dev [amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc
ppc64 ppc64el s390x sparc64 x32],
x11proto-dev,
@@ -400,6 +400,7 @@ Description: Mesa Off-screen rendering extension --
development files
Package: mesa-va-drivers
Section: libs
Architecture: linux-any kfreebsd-any
+Build-Profiles: <!pkg.mesa.nolibva>
Depends:
${shlibs:Depends},
${misc:Depends},
=====================================
debian/rules
=====================================
@@ -108,10 +108,13 @@ else
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
+
+ ifeq (,$(filter pkg.mesa.nolibva,$(DEB_BUILD_PROFILES)))
+ confflags_GALLIUM += -Dgallium-va=true
with_libva = ,libva
+ endif
endif
# Disable assembly usage on x32 otherwise Mesa defaults to x86_64 assembly
@@ -209,10 +212,12 @@ override_dh_install:
mv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/libvdpau*.so* \
debian/mesa-vdpau-drivers/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/
+ ifeq (,$(filter pkg.mesa.nolibva,$(DEB_BUILD_PROFILES)))
# Copy the hardlinked va drivers correctly.
install -m755 -d
debian/mesa-va-drivers/usr/lib/${DEB_HOST_MULTIARCH}/dri/
mv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/dri/*_drv_video.so \
debian/mesa-va-drivers/usr/lib/${DEB_HOST_MULTIARCH}/dri/
+ endif
endif
dh_install -a --fail-missing
View it on GitLab:
https://salsa.debian.org/xorg-team/lib/mesa/commit/f0ce92d885a21ee205b40f2dbd0740d6d7550e52
--
View it on GitLab:
https://salsa.debian.org/xorg-team/lib/mesa/commit/f0ce92d885a21ee205b40f2dbd0740d6d7550e52
You're receiving this email because of your account on salsa.debian.org.
