From 66db4dff0cb5ec5fe93f82bf61865d260d5b175d Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Tue, 19 Nov 2019 19:24:30 +0100 Subject: [PATCH] main/xf86-video-opentegra: remove (!754) The package doesn't build anymore and blocks the binary repository. See postmarketOS/pmaports#339 --- device/device-ouya-ouya/APKBUILD | 4 +- device/device-samsung-i927/APKBUILD | 4 +- device/device-samsung-p4wifi/APKBUILD | 4 +- main/xf86-video-opentegra/APKBUILD | 52 ------------------- .../Guard-malloc_trim-with-__GLIBC__.patch | 26 ---------- 5 files changed, 6 insertions(+), 84 deletions(-) delete mode 100644 main/xf86-video-opentegra/APKBUILD delete mode 100644 main/xf86-video-opentegra/Guard-malloc_trim-with-__GLIBC__.patch diff --git a/device/device-ouya-ouya/APKBUILD b/device/device-ouya-ouya/APKBUILD index 6bc7e2e89..2eb7d7a5b 100644 --- a/device/device-ouya-ouya/APKBUILD +++ b/device/device-ouya-ouya/APKBUILD @@ -2,18 +2,18 @@ pkgname=device-ouya-ouya pkgver=1 pkgdesc="Ouya" -pkgrel=11 +pkgrel=12 url="https://postmarketos.org" arch="armv7" license="MIT" options="!check !archcheck" +# FIXME xf86-video-opentegra was removed because it doesn't build anymore, see postmarketOS/pmaports#339 depends=" libdrm-grate libvdpau-tegra mesa-dri-swrast mkbootimg postmarketos-base - xf86-video-opentegra " makedepends="" install="" diff --git a/device/device-samsung-i927/APKBUILD b/device/device-samsung-i927/APKBUILD index c9feb2fb2..fbcb0d0c6 100644 --- a/device/device-samsung-i927/APKBUILD +++ b/device/device-samsung-i927/APKBUILD @@ -2,11 +2,12 @@ pkgname="device-samsung-i927" pkgdesc="Samsung Captivate Glide" pkgver=0.3 -pkgrel=1 +pkgrel=2 url="https://postmarketos.org" license="MIT" arch="armv7" options="!check !archcheck" +# FIXME xf86-video-opentegra was removed because it doesn't build anymore, see postmarketOS/pmaports#339 depends="postmarketos-base linux-samsung-i927 mkbootimg @@ -15,7 +16,6 @@ depends="postmarketos-base pm-utils libdrm-grate mesa-dri-swrast - xf86-video-opentegra mesa-demos libvdpau-tegra" makedepends="devicepkg-dev" diff --git a/device/device-samsung-p4wifi/APKBUILD b/device/device-samsung-p4wifi/APKBUILD index 36cae6c2e..63011419c 100644 --- a/device/device-samsung-p4wifi/APKBUILD +++ b/device/device-samsung-p4wifi/APKBUILD @@ -2,18 +2,18 @@ pkgname="device-samsung-p4wifi" pkgdesc="Galaxy Tab 10.1" pkgver=0.3 -pkgrel=4 +pkgrel=5 url="https://postmarketos.org" license="MIT" arch="armv7" options="!check !archcheck" +# FIXME xf86-video-opentegra was removed because it doesn't build anymore, see postmarketOS/pmaports#339 depends="postmarketos-base linux-samsung-p4wifi mkbootimg alsa-utils libdrm-grate mesa-dri-swrast - xf86-video-opentegra libvdpau-tegra" makedepends="devicepkg-dev" subpackages="$pkgname-nonfree-firmware:nonfree_firmware" diff --git a/main/xf86-video-opentegra/APKBUILD b/main/xf86-video-opentegra/APKBUILD deleted file mode 100644 index e5bdd5c97..000000000 --- a/main/xf86-video-opentegra/APKBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# Maintainer: Robert Yang -pkgname=xf86-video-opentegra -# FIXME: this package does not build anymore (#339)! -# When fixing this, also set a proper pkgver (see !565): -# pkgver=0.6.0_git20190323 -pkgver=0.6.0 -pkgrel=2 -pkgdesc="X.Org driver for NVIDIA tegra" -url="https://github.com/grate-driver/" -arch="armhf armv7" -license="MIT" -subpackages="$pkgname-doc" -depends="libdrm-grate" -makedepends="libdrm-grate-dev xorg-server-dev xproto fontsproto util-macros - libtool m4 automake autoconf bison flex" -_commit="bf853ada6d906ca1e983c1965995102ae1ccfccc" -source=" - https://github.com/grate-driver/xf86-video-opentegra/archive/$_commit.tar.gz - Guard-malloc_trim-with-__GLIBC__.patch - " -builddir="$srcdir"/$pkgname-$_commit - -prepare() { - default_prepare - - export PKG_CONFIG_PATH="/usr/lib/pkgconfig/libdrm-grate:${PKG_CONFIG_PATH}" - export LDFLAGS="$LDFLAGS -Wl,-z,lazy" - - ./autogen.sh \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr -} - -build() { - cd "$builddir" - make -} - -check() { - cd "$builddir" - make check -} - -package() { - cd "$builddir" - make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING -} - -sha512sums="7de5fc0e93a46bf8c5f2f04ef144ef2442b117e2260c7fea277dbec050c4fd2124e7a0fd640591ac3192c5be6ca61f79b44a5884fed0c6f6c900f20f29d124e9 bf853ada6d906ca1e983c1965995102ae1ccfccc.tar.gz -3e3cced887a73d865ee03cf030dbe2dd2035e29e3e771d79a95491c6e59a02570e273fc7fec67b87b0bf2008ab97212252bb9ed31bd6137b78d1bbbeda467fec Guard-malloc_trim-with-__GLIBC__.patch" diff --git a/main/xf86-video-opentegra/Guard-malloc_trim-with-__GLIBC__.patch b/main/xf86-video-opentegra/Guard-malloc_trim-with-__GLIBC__.patch deleted file mode 100644 index fe8965c10..000000000 --- a/main/xf86-video-opentegra/Guard-malloc_trim-with-__GLIBC__.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0f7bcd092f167202ff59c09f20eb258046745ae5 Mon Sep 17 00:00:00 2001 -From: Robert Yang -Date: Sat, 6 Oct 2018 10:48:24 -0400 -Subject: [PATCH] Guard malloc_trim with __GLIBC__ - ---- - src/exa.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/exa.c b/src/exa.c -index ea76dc3..3dd86e6 100644 ---- a/src/exa.c -+++ b/src/exa.c -@@ -213,7 +213,9 @@ static void TegraEXATrimHeap(TegraEXAPtr exa) - */ - if (exa->release_count > TEGRA_MALLOC_TRIM_THRESHOLD) { - exa->release_count = 0; -+#ifdef __GLIBC__ - malloc_trim(0); -+#endif - } - } - --- -2.17.1 -