diff options
| -rw-r--r-- | .SRCINFO | 19 | ||||
| -rw-r--r-- | 0001-arsdk_manifests-Remove-libs_and_samples.patch | 10 | ||||
| -rw-r--r-- | 0002-Use-local-json-and-curl.patch | 10 | ||||
| -rw-r--r-- | Config-linux-config.h | 200 | ||||
| -rw-r--r-- | PKGBUILD | 15 | ||||
| -rw-r--r-- | local-dependencies-atom.mk | 9 |
6 files changed, 246 insertions, 17 deletions
@@ -13,6 +13,7 @@ pkgbase = libarsdk3-git depends = avahi depends = ffmpeg depends = uthash + depends = libarsal-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 @@ -20,15 +21,17 @@ pkgbase = libarsdk3-git source = 0004-libARController-Fix-uthash-path.patch source = 0005-libARDiscovery-Fix-some-warnings.patch source = local-dependencies-atom.mk + source = Config-linux-config.h source = LICENSE - md5sums = SKIP - md5sums = SKIP - md5sums = SKIP - md5sums = SKIP - md5sums = SKIP - md5sums = SKIP - md5sums = SKIP - md5sums = SKIP + sha256sums = SKIP + sha256sums = c5132126585bfce6f2b5ca2e4fa0494a2f389e2c431060041346eca4eddf8d09 + sha256sums = ab927129737e5db58f0f86ef6df5ec1cb86bf2b20f146b8d2658b756d6e3ee19 + sha256sums = 0b630509176de0ceb48480cde0489095fd58632abeded9e7211de706ab20c926 + sha256sums = 2a103ea898e987ee5dfdb111e2dd594ec432e9262db1ba8fdd68ba095ad01857 + sha256sums = 82268abab9af48726993b82c7c9ab9a978c13cbddd4ecc4ab4588c0f4e323cc8 + sha256sums = 1d41f55e8b86dff248579bacd0f1edb49e3bb643a44fe41ade0e150ff3abb375 + sha256sums = 5956b54ef47ad26df51991a4aa7002abdcb524a51b455d040f55b4d11a4f44a7 + sha256sums = 1771e95329e9cb2bed04e023e330af3d558d0f13c0c1c5de0581f2880f149deb pkgname = libarsdk3-git diff --git a/0001-arsdk_manifests-Remove-libs_and_samples.patch b/0001-arsdk_manifests-Remove-libs_and_samples.patch index 213f45b1209e..6d686ab88fa8 100644 --- a/0001-arsdk_manifests-Remove-libs_and_samples.patch +++ b/0001-arsdk_manifests-Remove-libs_and_samples.patch @@ -10,7 +10,15 @@ <!-- ARSDK --> <project name="ARSDKBuildUtils" path="packages/ARSDKBuildUtils"/> <project name="ARSDK3" path="packages/ARSDK3"/> -@@ -37,7 +34,4 @@ +@@ -28,7 +25,6 @@ + <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="libARStream2" path="packages/libARStream2" /> + <project name="libARUpdater" path="packages/libARUpdater"/> +@@ -37,7 +33,4 @@ <project name="mavlink.git" path="packages/mavlink"/> diff --git a/0002-Use-local-json-and-curl.patch b/0002-Use-local-json-and-curl.patch index a16067c4dc48..cb8f0b3caf2a 100644 --- a/0002-Use-local-json-and-curl.patch +++ b/0002-Use-local-json-and-curl.patch @@ -11,13 +11,19 @@ CONFIG_ALCHEMY_BUILD_LIBARCOMMANDS=y CONFIG_ALCHEMY_BUILD_LIBARCONTROLLER=y CONFIG_ALCHEMY_BUILD_LIBARDATATRANSFER=y -@@ -26,5 +26,5 @@ CONFIG_ALCHEMY_BUILD_LIBARSTREAM=y +@@ -21,10 +21,10 @@ CONFIG_ALCHEMY_BUILD_LIBARMAVLINK=y + CONFIG_ALCHEMY_BUILD_LIBARMEDIA=y + CONFIG_ALCHEMY_BUILD_LIBARNETWORK=y + CONFIG_ALCHEMY_BUILD_LIBARNETWORKAL=y +-CONFIG_ALCHEMY_BUILD_LIBARSAL=y ++# CONFIG_ALCHEMY_BUILD_LIBARSAL is not set + CONFIG_ALCHEMY_BUILD_LIBARSTREAM=y CONFIG_ALCHEMY_BUILD_LIBARSTREAM2=y CONFIG_ALCHEMY_BUILD_LIBARUPDATER=y CONFIG_ALCHEMY_BUILD_LIBARUTILS=y -CONFIG_ALCHEMY_BUILD_LIBRESSL=y -+# CONFIG_ALCHEMY_BUILD_LIBRESSL is not set -CONFIG_ALCHEMY_BUILD_UTHASH=y ++# CONFIG_ALCHEMY_BUILD_LIBRESSL is not set +# CONFIG_ALCHEMY_BUILD_UTHASH is not set --- a/products/arsdk/native/config/product.mk +++ b/products/arsdk/native/config/product.mk diff --git a/Config-linux-config.h b/Config-linux-config.h new file mode 100644 index 000000000000..dc8a5ded8656 --- /dev/null +++ b/Config-linux-config.h @@ -0,0 +1,200 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Debug Mode */ +/* #undef DEBUG */ + +/* Define to 1 if you have the declaration of `PRIi16', and to 0 if you don't. + */ +#define HAVE_DECL_PRII16 1 + +/* Define to 1 if you have the declaration of `PRIi32', and to 0 if you don't. + */ +#define HAVE_DECL_PRII32 1 + +/* Define to 1 if you have the declaration of `PRIi64', and to 0 if you don't. + */ +#define HAVE_DECL_PRII64 1 + +/* Define to 1 if you have the declaration of `PRIi8', and to 0 if you don't. + */ +#define HAVE_DECL_PRII8 1 + +/* Define to 1 if you have the declaration of `PRIu16', and to 0 if you don't. + */ +#define HAVE_DECL_PRIU16 1 + +/* Define to 1 if you have the declaration of `PRIu32', and to 0 if you don't. + */ +#define HAVE_DECL_PRIU32 1 + +/* Define to 1 if you have the declaration of `PRIu64', and to 0 if you don't. + */ +#define HAVE_DECL_PRIU64 1 + +/* Define to 1 if you have the declaration of `PRIu8', and to 0 if you don't. + */ +#define HAVE_DECL_PRIU8 1 + +/* Define to 1 if you have the <android/log.h> header file. */ +/* #undef HAVE_ANDROID_LOG_H */ + +/* Define to 1 if you have the `clock_gettime' function. */ +#define HAVE_CLOCK_GETTIME 1 + +/* Define to 1 if you have the <CoreBluetooth/CoreBluetooth.h> header file. */ +/* #undef HAVE_COREBLUETOOTH_COREBLUETOOTH_H */ + +/* Define to 1 if you have the declaration of `MSG_NOSIGNAL', and to 0 if you + don't. */ +#ifdef __linux__ +# define HAVE_DECL_MSG_NOSIGNAL 1 +#else +# define HAVE_DECL_MSG_NOSIGNAL 0 +#endif + +/* Define to 1 if you have the declaration of `SO_NOSIGPIPE', and to 0 if you + don't. */ +#ifdef __linux__ +# define HAVE_DECL_SO_NOSIGPIPE 0 +#else +# define HAVE_DECL_SO_NOSIGPIPE 1 +#endif + +/* Define to 1 if you have the declaration of `CLOCK_MONOTONIC', and to 0 if + you don't. */ +#ifdef __linux__ +# define HAVE_DECL_CLOCK_MONOTONIC 1 +#else +# define HAVE_DECL_CLOCK_MONOTONIC 0 +#endif + +/* Define to 1 if you have the declaration of `CLOCK_REALTIME', and to 0 if + you don't. */ +#ifdef __linux__ +# define HAVE_DECL_CLOCK_REALTIME 1 +#else +# define HAVE_DECL_CLOCK_REALTIME 0 +#endif + +/* Define to 1 if you have the declaration of `log2', and to 0 if you don't. + */ +#define HAVE_DECL_LOG2 1 + +/* Define to 1 if you have the declaration of `SYS_gettid', and to 0 if you + don't. */ +#define HAVE_DECL_SYS_GETTID 1 + +/* Define to 1 if you have the <dlfcn.h> header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the <ftw.h> header file. */ +#define HAVE_FTW_H 1 + +/* Define to 1 if you have the `gettimeofday' function. */ +#define HAVE_GETTIMEOFDAY 1 + +/* Define to 1 if you have the <inttypes.h> header file. */ +#define HAVE_INTTYPES_H 1 + +/* Whether the libm on the host has the log2 function */ +#define HAVE_LOG2 1 + +/* Define to 1 if you have the <memory.h> header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the <netinet/in.h> header file. */ +#define HAVE_NETINET_IN_H 1 + +/* Define to 1 if you have the <pthread.h> header file. */ +#define HAVE_PTHREAD_H 1 + +/* Define to 1 if you have the <semaphore.h> header file. */ +#define HAVE_SEMAPHORE_H 1 + +/* Define to 1 if you have the `sem_destroy' function. */ +#define HAVE_SEM_DESTROY 1 + +/* Define to 1 if you have the `sem_getvalue' function. */ +#define HAVE_SEM_GETVALUE 1 + +/* Define to 1 if you have the `sem_init' function. */ +#define HAVE_SEM_INIT 1 + +/* Define to 1 if you have the `sem_post' function. */ +#define HAVE_SEM_POST 1 + +/* Define to 1 if you have the `sem_timedwait' function. */ +#ifdef __linux__ +# define HAVE_SEM_TIMEDWAIT 1 +#endif + +/* Define to 1 if you have the `sem_trywait' function. */ +#define HAVE_SEM_TRYWAIT 1 + +/* Define to 1 if you have the `sem_wait' function. */ +#define HAVE_SEM_WAIT 1 + +/* Define to 1 if you have the <stdarg.h> header file. */ +#define HAVE_STDARG_H 1 + +/* Define to 1 if you have the <stdint.h> header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the <stdio.h> header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the <stdlib.h> header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the <strings.h> header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the <string.h> header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the <sys/socket.h> header file. */ +#define HAVE_SYS_SOCKET_H 1 + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the <sys/time.h> header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the <sys/types.h> header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the <sys/uio.h> header file. */ +#define HAVE_SYS_UIO_H 1 + +/* Define to 1 if you have the `time' function. */ +#define HAVE_TIME 1 + +/* Define to 1 if you have the <time.h> header file. */ +#define HAVE_TIME_H 1 + +/* Define to 1 if you have the <unistd.h> header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the <sys/statfs.h> header file. */ +#ifdef __linux__ +# define HAVE_SYS_STATFS_H 1 +#endif + +/* Define to 1 if you have the <sys/mount.h> header file. */ +#define HAVE_SYS_MOUNT_H 1 + +/* No-debug Mode */ +#define NDEBUG /**/ + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define to 1 if you have the <sys/mount.h> header file. */ +#define HAVE_SYS_MOUNT_H 1 + +/* Define to 1 if you have the <UIKit/UIKit.h> header file. */ +/* #undef HAVE_UIKIT_UIKIT_H */ +/* Define to `unsigned int' if <sys/types.h> does not define. */ +/* #undef size_t */ @@ -5,13 +5,13 @@ pkgname=libarsdk3-git pkgver=r22.305521e -pkgrel=1 +pkgrel=2 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) +depends=(curl json-c avahi ffmpeg uthash libarsal-git) optdepends=() makedepends=(git repo python2-virtualenv) provides=() @@ -27,14 +27,16 @@ source=('arsdk_manifests::git+https://github.com/Parrot-Developers/arsdk_manifes '0004-libARController-Fix-uthash-path.patch' '0005-libARDiscovery-Fix-some-warnings.patch' 'local-dependencies-atom.mk' + 'Config-linux-config.h' 'LICENSE') sha256sums=('SKIP' - '6aebabef1df8ffb5ee1d82e983b7b7b699e9f6e430cdf72ad4237e2617723572' - '8c8a3054658fe6fdc4820f4625f17e90dd9c17a9bb00451f4dd60c85010358eb' + 'c5132126585bfce6f2b5ca2e4fa0494a2f389e2c431060041346eca4eddf8d09' + 'ab927129737e5db58f0f86ef6df5ec1cb86bf2b20f146b8d2658b756d6e3ee19' '0b630509176de0ceb48480cde0489095fd58632abeded9e7211de706ab20c926' '2a103ea898e987ee5dfdb111e2dd594ec432e9262db1ba8fdd68ba095ad01857' '82268abab9af48726993b82c7c9ab9a978c13cbddd4ecc4ab4588c0f4e323cc8' - '1a365608863d1a3000675dd243c007a7913dd391eeb1710baf51d886e2b121b5' + '1d41f55e8b86dff248579bacd0f1edb49e3bb643a44fe41ade0e150ff3abb375' + '5956b54ef47ad26df51991a4aa7002abdcb524a51b455d040f55b4d11a4f44a7' '1771e95329e9cb2bed04e023e330af3d558d0f13c0c1c5de0581f2880f149deb') pkgver() { @@ -63,8 +65,9 @@ prepare() { patch -p1 -i "$srcdir/0005-libARDiscovery-Fix-some-warnings.patch" # Add build settings to use archlinux libs - mkdir "$srcdir/packages/ArchlinuxLibs" + mkdir -p "$srcdir/packages/ArchlinuxLibs/Config/linux" cp "$srcdir/local-dependencies-atom.mk" "$srcdir/packages/ArchlinuxLibs/atom.mk" + cp "$srcdir/Config-linux-config.h" "$srcdir/packages/ArchlinuxLibs/Config/linux/config.h" } build() { diff --git a/local-dependencies-atom.mk b/local-dependencies-atom.mk index 99f08f758abf..4f0d1a1eab59 100644 --- a/local-dependencies-atom.mk +++ b/local-dependencies-atom.mk @@ -1,3 +1,5 @@ +LOCAL_PATH := $(call my-dir) + include $(CLEAR_VARS) LOCAL_MODULE := json LOCAL_EXPORT_C_INCLUDES := $(shell pkg-config --cflags json-c) @@ -13,3 +15,10 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := uthash include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := libARSAL +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/Config/linux +LOCAL_EXPORT_LDLIBS := -larsal +include $(BUILD_PREBUILT) + |