From a21282bd0461089c343b4b91513f445139dbf200 Mon Sep 17 00:00:00 2001
From: Yousong Zhou <yszhou4tech@gmail.com>
Date: Mon, 26 Nov 2018 01:46:06 +0000
Subject: [PATCH] pixman: bump to version 0.36.0

Patch 0005 is now included in upstream commit 7c6066b ("pixman-private:
include <float.h> only in C code")
---
 libs/pixman/Makefile                            |  4 ++--
 ...004-pixman-fix-detection-of-mips-dspr2.patch |  2 +-
 .../0005-pixman-arm-neon-assembler-fix.patch    | 17 -----------------
 3 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 libs/pixman/patches/0005-pixman-arm-neon-assembler-fix.patch

diff --git a/libs/pixman/Makefile b/libs/pixman/Makefile
index 76f5d984a..4ecab8eb1 100644
--- a/libs/pixman/Makefile
+++ b/libs/pixman/Makefile
@@ -8,10 +8,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pixman
-PKG_VERSION:=0.34.0
+PKG_VERSION:=0.36.0
 PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_HASH:=21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e
+PKG_HASH:=1ca19c8d4d37682adfbc42741d24977903fec1169b4153ec05bb690d4acf9fae
 PKG_SOURCE_URL:=https://www.cairographics.org/releases
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=COPYING
diff --git a/libs/pixman/patches/0004-pixman-fix-detection-of-mips-dspr2.patch b/libs/pixman/patches/0004-pixman-fix-detection-of-mips-dspr2.patch
index 1b37b02f6..6ace9a36b 100644
--- a/libs/pixman/patches/0004-pixman-fix-detection-of-mips-dspr2.patch
+++ b/libs/pixman/patches/0004-pixman-fix-detection-of-mips-dspr2.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac.orig	2016-11-22 20:44:21.205150763 +0800
 +++ b/configure.ac	2016-11-22 20:44:55.505161500 +0800
-@@ -720,7 +720,6 @@ dnl Check if assembler is gas compatible
+@@ -735,7 +735,6 @@ dnl Check if assembler is gas compatible
  have_mips_dspr2=no
  AC_MSG_CHECKING(whether to use MIPS DSPr2 assembler)
  xserver_save_CFLAGS=$CFLAGS
diff --git a/libs/pixman/patches/0005-pixman-arm-neon-assembler-fix.patch b/libs/pixman/patches/0005-pixman-arm-neon-assembler-fix.patch
deleted file mode 100644
index 4adaab6e9..000000000
--- a/libs/pixman/patches/0005-pixman-arm-neon-assembler-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/pixman/pixman-private.h.orig	2016-11-22 22:10:33.574769654 +0800
-+++ b/pixman/pixman-private.h	2016-11-22 22:10:47.638774056 +0800
-@@ -1,5 +1,3 @@
--#include <float.h>
--
- #ifndef PIXMAN_PRIVATE_H
- #define PIXMAN_PRIVATE_H
- 
-@@ -17,6 +15,8 @@
- 
- #ifndef __ASSEMBLER__
- 
-+#include <float.h>
-+
- #ifndef PACKAGE
- #  error config.h must be included before pixman-private.h
- #endif