Patchwork libjson: update to 0.11 and rename to json-c

login
register
mail settings
Submitter ml@communistcode.co.uk
Date Oct. 18, 2013, 8:45 a.m.
Message ID <1382085924-29893-1-git-send-email-ml@communistcode.co.uk>
Download mbox | patch
Permalink /patch/60219/
State New
Headers show

Comments

ml@communistcode.co.uk - Oct. 18, 2013, 8:45 a.m.
From: Jack Mitchell <jmitchell@cbnl.com>

libjson is now known as json-c, it keeps support for the old
libjson namespace so it shouldn't break anything. Built without
parallel make as it would fail when it tries to link to link back
to itself, which is odd, but the official word is: don't build in
parallel.

Signed-off-by: Jack Mitchell <jmitchell@cbnl.com>
---
 meta/conf/distro/include/seperatebuilddir.inc     |  2 +-
 meta/recipes-devtools/json-c/json-c_0.11.bb       | 13 +++++++++++++
 meta/recipes-devtools/libjson/libjson_0.9.bb      | 14 --------------
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc |  2 +-
 4 files changed, 15 insertions(+), 16 deletions(-)
 create mode 100644 meta/recipes-devtools/json-c/json-c_0.11.bb
 delete mode 100644 meta/recipes-devtools/libjson/libjson_0.9.bb
Saul Wold - Oct. 19, 2013, 6:05 a.m.
On 10/18/2013 01:45 AM, Jack Mitchell wrote:
> From: Jack Mitchell <jmitchell@cbnl.com>
>
> libjson is now known as json-c, it keeps support for the old
> libjson namespace so it shouldn't break anything. Built without
> parallel make as it would fail when it tries to link to link back
> to itself, which is odd, but the official word is: don't build in
> parallel.
>

This patch does not apply cleanly to Master, can you please ensure it's 
rebased against master.

Thanks
	Sau!

> Signed-off-by: Jack Mitchell <jmitchell@cbnl.com>
> ---
>   meta/conf/distro/include/seperatebuilddir.inc     |  2 +-
>   meta/recipes-devtools/json-c/json-c_0.11.bb       | 13 +++++++++++++
>   meta/recipes-devtools/libjson/libjson_0.9.bb      | 14 --------------
>   meta/recipes-multimedia/pulseaudio/pulseaudio.inc |  2 +-
>   4 files changed, 15 insertions(+), 16 deletions(-)
>   create mode 100644 meta/recipes-devtools/json-c/json-c_0.11.bb
>   delete mode 100644 meta/recipes-devtools/libjson/libjson_0.9.bb
>
> diff --git a/meta/conf/distro/include/seperatebuilddir.inc b/meta/conf/distro/include/seperatebuilddir.inc
> index c067183..e1a5c6b 100644
> --- a/meta/conf/distro/include/seperatebuilddir.inc
> +++ b/meta/conf/distro/include/seperatebuilddir.inc
> @@ -294,7 +294,7 @@ B_pn-libice = "${SEPB}"
>   B_pn-libice-native = "${SEPB}"
>   B_pn-libid3tag = "${SEPB}"
>   B_pn-libidn = "${SEPB}"
> -B_pn-libjson = "${SEPB}"
> +B_pn-json-c = "${SEPB}"
>   B_pn-libksba = "${SEPB}"
>   B_pn-libmad = "${SEPB}"
>   B_pn-libmatchbox = "${SEPB}"
> diff --git a/meta/recipes-devtools/json-c/json-c_0.11.bb b/meta/recipes-devtools/json-c/json-c_0.11.bb
> new file mode 100644
> index 0000000..e0391f5
> --- /dev/null
> +++ b/meta/recipes-devtools/json-c/json-c_0.11.bb
> @@ -0,0 +1,13 @@
> +SUMMARY = "JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C"
> +HOMEPAGE = "https://github.com/json-c/json-c/wiki"
> +LICENSE = "MIT"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2"
> +
> +SRC_URI = "https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
> +
> +SRC_URI[md5sum] = "aa02367d2f7a830bf1e3376f77881e98"
> +SRC_URI[sha256sum] = "28dfc65145dc0d4df1dfe7701ac173c4e5f9347176c8983edbfac9149494448c"
> +
> +PARALLEL_MAKE = ""
> +
> +inherit autotools
> diff --git a/meta/recipes-devtools/libjson/libjson_0.9.bb b/meta/recipes-devtools/libjson/libjson_0.9.bb
> deleted file mode 100644
> index e4951a8..0000000
> --- a/meta/recipes-devtools/libjson/libjson_0.9.bb
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -DESCRIPTION = "JSON-C - A JSON implementation in C"
> -HOMEPAGE = "http://oss.metaparadigm.com/json-c/"
> -
> -LICENSE = "MIT"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=30a276a476b02c2dcd0849bde417fb17"
> -
> -SRC_URI = "http://oss.metaparadigm.com/json-c/json-c-${PV}.tar.gz"
> -SRC_URI[md5sum] = "3a13d264528dcbaf3931b0cede24abae"
> -SRC_URI[sha256sum] = "702a486c9bf8e19137d484ab5c49b4ad314eb5e1fe37062a72c0a0fa39439475"
> -
> -S = "${WORKDIR}/json-c-${PV}"
> -
> -
> -inherit autotools
> diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
> index 4c10aa9..475da41 100644
> --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
> +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
> @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://GPL;md5=4325afd396febcb659c36b49533135d4 \
>   DEPENDS = "libatomics-ops liboil libsamplerate0 libsndfile1 libtool"
>   # optional
>   DEPENDS += "udev alsa-lib glib-2.0 dbus gconf"
> -DEPENDS += "libjson gdbm speex libxml-parser-perl-native"
> +DEPENDS += "json-c gdbm speex libxml-parser-perl-native"
>
>   inherit autotools pkgconfig useradd gettext perlnative
>
>

Patch

diff --git a/meta/conf/distro/include/seperatebuilddir.inc b/meta/conf/distro/include/seperatebuilddir.inc
index c067183..e1a5c6b 100644
--- a/meta/conf/distro/include/seperatebuilddir.inc
+++ b/meta/conf/distro/include/seperatebuilddir.inc
@@ -294,7 +294,7 @@  B_pn-libice = "${SEPB}"
 B_pn-libice-native = "${SEPB}"
 B_pn-libid3tag = "${SEPB}"
 B_pn-libidn = "${SEPB}"
-B_pn-libjson = "${SEPB}"
+B_pn-json-c = "${SEPB}"
 B_pn-libksba = "${SEPB}"
 B_pn-libmad = "${SEPB}"
 B_pn-libmatchbox = "${SEPB}"
diff --git a/meta/recipes-devtools/json-c/json-c_0.11.bb b/meta/recipes-devtools/json-c/json-c_0.11.bb
new file mode 100644
index 0000000..e0391f5
--- /dev/null
+++ b/meta/recipes-devtools/json-c/json-c_0.11.bb
@@ -0,0 +1,13 @@ 
+SUMMARY = "JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C"
+HOMEPAGE = "https://github.com/json-c/json-c/wiki"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2"
+
+SRC_URI = "https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
+
+SRC_URI[md5sum] = "aa02367d2f7a830bf1e3376f77881e98"
+SRC_URI[sha256sum] = "28dfc65145dc0d4df1dfe7701ac173c4e5f9347176c8983edbfac9149494448c"
+
+PARALLEL_MAKE = ""
+
+inherit autotools
diff --git a/meta/recipes-devtools/libjson/libjson_0.9.bb b/meta/recipes-devtools/libjson/libjson_0.9.bb
deleted file mode 100644
index e4951a8..0000000
--- a/meta/recipes-devtools/libjson/libjson_0.9.bb
+++ /dev/null
@@ -1,14 +0,0 @@ 
-DESCRIPTION = "JSON-C - A JSON implementation in C"
-HOMEPAGE = "http://oss.metaparadigm.com/json-c/"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=30a276a476b02c2dcd0849bde417fb17"
-
-SRC_URI = "http://oss.metaparadigm.com/json-c/json-c-${PV}.tar.gz"
-SRC_URI[md5sum] = "3a13d264528dcbaf3931b0cede24abae"
-SRC_URI[sha256sum] = "702a486c9bf8e19137d484ab5c49b4ad314eb5e1fe37062a72c0a0fa39439475"
-
-S = "${WORKDIR}/json-c-${PV}"
-
-
-inherit autotools
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 4c10aa9..475da41 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -11,7 +11,7 @@  LIC_FILES_CHKSUM = "file://GPL;md5=4325afd396febcb659c36b49533135d4 \
 DEPENDS = "libatomics-ops liboil libsamplerate0 libsndfile1 libtool"
 # optional
 DEPENDS += "udev alsa-lib glib-2.0 dbus gconf"
-DEPENDS += "libjson gdbm speex libxml-parser-perl-native"
+DEPENDS += "json-c gdbm speex libxml-parser-perl-native"
 
 inherit autotools pkgconfig useradd gettext perlnative