From 38ed2425f1e1ef8495e955b020cf989312d5907f Mon Sep 17 00:00:00 2001 From: Minecrell Date: Sun, 19 Jan 2020 13:21:03 +0100 Subject: [PATCH] pine64-*: depend only on mesa-git-dri-gallium (!896) mesa-git-dri-gallium covers all Gallium DRI drivers (including lima and kmsro). Also mesa-git-dri-gallium now depends directly on all relevant mesa-git subpackages, so the subpackages do not need to be specified in each device APKBUILD anymore. --- device/device-pine64-a64lts/APKBUILD | 4 ++-- device/device-pine64-dontbeevil/APKBUILD | 4 ++-- device/device-pine64-pinephone/APKBUILD | 4 ++-- device/device-pine64-pinetab/APKBUILD | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/device/device-pine64-a64lts/APKBUILD b/device/device-pine64-a64lts/APKBUILD index e4f6bc2d4..018538945 100644 --- a/device/device-pine64-a64lts/APKBUILD +++ b/device/device-pine64-a64lts/APKBUILD @@ -3,13 +3,13 @@ pkgname="device-pine64-a64lts" pkgdesc="PINE64 A64-LTS" pkgver=0.3 -pkgrel=1 +pkgrel=2 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" subpackages="$pkgname-nonfree-firmware:nonfree_firmware" -depends="postmarketos-base linux-postmarketos-allwinner u-boot-pine64 uboot-tools mesa-git mesa-git-glapi mesa-git-gl mesa-git-gles mesa-git-egl mesa-git-gbm mesa-git-dri-lima mesa-git-dri-kmsro" +depends="postmarketos-base linux-postmarketos-allwinner u-boot-pine64 uboot-tools mesa-git-dri-gallium" makedepends="devicepkg-dev" source=" deviceinfo diff --git a/device/device-pine64-dontbeevil/APKBUILD b/device/device-pine64-dontbeevil/APKBUILD index 2456ba4b7..45978f962 100644 --- a/device/device-pine64-dontbeevil/APKBUILD +++ b/device/device-pine64-dontbeevil/APKBUILD @@ -3,7 +3,7 @@ pkgname="device-pine64-dontbeevil" pkgdesc="PINE64 PinePhone Don't be evil devkit" pkgver=0.1 -pkgrel=13 +pkgrel=14 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -15,7 +15,7 @@ subpackages=" $pkgname-kernel-shortts:kernel_shortts $pkgname-kernel-longts:kernel_longts " -depends="postmarketos-base u-boot-pine64 uboot-tools mesa-git mesa-git-glapi mesa-git-gl mesa-git-gles mesa-git-egl mesa-git-gbm mesa-git-dri-lima mesa-git-dri-kmsro ofono" +depends="postmarketos-base u-boot-pine64 uboot-tools mesa-git-dri-gallium ofono" makedepends="devicepkg-dev" install="$pkgname.post-install" source=" diff --git a/device/device-pine64-pinephone/APKBUILD b/device/device-pine64-pinephone/APKBUILD index 9344e9775..bb55f47b2 100644 --- a/device/device-pine64-pinephone/APKBUILD +++ b/device/device-pine64-pinephone/APKBUILD @@ -3,7 +3,7 @@ pkgname="device-pine64-pinephone" pkgdesc="PINE64 PinePhone" pkgver=0.1 -pkgrel=19 +pkgrel=20 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -11,7 +11,7 @@ options="!check !archcheck" subpackages=" $pkgname-nonfree-firmware:nonfree_firmware " -depends="postmarketos-base u-boot-pine64 uboot-tools mesa-git mesa-git-glapi mesa-git-gl mesa-git-gles mesa-git-egl mesa-git-gbm mesa-git-dri-lima mesa-git-dri-kmsro linux-postmarketos-allwinner ofono ofono-openrc" +depends="postmarketos-base u-boot-pine64 uboot-tools mesa-git-dri-gallium linux-postmarketos-allwinner ofono ofono-openrc" makedepends="devicepkg-dev" install="$pkgname.post-install" source=" diff --git a/device/device-pine64-pinetab/APKBUILD b/device/device-pine64-pinetab/APKBUILD index 38f335b0e..2df98b7a0 100644 --- a/device/device-pine64-pinetab/APKBUILD +++ b/device/device-pine64-pinetab/APKBUILD @@ -3,12 +3,12 @@ pkgname="device-pine64-pinetab" pkgdesc="PINE64 PineTab" pkgver=0.1 -pkgrel=11 +pkgrel=12 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base linux-postmarketos-allwinner u-boot-pine64 uboot-tools mesa-git mesa-git-glapi mesa-git-gl mesa-git-egl mesa-git-dri-lima mesa-git-dri-kmsro mesa-git-gbm mesa-git-gles" +depends="postmarketos-base linux-postmarketos-allwinner u-boot-pine64 uboot-tools mesa-git-dri-gallium" makedepends="devicepkg-dev" subpackages=" $pkgname-sway