mirror of
https://git.yoctoproject.org/poky
synced 2026-03-06 15:29:40 +01:00
ghostscript: upgrade 10.02.1 -> 10.03.0
avoid-host-contamination.patch refreshed for 10.03.0 configure.ac-add-option-to-explicitly-disable-neon.patch removed since it's included in 10.03.0 (From OE-Core rev: 0e389b7b20cf77327127ae0ced856e2b2ec7aee2) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
7f23f72449
commit
f184b32700
@@ -1,7 +1,7 @@
|
||||
From 0ccbaa134093bf6afc79f2d20d061bca5a8754ed Mon Sep 17 00:00:00 2001
|
||||
From b36713c8f1ba0e5755b78845a433354a63663b1a Mon Sep 17 00:00:00 2001
|
||||
From: Kai Kang <kai.kang@windriver.com>
|
||||
Date: Thu, 29 Mar 2018 16:02:05 +0800
|
||||
Subject: [PATCH 04/10] avoid host contamination
|
||||
Subject: [PATCH] avoid host contamination
|
||||
|
||||
Remove hardcode path refer to host to avoid host contamination.
|
||||
|
||||
@@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/devices/devs.mak b/devices/devs.mak
|
||||
index 846aa50..9570182 100644
|
||||
index 186f704..88ab8c9 100644
|
||||
--- a/devices/devs.mak
|
||||
+++ b/devices/devs.mak
|
||||
@@ -393,7 +393,7 @@ $(DEVOBJ)gdevxalt.$(OBJ) : $(DEVSRC)gdevxalt.c $(GDEVX) $(math__h) $(memory__h)\
|
||||
@@ -397,7 +397,7 @@ $(DEVOBJ)gdevxalt.$(OBJ) : $(DEVSRC)gdevxalt.c $(GDEVX) $(math__h) $(memory__h)\
|
||||
### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT
|
||||
|
||||
$(DEVOBJ)X11.so : $(x11alt_) $(x11_) $(DEVS_MAK) $(MAKEDIRS)
|
||||
@@ -27,6 +27,3 @@ index 846aa50..9570182 100644
|
||||
|
||||
###### --------------- Memory-buffered printer devices --------------- ######
|
||||
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
||||
@@ -1,99 +0,0 @@
|
||||
From fd37229a17822c5ad21a369f670b8a6f6cc6b95b Mon Sep 17 00:00:00 2001
|
||||
From: Benjamin Bara <benjamin.bara@skidata.com>
|
||||
Date: Mon, 4 Sep 2023 12:16:39 +0200
|
||||
Subject: [PATCH] configure.ac: add option to explicitly disable neon
|
||||
|
||||
Uncomment an already existing possibility to explicitly disable neon and
|
||||
use it on both implemented neon checks.
|
||||
|
||||
Upstream-Status: Submitted [https://bugs.ghostscript.com/show_bug.cgi?id=707097]
|
||||
|
||||
Signed-off-by: Benjamin Bara <benjamin.bara@skidata.com>
|
||||
---
|
||||
configure.ac | 52 +++++++++++++++++++++++++++++-----------------------
|
||||
1 file changed, 29 insertions(+), 23 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 09d881dd1..62718e15e 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -749,6 +749,33 @@ SUBCONFIG_OPTS="--build=$build --host=$host"
|
||||
# SUBCONFIG_OPTS="$SUBCONFIG_OPTS --host=$host_alias"
|
||||
#fi
|
||||
|
||||
+dnl --------------------------------------------------
|
||||
+dnl Check for NEON support
|
||||
+dnl --------------------------------------------------
|
||||
+save_cflags=$CFLAGS
|
||||
+AC_MSG_CHECKING([neon support])
|
||||
+CFLAGS="$save_cflags $OPT_CFLAGS -mfpu=neon -mcpu=cortex-a53"
|
||||
+HAVE_NEON=""
|
||||
+AC_LINK_IFELSE(
|
||||
+ [AC_LANG_PROGRAM([#include "arm_neon.h"], [
|
||||
+ int32x4_t round = vdupq_n_s32(10);
|
||||
+ return(0);
|
||||
+ ])],
|
||||
+ [HAVE_NEON="-DHAVE_NEON"], [HAVE_NEON=""])
|
||||
+
|
||||
+AC_ARG_ENABLE([neon], AS_HELP_STRING([--disable-neon],
|
||||
+ [Do not use neon instrinsics]), [
|
||||
+ if test "x$enable_neon" = xno; then
|
||||
+ HAVE_NEON=""
|
||||
+ fi])
|
||||
+
|
||||
+if test "x$HAVE_NEON" != x; then
|
||||
+ AC_MSG_RESULT(yes)
|
||||
+else
|
||||
+ AC_MSG_RESULT(no)
|
||||
+fi
|
||||
+CFLAGS=$save_cflags
|
||||
+
|
||||
dnl --------------------------------------------------
|
||||
dnl Check for libraries
|
||||
dnl --------------------------------------------------
|
||||
@@ -971,11 +998,12 @@ if test x$with_tesseract != xno; then
|
||||
[TESS_NEON="-mfpu=neon -mcpu=cortex-a53 -D__ARM_NEON__"],
|
||||
[TESS_NEON=""])
|
||||
|
||||
- if test "x$TESS_NEON" != x; then
|
||||
+ if test "x$TESS_NEON" != x && test "x$enable_neon" != xno; then
|
||||
AC_MSG_RESULT(yes)
|
||||
TESS_CXXFLAGS="$TESS_CXXFLAGS -DHAVE_NEON"
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
+ TESS_NEON=""
|
||||
fi
|
||||
|
||||
CXXFLAGS="$save_cxxflags"
|
||||
@@ -2387,28 +2415,6 @@ if test x$WITH_CAL != x0; then
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
|
||||
- AC_MSG_CHECKING([neon support])
|
||||
- CFLAGS="$save_cflags $OPT_CFLAGS -mfpu=neon -mcpu=cortex-a53"
|
||||
- HAVE_NEON=""
|
||||
- AC_LINK_IFELSE(
|
||||
- [AC_LANG_PROGRAM([#include "arm_neon.h"], [
|
||||
- int32x4_t round = vdupq_n_s32(10);
|
||||
- return(0);
|
||||
- ])],
|
||||
- [HAVE_NEON="-DHAVE_NEON"], [HAVE_NEON=""])
|
||||
-
|
||||
- #AC_ARG_ENABLE([neon], AS_HELP_STRING([--disable-neon],
|
||||
- # [Do not use neon instrinsics]), [
|
||||
- # if test "x$enable_neon" = xno; then
|
||||
- # HAVE_NEON=""
|
||||
- # fi])
|
||||
-
|
||||
- if test "x$HAVE_NEON" != x; then
|
||||
- AC_MSG_RESULT(yes)
|
||||
- else
|
||||
- AC_MSG_RESULT(no)
|
||||
- fi
|
||||
-
|
||||
#AC_SUBST(HAVE_SSE4_2)
|
||||
#AC_SUBST(HAVE_NEON)
|
||||
CFLAGS=$save_cflags
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@@ -25,10 +25,9 @@ def gs_verdir(v):
|
||||
SRC_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${@gs_verdir("${PV}")}/${BPN}-${PV}.tar.gz \
|
||||
file://ghostscript-9.16-Werror-return-type.patch \
|
||||
file://avoid-host-contamination.patch \
|
||||
file://configure.ac-add-option-to-explicitly-disable-neon.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "e429e4f5b01615a4f0f93a4128e8a1a4d932dff983b1774174c79c0630717ad9"
|
||||
SRC_URI[sha256sum] = "6f2bc61023469fcf7c7c2d7f1bdd75b75f2b41836aa1d5e641396246d4abbb59"
|
||||
|
||||
PACKAGECONFIG ??= ""
|
||||
PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3"
|
||||
Reference in New Issue
Block a user