jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-02 07:57:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/pixman: bump version to 0.38.4

Browse Source 
Removed patch 0002, applied upstream
https://cgit.freedesktop.org/pixman/commit/?id=7c6066b700c7cdd4aeb8be426b14b3a5f0de4b6c

Added md5 hash provided by upstream and sha256 hashes for tarball and
license file.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Bernd Kuhls 2019-04-10 20:59:01 +02:00 committed by Thomas Petazzoni
parent cf6615d801
commit 9a47266fc0
3 changed files with 7 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
package/pixman/0002-pixman-private-include-float.h-only-in-C-code.patch
View File

@ -1,46 +0,0 @@
From 2a5b33fe5cb921993573392afac19185e224b49a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 17 Jan 2016 14:14:28 +0100
Subject: [PATCH] pixman-private: include <float.h> only in C code
<float.h> is included unconditionally by pixman-private.h, which in
turn gets included by assembler files. Unfortunately, with certain C
libraries (like the musl C library), <float.h> cannot be included in
assembler files:
CCLD libpixman-arm-simd.la
/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h: Assembler messages:
/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h:8: Error: bad instruction `int __flt_rounds(void)'
/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h: Assembler messages:
/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h:8: Error: bad instruction `int __flt_rounds(void)'
It turns out however that <float.h> is not needed by assembly files,
so we move its inclusion within the #ifndef __ASSEMBLER__ condition,
which solves the problem.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
pixman/pixman-private.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
index 73108a0..73a5414 100644
--- a/pixman/pixman-private.h
+++ b/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"
--
2.6.4

8
package/pixman/pixman.hash
View File

@ -1,2 +1,6 @@
# From http://lists.x.org/archives/xorg-announce/2016-January/002672.html # From https://lists.x.org/archives/xorg-announce/2019-April/002991.html
sha1 367698744e74d6d4f363041482965b9ea7fbe4a5 pixman-0.34.0.tar.bz2 md5 16a350a8a40116ddf67632a1d2623711 pixman-0.38.4.tar.bz2
sha1 87e1abc91ac4e5dfcc275f744f1d0ec3277ee7cd pixman-0.38.4.tar.bz2
# Locally computed
sha256 84abb7fa2541af24d9c3b34bf75d6ac60cc94ac4410061bbb295b66a29221550 pixman-0.38.4.tar.bz2
sha256 fac9270f0987b96ff4533fca3548c633e02083cbba4a0172a3b149b2e4019793 COPYING

2
package/pixman/pixman.mk
View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
PIXMAN_VERSION = 0.34.0 PIXMAN_VERSION = 0.38.4
PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.bz2 PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.bz2
PIXMAN_SITE = http://xorg.freedesktop.org/releases/individual/lib PIXMAN_SITE = http://xorg.freedesktop.org/releases/individual/lib
PIXMAN_LICENSE = MIT PIXMAN_LICENSE = MIT