aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorprspkt <prspkt@protonmail.com>2019-02-16 11:59:10 +0200
committerFrancesco Colista <fcolista@alpinelinux.org>2019-02-20 09:00:34 +0000
commit145b534e138dcdd08c4e1c57a52e884ca41cf93f (patch)
treef0cc66c2dcc989f6e7085bd31ad3760bfc6af1a4 /main
parent104de42e838e77bb5e0cec959f07ddc476880897 (diff)
downloadaports-145b534e138dcdd08c4e1c57a52e884ca41cf93f.tar.bz2
aports-145b534e138dcdd08c4e1c57a52e884ca41cf93f.tar.xz
main/pixman: upgrade to 0.38.0, clarify license
Diffstat (limited to 'main')
-rw-r--r--main/pixman/APKBUILD14
-rw-r--r--main/pixman/fix-ppc64le-vmx.patch12
-rw-r--r--main/pixman/float-header-fix.patch16
3 files changed, 5 insertions, 37 deletions
diff --git a/main/pixman/APKBUILD b/main/pixman/APKBUILD
index 3ebbe794de..7d93a69c17 100644
--- a/main/pixman/APKBUILD
+++ b/main/pixman/APKBUILD
@@ -1,17 +1,15 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=pixman
-pkgver=0.34.0
-pkgrel=6
+pkgver=0.38.0
+pkgrel=0
pkgdesc="Low-level pixel manipulation library"
url="http://xorg.freedesktop.org"
arch="all"
-license="custom"
+license="MIT"
subpackages="$pkgname-static $pkgname-dev $pkgname-dbg"
makedepends="perl linux-headers"
source="https://www.x.org/releases/individual/lib/$pkgname-$pkgver.tar.bz2
- float-header-fix.patch
stacksize-reduction.patch
- fix-ppc64le-vmx.patch
"
builddir="$srcdir/$pkgname-$pkgver"
@@ -44,7 +42,5 @@ static() {
mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
}
-sha512sums="755a3f5596e7bd9710abc8e5bfd341adaf2177f5b21f7aaae7f85b8fb57580ea48df586ad32bf6adef6ce0430e7cadaa57754a2fa466bc4b15bf70ee64cd1418 pixman-0.34.0.tar.bz2
-5064da221fe406e58169df0b07df7123ccf65487e654dba9e0903122480363c2b4e11ec0a14ac546658c747934509f2f66e3d0d078d6dd0ac92505c24b0e9ee9 float-header-fix.patch
-3d75e7328e6eaaa6e8f4defa4402db815764369f94b81be38fba07933267fe24b03b591dd4c3f3544cb090650153728bfbdd81a91acaf19524c3d08f61427f63 stacksize-reduction.patch
-244dfe9fe6d64aca9e330d11490271e96ffc80b1a3f1bf3231c081683f227e0777e3cf9394639325f98c07f31d0f4f99dd21372787e40a0ec74e73dc48b7aae9 fix-ppc64le-vmx.patch"
+sha512sums="f2279a30947df0c75064fdc36c3e0b735d9392d516191d99a9a66c9bae86778c538a552f1bf9eb75cdbd141891e3addb4836b37ef1553bc6d55285f214311b78 pixman-0.38.0.tar.bz2
+3d75e7328e6eaaa6e8f4defa4402db815764369f94b81be38fba07933267fe24b03b591dd4c3f3544cb090650153728bfbdd81a91acaf19524c3d08f61427f63 stacksize-reduction.patch"
diff --git a/main/pixman/fix-ppc64le-vmx.patch b/main/pixman/fix-ppc64le-vmx.patch
deleted file mode 100644
index b088f16f40..0000000000
--- a/main/pixman/fix-ppc64le-vmx.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/pixman/pixman-vmx.c
-+++ b/pixman/pixman-vmx.c
-@@ -227,7 +227,7 @@
- #define COMPUTE_SHIFT_MASKC(dest, source, mask)
-
- # define LOAD_VECTOR(source) \
-- v ## source = *((typeof(v ## source)*)source);
-+ v ## source = (typeof(v ## source))vec_xl(0, source);
-
- # define LOAD_VECTORS(dest, source) \
- LOAD_VECTOR(source); \
-
diff --git a/main/pixman/float-header-fix.patch b/main/pixman/float-header-fix.patch
deleted file mode 100644
index 5c151a14f6..0000000000
--- a/main/pixman/float-header-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./pixman/pixman-private.h.orig
-+++ ./pixman/pixman-private.h
-@@ -1,5 +1,3 @@
--#include <float.h>
--
- #ifndef PIXMAN_PRIVATE_H
- #define PIXMAN_PRIVATE_H
-
-@@ -30,6 +28,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <stddef.h>
-+#include <float.h>
-
- #include "pixman-compiler.h"
-