diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2021-05-08 00:09:40 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-05-27 15:46:22 +0300 |
commit | f103a7f6b5e3370ba34a5f547fb321eacc4fc5a0 (patch) | |
tree | 1f0fbdf0d25df477a98ec05d53de36832253af4e /meta-openembedded/meta-oe/recipes-support/gd | |
parent | c926e17c956a1babdf42d31f644bf0eedfa7f5f6 (diff) | |
download | openbmc-f103a7f6b5e3370ba34a5f547fb321eacc4fc5a0.tar.xz |
meta-openembedded: subtree update:08c0280b7c..4fe1065655
Alexander Kanavin (1):
libmicrohttpd: remove the recipe
Andreas Müller (4):
jack: upgrade 1.19.17 -> 1.19.18
xfce4-settings: upgrade 4.16.0 -> 4.16.1
zsh: reduce priority slightly to avoid conflict with bash
mutter/wayland: replace xserver-xorg-xwayland by xwayland in rdep
Andrej Kozemcak (1):
proftpd: Update to 1.3.7a release
Armin Kuster (3):
wireguard: update to v1.0.20210219 +1
nostromo: remove recipe
packagegroup-meta-webserver: remove nostromo from pkg grp
Chen Qi (3):
tigervnc: upgrade to 1.11.0
python3-django: upgrade to 2.2.20
tigervnc: fix do_package error when enabling user merge
Gianfranco (1):
vboxguestdrivers: upgrade 6.1.18 -> 6.1.20
Hongxu Jia (1):
debootstrap: explicitly add virtual/fakeroot-native to depends
Joe Hershberger (1):
strongswan: Make PACKAGECONFIG a default value
Justin Standring (1):
tslib: add PACKAGECONFIG for evthres, one-wire-ts-input
Kai Kang (1):
freeradius: check existence of openssl's commands in bootstrap
Khem Raj (36):
nss: Re-enable -Werror
gimp: Disable vector icon generation on mips/glibc too
iwd: Upgade to 1.13
python3-icu: Upgrade to 2.7.2
nodejs: Update to 14.16.1
nodejs: Fix build with icu-69
nodejs: Use qemu usermode to run target binaries during build
nodejs: Fix build on mips
nodejs: Fix build with clang for x86 target
tbb: Re-introduce PE
bearssl: Update to tip of master
gimp: Disable vector icons on musl/x86
gd: Replace deprecated types from tiff
nodejs: Enable snapshot
python3-docutils: Delete
libchamplain: Require opengl distro feature
aom: Match the name for AOM-Patent-License-1.0
libdevmapper,lvm2: Do not inherit license
gnome-disk-utility: Require polkit in distro features
README: Make git send-email example work
sysprof: Enable sysprofd/libsysprof only when polkit in DISTRO_FEATURES
packagegroup-gnome-apps: Add gnome-disk-utility only if polkit is in DISTRO_FEATURES
python3-jinja2_2.%.bbappend: Delete
python3-pyyaml: Do not check for meta-python
python3-pyyaml: Delete
python3-markupsafe: Delete bbappend
snort,proftpd,net-snmp: Deal with -ffile-prefix-map as well
apache2: Deal with -ffile-prefix-map
vk-gl-cts: Fix build with GCC 11
gegl: Update to 0.4.30
python3-m2crypto: Upgrade to 0.37.1
libupnp: Upgrade to 1.14.6
ctags: Switch to universal ctags
dibbler: Add libpthread to linker flags
libowfat: Replace __pure__ with pure and remove using __deprecated__
emacs: Do not use SIGSTKSZ
Leon Anavi (21):
python3-bitarray: Upgrade 1.9.2 -> 2.0.0
python3-xxhash: Upgrade 2.0.0 -> 2.0.2
python3-xlsxwriter: Upgrade 1.3.8 -> 1.3.9
python3-docutils: Upgrade 0.17 -> 0.17.1
python3-portion: Upgrade 2.1.5 -> 2.1.6
python3-huey: Upgrade 2.3.1 -> 2.3.2
python3-pysonos: Upgrade 0.0.42 -> 0.0.43
python3-asttokens: Upgrade 2.0.4 -> 2.0.5
python3-hyperframe: Upgrade 6.0.0 -> 6.0.1
python3-argcomplete: Upgrade 1.12.2 -> 1.12.3
python3-python-vlc: Upgrade 3.0.12117 -> 3.0.12118
python3-bitarray: Upgrade 2.0.0 -> 2.0.1
python3-sqlalchemy: Upgrade 1.4.7 -> 1.4.11
python3-watchdog: Upgrade 2.0.2 -> 2.0.3
python3-pytest-asyncio: Upgrade 0.14.0 -> 0.15.1
python3-xlsxwriter: Upgrade 1.3.9 -> 1.4.0
python3-astroid: Upgrade 2.5.3 -> 2.5.6
python3-arpeggio: Upgrade 1.10.1 -> 1.10.2
python3-cachetools: Upgrade 4.2.1 -> 4.2.2
python3-pymisp: Upgrade 2.4.141.1 -> 2.4.142
python3-et-xmlfile: Upgrade 1.0.1 -> 1.1.0
Mingli Yu (4):
python3-cryptography: Upgrade to 3.3.2
onig: add oniguruma to PROVIDES
php: Upgrade to 7.4.16
tk: adapt to potential pseudo changes
Persian Prince (1):
libdvdnav 6.1.1
Peter Kjellerstedt (1):
syslog-ng: Merge .bb and .inc
Ramon Fried (1):
bitwise: Upgrade 0.41 -> 0.42
Reto Schneider (1):
nng: Upgrade 1.2.5 -> 1.4.0
Saul Wold (2):
tbb: Disable PPC as COMPATIBLE_MACHINE
packagegroup-meta-oe: conditional remove tbb for powerpc
Silcet (2):
ufw: fix python shebang
ufw: bump version to 0.36 and add services
Sinan Kaya (1):
zram: add support for mem_limit
Stefan Ghinea (1):
python3-django: fix CVE-2021-28658
Ulrich Ölmann (1):
v4l-utils: fix reproducibility
Yi Fan Yu (3):
syslog-ng: upgrade 3.24.1 -> 3.31.2
syslog-ng: remove CONFIG_TLS override for arm DEBUG_BUILD
syslog-ng: Drop an obsolete patch to add --enable-libnet
Yi Zhao (1):
gvfs: rdepend on gsettings-desktop-schemas
zangrc (19):
fuse3: upgrade 3.10.2 -> 3.10.3
cifs-utils: upgrade 6.12 -> 6.13
dnsmasq: upgrade 2.84 -> 2.85
nbdkit: upgrade 1.25.5 -> 1.25.6
wolfssl: upgrade 4.7.0 -> 4.7.1
networkmanager: upgrade 1.30.2 -> 1.30.4
libdvdread: upgrade 6.1.1 -> 6.1.2
libwebsockets: upgrade 4.1.6 -> 4.2.0
ostree: upgrade 2021.1 -> 2021.2
redis: upgrade 6.2.1 -> 6.2.2
tinyproxy: upgrade 1.10.0 -> 1.11.0
nss: upgrade 3.63 -> 3.64
babeld: upgrade 1.9.2 -> 1.10
fetchmail: upgrade 6.4.18 -> 6.4.19
openvpn: upgrade 2.5.1 -> 2.5.2
wireshark: upgrade 3.4.4 -> 3.4.5
debootstrap: upgrade 1.0.123 -> 1.0.124
mailcap: upgrade 2.1.52 -> 2.1.53
rsyslog: upgrade 8.2102.0 -> 8.2104.0
zhengruoqin (7):
irssi: upgrade 1.2.2 -> 1.2.3
librsync: upgrade 2.3.1 -> 2.3.2
hiawatha: upgrade 10.11 -> 10.12
python3-supervisor: upgrade 4.2.1 -> 4.2.2
python3-zopeinterface: upgrade 5.3.0 -> 5.4.0
sdparm: upgrade 1.11 -> 1.12
tcsh: upgrade 6.22.03 -> 6.22.04
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Iaeb2fe4ee0a49cf44ea60bc3c1aef83528d92f55
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/gd')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/gd/gd/0001-replace-uint32-with-uint32_t-and-uint16-with-uint16_.patch | 170 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.2.bb | 3 |
2 files changed, 172 insertions, 1 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/gd/gd/0001-replace-uint32-with-uint32_t-and-uint16-with-uint16_.patch b/meta-openembedded/meta-oe/recipes-support/gd/gd/0001-replace-uint32-with-uint32_t-and-uint16-with-uint16_.patch new file mode 100644 index 0000000000..faf349b0b5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/gd/gd/0001-replace-uint32-with-uint32_t-and-uint16-with-uint16_.patch @@ -0,0 +1,170 @@ +From 4ae9904a10f61ed60f4d4ee02eb1994a95664d7b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 22 Apr 2021 22:48:59 -0700 +Subject: [PATCH] replace uint32 with uint32_t and uint16 with uint16_6 + +uint16 and uint32 are now deprecated in libtiff and suggestion is to use +standard C99 types + +Upstream-Status: Submitted [https://github.com/libgd/libgd/pull/694] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/gd_tiff.c | 52 +++++++++++++++++++++++++-------------------------- + 1 file changed, 26 insertions(+), 26 deletions(-) + +diff --git a/src/gd_tiff.c b/src/gd_tiff.c +index b22ee6c..699d719 100644 +--- a/src/gd_tiff.c ++++ b/src/gd_tiff.c +@@ -237,10 +237,10 @@ void tiffWriter(gdImagePtr image, gdIOCtx *out, int bitDepth) + int transparentColorR = -1; + int transparentColorG = -1; + int transparentColorB = -1; +- uint16 extraSamples[1]; +- uint16 *colorMapRed = NULL; +- uint16 *colorMapGreen = NULL; +- uint16 *colorMapBlue = NULL; ++ uint16_t extraSamples[1]; ++ uint16_t *colorMapRed = NULL; ++ uint16_t *colorMapGreen = NULL; ++ uint16_t *colorMapBlue = NULL; + + tiff_handle *th; + +@@ -292,18 +292,18 @@ void tiffWriter(gdImagePtr image, gdIOCtx *out, int bitDepth) + + /* build the color map for 8 bit images */ + if(bitDepth != 24) { +- colorMapRed = (uint16 *) gdMalloc(3 * (1 << bitsPerSample)); ++ colorMapRed = (uint16_t *) gdMalloc(3 * (1 << bitsPerSample)); + if (!colorMapRed) { + gdFree(th); + return; + } +- colorMapGreen = (uint16 *) gdMalloc(3 * (1 << bitsPerSample)); ++ colorMapGreen = (uint16_t *) gdMalloc(3 * (1 << bitsPerSample)); + if (!colorMapGreen) { + gdFree(colorMapRed); + gdFree(th); + return; + } +- colorMapBlue = (uint16 *) gdMalloc(3 * (1 << bitsPerSample)); ++ colorMapBlue = (uint16_t *) gdMalloc(3 * (1 << bitsPerSample)); + if (!colorMapBlue) { + gdFree(colorMapRed); + gdFree(colorMapGreen); +@@ -448,7 +448,7 @@ BGD_DECLARE(void) gdImageTiffCtx(gdImagePtr image, gdIOCtx *out) + /* Check if we are really in 8bit mode */ + static int checkColorMap(n, r, g, b) + int n; +-uint16 *r, *g, *b; ++uint16_t *r, *g, *b; + { + while (n-- > 0) + if (*r++ >= 256 || *g++ >= 256 || *b++ >= 256) +@@ -460,8 +460,8 @@ uint16 *r, *g, *b; + /* Read and convert a TIFF colormap */ + static int readTiffColorMap(gdImagePtr im, TIFF *tif, char is_bw, int photometric) + { +- uint16 *redcmap, *greencmap, *bluecmap; +- uint16 bps; ++ uint16_t *redcmap, *greencmap, *bluecmap; ++ uint16_t bps; + int i; + + if (is_bw) { +@@ -473,7 +473,7 @@ static int readTiffColorMap(gdImagePtr im, TIFF *tif, char is_bw, int photometri + gdImageColorAllocate(im, 255,255,255); + } + } else { +- uint16 min_sample_val, max_sample_val; ++ uint16_t min_sample_val, max_sample_val; + + if (!TIFFGetField(tif, TIFFTAG_MINSAMPLEVALUE, &min_sample_val)) { + min_sample_val = 0; +@@ -515,7 +515,7 @@ static int readTiffColorMap(gdImagePtr im, TIFF *tif, char is_bw, int photometri + + static void readTiffBw (const unsigned char *src, + gdImagePtr im, +- uint16 photometric, ++ uint16_t photometric, + int startx, + int starty, + int width, +@@ -547,7 +547,7 @@ static void readTiffBw (const unsigned char *src, + + static void readTiff8bit (const unsigned char *src, + gdImagePtr im, +- uint16 photometric, ++ uint16_t photometric, + int startx, + int starty, + int width, +@@ -634,10 +634,10 @@ static void readTiff8bit (const unsigned char *src, + } + } + +-static int createFromTiffTiles(TIFF *tif, gdImagePtr im, uint16 bps, uint16 photometric, ++static int createFromTiffTiles(TIFF *tif, gdImagePtr im, uint16_t bps, uint16_t photometric, + char has_alpha, char is_bw, int extra) + { +- uint16 planar; ++ uint16_t planar; + int im_width, im_height; + int tile_width, tile_height; + int x, y, height, width; +@@ -682,11 +682,11 @@ end: + return success; + } + +-static int createFromTiffLines(TIFF *tif, gdImagePtr im, uint16 bps, uint16 photometric, ++static int createFromTiffLines(TIFF *tif, gdImagePtr im, uint16_t bps, uint16_t photometric, + char has_alpha, char is_bw, int extra) + { +- uint16 planar; +- uint32 im_height, im_width, y; ++ uint16_t planar; ++ uint32_t im_height, im_width, y; + + unsigned char *buffer; + int success = GD_SUCCESS; +@@ -761,11 +761,11 @@ static int createFromTiffRgba(TIFF * tif, gdImagePtr im) + int color; + int width = im->sx; + int height = im->sy; +- uint32 *buffer; +- uint32 rgba; ++ uint32_t *buffer; ++ uint32_t rgba; + int success; + +- buffer = (uint32 *) gdCalloc(sizeof(uint32), width * height); ++ buffer = (uint32_t *) gdCalloc(sizeof(uint32_t), width * height); + if (!buffer) { + return GD_FAILURE; + } +@@ -810,11 +810,11 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromTiffCtx(gdIOCtx *infile) + TIFF *tif; + tiff_handle *th; + +- uint16 bps, spp, photometric; +- uint16 orientation; ++ uint16_t bps, spp, photometric; ++ uint16_t orientation; + int width, height; +- uint16 extra, *extra_types; +- uint16 planar; ++ uint16_t extra, *extra_types; ++ uint16_t planar; + char has_alpha, is_bw, is_gray; + char force_rgba = FALSE; + char save_transparent; +@@ -867,7 +867,7 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromTiffCtx(gdIOCtx *infile) + } + + if (!TIFFGetField (tif, TIFFTAG_PHOTOMETRIC, &photometric)) { +- uint16 compression; ++ uint16_t compression; + if (TIFFGetField(tif, TIFFTAG_COMPRESSION, &compression) && + (compression == COMPRESSION_CCITTFAX3 || + compression == COMPRESSION_CCITTFAX4 || diff --git a/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.2.bb b/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.2.bb index 37896415ee..4e95fa9549 100644 --- a/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.2.bb @@ -14,7 +14,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8e5bc8627b9494741c905d65238c66b7" DEPENDS = "freetype libpng jpeg zlib tiff" SRC_URI = "git://github.com/libgd/libgd.git;branch=master \ - " + file://0001-replace-uint32-with-uint32_t-and-uint16-with-uint16_.patch \ + " SRCREV = "2e40f55bfb460fc9d8cbcd290a0c9eb908d5af7e" |