From 91ca0bfa0192935c58908bff3f74ae07936fd1f3 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Mon, 27 Jun 2022 10:28:39 +0200 Subject: [PATCH] device/*: replace old mesa-dri- dependencies with gallium (MR 3257) vc4 and freedreno have been provided by mesa-dri-gallium for a long time. mesa-dri-intel subpackage has been deprecated for a while (previously dependend on dri-classic and dri-gallium) mesa-dri-classic drivers is removed because mesa upstream has removed those old drivers from the tree. They've been replaced (for not-ancient hardware) by gallium. See also https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/31848 --- device/community/device-asus-me176c/APKBUILD | 4 ++-- device/testing/device-asus-flo/APKBUILD | 4 ++-- device/testing/device-raspberry-pi/APKBUILD | 6 +++--- device/testing/device-raspberry-pi3/APKBUILD | 4 ++-- device/testing/device-surftab-wintron7.0/APKBUILD | 4 ++-- device/testing/device-tablet-x86uefi/APKBUILD | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/device/community/device-asus-me176c/APKBUILD b/device/community/device-asus-me176c/APKBUILD index b48b1299b..2e07f9b50 100644 --- a/device/community/device-asus-me176c/APKBUILD +++ b/device/community/device-asus-me176c/APKBUILD @@ -3,7 +3,7 @@ pkgname=device-asus-me176c pkgdesc="ASUS MeMO Pad 7 (ME176C(X))" pkgver=5 -pkgrel=0 +pkgrel=1 _commit=3155254999ac36c3051a2118c415de25a072c0f6 url="https://postmarketos.org" license="MIT" @@ -15,7 +15,7 @@ depends=" firmware-asus-me176c-acpi intel-ucode linux-asus-me176c - mesa-dri-classic + mesa-dri-gallium postmarketos-base " makedepends="devicepkg-dev meson eudev-dev" diff --git a/device/testing/device-asus-flo/APKBUILD b/device/testing/device-asus-flo/APKBUILD index d96d52a42..1a0f9111c 100644 --- a/device/testing/device-asus-flo/APKBUILD +++ b/device/testing/device-asus-flo/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: David Heidelberg pkgname=device-asus-flo pkgver=1.1 -pkgrel=0 +pkgrel=1 pkgdesc="Google Nexus 7 2013 (flo)" url="https://postmarketos.org" arch="armv7" @@ -40,7 +40,7 @@ weston() { kernel_downstream() { pkgdesc="GPU works somehow, very old" - depends="linux-asus-flo mesa-dri-freedreno" + depends="linux-asus-flo mesa-dri-gallium" devicepkg_subpackage_kernel $startdir $pkgname $subpkgname } diff --git a/device/testing/device-raspberry-pi/APKBUILD b/device/testing/device-raspberry-pi/APKBUILD index 6d866bce6..d15c20a1f 100644 --- a/device/testing/device-raspberry-pi/APKBUILD +++ b/device/testing/device-raspberry-pi/APKBUILD @@ -2,7 +2,7 @@ pkgname=device-raspberry-pi pkgdesc="Raspberry Pi" pkgver=0.2 -pkgrel=0 +pkgrel=1 url="https://postmarketos.org" license="MIT" arch="armhf" @@ -51,14 +51,14 @@ kernel_rpi2() { sway() { install_if="$pkgname postmarketos-ui-sway" - depends="$pkgname mesa-dri-vc4" + depends="$pkgname mesa-dri-gallium" install -Dm644 "$srcdir"/start-even-without-input.sh "$pkgdir"/etc/profile.d/start-even-without-input.sh mkdir "$subpkgdir" } phosh() { install_if="$pkgname postmarketos-ui-phosh" - depends="$pkgname mesa-dri-vc4" + depends="$pkgname mesa-dri-gallium" install -Dm644 "$srcdir"/start-even-without-input.sh "$pkgdir"/etc/profile.d/start-even-without-input.sh mkdir "$subpkgdir" } diff --git a/device/testing/device-raspberry-pi3/APKBUILD b/device/testing/device-raspberry-pi3/APKBUILD index f56429688..c96863bbb 100644 --- a/device/testing/device-raspberry-pi3/APKBUILD +++ b/device/testing/device-raspberry-pi3/APKBUILD @@ -2,12 +2,12 @@ pkgname=device-raspberry-pi3 pkgdesc="Raspberry Pi 3B/3B+" pkgver=0.2 -pkgrel=1 +pkgrel=2 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base raspberrypi-bootloader linux-rpi mesa-dri-vc4 bluetooth-raspberry-pi" +depends="postmarketos-base raspberrypi-bootloader linux-rpi mesa-dri-gallium bluetooth-raspberry-pi" makedepends="devicepkg-dev" install="$pkgname.post-install $pkgname.post-upgrade" subpackages="$pkgname-weston" diff --git a/device/testing/device-surftab-wintron7.0/APKBUILD b/device/testing/device-surftab-wintron7.0/APKBUILD index 30d8d9fea..b14041b86 100644 --- a/device/testing/device-surftab-wintron7.0/APKBUILD +++ b/device/testing/device-surftab-wintron7.0/APKBUILD @@ -2,12 +2,12 @@ pkgname=device-surftab-wintron7.0 pkgdesc="TrekStor SurfTab wintron 7.0" pkgver=0.5 -pkgrel=2 +pkgrel=3 url="https://postmarketos.org" license="MIT" arch="x86_64" options="!check !archcheck" -depends="grub-x86 postmarketos-base linux-lts mesa-dri-intel" +depends="grub-x86 postmarketos-base linux-lts mesa-dri-gallium" makedepends="devicepkg-dev" subpackages="$pkgname-nonfree-firmware:nonfree_firmware" source=" diff --git a/device/testing/device-tablet-x86uefi/APKBUILD b/device/testing/device-tablet-x86uefi/APKBUILD index 7c53dff1b..2a573015a 100644 --- a/device/testing/device-tablet-x86uefi/APKBUILD +++ b/device/testing/device-tablet-x86uefi/APKBUILD @@ -2,12 +2,12 @@ pkgname=device-tablet-x86uefi pkgdesc="Various tablets with atom CPU" pkgver=3 -pkgrel=1 +pkgrel=2 url="https://postmarketos.org" license="MIT" arch="x86_64" options="!check !archcheck" -depends="postmarketos-base linux-lts mesa-dri-intel libva-intel-driver grub-x86 alsa-ucm-conf" +depends="postmarketos-base linux-lts mesa-dri-gallium libva-intel-driver grub-x86 alsa-ucm-conf" makedepends="devicepkg-dev" source="deviceinfo grub.cfg phoc.ini" subpackages="$pkgname-phosh $pkgname-x11"