mirror of
https://git.yoctoproject.org/poky
synced 2026-09-20 03:49:32 +02:00
zlib: Upgrade 1.2.5 -> 1.2.6
Dont use autotools, it really not so autoconf like. the configure script gets updated with every release of zlib and we overwrite that. Instead use the upstream provided configure copyright year was changed in zlib.h which caused change in LIC_FILE_CHECKSUM fix.inverted.LFS.logic.patch is already applied upstream so drop it Drop the configure.ac and Makefile.am scripts since we do not autoreconf anymore and do not inherit autotools anymore Bump PR for depending recipes so a rebuild it ensues so that they dont depend on .la anymore and add missing dependencies discovered during incremental build (From OE-Core rev: 50ad5230ea9e0982cdfda23fb9fcfccf89d28f29) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -2,7 +2,7 @@ require cairo.inc
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
|
||||
|
||||
PR = "r3"
|
||||
PR = "r4"
|
||||
|
||||
SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
require libmatchbox.inc
|
||||
|
||||
PR = "r8"
|
||||
PR = "r9"
|
||||
|
||||
SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
|
||||
file://16bppfixes.patch \
|
||||
|
||||
@@ -9,13 +9,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
|
||||
file://menu-cache-daemon/menu-cached.c;endline=22;md5=fcecb7d315c57ef804103fa9cdab7111"
|
||||
|
||||
SECTION = "x11/libs"
|
||||
DEPENDS = "glib-2.0"
|
||||
DEPENDS = "glib-2.0 zlib"
|
||||
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/menu-cache-${PV}.tar.gz"
|
||||
|
||||
SRC_URI[md5sum] = "ac4a9ea77db68d3db3f9f53cc75af66a"
|
||||
SRC_URI[sha256sum] = "6b7c1627b5102d8301a8a3e845f673a7181a71dde32f6455abf22d03e392b89f"
|
||||
|
||||
PR = "r0"
|
||||
PR = "r1"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
@@ -2,7 +2,7 @@ require pango.inc
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
|
||||
|
||||
PR = "r6"
|
||||
PR = "r7"
|
||||
|
||||
SRC_URI += "file://no-tests.patch"
|
||||
SRC_URI += "file://noconst.patch"
|
||||
|
||||
@@ -9,7 +9,7 @@ LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=96254c20ab81c63e65b26f0dbcd4a1c1"
|
||||
|
||||
DEPENDS += "zlib xproto font-util"
|
||||
PR = "r1"
|
||||
PR = "r2"
|
||||
PE = "1"
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
|
||||
@@ -9,10 +9,10 @@ require xorg-lib-common.inc
|
||||
LICENSE= "MIT & MIT-style & BSD"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=a46c8040f2f737bcd0c435feb2ab1c2c"
|
||||
|
||||
DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
|
||||
DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc zlib"
|
||||
PROVIDES = "xfont"
|
||||
|
||||
PR = "r0"
|
||||
PR = "r1"
|
||||
PE = "1"
|
||||
|
||||
XORG_PN = "libXfont"
|
||||
|
||||
@@ -5,9 +5,9 @@ SUMMARY = "XFontCache: X Font Cache extension library"
|
||||
DESCRIPTION = "FontCache is an extension that is used by X-TrueType to cache \
|
||||
information about fonts."
|
||||
|
||||
DEPENDS += "libxext fontcacheproto"
|
||||
DEPENDS += "libxext fontcacheproto zlib"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=62a75d5d3da40f1f6eb1cbe3bcc0a5d0"
|
||||
PR = "r0"
|
||||
PR = "r1"
|
||||
PE = "1"
|
||||
|
||||
XORG_PN = "libXfontcache"
|
||||
|
||||
@@ -12,9 +12,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=14096c769ae0cbb5fcb94ec468be11b3 \
|
||||
file://pixman/pixman-matrix.c;endline=25;md5=ba6e8769bfaaee2c41698755af04c4be \
|
||||
file://pixman/pixman-arm-neon-asm.h;endline=24;md5=9a9cc1e51abbf1da58f4d9528ec9d49b \
|
||||
"
|
||||
DEPENDS += "zlib libpng"
|
||||
|
||||
PE = "1"
|
||||
PR = "r0"
|
||||
PR = "r1"
|
||||
|
||||
EXTRA_OECONF="--disable-gtk"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user