[PATCH 0/6] Package Upgrades

[PATCH 0/6] Package Upgrades

[Robert Yang]

The following changes since commit 8d207e55031c0b93387e728f4312b8cb34ad5b12:

  libgpg-error 1.18: simplify tupple handling and add armv8b support (2015-04-13 22:32:06 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/pu
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/pu

Chong Lu (2):
  gstreamer: change priv_gst_parse_yylex arguments
  webkit-gtk: ANGLE doesn't build with bison 3

Robert Yang (4):
  gnu-efi: 3.0.1 -> 3.0.2
  tcl: 8.6.3 -> 8.6.4
  python-git: 0.3.6 -> 1.0.0
  bison: 2.7.1 -> 3.0.4

 .../gnu-efi/{gnu-efi_3.0.1.bb => gnu-efi_3.0.2.bb} |    4 +--
 .../bison/bison/dont-depend-on-help2man.patch      |   32 -------------------
 .../bison/bison/fix_cross_manpage_building.patch   |   19 -----------
 .../bison/{bison_2.7.1.bb => bison_3.0.4.bb}       |   20 ++++++------
 .../{python-git_0.3.6.bb => python-git_1.0.0.bb}   |    4 +--
 .../tcltk/{tcl_8.6.3.bb => tcl_8.6.4.bb}           |   16 +++++-----
 ...mer-change-priv_gst_parse_yylex-arguments.patch |   33 ++++++++++++++++++++
 .../gstreamer/gstreamer_0.10.36.bb                 |    1 +
 ...bkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch |   26 +++++++++++++++
 meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb       |    1 +
 10 files changed, 82 insertions(+), 74 deletions(-)
 rename meta/recipes-bsp/gnu-efi/{gnu-efi_3.0.1.bb => gnu-efi_3.0.2.bb} (93%)
 delete mode 100644 meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch
 delete mode 100644 meta/recipes-devtools/bison/bison/fix_cross_manpage_building.patch
 rename meta/recipes-devtools/bison/{bison_2.7.1.bb => bison_3.0.4.bb} (70%)
 rename meta/recipes-devtools/python/{python-git_0.3.6.bb => python-git_1.0.0.bb} (85%)
 rename meta/recipes-devtools/tcltk/{tcl_8.6.3.bb => tcl_8.6.4.bb} (81%)
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer-0.10.36/gstreamer-change-priv_gst_parse_yylex-arguments.patch
 create mode 100644 meta/recipes-sato/webkit/files/webkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch

-- 
1.7.9.5

[PATCH 1/6] gnu-efi: 3.0.1 -> 3.0.2

[Robert Yang]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../gnu-efi/{gnu-efi_3.0.1.bb => gnu-efi_3.0.2.bb} |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-bsp/gnu-efi/{gnu-efi_3.0.1.bb => gnu-efi_3.0.2.bb} (93%)

diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.1.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.2.bb
similarity index 93%
rename from meta/recipes-bsp/gnu-efi/gnu-efi_3.0.1.bb
rename to meta/recipes-bsp/gnu-efi/gnu-efi_3.0.2.bb
index ad7f2e3..2b4f3f3 100644
--- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.1.bb
+++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.2.bb
@@ -17,8 +17,8 @@ LIC_FILES_CHKSUM = "file://gnuefi/crt0-efi-arm.S;beginline=4;endline=9;md5=2240d
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \
            file://parallel-make-archives.patch \
           "
-SRC_URI[md5sum] = "c4099c443b6b0c2b04dedc33e7814ec0"
-SRC_URI[sha256sum] = "e2e8d5940347eebfb00eaaeef107a8ba59e7838e40bc716c74d9a36fff648f1f"
+SRC_URI[md5sum] = "a9db2cabc01a2674715bd6aea2911f01"
+SRC_URI[sha256sum] = "194b580ecdb1fad0e41914845ba064c279afb687855960b58693459e5537b4d7"
 
 COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux"
 
-- 
1.7.9.5

[PATCH 2/6] tcl: 8.6.3 -> 8.6.4

[Robert Yang]

The LIC_FILES_CHKSUM has been changed since 2 extra spaces in the end
were moved.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../tcltk/{tcl_8.6.3.bb => tcl_8.6.4.bb}           |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
 rename meta/recipes-devtools/tcltk/{tcl_8.6.3.bb => tcl_8.6.4.bb} (81%)

diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.3.bb b/meta/recipes-devtools/tcltk/tcl_8.6.4.bb
similarity index 81%
rename from meta/recipes-devtools/tcltk/tcl_8.6.3.bb
rename to meta/recipes-devtools/tcltk/tcl_8.6.4.bb
index 73c0d25..8e92b3e 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.6.3.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.6.4.bb
@@ -4,12 +4,12 @@ SECTION = "devel/tcltk"
 
 # http://www.tcl.tk/software/tcltk/license.html
 LICENSE = "tcl & BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://../license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
-    file://../compat/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
-    file://../library/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
-    file://../macosx/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
-    file://../tests/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
-    file://../win/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
+LIC_FILES_CHKSUM = "file://../license.terms;md5=058f6229798281bbcac4239c788cfa38 \
+    file://../compat/license.terms;md5=058f6229798281bbcac4239c788cfa38 \
+    file://../library/license.terms;md5=058f6229798281bbcac4239c788cfa38 \
+    file://../macosx/license.terms;md5=058f6229798281bbcac4239c788cfa38 \
+    file://../tests/license.terms;md5=058f6229798281bbcac4239c788cfa38 \
+    file://../win/license.terms;md5=058f6229798281bbcac4239c788cfa38 \
 "
 
 DEPENDS = "tcl-native zlib"
@@ -24,8 +24,8 @@ SRC_URI = "${BASE_SRC_URI} \
            file://alter-includedir.patch \
            file://run-ptest \
 "
-SRC_URI[md5sum] = "db382feca91754b7f93da16dc4cdad1f"
-SRC_URI[sha256sum] = "6ce0778de0d50daaa9c345d7c1fd1288fb658f674028812e7eeee992e3051005"
+SRC_URI[md5sum] = "d7cbb91f1ded1919370a30edd1534304"
+SRC_URI[sha256sum] = "9e6ed94c981c1d0c5f5fefb8112d06c6bf4d050a7327e95e71d417c416519c8d"
 
 SRC_URI_class-native = "${BASE_SRC_URI}"
 
-- 
1.7.9.5

[PATCH 3/6] python-git: 0.3.6 -> 1.0.0

[Robert Yang]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../{python-git_0.3.6.bb => python-git_1.0.0.bb}   |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python-git_0.3.6.bb => python-git_1.0.0.bb} (85%)

diff --git a/meta/recipes-devtools/python/python-git_0.3.6.bb b/meta/recipes-devtools/python/python-git_1.0.0.bb
similarity index 85%
rename from meta/recipes-devtools/python/python-git_0.3.6.bb
rename to meta/recipes-devtools/python/python-git_1.0.0.bb
index 80cdd7c..eea1543 100644
--- a/meta/recipes-devtools/python/python-git_0.3.6.bb
+++ b/meta/recipes-devtools/python/python-git_1.0.0.bb
@@ -11,8 +11,8 @@ DEPENDS = "python-gitdb"
 
 SRC_URI = "http://pypi.python.org/packages/source/G/GitPython/GitPython-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "87404ab9e0fcee81e660e932b3d9f2c6"
-SRC_URI[sha256sum] = "f3f42ca085eedbd3a9956b5e639de58bbe77a119f6b3d5c3af27669a2322c4a9"
+SRC_URI[md5sum] = "c3833aad16d5660436e284d597ec1bec"
+SRC_URI[sha256sum] = "c1b3e6fdd209040b6b1cb32ecbff989eeb2fb31b4e7078c3342d71ae8ef7352b"
 
 S = "${WORKDIR}/GitPython-${PV}"
 
-- 
1.7.9.5

[PATCH 4/6] bison: 2.7.1 -> 3.0.4

[Robert Yang]

* Based on Chong Lu's previous upgrade to 3.0.2
* Remove unneeded patches:
  dont-depend-on-help2man.patch and
  fix_cross_manpage_building.patch

Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../bison/bison/dont-depend-on-help2man.patch      |   32 --------------------
 .../bison/bison/fix_cross_manpage_building.patch   |   19 ------------
 .../bison/{bison_2.7.1.bb => bison_3.0.4.bb}       |   20 ++++++------
 3 files changed, 9 insertions(+), 62 deletions(-)
 delete mode 100644 meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch
 delete mode 100644 meta/recipes-devtools/bison/bison/fix_cross_manpage_building.patch
 rename meta/recipes-devtools/bison/{bison_2.7.1.bb => bison_3.0.4.bb} (70%)

diff --git a/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch b/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch
deleted file mode 100644
index 21b44bf..0000000
--- a/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Upstream-Status: Inappropriate
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff -Nurd bison-2.7/doc/Makefile.am bison-2.7/doc/Makefile.am
---- bison-2.7/doc/Makefile.am	2012-12-09 17:51:03.000000000 +0200
-+++ bison-2.7/doc/Makefile.am	2013-01-02 06:49:50.804894071 +0200
-@@ -52,15 +52,11 @@
- ## Man Pages.  ##
- ## ----------- ##
-
--dist_man_MANS = $(srcdir)/bison.1
--
--EXTRA_DIST += $(dist_man_MANS:.1=.x) common.x
--MAINTAINERCLEANFILES += $(dist_man_MANS)
-+EXTRA_DIST += bison.x common.x
-
- # Depend on configure to get version number changes.
- common_dep = $(top_srcdir)/configure $(srcdir)/common.x
- srcsrcdir = $(top_srcdir)/bin
--$(srcdir)/bison.1:      $(common_dep) $(top_srcdir)/src/getargs.c
-
- # Differences to ignore when comparing the man page (the date).
- remove_time_stamp = \
-@@ -94,8 +90,6 @@
-	fi
-	$(AM_V_at)rm -f $@*.t
-
--nodist_man_MANS = yacc.1
--
- ## ------------------------------ ##
- ## Graphviz examples generation.  ##
- ## ------------------------------ ##
diff --git a/meta/recipes-devtools/bison/bison/fix_cross_manpage_building.patch b/meta/recipes-devtools/bison/bison/fix_cross_manpage_building.patch
deleted file mode 100644
index 8b68379..0000000
--- a/meta/recipes-devtools/bison/bison/fix_cross_manpage_building.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-help2man is looking at the generated binary for help output. This does not work for cross compilations. So taking out the local PREPATH (../src) directory from path so that help2 man can find the native version of the bison in the native sysroot directory.
-
-Date: 2010/06/28
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
-
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index c7f2755..af9453a 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -80,7 +80,6 @@ PREPATH = $(top_builddir)/src
- 	  echo cd $$dir '&&' $(MAKE) $(AM_MAKEFLAGS) $$program &&	\
- 	  (cd $$dir && $(MAKE) $(AM_MAKEFLAGS) $$program) || exit;	\
- 	done
--	$(AM_V_at)PATH="$(PREPATH)$(PATH_SEPARATOR)$$PATH";		     \
- 	export PATH;							     \
- 	$(HELP2MAN)							     \
- 	    --include=$*.x						     \
diff --git a/meta/recipes-devtools/bison/bison_2.7.1.bb b/meta/recipes-devtools/bison/bison_3.0.4.bb
similarity index 70%
rename from meta/recipes-devtools/bison/bison_2.7.1.bb
rename to meta/recipes-devtools/bison/bison_3.0.4.bb
index 4a3ad15..0156201 100644
--- a/meta/recipes-devtools/bison/bison_2.7.1.bb
+++ b/meta/recipes-devtools/bison/bison_3.0.4.bb
@@ -9,28 +9,26 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 SECTION = "devel"
 DEPENDS = "bison-native flex-native"
 
-BASE_SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \
-	        file://m4.patch \
-                file://dont-depend-on-help2man.patch \
-	       "
+SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \
+           file://m4.patch \
+"
 
 # No point in hardcoding path to m4, just use PATH
 EXTRA_OECONF += "M4=m4"
 
-SRC_URI = "${BASE_SRC_URI} \
-           file://fix_cross_manpage_building.patch \
-          "
-
-SRC_URI[md5sum] = "7be02eb973eccf388f1ae750fc09eed0"
-SRC_URI[sha256sum] = "b409adcbf245baadb68d2f66accf6fdca5e282cafec1b865f4b5e963ba8ea7fb"
+SRC_URI[md5sum] = "c342201de104cc9ce0a21e0ad10d4021"
+SRC_URI[sha256sum] = "a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0716fe1"
 
 LDFLAGS_prepend_libc-uclibc = " -lrt "
 DEPENDS_class-native = "gettext-minimal-native"
-SRC_URI_class-native = "${BASE_SRC_URI}"
 
 inherit autotools gettext texinfo
 acpaths = "-I ${S}/m4"
 
+do_compile_prepend() {
+	for i in mfcalc calc++ rpcalc; do mkdir -p ${B}/examples/$i; done
+}
+
 do_install_append_class-native() {
 	create_wrapper ${D}/${bindir}/bison \
 		BISON_PKGDATADIR=${STAGING_DATADIR_NATIVE}/bison
-- 
1.7.9.5

[PATCH 5/6] gstreamer: change priv_gst_parse_yylex arguments

[Robert Yang]

From: Chong Lu <Chong.Lu@windriver.com>

Change priv_gst_parse_yylex to fit new bison version, else we will
get following error:

| grammar.tab.c: In function 'priv_gst_parse_yyparse':
| grammar.tab.c:67:25: error: too few arguments to function 'priv_gst_parse_yylex'
|  #define yylex           priv_gst_parse_yylex
|                          ^

Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
 ...mer-change-priv_gst_parse_yylex-arguments.patch |   33 ++++++++++++++++++++
 .../gstreamer/gstreamer_0.10.36.bb                 |    1 +
 2 files changed, 34 insertions(+)
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer-0.10.36/gstreamer-change-priv_gst_parse_yylex-arguments.patch

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer-0.10.36/gstreamer-change-priv_gst_parse_yylex-arguments.patch b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.36/gstreamer-change-priv_gst_parse_yylex-arguments.patch
new file mode 100644
index 0000000..bf93cb2
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.36/gstreamer-change-priv_gst_parse_yylex-arguments.patch
@@ -0,0 +1,33 @@
+gstreamer: change priv_gst_parse_yylex arguments
+
+Change priv_gst_parse_yylex to fit new bison version, else we will
+get following error:
+
+| grammar.tab.c: In function 'priv_gst_parse_yyparse':
+| grammar.tab.c:67:25: error: too few arguments to function 'priv_gst_parse_yylex'
+|  #define yylex           priv_gst_parse_yylex
+|                          ^
+
+Upstream-Status: Pending
+
+Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
+---
+ gst/parse/grammar.y | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gst/parse/grammar.y b/gst/parse/grammar.y
+index 24fc87b..24fe906 100644
+--- a/gst/parse/grammar.y
++++ b/gst/parse/grammar.y
+@@ -36,7 +36,7 @@
+ 
+ typedef void* yyscan_t;
+ 
+-int priv_gst_parse_yylex (void * yylval_param , yyscan_t yyscanner);
++int priv_gst_parse_yylex (yyscan_t yyscanner);
+ int priv_gst_parse_yylex_init (yyscan_t scanner);
+ int priv_gst_parse_yylex_destroy (yyscan_t scanner);
+ struct yy_buffer_state * priv_gst_parse_yy_scan_string (char* , yyscan_t);
+-- 
+1.9.1
+
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb
index f08908a..5b30603 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb
@@ -15,6 +15,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz
            file://check_fix.patch \
            file://gst-inspect-check-error.patch \
            file://0001-baseparse-Fix-self-comparison-always-evaluates-to-tr.patch \
+           file://gstreamer-change-priv_gst_parse_yylex-arguments.patch \
 "
 
 SRC_URI[md5sum] = "a0cf7d6877f694a1a2ad2b4d1ecb890b"
-- 
1.7.9.5

[PATCH 6/6] webkit-gtk: ANGLE doesn't build with bison 3

[Robert Yang]

From: Chong Lu <Chong.Lu@windriver.com>

Use %lex-param to set YYLEX_PARAM.

Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
 ...bkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch |   26 ++++++++++++++++++++
 meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb       |    1 +
 2 files changed, 27 insertions(+)
 create mode 100644 meta/recipes-sato/webkit/files/webkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch

diff --git a/meta/recipes-sato/webkit/files/webkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch b/meta/recipes-sato/webkit/files/webkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch
new file mode 100644
index 0000000..e7e9083
--- /dev/null
+++ b/meta/recipes-sato/webkit/files/webkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch
@@ -0,0 +1,26 @@
+webkit-gtk: ANGLE doesn't build with bison 3
+
+Use %lex-param to set YYLEX_PARAM.
+
+Upstream-Status: Pending
+
+Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
+---
+ Source/ThirdParty/ANGLE/src/compiler/glslang.y | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/ThirdParty/ANGLE/src/compiler/glslang.y b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
+index ec1a85c..15723cc 100644
+--- a/Source/ThirdParty/ANGLE/src/compiler/glslang.y
++++ b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
+@@ -32,6 +32,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h).
+ %expect 1 /* One shift reduce conflict because of if | else */
+ %pure-parser
+ %parse-param {TParseContext* context}
++%lex-param {YYLEX_PARAM}
+ 
+ %union {
+     struct {
+-- 
+1.9.1
+
diff --git a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
index 15c73cf..3f19c2d 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
@@ -26,6 +26,7 @@ SRC_URI = "\
   file://obsolete_automake_macros.patch \
   file://0001-Enable-mips64-build.patch \
   file://aarch64.patch \
+  file://webkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch \
  "
 
 SRC_URI[md5sum] = "dcbf9d5e2e6391f857c29a57528b32a6"
-- 
1.7.9.5