CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

libimobiledevice: Upgrade to latest

Browse Source 
Needs several packages to be updates
Fixes build with openSSL 1.1.x

License-Update:

Drop LGPL-2.1, its moved out to separate package

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2018-09-04 23:23:59 -07:00
parent 412045dfaf
commit bfbcc00cb9
6 changed files with 18 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
meta-oe/recipes-connectivity/libimobiledevice/files/inline-without-definition.patch
View File

@ -1,31 +0,0 @@
Fix link error with gcc 5 toolchains
afc.c:258: error: undefined reference to 'debug_buffer'
collect2: error: ld returned 1 exit status
debug.h header was declaring things inline without providing a definition.
Files that included this header then failed to link against the corresponding
external symbol in debug.c, because the linker took the 'inline' keyword
seriously rather than ignoring it.
--- libimobiledevice-1.1.4/src/debug.h.orig 2015-10-03 16:24:08.758740386 -0700
+++ libimobiledevice-1.1.4/src/debug.h 2015-10-03 16:24:22.706740355 -0700
@@ -44,14 +44,14 @@
#define debug_plist(a)
#endif
-LIBIMOBILEDEVICE_INTERNAL inline void debug_info_real(const char *func,
+LIBIMOBILEDEVICE_INTERNAL void debug_info_real(const char *func,
const char *file,
int line,
const char *format, ...);
-LIBIMOBILEDEVICE_INTERNAL inline void debug_buffer(const char *data, const int length);
-LIBIMOBILEDEVICE_INTERNAL inline void debug_buffer_to_file(const char *file, const char *data, const int length);
-LIBIMOBILEDEVICE_INTERNAL inline void debug_plist_real(const char *func,
+LIBIMOBILEDEVICE_INTERNAL void debug_buffer(const char *data, const int length);
+LIBIMOBILEDEVICE_INTERNAL void debug_buffer_to_file(const char *file, const char *data, const int length);
+LIBIMOBILEDEVICE_INTERNAL void debug_plist_real(const char *func,
const char *file,
int line,
plist_t plist);

13
meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.1.4.bb → meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb
View File

@ -7,17 +7,16 @@ LIC_FILES_CHKSUM = "\
HOMEPAGE ="http://www.libimobiledevice.org/"
DEPENDS = "libplist usbmuxd libtasn1 gnutls libgcrypt"
DEPENDS = "libplist usbmuxd libusbmuxd libtasn1 gnutls libgcrypt"
SRC_URI = " \
http://www.libimobiledevice.org/downloads/libimobiledevice-${PV}.tar.bz2 \
SRCREV = "fb71aeef10488ed7b0e60a1c8a553193301428c0"
PV = "1.2.0+git${SRCPV}"
SRC_URI = "\
git://github.com/libimobiledevice/libimobiledevice;protocol=https \
file://configure-fix-largefile.patch \
file://inline-without-definition.patch \
"
SRC_URI[md5sum] = "3f28cbc6a2e30d34685049c0abde5183"
SRC_URI[sha256sum] = "67499cfaa6172f566ee6b0783605acffe484fb7ddc3b09881ab7ac58667ee5b8"
S = "${WORKDIR}/git"
inherit autotools pkgconfig
EXTRA_OECONF = " --without-cython "

19
meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb
View File

@ -1,24 +1,21 @@
DESCRIPTION = "This daemon is in charge of multiplexing connections over USB to an iPhone or iPod touch."
LICENSE = "GPLv3 & GPLv2 & LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=ebb5c50ab7cab4baeffba14977030c07 \
file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
file://COPYING.LGPLv2.1;md5=6ab17b41640564434dda85c06b7124f7"
file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504"
DEPENDS = "udev libusb1"
DEPENDS = "udev libusb1 libplist"
inherit cmake pkgconfig gitpkgv
inherit autotools pkgconfig gitpkgv systemd
PKGV = "${GITPKGVTAG}"
SRCREV = "919587580c5e77f3936f3432115d2e10c7bac7c5"
SRC_URI = "git://git.sukimashita.com/usbmuxd.git;protocol=http"
SRCREV = "ee85938c21043ef5f7cd4dfbc7677f385814d4d8"
SRC_URI = "git://github.com/libimobiledevice/usbmuxd;protocol=https"
S = "${WORKDIR}/git"
EXTRA_OECONF += "--without-preflight"
FILES_${PN} += "${base_libdir}/udev/rules.d/"
# fix usbmuxd installing files to /usr/lib64 on 64bit hosts:
EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}"
PACKAGECONFIG ??= ""
PACKAGECONFIG[plist] = "-DWANT_PLIST=1,-DWANT_PLIST=0,libplist"
SYSTEMD_SERVICE_${PN} = "usbmuxd.service"

51
meta-oe/recipes-extended/libimobiledevice/files/0001-Fix-warnings-found-with-clang.patch
View File

@ -1,51 +0,0 @@
From ad1be542b87b3186f8ef7bee2c594daefe5bb4c8 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 18 Oct 2016 21:31:40 +0000
Subject: [PATCH] Fix warnings found with clang
| /mnt/oe/openembedded-core/build/workspace/sources/libplist/src/base64.c:107:12: error: non-void function 'base64decode' should return a value [-Wreturn-type]
| if (!buf) return;
| ^
| /mnt/oe/openembedded-core/build/workspace/sources/libplist/src/base64.c:109:16: error: non-void function 'base64decode' should return a value [-Wreturn-type]
| if (len <= 0) return;
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
libcnary/node.c | 2 +-
src/base64.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libcnary/node.c b/libcnary/node.c
index 1f9f669..d6f3f63 100644
--- a/libcnary/node.c
+++ b/libcnary/node.c
@@ -104,7 +104,7 @@ int node_detach(node_t* parent, node_t* child) {
int node_insert(node_t* parent, unsigned int index, node_t* child)
{
- if (!parent || !child) return;
+ if (!parent || !child) return -1;
child->isLeaf = TRUE;
child->isRoot = FALSE;
child->parent = parent;
diff --git a/src/base64.c b/src/base64.c
index 65c6061..531a06a 100644
--- a/src/base64.c
+++ b/src/base64.c
@@ -104,9 +104,9 @@ static int base64decode_block(unsigned char *target, const char *data, size_t da
unsigned char *base64decode(const char *buf, size_t *size)
{
- if (!buf) return;
+ if (!buf) return 0;
size_t len = strlen(buf);
- if (len <= 0) return;
+ if (len <= 0) return 0;
unsigned char *outbuf = (unsigned char*)malloc((len/4)*3+3);
unsigned char *line;
--
1.9.1

21
meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch
View File

@ -1,21 +0,0 @@
From 335b25febd4c864ad0ac08479f5cd43fc21b7d73 Mon Sep 17 00:00:00 2001
From: Nikias Bassen
Date: Mon, 09 Jul 2012 21:17:15 +0000
Subject: Fix building with parallel build makeopts
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0bad840..155994e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,6 +57,8 @@ ADD_SUBDIRECTORY( plutil )
ADD_SUBDIRECTORY( include )
ADD_SUBDIRECTORY( test )
+ADD_DEPENDENCIES( plist libcnary )
+
IF ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND )
ADD_SUBDIRECTORY( swig )
ENDIF ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND )
--
cgit v0.9.0.2

10
meta-oe/recipes-extended/libimobiledevice/libplist_1.8.bb → meta-oe/recipes-extended/libimobiledevice/libplist_2.0.0.bb
View File

@ -6,15 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07 \
DEPENDS = "libxml2 glib-2.0 swig python"
inherit cmake pkgconfig
inherit autotools pkgconfig pythonnative
SRC_URI = "http://www.libimobiledevice.org/downloads/libplist-${PV}.tar.bz2 \
file://fix-parallel-make.patch \
file://0001-Fix-warnings-found-with-clang.patch \
SRCREV = "62ec804736435fa34e37e66e228e17e2aacee1d7"
SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https \
"
SRC_URI[md5sum] = "2a9e0258847d50f9760dc3ece25f4dc6"
SRC_URI[sha256sum] = "a418da3880308199b74766deef2a760a9b169b81a868a6a9032f7614e20500ec"
S = "${WORKDIR}/git"
do_install_append () {
if [ -e ${D}${libdir}/python*/site-packages/plist/_plist.so ]; then