mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-10-01 06:21:56 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/matchbox-lib: bump to version 1.12

Browse Source 
Drop second and third patches (already in version)

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine
2022-01-07 22:37:40 +01:00
committed by Peter Korsgaard
parent 315ba5c26d
commit 21648affd2
4 changed files with 5 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
package/matchbox-lib/0002-libpng15.patch
View File

@@ -1,26 +0,0 @@
Support for libpng 1.5+ shamelessly taken from Gentoo.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
--- a/libmb/mbpixbuf.c
+++ b/libmb/mbpixbuf.c
@@ -247,7 +247,7 @@
return NULL;
}
- if ( setjmp( png_ptr->jmpbuf ) ) {
+ if ( setjmp( png_jmpbuf(png_ptr) ) ) {
png_destroy_read_struct( &png_ptr, &info_ptr, NULL);
fclose(fd);
return NULL;
@@ -269,8 +269,8 @@
( color_type == PNG_COLOR_TYPE_GRAY_ALPHA ))
png_set_gray_to_rgb(png_ptr);
- if ( info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA
- || info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA
+ if ( color_type == PNG_COLOR_TYPE_RGB_ALPHA
+ || color_type == PNG_COLOR_TYPE_GRAY_ALPHA
)
*has_alpha = 1;
else

17
package/matchbox-lib/0003-include-setjmp-h.patch
View File

@@ -1,17 +0,0 @@
matchbox-lib: include setjmp.h
Based on this upstream patch:
http://git.yoctoproject.org/cgit/cgit.cgi/libmatchbox/commit/?id=9315bcce1f01e7d6c00161442d61d3c676794d9d
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
--- libmatchbox-1.9/libmb/mbpixbuf.c.orig 2014-02-21 12:45:46.867035956 +0000
+++ libmatchbox-1.9/libmb/mbpixbuf.c 2014-02-21 12:46:43.482949583 +0000
@@ -22,6 +22,7 @@
#include <strings.h>
#include "mbpixbuf.h"
+#include <setjmp.h>
#define BYTE_ORD_24_RGB 0
#define BYTE_ORD_24_RBG 1

3
package/matchbox-lib/matchbox-lib.hash
View File

@@ -1,4 +1,3 @@
# From http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/1.9/libmatchbox-1.9.tar.bz2.md5
md5 9f73e7515cc4679171a5db180dc1343b libmatchbox-1.9.tar.bz2
# Locally computed # Locally computed
sha256 5c7795e46c24d848a2b960f3b994911165d95e5d5731e39105ee0d808d2373eb libmatchbox-1.12.tar.bz2
sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING

6
package/matchbox-lib/matchbox-lib.mk
View File

@@ -4,11 +4,13 @@
# #
################################################################################ ################################################################################
MATCHBOX_LIB_VERSION = 1.9 MATCHBOX_LIB_VERSION = 1.12
MATCHBOX_LIB_SOURCE = libmatchbox-$(MATCHBOX_LIB_VERSION).tar.bz2 MATCHBOX_LIB_SOURCE = libmatchbox-$(MATCHBOX_LIB_VERSION).tar.bz2
MATCHBOX_LIB_SITE = http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/$(MATCHBOX_LIB_VERSION) MATCHBOX_LIB_SITE = http://git.yoctoproject.org/cgit/cgit.cgi/libmatchbox/snapshot
MATCHBOX_LIB_LICENSE = LGPL-2.1+ MATCHBOX_LIB_LICENSE = LGPL-2.1+
MATCHBOX_LIB_LICENSE_FILES = COPYING MATCHBOX_LIB_LICENSE_FILES = COPYING
# From git
MATCHBOX_LIB_AUTORECONF = YES
MATCHBOX_LIB_INSTALL_STAGING = YES MATCHBOX_LIB_INSTALL_STAGING = YES
MATCHBOX_LIB_DEPENDENCIES = host-pkgconf xlib_libXext MATCHBOX_LIB_DEPENDENCIES = host-pkgconf xlib_libXext
MATCHBOX_LIB_CONF_OPTS = --disable-doxygen-docs MATCHBOX_LIB_CONF_OPTS = --disable-doxygen-docs