summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2024-03-13 15:08:03 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-04-16 08:07:01 +0100
commitf184b3270051c97ebc9dc3cc3c2402c0c2a84ba7 (patch)
tree758d7f87b8cc52b14d9bcf4b9b7c7d9791fd83b7 /meta
parent7f23f72449d4334d41da5637508ab6489399b709 (diff)
downloadpoky-f184b3270051c97ebc9dc3cc3c2402c0c2a84ba7.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch11
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/configure.ac-add-option-to-explicitly-disable-neon.patch99
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript_10.03.0.bb (renamed from meta/recipes-extended/ghostscript/ghostscript_10.02.1.bb)3
3 files changed, 5 insertions, 108 deletions
diff --git a/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch b/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch
index 15c7eb5a77..67f14bd368 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch
+++ b/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch
@@ -1,7 +1,7 @@
1From 0ccbaa134093bf6afc79f2d20d061bca5a8754ed Mon Sep 17 00:00:00 2001 1From b36713c8f1ba0e5755b78845a433354a63663b1a Mon Sep 17 00:00:00 2001
2From: Kai Kang <kai.kang@windriver.com> 2From: Kai Kang <kai.kang@windriver.com>
3Date: Thu, 29 Mar 2018 16:02:05 +0800 3Date: Thu, 29 Mar 2018 16:02:05 +0800
4Subject: [PATCH 04/10] avoid host contamination 4Subject: [PATCH] avoid host contamination
5 5
6Remove hardcode path refer to host to avoid host contamination. 6Remove hardcode path refer to host to avoid host contamination.
7 7
@@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15 1 file changed, 1 insertion(+), 1 deletion(-) 15 1 file changed, 1 insertion(+), 1 deletion(-)
16 16
17diff --git a/devices/devs.mak b/devices/devs.mak 17diff --git a/devices/devs.mak b/devices/devs.mak
18index 846aa50..9570182 100644 18index 186f704..88ab8c9 100644
19--- a/devices/devs.mak 19--- a/devices/devs.mak
20+++ b/devices/devs.mak 20+++ b/devices/devs.mak
21@@ -393,7 +393,7 @@ $(DEVOBJ)gdevxalt.$(OBJ) : $(DEVSRC)gdevxalt.c $(GDEVX) $(math__h) $(memory__h)\ 21@@ -397,7 +397,7 @@ $(DEVOBJ)gdevxalt.$(OBJ) : $(DEVSRC)gdevxalt.c $(GDEVX) $(math__h) $(memory__h)\
22 ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT 22 ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT
23 23
24 $(DEVOBJ)X11.so : $(x11alt_) $(x11_) $(DEVS_MAK) $(MAKEDIRS) 24 $(DEVOBJ)X11.so : $(x11alt_) $(x11_) $(DEVS_MAK) $(MAKEDIRS)
@@ -27,6 +27,3 @@ index 846aa50..9570182 100644
27 27
28 ###### --------------- Memory-buffered printer devices --------------- ###### 28 ###### --------------- Memory-buffered printer devices --------------- ######
29 29
30--
311.8.3.1
32
diff --git a/meta/recipes-extended/ghostscript/ghostscript/configure.ac-add-option-to-explicitly-disable-neon.patch b/meta/recipes-extended/ghostscript/ghostscript/configure.ac-add-option-to-explicitly-disable-neon.patch
deleted file mode 100644
index 7873396045..0000000000
--- a/meta/recipes-extended/ghostscript/ghostscript/configure.ac-add-option-to-explicitly-disable-neon.patch
+++ /dev/null
@@ -1,99 +0,0 @@
1From fd37229a17822c5ad21a369f670b8a6f6cc6b95b Mon Sep 17 00:00:00 2001
2From: Benjamin Bara <benjamin.bara@skidata.com>
3Date: Mon, 4 Sep 2023 12:16:39 +0200
4Subject: [PATCH] configure.ac: add option to explicitly disable neon
5
6Uncomment an already existing possibility to explicitly disable neon and
7use it on both implemented neon checks.
8
9Upstream-Status: Submitted [https://bugs.ghostscript.com/show_bug.cgi?id=707097]
10
11Signed-off-by: Benjamin Bara <benjamin.bara@skidata.com>
12---
13 configure.ac | 52 +++++++++++++++++++++++++++++-----------------------
14 1 file changed, 29 insertions(+), 23 deletions(-)
15
16diff --git a/configure.ac b/configure.ac
17index 09d881dd1..62718e15e 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -749,6 +749,33 @@ SUBCONFIG_OPTS="--build=$build --host=$host"
21 # SUBCONFIG_OPTS="$SUBCONFIG_OPTS --host=$host_alias"
22 #fi
23
24+dnl --------------------------------------------------
25+dnl Check for NEON support
26+dnl --------------------------------------------------
27+save_cflags=$CFLAGS
28+AC_MSG_CHECKING([neon support])
29+CFLAGS="$save_cflags $OPT_CFLAGS -mfpu=neon -mcpu=cortex-a53"
30+HAVE_NEON=""
31+AC_LINK_IFELSE(
32+ [AC_LANG_PROGRAM([#include "arm_neon.h"], [
33+ int32x4_t round = vdupq_n_s32(10);
34+ return(0);
35+ ])],
36+ [HAVE_NEON="-DHAVE_NEON"], [HAVE_NEON=""])
37+
38+AC_ARG_ENABLE([neon], AS_HELP_STRING([--disable-neon],
39+ [Do not use neon instrinsics]), [
40+ if test "x$enable_neon" = xno; then
41+ HAVE_NEON=""
42+ fi])
43+
44+if test "x$HAVE_NEON" != x; then
45+ AC_MSG_RESULT(yes)
46+else
47+ AC_MSG_RESULT(no)
48+fi
49+CFLAGS=$save_cflags
50+
51 dnl --------------------------------------------------
52 dnl Check for libraries
53 dnl --------------------------------------------------
54@@ -971,11 +998,12 @@ if test x$with_tesseract != xno; then
55 [TESS_NEON="-mfpu=neon -mcpu=cortex-a53 -D__ARM_NEON__"],
56 [TESS_NEON=""])
57
58- if test "x$TESS_NEON" != x; then
59+ if test "x$TESS_NEON" != x && test "x$enable_neon" != xno; then
60 AC_MSG_RESULT(yes)
61 TESS_CXXFLAGS="$TESS_CXXFLAGS -DHAVE_NEON"
62 else
63 AC_MSG_RESULT(no)
64+ TESS_NEON=""
65 fi
66
67 CXXFLAGS="$save_cxxflags"
68@@ -2387,28 +2415,6 @@ if test x$WITH_CAL != x0; then
69 AC_MSG_RESULT(no)
70 fi
71
72- AC_MSG_CHECKING([neon support])
73- CFLAGS="$save_cflags $OPT_CFLAGS -mfpu=neon -mcpu=cortex-a53"
74- HAVE_NEON=""
75- AC_LINK_IFELSE(
76- [AC_LANG_PROGRAM([#include "arm_neon.h"], [
77- int32x4_t round = vdupq_n_s32(10);
78- return(0);
79- ])],
80- [HAVE_NEON="-DHAVE_NEON"], [HAVE_NEON=""])
81-
82- #AC_ARG_ENABLE([neon], AS_HELP_STRING([--disable-neon],
83- # [Do not use neon instrinsics]), [
84- # if test "x$enable_neon" = xno; then
85- # HAVE_NEON=""
86- # fi])
87-
88- if test "x$HAVE_NEON" != x; then
89- AC_MSG_RESULT(yes)
90- else
91- AC_MSG_RESULT(no)
92- fi
93-
94 #AC_SUBST(HAVE_SSE4_2)
95 #AC_SUBST(HAVE_NEON)
96 CFLAGS=$save_cflags
97--
982.34.1
99
diff --git a/meta/recipes-extended/ghostscript/ghostscript_10.02.1.bb b/meta/recipes-extended/ghostscript/ghostscript_10.03.0.bb
index 3dff16eec2..ff7d38676e 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_10.02.1.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_10.03.0.bb
@@ -25,10 +25,9 @@ def gs_verdir(v):
25SRC_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${@gs_verdir("${PV}")}/${BPN}-${PV}.tar.gz \ 25SRC_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${@gs_verdir("${PV}")}/${BPN}-${PV}.tar.gz \
26 file://ghostscript-9.16-Werror-return-type.patch \ 26 file://ghostscript-9.16-Werror-return-type.patch \
27 file://avoid-host-contamination.patch \ 27 file://avoid-host-contamination.patch \
28 file://configure.ac-add-option-to-explicitly-disable-neon.patch \
29 " 28 "
30 29
31SRC_URI[sha256sum] = "e429e4f5b01615a4f0f93a4128e8a1a4d932dff983b1774174c79c0630717ad9" 30SRC_URI[sha256sum] = "6f2bc61023469fcf7c7c2d7f1bdd75b75f2b41836aa1d5e641396246d4abbb59"
32 31
33PACKAGECONFIG ??= "" 32PACKAGECONFIG ??= ""
34PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3" 33PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-02 05:53:00 +0000