mesa-aco: Try to bring up to speed...

ernstp · Nov 13, 2024 · b8d10d6 · b8d10d6
1 parent 4b12766
commit b8d10d6
Show file tree

Hide file tree

Showing 22 changed files with 125 additions and 67 deletions.
diff --git a/mesa-aco/debian/focal/control b/mesa-aco/debian/focal/control
@@ -11,21 +11,19 @@ Build-Depends:
  meson (>= 1.4.0),
  quilt (>= 0.63-8.2~),
  pkg-config,
- libdrm-dev (>= 2.4.120),
+ libdrm-dev (>= 2.4.121),
  libx11-dev,
  libxxf86vm-dev,
  libexpat1-dev,
  libflatbuffers-dev [linux-arm64],
  libsensors-dev [!hurd-any],
  libxfixes-dev,
- libxdamage-dev,
  libxext-dev,
  libva-dev (>= 1.6.0) [linux-any] <!pkg.mesa.nolibva>,
  libvdpau-dev (>= 1.5) [linux-any],
  libvulkan-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
  x11proto-dev,
  linux-libc-dev (>= 2.6.31) [linux-any],
- libpciaccess-dev,
  libx11-xcb-dev,
  libxcb-dri2-0-dev (>= 1.8),
  libxcb-glx0-dev (>= 1.8.1),
@@ -39,10 +37,10 @@ Build-Depends:
  libxshmfence-dev (>= 1.1),
  libxtensor-dev [linux-arm64],
  libzstd-dev,
- lua5.4 [arm64 armel armhf],
  python3,
  python3-mako,
  python3-ply,
+ python3-yaml,
  python3-pycparser [arm64 armhf],
  python3-setuptools,
  flex,
@@ -132,6 +130,7 @@ Architecture: linux-any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
+ mesa-libgallium (= ${binary:Version}),
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: generic buffer management API -- runtime
@@ -163,6 +162,7 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  libgbm1 (= ${binary:Version}) [!hurd-any],
+ mesa-libgallium (= ${binary:Version}),
 Provides: libegl-vendor
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
@@ -221,6 +221,7 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  libgl1-mesa-dri,
+ mesa-libgallium (= ${binary:Version}),
 Provides: libglx-vendor
 Breaks:
  libopengl-perl (<< 0.6704+dfsg-2),
@@ -290,6 +291,19 @@ Description: Developer documentation for Mesa
  extensions, the complete set of release notes and the development header
  files common to all Mesa packages.
 
+Package: mesa-libgallium
+Section: libs
+Architecture: linux-any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: shared infrastructure for Mesa drivers
+ This package contains libgallium, a private library shared between
+ multiple Mesa drivers. This library is an implementation detail of Mesa
+ and should not be used directly by user code.
+
 Package: libosmesa6
 Section: libs
 Architecture: any
@@ -419,7 +433,7 @@ Depends:
  ${misc:Depends},
 Multi-Arch: same
 Description: DRM shim libraries
- This package provides drm-shim libraries which can be used for testing DRM drivers when
- none exists on the host
+ This package provides drm-shim libraries which can be used for testing DRM
+ drivers when none exists on the host.
 
 # vim: tw=0
diff --git a/mesa-aco/debian/focal/libgbm1.install b/mesa-aco/debian/focal/libgbm1.install
@@ -1 +1,2 @@
 usr/lib/*/libgbm.so.1*
+usr/lib/*/gbm/dri_gbm.so*
diff --git a/mesa-aco/debian/focal/libgbm1.lintian-overrides b/mesa-aco/debian/focal/libgbm1.lintian-overrides
@@ -1 +1 @@
-symbols-declares-dependency-on-other-package libgbm1-private
+symbols-declares-dependency-on-other-package libgbm1-private (libgbm.so.1) [symbols]
diff --git a/mesa-aco/debian/focal/mesa-libgallium.install b/mesa-aco/debian/focal/mesa-libgallium.install
@@ -0,0 +1 @@
+usr/lib/*/libgallium-*.so
diff --git a/mesa-aco/debian/focal/mesa-libgallium.lintian-overrides b/mesa-aco/debian/focal/mesa-libgallium.lintian-overrides
@@ -0,0 +1 @@
+package-name-doesnt-match-sonames libgallium-*
diff --git a/mesa-aco/debian/focal/rules b/mesa-aco/debian/focal/rules
@@ -35,11 +35,10 @@ else
 endif
 
 EGL_PLATFORMS = x11
-GALLIUM_DRIVERS = swrast
+GALLIUM_DRIVERS =
 VULKAN_DRIVERS =
 VULKAN_LAYERS =
 
-confflags_DRI3 = -Ddri3=disabled
 confflags_OSMESA = -Dosmesa=true
 confflags_SSE2 = -Dsse2=true
 confflags_TEFLON = -Dteflon=false
@@ -52,6 +51,7 @@ WINE_ARCHS     = amd64 arm64 armel armhf i386
 
 # hurd doesn't do direct rendering
 ifeq ($(DEB_HOST_ARCH_OS), hurd)
+  GALLIUM_DRIVERS += softpipe
   confflags_DIRECT_RENDERING = -Dglx-direct=false
   confflags_GBM = -Dgbm=disabled
 else
@@ -62,7 +62,6 @@ else
 
   GALLIUM_DRIVERS += r300 r600 virgl
   confflags_DIRECT_RENDERING = -Dglx-direct=true
-  confflags_DRI3 = -Ddri3=enabled
   confflags_GBM = -Dgbm=enabled
   confflags_GALLIUM += -Dgallium-extra-hud=true
   confflags_GALLIUM += -Dgallium-vdpau=enabled
@@ -107,7 +106,7 @@ else
   # LLVM is required for building r300g, radeonsi and llvmpipe drivers.
   # It's also required for building OpenCL support.
   ifneq (,$(filter $(DEB_HOST_ARCH), $(LLVM_ARCHS)))
-	GALLIUM_DRIVERS += radeonsi zink
+	GALLIUM_DRIVERS += radeonsi zink llvmpipe
 
 	# Only enable amd on riscv64, swrast needs CPU JIT support which doesn't work properly yet
 	ifneq (,$(filter $(DEB_HOST_ARCH), riscv64))
@@ -140,6 +139,7 @@ else
 		confflags_GALLIUM += -Dgallium-nine=true
 	endif
   else
+	GALLIUM_DRIVERS += softpipe
 	confflags_GALLIUM += -Dllvm=disabled
   endif
 
@@ -175,19 +175,16 @@ confflags_GALLIUM += -Dgallium-drivers="[$(GALLIUM_DRIVERS_LIST)]"
 
 confflags += \
 	-Ddri-drivers-path=/usr/lib/$(DEB_HOST_MULTIARCH)/dri \
-	-Ddri-search-path='/usr/lib/$(DEB_HOST_MULTIARCH)/dri:\$$$${ORIGIN}/dri:/usr/lib/dri' \
 	-Dplatforms="[$(EGL_PLATFORMS_LIST)]" \
 	-Dvulkan-drivers="[$(VULKAN_DRIVERS_LIST)]" \
 	-Dvulkan-layers="[$(VULKAN_LAYERS_LIST)]" \
-	-Dglvnd=true \
+	-Dglvnd=enabled \
 	-Dshared-glapi=enabled \
-	-Dgallium-omx=disabled \
 	-Db_ndebug=true \
 	-Dbuild-tests=false \
 	-Dtools=drm-shim \
 	$(confflags_DIRECT_RENDERING) \
 	$(confflags_GBM) \
-	$(confflags_DRI3) \
 	$(confflags_GALLIUM) \
 	$(confflags_GLES) \
 	$(confflags_OSMESA) \

diff --git a/mesa-aco/debian/jammy/control b/mesa-aco/debian/jammy/control
@@ -11,21 +11,19 @@ Build-Depends:
  meson (>= 1.4.0),
  quilt (>= 0.63-8.2~),
  pkg-config,
- libdrm-dev (>= 2.4.120),
+ libdrm-dev (>= 2.4.121),
  libx11-dev,
  libxxf86vm-dev,
  libexpat1-dev,
  libflatbuffers-dev [linux-arm64],
  libsensors-dev [!hurd-any],
  libxfixes-dev,
- libxdamage-dev,
  libxext-dev,
  libva-dev (>= 1.6.0) [linux-any] <!pkg.mesa.nolibva>,
  libvdpau-dev (>= 1.5) [linux-any],
  libvulkan-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
  x11proto-dev,
  linux-libc-dev (>= 2.6.31) [linux-any],
- libpciaccess-dev,
  libx11-xcb-dev,
  libxcb-dri2-0-dev (>= 1.8),
  libxcb-glx0-dev (>= 1.8.1),
@@ -39,10 +37,10 @@ Build-Depends:
  libxshmfence-dev (>= 1.1),
  libxtensor-dev [linux-arm64],
  libzstd-dev,
- lua5.4 [arm64 armel armhf],
  python3,
  python3-mako,
  python3-ply,
+ python3-yaml,
  python3-pycparser [arm64 armhf],
  python3-setuptools,
  flex,
@@ -132,6 +130,7 @@ Architecture: linux-any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
+ mesa-libgallium (= ${binary:Version}),
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: generic buffer management API -- runtime
@@ -163,6 +162,7 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  libgbm1 (= ${binary:Version}) [!hurd-any],
+ mesa-libgallium (= ${binary:Version}),
 Provides: libegl-vendor
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
@@ -221,6 +221,7 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  libgl1-mesa-dri,
+ mesa-libgallium (= ${binary:Version}),
 Provides: libglx-vendor
 Breaks:
  libopengl-perl (<< 0.6704+dfsg-2),
@@ -290,6 +291,19 @@ Description: Developer documentation for Mesa
  extensions, the complete set of release notes and the development header
  files common to all Mesa packages.
 
+Package: mesa-libgallium
+Section: libs
+Architecture: linux-any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: shared infrastructure for Mesa drivers
+ This package contains libgallium, a private library shared between
+ multiple Mesa drivers. This library is an implementation detail of Mesa
+ and should not be used directly by user code.
+
 Package: libosmesa6
 Section: libs
 Architecture: any
@@ -419,7 +433,7 @@ Depends:
  ${misc:Depends},
 Multi-Arch: same
 Description: DRM shim libraries
- This package provides drm-shim libraries which can be used for testing DRM drivers when
- none exists on the host
+ This package provides drm-shim libraries which can be used for testing DRM
+ drivers when none exists on the host.
 
 # vim: tw=0
diff --git a/mesa-aco/debian/jammy/libgbm1.install b/mesa-aco/debian/jammy/libgbm1.install
@@ -1 +1,2 @@
 usr/lib/*/libgbm.so.1*
+usr/lib/*/gbm/dri_gbm.so*
diff --git a/mesa-aco/debian/jammy/libgbm1.lintian-overrides b/mesa-aco/debian/jammy/libgbm1.lintian-overrides
@@ -1 +1 @@
-symbols-declares-dependency-on-other-package libgbm1-private
+symbols-declares-dependency-on-other-package libgbm1-private (libgbm.so.1) [symbols]
diff --git a/mesa-aco/debian/jammy/mesa-libgallium.install b/mesa-aco/debian/jammy/mesa-libgallium.install
@@ -0,0 +1 @@
+usr/lib/*/libgallium-*.so
diff --git a/mesa-aco/debian/jammy/mesa-libgallium.lintian-overrides b/mesa-aco/debian/jammy/mesa-libgallium.lintian-overrides
@@ -0,0 +1 @@
+package-name-doesnt-match-sonames libgallium-*
diff --git a/mesa-aco/debian/jammy/rules b/mesa-aco/debian/jammy/rules
@@ -35,11 +35,10 @@ else
 endif
 
 EGL_PLATFORMS = x11
-GALLIUM_DRIVERS = swrast
+GALLIUM_DRIVERS =
 VULKAN_DRIVERS =
 VULKAN_LAYERS =
 
-confflags_DRI3 = -Ddri3=disabled
 confflags_OSMESA = -Dosmesa=true
 confflags_SSE2 = -Dsse2=true
 confflags_TEFLON = -Dteflon=false
@@ -52,6 +51,7 @@ WINE_ARCHS     = amd64 arm64 armel armhf i386
 
 # hurd doesn't do direct rendering
 ifeq ($(DEB_HOST_ARCH_OS), hurd)
+  GALLIUM_DRIVERS += softpipe
   confflags_DIRECT_RENDERING = -Dglx-direct=false
   confflags_GBM = -Dgbm=disabled
 else
@@ -62,7 +62,6 @@ else
 
   GALLIUM_DRIVERS += nouveau r300 r600 virgl
   confflags_DIRECT_RENDERING = -Dglx-direct=true
-  confflags_DRI3 = -Ddri3=enabled
   confflags_GBM = -Dgbm=enabled
   confflags_GALLIUM += -Dgallium-extra-hud=true
   confflags_GALLIUM += -Dgallium-vdpau=enabled
@@ -107,7 +106,7 @@ else
   # LLVM is required for building r300g, radeonsi and llvmpipe drivers.
   # It's also required for building OpenCL support.
   ifneq (,$(filter $(DEB_HOST_ARCH), $(LLVM_ARCHS)))
-	GALLIUM_DRIVERS += radeonsi zink
+	GALLIUM_DRIVERS += radeonsi zink llvmpipe
 
 	# Only enable amd on riscv64, swrast needs CPU JIT support which doesn't work properly yet
 	ifneq (,$(filter $(DEB_HOST_ARCH), riscv64))
@@ -140,6 +139,7 @@ else
 		confflags_GALLIUM += -Dgallium-nine=true
 	endif
   else
+	GALLIUM_DRIVERS += softpipe
 	confflags_GALLIUM += -Dllvm=disabled
   endif
 
@@ -175,19 +175,16 @@ confflags_GALLIUM += -Dgallium-drivers="[$(GALLIUM_DRIVERS_LIST)]"
 
 confflags += \
 	-Ddri-drivers-path=/usr/lib/$(DEB_HOST_MULTIARCH)/dri \
-	-Ddri-search-path='/usr/lib/$(DEB_HOST_MULTIARCH)/dri:\$$$${ORIGIN}/dri:/usr/lib/dri' \
 	-Dplatforms="[$(EGL_PLATFORMS_LIST)]" \
 	-Dvulkan-drivers="[$(VULKAN_DRIVERS_LIST)]" \
 	-Dvulkan-layers="[$(VULKAN_LAYERS_LIST)]" \
-	-Dglvnd=true \
+	-Dglvnd=enabled \
 	-Dshared-glapi=enabled \
-	-Dgallium-omx=disabled \
 	-Db_ndebug=true \
 	-Dbuild-tests=false \
 	-Dtools=drm-shim \
 	$(confflags_DIRECT_RENDERING) \
 	$(confflags_GBM) \
-	$(confflags_DRI3) \
 	$(confflags_GALLIUM) \
 	$(confflags_GLES) \
 	$(confflags_OSMESA) \
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		usr/lib//libgbm.so.1
		usr/lib//gbm/dri_gbm.so
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		symbols-declares-dependency-on-other-package libgbm1-private
		symbols-declares-dependency-on-other-package libgbm1-private (libgbm.so.1) [symbols]