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

pixman: Version bump 0.32.4

Browse Source 
- removed pixman-01-loongson-cflags.patch, applied upstream

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Bernd Kuhls 2014-04-03 21:00:56 +02:00 committed by Thomas Petazzoni
parent 58442b5eef
commit 3c4841f478
2 changed files with 1 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
package/pixman/pixman-01-loongson-cflags.patch
View File

@ -1,38 +0,0 @@
configure.ac: Verify that the Loongson MMI code can link
The Loongson MMI code modifies -march and as a result it breaks linking
when the rest of the code is built with a different -match/-mtune.
This patch fixes the problem by trying to link the code instead of just
compiling it. This patch is already committed upstream.
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
From d77d75cc6e5de14d027d22b70389a4d0c71048b9 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Wed, 15 May 2013 16:51:20 +0000
Subject: Use AC_LINK_IFELSE to check if the Loongson MMI code can link
The Loongson code is compiled with -march=loongson2f to enable the MMI
instructions, but binutils refuses to link object code compiled with
different -march settings, leading to link failures later in the
compile. This avoids that problem by checking if we can link code
compiled for Loongson.
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
---
diff --git a/configure.ac b/configure.ac
index c43a0d2..221179f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -279,7 +279,7 @@ AC_MSG_CHECKING(whether to use Loongson MMI assembler)
xserver_save_CFLAGS=$CFLAGS
CFLAGS=" $LS_CFLAGS $CFLAGS -I$srcdir"
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+AC_LINK_IFELSE([AC_LANG_SOURCE([[
#ifndef __mips_loongson_vector_rev
#error "Loongson Multimedia Instructions are only available on Loongson"
#endif
--
cgit v0.9.0.2-2-gbebe

2
package/pixman/pixman.mk
View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
PIXMAN_VERSION = 0.30.0 PIXMAN_VERSION = 0.32.4
PIXMAN_SITE = http://xorg.freedesktop.org/releases/individual/lib PIXMAN_SITE = http://xorg.freedesktop.org/releases/individual/lib
PIXMAN_LICENSE = MIT PIXMAN_LICENSE = MIT
PIXMAN_LICENSE_FILES = COPYING PIXMAN_LICENSE_FILES = COPYING