[PATCH 1/3] cairo: upgrade from 1.8.10 to 1.10.0

[PATCH 1/3] cairo: upgrade from 1.8.10 to 1.10.0

[Yu Ke]

several chagnes are made:

- hardcoded_libtool.patch is removed, because the code (dolt logic) it
  applys to have been removed. dolt is originally introduced to
  accelerate libtool, it is later removed by commit 9de25a0297c due to
  libtool is fast enough. so this patch can be removed too.

- explicitly specify the package name as libcairo2. In 1.8.10, the debian
  rename hook (meta/classes/debian.bbclass:debian_package_name_hook )
  will automatically rename the package to libcairo2. When upgrade to
  1.10.0, the name changes to cairo, because the package contains not
  only library, but also bin executable. This name change will cause
  dependency  failure to thos package which depends on libcairo-1.8.10.
  so it is necessary to keep name as libcairo2 by explicitly specifing.

- specify extra package: libcairo-gobject2, libcairo-script-interpreter2
  and cairo-perf-utils. it is newly added in 1.10.0. The name schema is
  from Debian.

Signed-off-by: Yu Ke <ke.yu@intel.com>
---
 .../cairo/cairo-1.8.10/hardcoded_libtool.patch     |   17 ---------
 meta/recipes-graphics/cairo/cairo_1.10.0.bb        |   36 ++++++++++++++++++++
 meta/recipes-graphics/cairo/cairo_1.8.10.bb        |    8 ----
 3 files changed, 36 insertions(+), 25 deletions(-)
 delete mode 100644 meta/recipes-graphics/cairo/cairo-1.8.10/hardcoded_libtool.patch
 create mode 100644 meta/recipes-graphics/cairo/cairo_1.10.0.bb
 delete mode 100644 meta/recipes-graphics/cairo/cairo_1.8.10.bb

diff --git a/meta/recipes-graphics/cairo/cairo-1.8.10/hardcoded_libtool.patch b/meta/recipes-graphics/cairo/cairo-1.8.10/hardcoded_libtool.patch
deleted file mode 100644
index afdf2c8..0000000
--- a/meta/recipes-graphics/cairo/cairo-1.8.10/hardcoded_libtool.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: cairo-1.8.2/build/aclocal.dolt.m4
-===================================================================
---- cairo-1.8.2.orig/build/aclocal.dolt.m4
-+++ cairo-1.8.2/build/aclocal.dolt.m4
-@@ -163,7 +163,11 @@ done
- if $modeok && $tagok ; then
-     . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}"
- else
--    exec ${top_builddir_slash}libtool "$[]@"
-+__DOLTLIBTOOL__EOF__
-+
-+echo '    exec ${top_builddir_slash}'${host_alias}-libtool' "$[]@"' >> doltlibtool
-+
-+    cat << '__DOLTLIBTOOL__EOF__' >> doltlibtool
- fi
- __DOLTLIBTOOL__EOF__
- 
diff --git a/meta/recipes-graphics/cairo/cairo_1.10.0.bb b/meta/recipes-graphics/cairo/cairo_1.10.0.bb
new file mode 100644
index 0000000..627de5e
--- /dev/null
+++ b/meta/recipes-graphics/cairo/cairo_1.10.0.bb
@@ -0,0 +1,36 @@
+require cairo.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
+
+PR = "r0"
+
+SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
+
+RDEPENDS += "libcairo2 libcairo-gobject2 libcairo-script-interpreter2 \
+		  cairo-perf-utils"
+
+ALLOW_EMPTY = "1"
+
+#
+# Old version (1.8.10 or below) is automatically named as libcairo2 by
+# debian_package_name_hook. To keep backword compatibility,
+# it is necessary to explicitly name the package as libcairo2 here
+#
+PACKAGES =+ "libcairo2 libcairo2-dev libcairo2-dbg \
+		     libcairo-gobject2 \
+			 libcairo-script-interpreter2 \
+		     cairo-perf-utils \
+			"
+
+DESCRIPTION_libcairo2 = "The Cairo 2D vector graphics library"
+DESCRIPTION_libcairo-gobject2 = "The Cairo library GObject wrapper library"
+DESCRIPTION_libcairo-script-interpreter2 = "The Cairo library script interpreter"
+DESCRIPTION_cairo-perf-utils = "The Cairo library performance utilities"
+
+FILES_libcairo2 = "${libdir}/libcairo.so*"
+FILES_libcairo2-dev = "${includedir} ${libdir}/*.la ${libdir}/*.a \
+					   ${libdir}/*.o ${libdir}/pkgconfig"
+FILES_libcairo2-dbg = "${libdir}/.debug ${libdir}/cairo/.debug"
+FILES_libcairo-gobject2 = "${libdir}/libcairo-gobject.so*"
+FILES_libcairo-script-interpreter2 = "${libdir}/libcairo-script-interpreter.so*"
+FILES_cairo-perf-utils = "${bindir}/cairo-trace ${libdir}/cairo/libcairo-trace.*"
diff --git a/meta/recipes-graphics/cairo/cairo_1.8.10.bb b/meta/recipes-graphics/cairo/cairo_1.8.10.bb
deleted file mode 100644
index 9e7e7a3..0000000
--- a/meta/recipes-graphics/cairo/cairo_1.8.10.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require cairo.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=7d7cc3410ae869ed913ebd30d7f45941"
-
-PR = "r0"
-
-SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
-           file://hardcoded_libtool.patch"
-- 
1.7.0.4

[PATCH 2/3] pango: upgrade from 1.28.0 to 1.28.3

[Yu Ke]

Signed-off-by: Yu Ke <ke.yu@intel.com>
---
 .../{pango-1.28.0 => pango-1.28.3}/no-tests.patch  |    0
 meta/recipes-graphics/pango/pango.inc              |    1 +
 .../pango/{pango_1.28.0.bb => pango_1.28.3.bb}     |    0
 3 files changed, 1 insertions(+), 0 deletions(-)
 rename meta/recipes-graphics/pango/{pango-1.28.0 => pango-1.28.3}/no-tests.patch (100%)
 rename meta/recipes-graphics/pango/{pango_1.28.0.bb => pango_1.28.3.bb} (100%)

diff --git a/meta/recipes-graphics/pango/pango-1.28.0/no-tests.patch b/meta/recipes-graphics/pango/pango-1.28.3/no-tests.patch
similarity index 100%
rename from meta/recipes-graphics/pango/pango-1.28.0/no-tests.patch
rename to meta/recipes-graphics/pango/pango-1.28.3/no-tests.patch
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index fa22fa5..38ca3be 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -1,3 +1,4 @@
+SUMMARY = "Framework for layout and rendering of internationalized text"
 DESCRIPTION = "The goal of the Pango project is to provide an \
 Open Source framework for the layout and rendering of \
 internationalized text."
diff --git a/meta/recipes-graphics/pango/pango_1.28.0.bb b/meta/recipes-graphics/pango/pango_1.28.3.bb
similarity index 100%
rename from meta/recipes-graphics/pango/pango_1.28.0.bb
rename to meta/recipes-graphics/pango/pango_1.28.3.bb
-- 
1.7.0.4

[PATCH 3/3] imake: upgrade from 1.0.2 to 1.0.4

[Yu Ke]

Signed-off-by: Yu Ke <ke.yu@intel.com>
---
 .../distro/include/preferred-xorg-versions.inc     |    2 +-
 .../xorg-util/{imake_1.0.2.bb => imake_1.0.4.bb}   |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-util/{imake_1.0.2.bb => imake_1.0.4.bb} (64%)

diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 56ae237..b009917 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -17,7 +17,7 @@ PREFERRED_VERSION_fontsproto ?= "2.1.1"
 PREFERRED_VERSION_fontsproto-native ?= "2.1.1"
 PREFERRED_VERSION_gccmakedep ?= "1.0.2"
 PREFERRED_VERSION_glproto ?= "1.4.12"
-PREFERRED_VERSION_imake ?= "1.0.2"
+PREFERRED_VERSION_imake ?= "1.0.4"
 #PREFERRED_VERSION_inputproto ?= "2.0"
 #PREFERRED_VERSION_inputproto-native ?= "2.0"
 #PREFERRED_VERSION_inputproto-nativesdk ?= "2.0"
diff --git a/meta/recipes-graphics/xorg-util/imake_1.0.2.bb b/meta/recipes-graphics/xorg-util/imake_1.0.4.bb
similarity index 64%
rename from meta/recipes-graphics/xorg-util/imake_1.0.2.bb
rename to meta/recipes-graphics/xorg-util/imake_1.0.4.bb
index e533ece..cd8ffdb 100644
--- a/meta/recipes-graphics/xorg-util/imake_1.0.2.bb
+++ b/meta/recipes-graphics/xorg-util/imake_1.0.4.bb
@@ -4,5 +4,7 @@ DESCRIPTION = "C preprocessor interface to the make utility"
 DEPENDS = "util-macros"
 RDEPENDS = "perl xproto"
 
-PR = "r1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b9c6cfb044c6d0ff899eaafe4c729367"
+
+PR = "r0"
 PE = "1"
-- 
1.7.0.4

[PATCH 0/3] upgrade cairo, pango, imake

[Yu Ke]

Cairo upgradtion patch has been hold in last patch push due to build failure mentioned in bug 540. This issue has been root caused as package rename, and has been fixed this time. so push it for review again.

Note: cairo 1.10.0 depends on pixman 0.20.0, which is already in contrib/distro/master branch, but not in poky/master yet. so please build this commit upon contrib/distro/master, not poky/master.

Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: kyu3/upgrade-11-21
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/upgrade-11-21

Thanks,
    Yu Ke <ke.yu@intel.com>
---


Yu Ke (3):
  cairo: upgrade from 1.8.10 to 1.10.0
  pango: upgrade from 1.28.0 to 1.28.3
  imake: upgrade from 1.0.2 to 1.0.4

 .../distro/include/preferred-xorg-versions.inc     |    2 +-
 .../cairo/cairo-1.8.10/hardcoded_libtool.patch     |   17 ---------
 meta/recipes-graphics/cairo/cairo_1.10.0.bb        |   36 ++++++++++++++++++++
 meta/recipes-graphics/cairo/cairo_1.8.10.bb        |    8 ----
 .../{pango-1.28.0 => pango-1.28.3}/no-tests.patch  |    0
 meta/recipes-graphics/pango/pango.inc              |    1 +
 .../pango/{pango_1.28.0.bb => pango_1.28.3.bb}     |    0
 .../xorg-util/{imake_1.0.2.bb => imake_1.0.4.bb}   |    4 ++-
 8 files changed, 41 insertions(+), 27 deletions(-)
 delete mode 100644 meta/recipes-graphics/cairo/cairo-1.8.10/hardcoded_libtool.patch
 create mode 100644 meta/recipes-graphics/cairo/cairo_1.10.0.bb
 delete mode 100644 meta/recipes-graphics/cairo/cairo_1.8.10.bb
 rename meta/recipes-graphics/pango/{pango-1.28.0 => pango-1.28.3}/no-tests.patch (100%)
 rename meta/recipes-graphics/pango/{pango_1.28.0.bb => pango_1.28.3.bb} (100%)
 rename meta/recipes-graphics/xorg-util/{imake_1.0.2.bb => imake_1.0.4.bb} (64%)

Re: [PATCH 0/3] upgrade cairo, pango, imake

[Saul Wold]

On 11/21/2010 05:21 AM, Yu Ke wrote:
> Cairo upgradtion patch has been hold in last patch push due to build failure mentioned in bug 540. This issue has been root caused as package rename, and has been fixed this time. so push it for review again.
>
> Note: cairo 1.10.0 depends on pixman 0.20.0, which is already in contrib/distro/master branch, but not in poky/master yet. so please build this commit upon contrib/distro/master, not poky/master.
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
>    Branch: kyu3/upgrade-11-21
>    Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/upgrade-11-21
>
> Thanks,
>      Yu Ke<ke.yu@intel.com>
> ---
>
>
> Yu Ke (3):
>    cairo: upgrade from 1.8.10 to 1.10.0
>    pango: upgrade from 1.28.0 to 1.28.3
>    imake: upgrade from 1.0.2 to 1.0.4
>
>   .../distro/include/preferred-xorg-versions.inc     |    2 +-
>   .../cairo/cairo-1.8.10/hardcoded_libtool.patch     |   17 ---------
>   meta/recipes-graphics/cairo/cairo_1.10.0.bb        |   36 ++++++++++++++++++++
>   meta/recipes-graphics/cairo/cairo_1.8.10.bb        |    8 ----
>   .../{pango-1.28.0 =>  pango-1.28.3}/no-tests.patch  |    0
>   meta/recipes-graphics/pango/pango.inc              |    1 +
>   .../pango/{pango_1.28.0.bb =>  pango_1.28.3.bb}     |    0
>   .../xorg-util/{imake_1.0.2.bb =>  imake_1.0.4.bb}   |    4 ++-
>   8 files changed, 41 insertions(+), 27 deletions(-)
>   delete mode 100644 meta/recipes-graphics/cairo/cairo-1.8.10/hardcoded_libtool.patch
>   create mode 100644 meta/recipes-graphics/cairo/cairo_1.10.0.bb
>   delete mode 100644 meta/recipes-graphics/cairo/cairo_1.8.10.bb
>   rename meta/recipes-graphics/pango/{pango-1.28.0 =>  pango-1.28.3}/no-tests.patch (100%)
>   rename meta/recipes-graphics/pango/{pango_1.28.0.bb =>  pango_1.28.3.bb} (100%)
>   rename meta/recipes-graphics/xorg-util/{imake_1.0.2.bb =>  imake_1.0.4.bb} (64%)
>
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
>

Pulled into Master

Thanks
    Sau!