From 5b7db395d89e68024ef35229cf9ae7dfd633c566 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Tue, 7 Jan 2020 21:13:04 +0000 Subject: user/*: Modernise / fix syntax / deps Also move freedreno to the ARM-only depends. --- user/xf86-video-intel/APKBUILD | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'user/xf86-video-intel/APKBUILD') diff --git a/user/xf86-video-intel/APKBUILD b/user/xf86-video-intel/APKBUILD index 6727ce394..7ffb832b9 100644 --- a/user/xf86-video-intel/APKBUILD +++ b/user/xf86-video-intel/APKBUILD @@ -9,11 +9,11 @@ url="https://xorg.freedesktop.org" arch="pmmx x86_64" options="!check" # No test suite. license="MIT" -subpackages="$pkgname-doc" depends="mesa-dri-intel" makedepends="xorg-server-dev libxi-dev libdrm-dev mesa-dev libxvmc-dev xcb-util-dev eudev-dev util-macros autoconf automake libtool xorgproto " +subpackages="$pkgname-doc" source="https://dev.sick.bike/$pkgname-$pkgver.tar.gz pmmx.patch " @@ -21,13 +21,11 @@ giturl="https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel.git" reporev="3d395062ce73f85e8340218df01c2ebf4bc25023" prepare() { - cd "$builddir" default_prepare autoreconf -vif } build() { - cd "$builddir" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" ./configure \ --build=$CBUILD \ @@ -40,7 +38,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING rm "$pkgdir"/usr/libexec/xf86-video-intel-backlight-helper -- cgit v1.2.3-70-g09d2 From f640f3f0531846f50cd7c418df170a30a22ee7fe Mon Sep 17 00:00:00 2001 From: Max Rees Date: Mon, 24 Feb 2020 18:30:25 -0600 Subject: user/xf86-video-intel: bump to latest master changelog: https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/compare/3d395062ce73f85e8340218df01c2ebf4bc25023...f66d39544bb8339130c96d282a80f87ca1606caf --- user/xf86-video-intel/APKBUILD | 12 +++++------- user/xf86-video-intel/pmmx.patch | 13 ------------- 2 files changed, 5 insertions(+), 20 deletions(-) delete mode 100644 user/xf86-video-intel/pmmx.patch (limited to 'user/xf86-video-intel/APKBUILD') diff --git a/user/xf86-video-intel/APKBUILD b/user/xf86-video-intel/APKBUILD index 7ffb832b9..15bee6cde 100644 --- a/user/xf86-video-intel/APKBUILD +++ b/user/xf86-video-intel/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees 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" @@ -12,13 +12,12 @@ license="MIT" depends="mesa-dri-intel" 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)) -- cgit v1.2.3-70-g09d2 From 8d2e00db5f387a3d8baa8961cdf6fa847ced9761 Mon Sep 17 00:00:00 2001 From: Max Rees Date: Mon, 24 Feb 2020 18:31:54 -0600 Subject: 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. --- user/xf86-video-ati/APKBUILD | 4 ++-- user/xf86-video-intel/APKBUILD | 2 +- user/xf86-video-nouveau/APKBUILD | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'user/xf86-video-intel/APKBUILD') 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 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 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" -- cgit v1.2.3-70-g09d2