Skip to contentSkip to conversation

libjson: update to 0.11 and rename to json-c

PATCH Superseded Jack Mitchell 2 participants 2 messages Oct 18, 2013 – Oct 19, 2013

v1 of 6 Superseded Latest is v6 →

lore
Share & tools
lore

Jack Mitchell

author
#0 lore raw

PATCH 1/1 libjson: update to 0.11 and rename to json-c

From: Jack Mitchell <[email protected]>

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 <[email protected]>
---
 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
meta/conf/distro/include/seperatebuilddir.inc +1 -1
index c067183..e1a5c6b 100644
@@ -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}"
meta/recipes-devtools/json-c/json-c_0.11.bb new file +13 -0
new file mode 100644
index 0000000..e0391f5
@@ -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
meta/recipes-devtools/libjson/libjson_0.9.bb deleted +0 -14
deleted file mode 100644
index e4951a8..0000000
@@ -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
meta/recipes-multimedia/pulseaudio/pulseaudio.inc +1 -1
index 4c10aa9..475da41 100644
@@ -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
Signature · 1 line
1.8.4
#1 lore raw
Quoted 8 lines · Jack Mitchell

From: Jack Mitchell <[email protected]>

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!

Quoted 76 lines
Signed-off-by Jack Mitchell <[email protected]>
---
  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

meta/conf/distro/include/seperatebuilddir.inc +1 -1
index c067183..e1a5c6b 100644
@@ -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}"
meta/recipes-devtools/json-c/json-c_0.11.bb new file +13 -0
new file mode 100644
index 0000000..e0391f5
@@ -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
meta/recipes-devtools/libjson/libjson_0.9.bb deleted +0 -14
deleted file mode 100644
index e4951a8..0000000
@@ -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
meta/recipes-multimedia/pulseaudio/pulseaudio.inc +1 -1
index 4c10aa9..475da41 100644
@@ -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