[PATCH 1/2] freetype: upgrade to 2.5.0.1

[PATCH 1/2] freetype: upgrade to 2.5.0.1

[Ross Burton]

Add disabled-by-default PACKAGECONFIG for pixmap glyphs (floating dependency on
libpng).

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../freetype/{freetype_2.4.12.bb => freetype_2.5.0.1.bb}       |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/freetype/{freetype_2.4.12.bb => freetype_2.5.0.1.bb} (86%)

diff --git a/meta/recipes-graphics/freetype/freetype_2.4.12.bb b/meta/recipes-graphics/freetype/freetype_2.5.0.1.bb
similarity index 86%
rename from meta/recipes-graphics/freetype/freetype_2.4.12.bb
rename to meta/recipes-graphics/freetype/freetype_2.5.0.1.bb
index 701c629..0b69af9 100644
--- a/meta/recipes-graphics/freetype/freetype_2.4.12.bb
+++ b/meta/recipes-graphics/freetype/freetype_2.5.0.1.bb
@@ -13,12 +13,11 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=c017ff17fc6f0794adf93db5559ccd56
 
 SECTION = "libs"
 
-
 SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
 "
 
-SRC_URI[md5sum] = "3463102764315eb86c0d3c2e1f3ffb7d"
-SRC_URI[sha256sum] = "a78a17486689ab6852a9e1a759b179827ac9dfd7e2f237ddf169c73398c85381"
+SRC_URI[md5sum] = "c72e9010b1d986d556fc0b2b5fcbf31a"
+SRC_URI[sha256sum] = "57bce5b37989577aa8b4a588426839f6bf39bcc3869748cb18f6827df251f4e5"
 
 S = "${WORKDIR}/freetype-${PV}"
 
@@ -29,6 +28,9 @@ EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
 EXTRA_OEMAKE_class-native = ""
 EXTRA_OECONF = "--without-zlib --without-bzip2 CC_BUILD='${BUILD_CC}'"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[pixmap] = "--with-png,--without-png,libpng"
+
 do_configure() {
 	cd builds/unix
 	libtoolize --force --copy
-- 
1.7.10.4

[PATCH 2/2] clutter-gtk-1.0: upgrade to 1.4.4

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb |    6 ------
 meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.4.bb |    6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb
 create mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.4.bb

diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb
deleted file mode 100644
index 64eb70c..0000000
--- a/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require clutter-gtk-1.0.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
-
-SRC_URI[archive.md5sum] = "842601b584daf4447a46799a4ba88df6"
-SRC_URI[archive.sha256sum] = "dc3ec6e90bc742c8a68ed7fa4c0d25b9b376828f1a7f013c363fbaf14f3a6974"
diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.4.bb b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.4.bb
new file mode 100644
index 0000000..37a035c
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.4.bb
@@ -0,0 +1,6 @@
+require clutter-gtk-1.0.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
+
+SRC_URI[archive.md5sum] = "ef50b52ffc2a18704eb62f13dd8d6198"
+SRC_URI[archive.sha256sum] = "bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e"
-- 
1.7.10.4

Re: [PATCH 1/2] freetype: upgrade to 2.5.0.1

[Saul Wold]

On 08/02/2013 08:40 AM, Ionut Radu wrote:
> Signed-off-by: Ionut Radu <ionutx.radu@intel.com>
> ---
>   .../freetype/{freetype_2.4.12.bb => freetype_2.5.0.1.bb}         |    6 ++----
>   1 file changed, 2 insertions(+), 4 deletions(-)
>   rename meta/recipes-graphics/freetype/{freetype_2.4.12.bb => freetype_2.5.0.1.bb} (90%)
>
> diff --git a/meta/recipes-graphics/freetype/freetype_2.4.12.bb b/meta/recipes-graphics/freetype/freetype_2.5.0.1.bb
> similarity index 90%
> rename from meta/recipes-graphics/freetype/freetype_2.4.12.bb
> rename to meta/recipes-graphics/freetype/freetype_2.5.0.1.bb
> index 8cf79d3..d9f53ab 100644
> --- a/meta/recipes-graphics/freetype/freetype_2.4.12.bb
> +++ b/meta/recipes-graphics/freetype/freetype_2.5.0.1.bb
> @@ -13,13 +13,11 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=c017ff17fc6f0794adf93db5559ccd56
>
>   SECTION = "libs"
>
> -PR = "r0"
> -
>   SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
>   "
>
> -SRC_URI[md5sum] = "3463102764315eb86c0d3c2e1f3ffb7d"
> -SRC_URI[sha256sum] = "a78a17486689ab6852a9e1a759b179827ac9dfd7e2f237ddf169c73398c85381"
> +SRC_URI[md5sum] = "c72e9010b1d986d556fc0b2b5fcbf31a"
> +SRC_URI[sha256sum] = "57bce5b37989577aa8b4a588426839f6bf39bcc3869748cb18f6827df251f4e5"
>
>   S = "${WORKDIR}/freetype-${PV}"
>
>
This seems to have a problem with the creation of the libfreetype.la, it 
includes the full sysroot path to the libpng16.la file in, instead of 
the short root relative path.

> | make[2]: Entering directory `/srv/ssd/sgw/builds/world/tmp/work/x86_64-poky-linux/directfb/1.6.1-r0.2/build/tools'
> | ../x86_64-poky-linux-libtool  --tag=CC   --mode=link x86_64-poky-linux-gcc  -m64 --sysroot=/srv/ssd/sgw/builds/world/tmp/sysroots/qemux86-64 -I/srv/ssd/sgw/builds/world/tmp/sysroots/qemux86-64/usr/include/freetype2  -I/srv/ssd/sgw/builds/world/tmp/sysroots/qemux86-64/usr/include/libpng16  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wno-strict-aliasing -Werror-implicit-function-declaration -O2 -g2 -ffast-math -pipe -O2 -pipe -g -feliminate-unused-debug-types -D_GNU_SOURCE  -std=gnu99 -Werror-implicit-function-declaration  -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -lts -lm -o mkdgiff mkdgiff.o -lfreetype  ../lib/direct/libdirect.la -ldl -lrt -lpthread
> | x86_64-poky-linux-libtool: link: cannot find the library `/srv/ssd/sgw/builds/world/tmp/sysroots/qemux86-64/srv/ssd/sgw/builds/world/tmp/sysroots/x86_64-linux/usr/lib/libpng16.la' or unhandled argument `=/srv/ssd/sgw/builds/world/tmp/sysroots/x86_64-linux/usr/lib/libpng16.la'
> | make[2]: *** [mkdgiff] Error 1

This library should be with out the extra 
"srv/ssd/sgw/builds/world/tmp/sysroots/x86_64-linux"

These three recipes have the same issue.

>   /srv/ssd/sgw/poky/meta/recipes-graphics/fontconfig/fontconfig_2.10.2.bb, do_compile
>   /srv/ssd/sgw/poky/meta/recipes-graphics/xorg-lib/libxfont_1.4.6.bb, do_compile
>   /srv/ssd/sgw/poky/meta/recipes-graphics/directfb/directfb_1.6.1.bb, do_compile

It may be due to the libtool.

Sau!

[PATCH 1/2] freetype: upgrade to 2.5.0.1

[Ionut Radu]

Signed-off-by: Ionut Radu <ionutx.radu@intel.com>
---
 .../freetype/{freetype_2.4.12.bb => freetype_2.5.0.1.bb}         |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
 rename meta/recipes-graphics/freetype/{freetype_2.4.12.bb => freetype_2.5.0.1.bb} (90%)

diff --git a/meta/recipes-graphics/freetype/freetype_2.4.12.bb b/meta/recipes-graphics/freetype/freetype_2.5.0.1.bb
similarity index 90%
rename from meta/recipes-graphics/freetype/freetype_2.4.12.bb
rename to meta/recipes-graphics/freetype/freetype_2.5.0.1.bb
index 8cf79d3..d9f53ab 100644
--- a/meta/recipes-graphics/freetype/freetype_2.4.12.bb
+++ b/meta/recipes-graphics/freetype/freetype_2.5.0.1.bb
@@ -13,13 +13,11 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=c017ff17fc6f0794adf93db5559ccd56
 
 SECTION = "libs"
 
-PR = "r0"
-
 SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
 "
 
-SRC_URI[md5sum] = "3463102764315eb86c0d3c2e1f3ffb7d"
-SRC_URI[sha256sum] = "a78a17486689ab6852a9e1a759b179827ac9dfd7e2f237ddf169c73398c85381"
+SRC_URI[md5sum] = "c72e9010b1d986d556fc0b2b5fcbf31a"
+SRC_URI[sha256sum] = "57bce5b37989577aa8b4a588426839f6bf39bcc3869748cb18f6827df251f4e5"
 
 S = "${WORKDIR}/freetype-${PV}"
 
-- 
1.7.10.4