summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Goto2018-10-15 21:21:58 +0200
committerPhilip Goto2018-10-15 21:21:58 +0200
commit26d49169cfd895990588d48301ec176b65d04b06 (patch)
tree9aa9e9a752ea260c3749f8f59fa084268c7bf81e
parenta6465409a52330b8d6797c0d91633076092cffce (diff)
downloadaur-26d49169cfd895990588d48301ec176b65d04b06.tar.gz
Update package to actually work
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD28
-rw-r--r--minigbm.patch12
3 files changed, 21 insertions, 33 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ffb4271f9e8..c2c843a219c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,19 @@
pkgbase = libminigbm-git
pkgdesc = Generic Buffer Management (GBM) implementation used in Chromium OS
- pkgver = latest
+ pkgver = r305.ee98f4ec
pkgrel = 1
url = https://chromium.googlesource.com/chromiumos/platform/minigbm/
+ arch = i686
arch = x86_64
- license = https://chromium.googlesource.com/chromiumos/platform/minigbm/+/master/LICENSE
+ arch = armv6h
+ arch = armv7h
+ license = custom
+ makedepends = clang
provides = libminigbm
+ conflicts = libminigbm
+ conflicts = mesa
source = git+https://chromium.googlesource.com/chromiumos/platform/minigbm
- source = minigbm.patch
- sha256sums = SKIP
- sha256sums = a347ca3e125e42cf1dd9e19ca058c3569ee7d88eb1592534d30a2fa130400d1e
+ md5sums = SKIP
pkgname = libminigbm-git
diff --git a/PKGBUILD b/PKGBUILD
index 851a2f8d238..61b2bda8108 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,29 @@
# Maintainer: Philip Goto <philip.goto@gmail.com>
+
pkgname=libminigbm-git
-pkgver=latest
+pkgver=r305.ee98f4ec
pkgrel=1
pkgdesc="Generic Buffer Management (GBM) implementation used in Chromium OS"
-arch=('x86_64')
+arch=(i686 x86_64 armv6h armv7h)
url="https://chromium.googlesource.com/chromiumos/platform/minigbm/"
-license=('https://chromium.googlesource.com/chromiumos/platform/minigbm/+/master/LICENSE')
-provides=('libminigbm')
-source=("git+https://chromium.googlesource.com/chromiumos/platform/minigbm"
- "minigbm.patch")
-sha256sums=('SKIP'
- 'a347ca3e125e42cf1dd9e19ca058c3569ee7d88eb1592534d30a2fa130400d1e')
+license=(custom)
+makedepends=(clang)
+provides=(libminigbm)
+conflicts=(libminigbm mesa)
+source=("git+https://chromium.googlesource.com/chromiumos/platform/minigbm")
+md5sums=(SKIP)
pkgver() {
cd minigbm
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
-prepare() {
- cd minigbm
- patch -Np1 -i "${srcdir}/minigbm.patch"
-}
-
build() {
cd minigbm
- make
+ make CC=clang
}
package() {
- install -dm 755 "${pkgdir}/usr/lib"
- install -m 755 "minigbm/libminigbm.so.1.0.0" "${pkgdir}/usr/lib/libminigbm.so"
+ cd minigbm
+ make DESTDIR="${pkgdir}" install
}
diff --git a/minigbm.patch b/minigbm.patch
deleted file mode 100644
index 2088fa5c9aa..00000000000
--- a/minigbm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ura minigbm.orig/common.mk minigbm.new/common.mk
---- minigbm.orig/common.mk 2017-08-09 21:48:00.970953150 +0200
-+++ minigbm.new/common.mk 2017-08-09 21:49:03.386297173 +0200
-@@ -311,7 +311,7 @@
- # The same goes for CFLAGS.
- COMMON_CFLAGS-gcc := -fvisibility=internal -ggdb3 -Wa,--noexecstack
- COMMON_CFLAGS-clang := -fvisibility=hidden -ggdb
--COMMON_CFLAGS := -Wall -Werror -fno-strict-aliasing $(SSP_CFLAGS) -O1 -Wformat=2
-+COMMON_CFLAGS := -Wall -fno-strict-aliasing $(SSP_CFLAGS) -O1 -Wformat=2
- CXXFLAGS += $(COMMON_CFLAGS) $(COMMON_CFLAGS-$(CXXDRIVER))
- CFLAGS += $(COMMON_CFLAGS) $(COMMON_CFLAGS-$(CDRIVER))
- CPPFLAGS += -D_FORTIFY_SOURCE=2