Add libarnetwork and libarstream2 deps

10 files changed, 118 insertions, 193 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e8210a44a197..5b2104654727 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = libarsdk3-git
 	pkgdesc = ARSDK3 C librairies to control Parrot devices
 	pkgver = r22.305521e
-	pkgrel = 2
+	pkgrel = 4
 	url = http://developer.parrot.com/
 	arch = x86_64
 	license = custom
@@ -9,29 +9,32 @@ pkgbase = libarsdk3-git
 	makedepends = repo
 	makedepends = python2-virtualenv
 	depends = curl
-	depends = json-c
-	depends = avahi
 	depends = ffmpeg
 	depends = uthash
-	depends = libarsal-git
+	depends = libardiscovery-git
 	depends = libarmavlink-git
 	depends = libarnetworkal-git
+	depends = libarnetwork-git
+	depends = libarsal-git
+	depends = libarstream2-git
 	source = arsdk_manifests::git+https://github.com/Parrot-Developers/arsdk_manifests
 	source = 0001-arsdk_manifests-Remove-libs_and_samples.patch
-	source = 0002-Use-local-json-and-curl.patch
-	source = 0003-Fix-json-c.patch
+	source = 0002-products-Remove-libs_and_samples.patch
+	source = 0003-libARController-Fix-json-c.patch
 	source = 0004-libARController-Fix-uthash-path.patch
-	source = 0005-libARDiscovery-Fix-some-warnings.patch
+	source = 0005-libARMedia-Fix-json-c.patch
+	source = 0006-libARUpdater-Fix-json-c.patch
 	source = local-dependencies-atom.mk
 	source = Config-linux-config.h
 	source = LICENSE
 	sha256sums = SKIP
-	sha256sums = 05b9d1f6c908e9c9100b0d0c65f4f74023fc04ea96b1b4e6168fd49c7c76c653
-	sha256sums = 6ebbeeff36b15dec168572004c0ccf5bf7a9fb83d08490afbdb9da8bbb3b8900
-	sha256sums = 0b630509176de0ceb48480cde0489095fd58632abeded9e7211de706ab20c926
-	sha256sums = 2a103ea898e987ee5dfdb111e2dd594ec432e9262db1ba8fdd68ba095ad01857
-	sha256sums = 82268abab9af48726993b82c7c9ab9a978c13cbddd4ecc4ab4588c0f4e323cc8
-	sha256sums = 6577c0bae441c02a5a5c2bf23592be33a3d1a7d301f80da5968830dd01af027f
+	sha256sums = 568dbff69a1de277fa4783755094398fde06dcc3a1f30305a7a65817a6e02a61
+	sha256sums = 0790aa37fca6cffa53e99b1ca9ad2cdcd44819ec0893767de48ef5087b33136c
+	sha256sums = be1bf8b1b8a4105d30a494b03cda6679d44ea207516bae03d9e5913882dd203f
+	sha256sums = 8c18e3bb918323b0445935649d60f95c6f2759173e881c5ea0d9dc51c07e3fdf
+	sha256sums = 8e362c058ccf2023fb5df8dbe1307411e3d6221c093af5cc095b37d39b3801aa
+	sha256sums = 69cbcc090ec8356adbd57461ef58c3b1fe18699647779232673315bce5663c72
+	sha256sums = fa1f78bb07ddf17a1afe21995070added4d58bbabed156135dcb7af675ec528f
 	sha256sums = 5956b54ef47ad26df51991a4aa7002abdcb524a51b455d040f55b4d11a4f44a7
 	sha256sums = 1771e95329e9cb2bed04e023e330af3d558d0f13c0c1c5de0581f2880f149deb
 
diff --git a/0001-arsdk_manifests-Remove-libs_and_samples.patch b/0001-arsdk_manifests-Remove-libs_and_samples.patch
index 7e6e49d2a41e..79c0c8bfc947 100644
--- a/0001-arsdk_manifests-Remove-libs_and_samples.patch
+++ b/0001-arsdk_manifests-Remove-libs_and_samples.patch
@@ -1,6 +1,6 @@
 --- a/.repo/manifests/default.xml
 +++ b/.repo/manifests/default.xml
-@@ -14,9 +14,6 @@
+@@ -14,30 +14,16 @@
   <!-- products  -->
   <project name="arsdk_products" path="products/arsdk"/>
  
@@ -10,17 +10,17 @@
   <!-- ARSDK -->
   <project name="ARSDKBuildUtils" path="packages/ARSDKBuildUtils"/>
   <project name="ARSDK3" path="packages/ARSDK3"/>
-@@ -24,20 +21,12 @@
+  <project name="libARCommands" path="packages/libARCommands"/>
   <project name="libARController" path="packages/libARController"/>
   <project name="libARDataTransfer" path="packages/libARDataTransfer"/>
-  <project name="libARDiscovery" path="packages/libARDiscovery"/>
+- <project name="libARDiscovery" path="packages/libARDiscovery"/>
 - <project name="libARMavlink" path="packages/libARMavlink"/>
   <project name="libARMedia" path="packages/libARMedia"/>
-  <project name="libARNetwork" path="packages/libARNetwork"/>
+- <project name="libARNetwork" path="packages/libARNetwork"/>
 - <project name="libARNetworkAL" path="packages/libARNetworkAL" />
 - <project name="libARSAL" path="packages/libARSAL"/>
   <project name="libARStream" path="packages/libARStream" />
-  <project name="libARStream2" path="packages/libARStream2" />
+- <project name="libARStream2" path="packages/libARStream2" />
   <project name="libARUpdater" path="packages/libARUpdater"/>
   <project name="libARUtils" path="packages/libARUtils"/>
   <project name="arsdk-xml" path="packages/arsdk-xml"/>
diff --git a/0002-Use-local-json-and-curl.patch b/0002-products-Remove-libs_and_samples.patch
index 8576ec82cc59..b3e48e1dad99 100644
--- a/0002-Use-local-json-and-curl.patch
+++ b/0002-products-Remove-libs_and_samples.patch
@@ -11,17 +11,20 @@
  CONFIG_ALCHEMY_BUILD_LIBARCOMMANDS=y
  CONFIG_ALCHEMY_BUILD_LIBARCONTROLLER=y
  CONFIG_ALCHEMY_BUILD_LIBARDATATRANSFER=y
- CONFIG_ALCHEMY_BUILD_LIBARDISCOVERY=y
+-CONFIG_ALCHEMY_BUILD_LIBARDISCOVERY=y
 -CONFIG_ALCHEMY_BUILD_LIBARMAVLINK=y
++# CONFIG_ALCHEMY_BUILD_LIBARDISCOVERY is not set
 +# CONFIG_ALCHEMY_BUILD_LIBARMAVLINK is not set
  CONFIG_ALCHEMY_BUILD_LIBARMEDIA=y
- CONFIG_ALCHEMY_BUILD_LIBARNETWORK=y
+-CONFIG_ALCHEMY_BUILD_LIBARNETWORK=y
 -CONFIG_ALCHEMY_BUILD_LIBARNETWORKAL=y
-+#CONFIG_ALCHEMY_BUILD_LIBARNETWORKAL is not set
 -CONFIG_ALCHEMY_BUILD_LIBARSAL=y
++# CONFIG_ALCHEMY_BUILD_LIBARNETWORK is not set
++# CONFIG_ALCHEMY_BUILD_LIBARNETWORKAL is not set
 +# CONFIG_ALCHEMY_BUILD_LIBARSAL is not set
  CONFIG_ALCHEMY_BUILD_LIBARSTREAM=y
- CONFIG_ALCHEMY_BUILD_LIBARSTREAM2=y
+-CONFIG_ALCHEMY_BUILD_LIBARSTREAM2=y
++# CONFIG_ALCHEMY_BUILD_LIBARSTREAM2 is not set
  CONFIG_ALCHEMY_BUILD_LIBARUPDATER=y
  CONFIG_ALCHEMY_BUILD_LIBARUTILS=y
 -CONFIG_ALCHEMY_BUILD_LIBRESSL=y
diff --git a/0003-Fix-json-c.patch b/0003-libARController-Fix-json-c.patch
index db5fa26801ba..1806919e272a 100644
--- a/0003-Fix-json-c.patch
+++ b/0003-libARController-Fix-json-c.patch
@@ -75,114 +75,6 @@
  #include <libARSAL/ARSAL_Socket.h>
  #include <libARSAL/ARSAL_Thread.h>
  #include <libARController/ARCONTROLLER_Error.h>
---- a/packages/libARDiscovery/Includes/libARDiscovery/ARDISCOVERY_Device.h
-+++ b/packages/libARDiscovery/Includes/libARDiscovery/ARDISCOVERY_Device.h
-@@ -38,7 +38,7 @@
- #ifndef _ARDISCOVERY_DEVICE_H_
- #define _ARDISCOVERY_DEVICE_H_
- 
--#include <json/json.h>
-+#include <json-c/json.h>
- #include <libARNetworkAL/ARNETWORKAL_Manager.h>
- #include <libARNetworkAL/ARNETWORKAL_Error.h>
- #include <libARNetwork/ARNETWORK_IOBufferParam.h>
---- a/packages/libARDiscovery/Sources/BLE/ARDISCOVERY_DEVICE_Ble.c
-+++ b/packages/libARDiscovery/Sources/BLE/ARDISCOVERY_DEVICE_Ble.c
-@@ -37,7 +37,7 @@
-  */
- 
- #include <stdlib.h>
--#include <json/json.h>
-+#include <json-c/json.h>
- #include <libARSAL/ARSAL_Print.h>
- #include <libARNetworkAL/ARNETWORKAL_Manager.h>
- #include <libARNetworkAL/ARNETWORKAL_Error.h>
---- a/packages/libARDiscovery/Sources/BLE/ARDISCOVERY_DEVICE_Ble.h
-+++ b/packages/libARDiscovery/Sources/BLE/ARDISCOVERY_DEVICE_Ble.h
-@@ -38,7 +38,7 @@
- #ifndef _ARDISCOVERY_DEVICE_BLE_H_
- #define _ARDISCOVERY_DEVICE_BLE_H_
- 
--#include <json/json.h>
-+#include <json-c/json.h>
- #include <libARNetworkAL/ARNETWORKAL_Manager.h>
- #include <libARNetworkAL/ARNETWORKAL_Error.h>
- #include <libARNetwork/ARNETWORK_IOBufferParam.h>
---- a/packages/libARDiscovery/Sources/Wifi/ARDISCOVERY_DEVICE_Wifi.c
-+++ b/packages/libARDiscovery/Sources/Wifi/ARDISCOVERY_DEVICE_Wifi.c
-@@ -37,7 +37,7 @@
-  */
- 
- #include <stdlib.h>
--#include <json/json.h>
-+#include <json-c/json.h>
- #include <libARSAL/ARSAL_Print.h>
- #include <libARNetworkAL/ARNETWORKAL_Manager.h>
- #include <libARNetworkAL/ARNETWORKAL_Error.h>
---- a/packages/libARDiscovery/Sources/Wifi/ARDISCOVERY_DEVICE_Wifi.h
-+++ b/packages/libARDiscovery/Sources/Wifi/ARDISCOVERY_DEVICE_Wifi.h
-@@ -38,7 +38,7 @@
- #ifndef _ARDISCOVERY_DEVICE_WIFI_H_
- #define _ARDISCOVERY_DEVICE_WIFI_H_
- 
--#include <json/json.h>
-+#include <json-c/json.h>
- #include <libARNetworkAL/ARNETWORKAL_Manager.h>
- #include <libARNetworkAL/ARNETWORKAL_Error.h>
- #include <libARNetwork/ARNETWORK_IOBufferParam.h>
---- a/packages/libARMedia/Sources/ARMEDIA_VideoAtoms.c
-+++ b/packages/libARMedia/Sources/ARMEDIA_VideoAtoms.c
-@@ -40,7 +40,7 @@
- #include <libARMedia/ARMedia.h>
- #include <libARMedia/ARMEDIA_VideoEncapsuler.h>
- #include <libARSAL/ARSAL_Print.h>
--#include <json/json.h>
-+#include <json-c/json.h>
- 
- #include <string.h>
- #include <arpa/inet.h>
---- a/packages/libARMedia/Sources/ARMEDIA_VideoEncapsuler.c
-+++ b/packages/libARMedia/Sources/ARMEDIA_VideoEncapsuler.c
-@@ -45,7 +45,7 @@
- #include <stdbool.h>
- #include <string.h>
- #include <arpa/inet.h>
--#include <json/json.h>
-+#include <json-c/json.h>
- #include <libARDiscovery/ARDiscovery.h>
- #include <libARMedia/ARMedia.h>
- #include <libARSAL/ARSAL_Print.h>
---- a/packages/libARUpdater/Sources/ARUPDATER_Downloader.c
-+++ b/packages/libARUpdater/Sources/ARUPDATER_Downloader.c
-@@ -46,7 +46,7 @@
- #include "ARUPDATER_Manager.h"
- #include "ARUPDATER_Downloader.h"
- #include "ARUPDATER_Utils.h"
--#include <json/json.h>
-+#include <json-c/json.h>
- 
- /* ***************************************
-  *
---- a/packages/libARDiscovery/Sources/Wifi/ARDISCOVERY_DEVICE_Wifi.c
-+++ b/packages/libARDiscovery/Sources/Wifi/ARDISCOVERY_DEVICE_Wifi.c
-@@ -1189,7 +1189,7 @@ eARDISCOVERY_ERROR ARDISCOVERY_DEVICE_Wifi_ReceiveJsonCallback (uint8_t *dataRx,
-     if (error == ARDISCOVERY_OK)
-     {
-         // get ARDISCOVERY_CONNECTION_JSON_C2DPORT_KEY
--        valueJsonObj = json_object_object_get (jsonObj, ARDISCOVERY_CONNECTION_JSON_C2DPORT_KEY);
-+        json_object_object_get_ex (jsonObj, ARDISCOVERY_CONNECTION_JSON_C2DPORT_KEY, &valueJsonObj);
-         if (valueJsonObj != NULL)
-         {
-             specificWifiParam->controllerToDevicePort = json_object_get_int(valueJsonObj);
-@@ -1197,7 +1197,7 @@ eARDISCOVERY_ERROR ARDISCOVERY_DEVICE_Wifi_ReceiveJsonCallback (uint8_t *dataRx,
-         
-         // get ARDISCOVERY_CONNECTION_JSON_STATUS_KEY
- 
--        valueJsonObj = json_object_object_get (jsonObj, ARDISCOVERY_CONNECTION_JSON_STATUS_KEY);
-+        json_object_object_get_ex (jsonObj, ARDISCOVERY_CONNECTION_JSON_STATUS_KEY, &valueJsonObj);
-         if (valueJsonObj != NULL)
-         {
-             specificWifiParam->connectionStatus = json_object_get_int(valueJsonObj);
 --- a/packages/libARController/Sources/ARCONTROLLER_Stream1.c
 +++ b/packages/libARController/Sources/ARCONTROLLER_Stream1.c
 @@ -503,21 +503,21 @@ eARDISCOVERY_ERROR ARCONTROLLER_Stream1_OnReceiveJson (ARCONTROLLER_Stream1_t *s
@@ -310,15 +202,3 @@
          if (valueJsonObj != NULL)
          {
              streamController->maxAckInterval = json_object_get_int(valueJsonObj);
---- a/packages/libARUpdater/Sources/ARUPDATER_Downloader.c
-+++ b/packages/libARUpdater/Sources/ARUPDATER_Downloader.c
-@@ -1207,7 +1207,8 @@ eARUPDATER_ERROR ARUPDATER_Downloader_GetBlacklistedFirmwareVersionsSync(ARUPDAT
-                 device = malloc(ARUPDATER_MANAGER_DEVICE_STRING_MAX_SIZE);
-                 snprintf(device, ARUPDATER_MANAGER_DEVICE_STRING_MAX_SIZE, "%04x", productId);
-                 
--                json_object *productJsonObj = json_object_object_get (jsonObj, device);
-+                json_object *productJsonObj = NULL;
-+                json_object_object_get_ex (jsonObj, device, &productJsonObj);
-                 if ((productJsonObj != NULL) && !is_error(productJsonObj))
-                 {
-                     blacklistedRemoteList = json_object_get_array(productJsonObj);
diff --git a/0004-libARController-Fix-uthash-path.patch b/0004-libARController-Fix-uthash-path.patch
index aeb006ce521a..12951898f9fd 100644
--- a/0004-libARController-Fix-uthash-path.patch
+++ b/0004-libARController-Fix-uthash-path.patch
@@ -72,6 +72,3 @@
  
  #include <libARSAL/ARSAL_Print.h>
  
--- 
-2.9.2
-
diff --git a/0005-libARDiscovery-Fix-some-warnings.patch b/0005-libARDiscovery-Fix-some-warnings.patch
deleted file mode 100644
index 40516a0d0a43..000000000000
--- a/0005-libARDiscovery-Fix-some-warnings.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/packages/libARDiscovery/Sources/ARDISCOVERY_Connection.c
-+++ b/packages/libARDiscovery/Sources/ARDISCOVERY_Connection.c
-@@ -866,7 +866,7 @@ static eARDISCOVERY_ERROR ARDISCOVERY_Connection_RxPending (ARDISCOVERY_Connecti
-             else
-             {
-                 if ((readSize == 0 || readSize == -1) &&
--                    (errno == EAGAIN || errno == EWOULDBLOCK))
-+                    (errno == EAGAIN))
-                 {
-                     ARSAL_PRINT(ARSAL_PRINT_DEBUG, ARDISCOVERY_CONNECTION_TAG, "No more data to read");
-                     // Nothing to do here, it just means that we had a size which is a multiple of ARDISCOVERY_CONNECTION_RX_BUFFER_SIZE
-@@ -902,7 +902,7 @@ static eARDISCOVERY_ERROR ARDISCOVERY_Connection_RxPending (ARDISCOVERY_Connecti
-                     else
-                     {
-                         if ((readSize == 0 || readSize == -1) &&
--                            (errno == EAGAIN || errno == EWOULDBLOCK))
-+                            (errno == EAGAIN))
-                         {
-                             ARSAL_PRINT(ARSAL_PRINT_DEBUG, ARDISCOVERY_CONNECTION_TAG, "No more data to read");
-                             // Nothing to do here, it just means that we had a size which is a multiple of ARDISCOVERY_CONNECTION_RX_BUFFER_SIZE
---- a/packages/libARDiscovery/Sources/ARDISCOVERY_Connection.h
-+++ b/packages/libARDiscovery/Sources/ARDISCOVERY_Connection.h
-@@ -40,7 +40,7 @@
- typedef struct ARDISCOVERY_Connection_ComData_t
- {
-     uint8_t *buffer; /**< data buffer */
--    int32_t size; /**< size of the data */
-+    uint32_t size; /**< size of the data */
-     int32_t capacity; /**< size allocated of the data buffer */
- } ARDISCOVERY_Connection_ComData_t;
- 
diff --git a/0005-libARMedia-Fix-json-c.patch b/0005-libARMedia-Fix-json-c.patch
new file mode 100644
index 000000000000..9ec797672950
--- /dev/null
+++ b/0005-libARMedia-Fix-json-c.patch
@@ -0,0 +1,22 @@
+--- a/packages/libARMedia/Sources/ARMEDIA_VideoAtoms.c
++++ b/packages/libARMedia/Sources/ARMEDIA_VideoAtoms.c
+@@ -40,7 +40,7 @@
+ #include <libARMedia/ARMedia.h>
+ #include <libARMedia/ARMEDIA_VideoEncapsuler.h>
+ #include <libARSAL/ARSAL_Print.h>
+-#include <json/json.h>
++#include <json-c/json.h>
+ 
+ #include <string.h>
+ #include <arpa/inet.h>
+--- a/packages/libARMedia/Sources/ARMEDIA_VideoEncapsuler.c
++++ b/packages/libARMedia/Sources/ARMEDIA_VideoEncapsuler.c
+@@ -45,7 +45,7 @@
+ #include <stdbool.h>
+ #include <string.h>
+ #include <arpa/inet.h>
+-#include <json/json.h>
++#include <json-c/json.h>
+ #include <libARDiscovery/ARDiscovery.h>
+ #include <libARMedia/ARMedia.h>
+ #include <libARSAL/ARSAL_Print.h>
diff --git a/0006-libARUpdater-Fix-json-c.patch b/0006-libARUpdater-Fix-json-c.patch
new file mode 100644
index 000000000000..b523721ec254
--- /dev/null
+++ b/0006-libARUpdater-Fix-json-c.patch
@@ -0,0 +1,23 @@
+--- a/packages/libARUpdater/Sources/ARUPDATER_Downloader.c
++++ b/packages/libARUpdater/Sources/ARUPDATER_Downloader.c
+@@ -46,7 +46,7 @@
+ #include "ARUPDATER_Manager.h"
+ #include "ARUPDATER_Downloader.h"
+ #include "ARUPDATER_Utils.h"
+-#include <json/json.h>
++#include <json-c/json.h>
+ 
+ /* ***************************************
+  *
+--- a/packages/libARUpdater/Sources/ARUPDATER_Downloader.c
++++ b/packages/libARUpdater/Sources/ARUPDATER_Downloader.c
+@@ -1207,7 +1207,8 @@ eARUPDATER_ERROR ARUPDATER_Downloader_GetBlacklistedFirmwareVersionsSync(ARUPDAT
+                 device = malloc(ARUPDATER_MANAGER_DEVICE_STRING_MAX_SIZE);
+                 snprintf(device, ARUPDATER_MANAGER_DEVICE_STRING_MAX_SIZE, "%04x", productId);
+                 
+-                json_object *productJsonObj = json_object_object_get (jsonObj, device);
++                json_object *productJsonObj = NULL;
++                json_object_object_get_ex (jsonObj, device, &productJsonObj);
+                 if ((productJsonObj != NULL) && !is_error(productJsonObj))
+                 {
+                     blacklistedRemoteList = json_object_get_array(productJsonObj);
diff --git a/PKGBUILD b/PKGBUILD
index a84e39d10e7c..032903b2361e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,22 @@
 # Maintainer: Alexandre Iooss <alexandre.iooss@gmail.com>
 
-# Everything works except libARController because of uthash
-# The uthash in community is too old and create a segfault
-
 pkgname=libarsdk3-git
 pkgver=r22.305521e
-pkgrel=3
+pkgrel=4
 pkgdesc="ARSDK3 C librairies to control Parrot devices"
 arch=(x86_64)
 url="http://developer.parrot.com/"
 license=('custom')
 groups=()
-depends=(curl json-c avahi ffmpeg uthash libarsal-git libarmavlink-git libarnetworkal-git)
+depends=(curl
+         ffmpeg
+         uthash
+         libardiscovery-git
+         libarmavlink-git
+         libarnetworkal-git
+         libarnetwork-git
+         libarsal-git
+         libarstream2-git)
 optdepends=()
 makedepends=(git repo python2-virtualenv)
 provides=()
@@ -22,20 +27,22 @@ options=()
 install=
 source=('arsdk_manifests::git+https://github.com/Parrot-Developers/arsdk_manifests'
         '0001-arsdk_manifests-Remove-libs_and_samples.patch'
-        '0002-Use-local-json-and-curl.patch'
-        '0003-Fix-json-c.patch'
+        '0002-products-Remove-libs_and_samples.patch'
+        '0003-libARController-Fix-json-c.patch'
         '0004-libARController-Fix-uthash-path.patch'
-        '0005-libARDiscovery-Fix-some-warnings.patch'
+        '0005-libARMedia-Fix-json-c.patch'
+        '0006-libARUpdater-Fix-json-c.patch'
         'local-dependencies-atom.mk'
         'Config-linux-config.h'
         'LICENSE')
 sha256sums=('SKIP'
-            '05b9d1f6c908e9c9100b0d0c65f4f74023fc04ea96b1b4e6168fd49c7c76c653'
-            '6ebbeeff36b15dec168572004c0ccf5bf7a9fb83d08490afbdb9da8bbb3b8900'
-            '0b630509176de0ceb48480cde0489095fd58632abeded9e7211de706ab20c926'
-            '2a103ea898e987ee5dfdb111e2dd594ec432e9262db1ba8fdd68ba095ad01857'
-            '82268abab9af48726993b82c7c9ab9a978c13cbddd4ecc4ab4588c0f4e323cc8'
-            '6577c0bae441c02a5a5c2bf23592be33a3d1a7d301f80da5968830dd01af027f'
+            '568dbff69a1de277fa4783755094398fde06dcc3a1f30305a7a65817a6e02a61'
+            '0790aa37fca6cffa53e99b1ca9ad2cdcd44819ec0893767de48ef5087b33136c'
+            'be1bf8b1b8a4105d30a494b03cda6679d44ea207516bae03d9e5913882dd203f'
+            '8c18e3bb918323b0445935649d60f95c6f2759173e881c5ea0d9dc51c07e3fdf'
+            '8e362c058ccf2023fb5df8dbe1307411e3d6221c093af5cc095b37d39b3801aa'
+            '69cbcc090ec8356adbd57461ef58c3b1fe18699647779232673315bce5663c72'
+            'fa1f78bb07ddf17a1afe21995070added4d58bbabed156135dcb7af675ec528f'
             '5956b54ef47ad26df51991a4aa7002abdcb524a51b455d040f55b4d11a4f44a7'
             '1771e95329e9cb2bed04e023e330af3d558d0f13c0c1c5de0581f2880f149deb')
 
@@ -59,10 +66,11 @@ prepare() {
 	repo sync
 
 	# Patch files
-	patch -p1 -i "$srcdir/0002-Use-local-json-and-curl.patch"
-	patch -p1 -i "$srcdir/0003-Fix-json-c.patch"
+	patch -p1 -i "$srcdir/0002-products-Remove-libs_and_samples.patch"
+	patch -p1 -i "$srcdir/0003-libARController-Fix-json-c.patch"
 	patch -p1 -i "$srcdir/0004-libARController-Fix-uthash-path.patch"
-	patch -p1 -i "$srcdir/0005-libARDiscovery-Fix-some-warnings.patch"
+	patch -p1 -i "$srcdir/0005-libARMedia-Fix-json-c.patch"
+	patch -p1 -i "$srcdir/0006-libARUpdater-Fix-json-c.patch"
 
 	# Add build settings to use archlinux libs
 	mkdir -p "$srcdir/packages/ArchlinuxLibs/Config/linux"
diff --git a/local-dependencies-atom.mk b/local-dependencies-atom.mk
index f17ff9e77ec0..f4a2a80bb9e2 100644
--- a/local-dependencies-atom.mk
+++ b/local-dependencies-atom.mk
@@ -23,6 +23,26 @@ LOCAL_EXPORT_LDLIBS := -larsal
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
+LOCAL_MODULE := libARDiscovery
+LOCAL_EXPORT_LDLIBS := -lardiscovery
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libARMavlink
+LOCAL_EXPORT_LDLIBS := -larmavlink
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
 LOCAL_MODULE := libARNetworkAL
 LOCAL_EXPORT_LDLIBS := -larnetworkal
 include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libARNetwork
+LOCAL_EXPORT_LDLIBS := -larnetwork
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libARStream2
+LOCAL_EXPORT_LDLIBS := -larstream2
+include $(BUILD_PREBUILT)