mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-07 05:10:20 +00:00
Code Issues Projects Releases Wiki Activity

poppler: fix build for soft FPU machines

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Andreas Müller
2013-05-12 20:48:18 +00:00
committed by Martin Jansa
parent 38e78df3ca
commit d3fd0666c9
2 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/poppler/poppler/0001-splash-Splash.cc-add-cast-to-fix-build-for-enable-fi.patch
+42
View File
@@ -0,0 +1,42 @@
From 8bd7428c28750f682fe3cc1a35291e5696c17638 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sun, 12 May 2013 18:00:06 +0200
Subject: [PATCH] splash/Splash.cc: add cast to fix build for
--enable-fixedpoint
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
| Splash.cc:1497:30: error: conversion from 'SplashCoord {aka FixedPoint}' to 'Guchar {aka unsigned char}' is ambiguous
| Splash.cc:1497:30: note: candidates are:
| In file included from SplashMath.h:27:0,
| from Splash.cc:44:
| ../goo/FixedPoint.h:45:3: note: FixedPoint::operator int()
| ../goo/FixedPoint.h:43:3: note: FixedPoint::operator double()
| ../goo/FixedPoint.h:41:3: note: FixedPoint::operator float()
Upstream-Status: Submitted [1]
[1] http://lists.freedesktop.org/archives/poppler/2013-May/010247.html
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
splash/Splash.cc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/splash/Splash.cc b/splash/Splash.cc
index cd0ec72..6630370 100644
--- a/splash/Splash.cc
+++ b/splash/Splash.cc
@@ -1494,7 +1494,7 @@ inline void Splash::drawAALine(SplashPipe *pipe, int x0, int x1, int y) {
#endif
if (t != 0) {
- pipe->shape = aaGamma[t];
+ pipe->shape = (int)aaGamma[t];
(this->*pipe->run)(pipe);
updateModX(x);
updateModY(y);
--
1.7.4.4
meta-oe/recipes-support/poppler/poppler_0.22.3.bb
+5 -2
View File
@@ -2,9 +2,12 @@ DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code bas
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
PR = "r1"
PR = "r2"
SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
SRC_URI = " \
http://poppler.freedesktop.org/${PN}-${PV}.tar.gz \
file://0001-splash-Splash.cc-add-cast-to-fix-build-for-enable-fi.patch \
"
SRC_URI[md5sum] = "be915388eaad6865cee5a156c8119ec1"
SRC_URI[sha256sum] = "916a931cbef951366014f13d5f4a574657ccc064ac41051df96dd58e22934431"