Add libARMedia and libARStream deps

7 files changed, 32 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5b2104654727..783ad4fcefac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,6 +13,7 @@ pkgbase = libarsdk3-git
 	depends = uthash
 	depends = libardiscovery-git
 	depends = libarmavlink-git
+	depends = libarmedia-git
 	depends = libarnetworkal-git
 	depends = libarnetwork-git
 	depends = libarsal-git
@@ -22,19 +23,17 @@ pkgbase = libarsdk3-git
 	source = 0002-products-Remove-libs_and_samples.patch
 	source = 0003-libARController-Fix-json-c.patch
 	source = 0004-libARController-Fix-uthash-path.patch
-	source = 0005-libARMedia-Fix-json-c.patch
-	source = 0006-libARUpdater-Fix-json-c.patch
+	source = 0005-libARUpdater-Fix-json-c.patch
 	source = local-dependencies-atom.mk
 	source = Config-linux-config.h
 	source = LICENSE
 	sha256sums = SKIP
-	sha256sums = 568dbff69a1de277fa4783755094398fde06dcc3a1f30305a7a65817a6e02a61
-	sha256sums = 0790aa37fca6cffa53e99b1ca9ad2cdcd44819ec0893767de48ef5087b33136c
+	sha256sums = d5171cbf0c7385e608423a7ac426dbf017442a4625c5315cd3d7a75223354aad
+	sha256sums = be3a8dda1aaff595656cd41c4c54dd939457217f05746f2d518bde6332216d8b
 	sha256sums = be1bf8b1b8a4105d30a494b03cda6679d44ea207516bae03d9e5913882dd203f
 	sha256sums = 8c18e3bb918323b0445935649d60f95c6f2759173e881c5ea0d9dc51c07e3fdf
-	sha256sums = 8e362c058ccf2023fb5df8dbe1307411e3d6221c093af5cc095b37d39b3801aa
 	sha256sums = 69cbcc090ec8356adbd57461ef58c3b1fe18699647779232673315bce5663c72
-	sha256sums = fa1f78bb07ddf17a1afe21995070added4d58bbabed156135dcb7af675ec528f
+	sha256sums = 177305249ca17839bd590a287c7a4cb1abec721a95b85dc5505801f05becf877
 	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 79c0c8bfc947..fa89fa3d1ce4 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,30 +14,16 @@
+@@ -14,30 +14,14 @@
   <!-- products  -->
   <project name="arsdk_products" path="products/arsdk"/>
  
@@ -15,11 +15,11 @@
   <project name="libARDataTransfer" path="packages/libARDataTransfer"/>
 - <project name="libARDiscovery" path="packages/libARDiscovery"/>
 - <project name="libARMavlink" path="packages/libARMavlink"/>
-  <project name="libARMedia" path="packages/libARMedia"/>
+- <project name="libARMedia" path="packages/libARMedia"/>
 - <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="libARStream" path="packages/libARStream" />
 - <project name="libARStream2" path="packages/libARStream2" />
   <project name="libARUpdater" path="packages/libARUpdater"/>
   <project name="libARUtils" path="packages/libARUtils"/>
diff --git a/0002-products-Remove-libs_and_samples.patch b/0002-products-Remove-libs_and_samples.patch
index b3e48e1dad99..45dcb4046a04 100644
--- a/0002-products-Remove-libs_and_samples.patch
+++ b/0002-products-Remove-libs_and_samples.patch
@@ -13,17 +13,19 @@
  CONFIG_ALCHEMY_BUILD_LIBARDATATRANSFER=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_LIBARMEDIA=y
 -CONFIG_ALCHEMY_BUILD_LIBARNETWORK=y
 -CONFIG_ALCHEMY_BUILD_LIBARNETWORKAL=y
 -CONFIG_ALCHEMY_BUILD_LIBARSAL=y
+-CONFIG_ALCHEMY_BUILD_LIBARSTREAM=y
+-CONFIG_ALCHEMY_BUILD_LIBARSTREAM2=y
++# CONFIG_ALCHEMY_BUILD_LIBARDISCOVERY is not set
++# CONFIG_ALCHEMY_BUILD_LIBARMAVLINK is not set
++# CONFIG_ALCHEMY_BUILD_LIBARMEDIA is not set
 +# 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_LIBARSTREAM is not set
 +# CONFIG_ALCHEMY_BUILD_LIBARSTREAM2 is not set
  CONFIG_ALCHEMY_BUILD_LIBARUPDATER=y
  CONFIG_ALCHEMY_BUILD_LIBARUTILS=y
diff --git a/0005-libARMedia-Fix-json-c.patch b/0005-libARMedia-Fix-json-c.patch
deleted file mode 100644
index 9ec797672950..000000000000
--- a/0005-libARMedia-Fix-json-c.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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/0005-libARUpdater-Fix-json-c.patch
index b523721ec254..b523721ec254 100644
--- a/0006-libARUpdater-Fix-json-c.patch
+++ b/0005-libARUpdater-Fix-json-c.patch
diff --git a/PKGBUILD b/PKGBUILD
index 032903b2361e..dbda52641830 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=libarsdk3-git
 pkgver=r22.305521e
-pkgrel=4
+pkgrel=5
 pkgdesc="ARSDK3 C librairies to control Parrot devices"
 arch=(x86_64)
 url="http://developer.parrot.com/"
@@ -13,6 +13,7 @@ depends=(curl
          uthash
          libardiscovery-git
          libarmavlink-git
+         libarmedia-git
          libarnetworkal-git
          libarnetwork-git
          libarsal-git
@@ -30,19 +31,17 @@ source=('arsdk_manifests::git+https://github.com/Parrot-Developers/arsdk_manifes
         '0002-products-Remove-libs_and_samples.patch'
         '0003-libARController-Fix-json-c.patch'
         '0004-libARController-Fix-uthash-path.patch'
-        '0005-libARMedia-Fix-json-c.patch'
-        '0006-libARUpdater-Fix-json-c.patch'
+        '0005-libARUpdater-Fix-json-c.patch'
         'local-dependencies-atom.mk'
         'Config-linux-config.h'
         'LICENSE')
 sha256sums=('SKIP'
-            '568dbff69a1de277fa4783755094398fde06dcc3a1f30305a7a65817a6e02a61'
-            '0790aa37fca6cffa53e99b1ca9ad2cdcd44819ec0893767de48ef5087b33136c'
+            'd5171cbf0c7385e608423a7ac426dbf017442a4625c5315cd3d7a75223354aad'
+            'be3a8dda1aaff595656cd41c4c54dd939457217f05746f2d518bde6332216d8b'
             'be1bf8b1b8a4105d30a494b03cda6679d44ea207516bae03d9e5913882dd203f'
             '8c18e3bb918323b0445935649d60f95c6f2759173e881c5ea0d9dc51c07e3fdf'
-            '8e362c058ccf2023fb5df8dbe1307411e3d6221c093af5cc095b37d39b3801aa'
             '69cbcc090ec8356adbd57461ef58c3b1fe18699647779232673315bce5663c72'
-            'fa1f78bb07ddf17a1afe21995070added4d58bbabed156135dcb7af675ec528f'
+            '177305249ca17839bd590a287c7a4cb1abec721a95b85dc5505801f05becf877'
             '5956b54ef47ad26df51991a4aa7002abdcb524a51b455d040f55b4d11a4f44a7'
             '1771e95329e9cb2bed04e023e330af3d558d0f13c0c1c5de0581f2880f149deb')
 
@@ -69,8 +68,7 @@ prepare() {
 	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-libARMedia-Fix-json-c.patch"
-	patch -p1 -i "$srcdir/0006-libARUpdater-Fix-json-c.patch"
+	patch -p1 -i "$srcdir/0005-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 f4a2a80bb9e2..d101b719cef6 100644
--- a/local-dependencies-atom.mk
+++ b/local-dependencies-atom.mk
@@ -33,6 +33,11 @@ LOCAL_EXPORT_LDLIBS := -larmavlink
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
+LOCAL_MODULE := libARMedia
+LOCAL_EXPORT_LDLIBS := -larmedia
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
 LOCAL_MODULE := libARNetworkAL
 LOCAL_EXPORT_LDLIBS := -larnetworkal
 include $(BUILD_PREBUILT)
@@ -46,3 +51,8 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libARStream2
 LOCAL_EXPORT_LDLIBS := -larstream2
 include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libARStream
+LOCAL_EXPORT_LDLIBS := -larstream
+include $(BUILD_PREBUILT)