diff options
| author | Max Rees <maxcrees@me.com> | 2020-02-24 18:31:54 -0600 |
|---|---|---|
| committer | Max Rees <maxcrees@me.com> | 2020-02-24 18:31:54 -0600 |
| commit | 8d2e00db5f387a3d8baa8961cdf6fa847ced9761 (patch) | |
| tree | ef221164c7133bc59854b3703dca2963840c61b2 | |
| parent | f640f3f0531846f50cd7c418df170a30a22ee7fe (diff) | |
| download | packages-8d2e00db5f387a3d8baa8961cdf6fa847ced9761.tar.gz packages-8d2e00db5f387a3d8baa8961cdf6fa847ced9761.tar.bz2 packages-8d2e00db5f387a3d8baa8961cdf6fa847ced9761.tar.xz packages-8d2e00db5f387a3d8baa8961cdf6fa847ced9761.zip | |
user/xf86-video-*: ensure depends= on mesa-dri and not old subpackages
If depending on the old subpackages of mesa-dri, apk is not smart enough
to determine that it should replace those old subpackages with the new
unified mesa-dri package, so we change the depends= in each reverse
dependency of those old subpackage names to force apk to purge the old
packages. As usual provides=/replaces= are a mystical art.
| -rw-r--r-- | user/xf86-video-ati/APKBUILD | 4 | ||||
| -rw-r--r-- | user/xf86-video-intel/APKBUILD | 2 | ||||
| -rw-r--r-- | user/xf86-video-nouveau/APKBUILD | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/user/xf86-video-ati/APKBUILD b/user/xf86-video-ati/APKBUILD index 4bce3a851..15029c507 100644 --- a/user/xf86-video-ati/APKBUILD +++ b/user/xf86-video-ati/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-video-ati pkgver=19.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="ATI video driver for X11" url="https://www.X.Org/" arch="all" options="!check" # No test suite. license="MIT" -depends="mesa-dri-ati" +depends="mesa-dri" makedepends="eudev-dev libdrm-dev libxi-dev mesa-dev pixman-dev util-macros xorg-server-dev" subpackages="$pkgname-doc" diff --git a/user/xf86-video-intel/APKBUILD b/user/xf86-video-intel/APKBUILD index 15bee6cde..a7eb064bb 100644 --- a/user/xf86-video-intel/APKBUILD +++ b/user/xf86-video-intel/APKBUILD @@ -9,7 +9,7 @@ url="https://xorg.freedesktop.org" arch="pmmx x86_64" options="!check" # No test suite. license="MIT" -depends="mesa-dri-intel" +depends="mesa-dri" makedepends="xorg-server-dev libxi-dev libdrm-dev mesa-dev libxvmc-dev xcb-util-dev eudev-dev util-macros autoconf automake libtool xorgproto libxv-dev diff --git a/user/xf86-video-nouveau/APKBUILD b/user/xf86-video-nouveau/APKBUILD index 40c9b8f82..2f812fc77 100644 --- a/user/xf86-video-nouveau/APKBUILD +++ b/user/xf86-video-nouveau/APKBUILD @@ -2,12 +2,12 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-video-nouveau pkgver=1.0.16 -pkgrel=0 +pkgrel=1 pkgdesc="Libre Nvidia video driver for X11" url="https://nouveau.freedesktop.org/" arch="all" license="MIT" -depends="mesa-dri-nouveau" +depends="mesa-dri" makedepends="eudev-dev libdrm-dev util-macros xorgproto-dev xorg-server-dev" subpackages="$pkgname-doc" source="https://www.X.Org/archive/individual/driver/$pkgname-$pkgver.tar.bz2" |