[oe-commits] Armin Kuster : protobuf: update update and build fix

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: fido-next
Commit: 5fc717746b50e7d943da9a1fef03688367b4c76d
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=5fc717746b50e7d943da9a1fef03688367b4c76d

Author: Armin Kuster <akuster808 at gmail.com>
Date:   Sat Apr  4 19:54:16 2015 -0700

protobuf: update update and build fix

googlecode is shutting down so had to move SRC_URI to github.
changed LIC_FILES_CHKSUM to LICENSE since COPY.TXT has been removed.

updated fixed the following build issue:

| tmp/work/ppc7400-poky-linux/protobuf/2.5.0-r0/protobuf-2.5.0/src/google/protobuf/extension_set.cc:81:3: error: 'GoogleOnceInit' is not a member of 'google::protobuf'
|    ::google::protobuf::GoogleOnceInit(&registry_init_, &InitRegistry);
|    ^
| tmp/work/ppc7400-poky-linux/protobuf/2.5.0-r0/protobuf-2.5.0/src/google/protobuf/extension_set.cc:81:39: error: 'registry_init_' was not declared in this scope
|    ::google::protobuf::GoogleOnceInit(&registry_init_, &InitRegistry);
|                                        ^

Signed-off-by: Armin Kuster <akuster808 at gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Armin Kuster <akuster808 at gmail.com>

---

 .../protobuf/{protobuf_2.5.0.bb => protobuf_2.6.1.bb}       | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_2.5.0.bb b/meta-oe/recipes-devtools/protobuf/protobuf_2.6.1.bb
similarity index 56%
rename from meta-oe/recipes-devtools/protobuf/protobuf_2.5.0.bb
rename to meta-oe/recipes-devtools/protobuf/protobuf_2.6.1.bb
index a0db7bf..049f9d4 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf_2.5.0.bb
+++ b/meta-oe/recipes-devtools/protobuf/protobuf_2.6.1.bb
@@ -2,21 +2,24 @@ SUMMARY = "Protocol Buffers - structured data serialisation mechanism"
 DESCRIPTION = "Protocol Buffers are a way of encoding structured data in an \
 efficient yet extensible format. Google uses Protocol Buffers for almost \
 all of its internal RPC protocols and file formats."
-HOMEPAGE = "http://code.google.com/p/protobuf/"
+HOMEPAGE = "https://github.com/google/protobuf"
 SECTION = "console/tools"
 LICENSE = "BSD-3-Clause"
 
 DEPENDS = "zlib"
 
-LIC_FILES_CHKSUM = "file://COPYING.txt;md5=af6809583bfde9a31595a58bb4a24514"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=af6809583bfde9a31595a58bb4a24514"
 
-SRC_URI = "http://protobuf.googlecode.com/files/protobuf-${PV}.tar.gz"
+SRCREV = "bba83652e1be610bdb7ee1566ad18346d98b843c"
 
-SRC_URI[md5sum] = "b751f772bdeb2812a2a8e7202bf1dae8"
-SRC_URI[sha256sum] = "c55aa3dc538e6fd5eaf732f4eb6b98bdcb7cedb5b91d3b5bdcf29c98c293f58e"
+PV = "2.6.1+git${SRCPV}"
+
+SRC_URI = "git://github.com/google/protobuf.git"
 
 EXTRA_OECONF += " --with-protoc=echo"
 
 inherit autotools
 
+S = "${WORKDIR}/git"
+
 BBCLASSEXTEND = "native nativesdk"