Merge branch 'mesa-provides-fixes' into 'master'

Remove dependencies on old mesa-dri subpackage names & upgrade intel DDX

See merge request adelie/packages!404

4 files changed, 10 insertions, 25 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 7ffb832b9..a7eb064bb 100644
--- a/user/xf86-video-intel/APKBUILD
+++ b/user/xf86-video-intel/APKBUILD
@@ -2,23 +2,22 @@
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=xf86-video-intel
 verbase=2.99.917
-pkgver=${verbase}_git20180803
+pkgver=${verbase}_git20200224
 pkgrel=0
 pkgdesc="Legacy X.Org driver for Intel graphics cards"
 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
 	"
 subpackages="$pkgname-doc"
-source="https://dev.sick.bike/$pkgname-$pkgver.tar.gz
-	pmmx.patch
-	"
+source="https://dev.sick.bike/dist/$pkgname-$pkgver.tar.gz"
 giturl="https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel.git"
-reporev="3d395062ce73f85e8340218df01c2ebf4bc25023"
+reporev="f66d39544bb8339130c96d282a80f87ca1606caf"
 
 prepare() {
 	default_prepare
@@ -43,5 +42,4 @@ package() {
 	rm "$pkgdir"/usr/libexec/xf86-video-intel-backlight-helper
 }
 
-sha512sums="a96e627ed1b3fb6b66f02caaafb0f94967df9a2409158aacc9d8958538ef47bd84176ce71a4785f21944beb764450b1560c6dc59eef435f75959e27704be41f1  xf86-video-intel-2.99.917_git20180803.tar.gz
-13694f8829ec59773f764817467052d5d4b93b5de16d8cdacc08ced48608b46008414be1f5f118e5f327c401541477c3418f510ada9cfb290a11ac2e5590b0f3  pmmx.patch"
+sha512sums="cb853076238cbde61faeb7dd1a07c5edc5325361dc3109acd9c142c1bf66566ee8c19f8e709bde34456e4198353ac72d337bc6a43dbcc80a4546762541be6eb9  xf86-video-intel-2.99.917_git20200224.tar.gz"
diff --git a/user/xf86-video-intel/pmmx.patch b/user/xf86-video-intel/pmmx.patch
deleted file mode 100644
index 7edddfb96..000000000
--- a/user/xf86-video-intel/pmmx.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/sna/compiler.h b/src/sna/compiler.h
-index 0f3775ec..c4056913 100644
---- a/src/sna/compiler.h
-+++ b/src/sna/compiler.h
-@@ -32,7 +32,7 @@
- #define likely(expr) (__builtin_expect (!!(expr), 1))
- #define unlikely(expr) (__builtin_expect (!!(expr), 0))
- #define noinline __attribute__((noinline))
--#define force_inline inline __attribute__((always_inline))
-+#define force_inline inline
- #define fastcall __attribute__((regparm(3)))
- #define must_check __attribute__((warn_unused_result))
- #define constant __attribute__((const))
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"