[Git][xorg-team/lib/mesa][debian-unstable] Add pkg.mesa.nolibva build profile

[Emilio Pozuelo Monfort <pochu@debian.org>]

Title: GitLab

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:
17	17	libxfixes-dev,
18	18	libxdamage-dev,
19	19	libxext-dev,
20		- libva-dev (>= 1.6.0) [linux-any kfreebsd-any],
	20	+ libva-dev (>= 1.6.0) [linux-any kfreebsd-any] <!pkg.mesa.nolibva>,
21	21	libvdpau-dev (>= 1.1.1) [linux-any kfreebsd-any],
22	22	libvulkan-dev [amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64 x32],
23	23	x11proto-dev,
...	...	@@ -400,6 +400,7 @@ Description: Mesa Off-screen rendering extension -- development files
400	400	Package: mesa-va-drivers
401	401	Section: libs
402	402	Architecture: linux-any kfreebsd-any
	403	+Build-Profiles: <!pkg.mesa.nolibva>
403	404	Depends:
404	405	${shlibs:Depends},
405	406	${misc:Depends},

debian/rules

---

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

—
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.