vala: update to 0.16.0 and restructure some stuff into vala.inc

* SRC_URI is now set initially to real upstream and not freesmartphone.org
* reset PR and INC_PR
* moved DEPENDS += "gtk+" to vala.inc

Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

4 files changed, 13 insertions, 24 deletions

diff --git a/meta-oe/recipes-devtools/vala/vala-0.14.2/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch b/meta-oe/recipes-devtools/vala/vala-0.16.0/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch
index e6c7941a77..e6c7941a77 100644
--- a/meta-oe/recipes-devtools/vala/vala-0.14.2/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch
+++ b/meta-oe/recipes-devtools/vala/vala-0.16.0/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch
diff --git a/meta-oe/recipes-devtools/vala/vala.inc b/meta-oe/recipes-devtools/vala/vala.inc
index 0815c6626e..3d33953b6b 100644
--- a/meta-oe/recipes-devtools/vala/vala.inc
+++ b/meta-oe/recipes-devtools/vala/vala.inc
@@ -1,25 +1,20 @@
 DESCRIPTION = "Vala is a C#-like language dedicated to ease GObject programming. \
 Vala compiles to plain C and has no runtime environment nor penalities whatsoever."
 SECTION = "devel"
-DEPENDS = "glib-2.0 dbus"
+DEPENDS = "glib-2.0 dbus gtk+"
 BBCLASSEXTEND = "native"
 DEPENDS_virtclass-native = "glib-2.0-native dbus-native"
 HOMEPAGE = "http://vala-project.org"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
-INC_PR = "r0"
+INC_PR = "r1"
 
-#
-# WARNING: This source release has specifically been built for OpenEmbedded.
-# Don't update to any upstream release without consulting the recipe maintainer.
-#
-
-SRC_URI = "\
-  http://downloads.freesmartphone.org/sources/vala-${PV}.tar.bz2;name=archive \
-"
+SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz"
 inherit autotools
 
 EXTRA_OECONF = "--disable-vapigen"
 
 FILES_${PN}-doc += "${datadir}/devhelp"
+FILES_${PN} += "${datadir}/${BPN}-${SHRT_VER}/vapi"
diff --git a/meta-oe/recipes-devtools/vala/vala_0.14.2.bb b/meta-oe/recipes-devtools/vala/vala_0.14.2.bb
deleted file mode 100644
index 18e6346e73..0000000000
--- a/meta-oe/recipes-devtools/vala/vala_0.14.2.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require recipes-devtools/vala/vala.inc
-
-PR = "r1"
-
-DEPENDS += "gtk+"
-
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/vala/0.14/vala-${PV}.tar.xz \
-           file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch \
-"
-
-FILES_${PN} += "${datadir}/vala-0.14/vapi"
-
-SRC_URI[md5sum] = "f05263a56c1e328637e4c97a61befdad"
-SRC_URI[sha256sum] = "807e6978484f66cab3cf4fefd72f37a4293d2831d7a5fd29119bdf9d38a5b3d0"
diff --git a/meta-oe/recipes-devtools/vala/vala_0.16.0.bb b/meta-oe/recipes-devtools/vala/vala_0.16.0.bb
new file mode 100644
index 0000000000..1dd190f01e
--- /dev/null
+++ b/meta-oe/recipes-devtools/vala/vala_0.16.0.bb
@@ -0,0 +1,8 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI += " file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch"
+
+SRC_URI[md5sum] = "84b742e9cca4c90fde3026c3793c03c1"
+SRC_URI[sha256sum] = "3adb37aa2b35e2e2daed47552e85dbcbf752c0f7768b269d856993620073a657"