From bfbcc00cb95633c2e55f5adb3f1969867e1d1f89 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 4 Sep 2018 23:23:59 -0700 Subject: libimobiledevice: Upgrade to latest 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 --- .../files/inline-without-definition.patch | 31 ---------------------- .../libimobiledevice/libimobiledevice_1.1.4.bb | 23 ---------------- .../libimobiledevice/libimobiledevice_git.bb | 22 +++++++++++++++ .../recipes-connectivity/usbmuxd/usbmuxd_git.bb | 19 ++++++------- 4 files changed, 30 insertions(+), 65 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/libimobiledevice/files/inline-without-definition.patch delete mode 100644 meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.1.4.bb create mode 100644 meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb (limited to 'meta-oe/recipes-connectivity') diff --git a/meta-oe/recipes-connectivity/libimobiledevice/files/inline-without-definition.patch b/meta-oe/recipes-connectivity/libimobiledevice/files/inline-without-definition.patch deleted file mode 100644 index 9a7895fd41..0000000000 --- a/meta-oe/recipes-connectivity/libimobiledevice/files/inline-without-definition.patch +++ /dev/null @@ -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); diff --git a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.1.4.bb b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.1.4.bb deleted file mode 100644 index 32aca96fd0..0000000000 --- a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.1.4.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "A protocol library to access an iPhone or iPod Touch in Linux" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "\ - file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07 \ - file://COPYING.LESSER;md5=6ab17b41640564434dda85c06b7124f7 \ -" - -HOMEPAGE ="http://www.libimobiledevice.org/" - -DEPENDS = "libplist usbmuxd libtasn1 gnutls libgcrypt" - -SRC_URI = " \ - http://www.libimobiledevice.org/downloads/libimobiledevice-${PV}.tar.bz2 \ - file://configure-fix-largefile.patch \ - file://inline-without-definition.patch \ -" - -SRC_URI[md5sum] = "3f28cbc6a2e30d34685049c0abde5183" -SRC_URI[sha256sum] = "67499cfaa6172f566ee6b0783605acffe484fb7ddc3b09881ab7ac58667ee5b8" - -inherit autotools pkgconfig - -EXTRA_OECONF = " --without-cython " diff --git a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb new file mode 100644 index 0000000000..908b98d8c5 --- /dev/null +++ b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb @@ -0,0 +1,22 @@ +SUMMARY = "A protocol library to access an iPhone or iPod Touch in Linux" +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = "\ + file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07 \ + file://COPYING.LESSER;md5=6ab17b41640564434dda85c06b7124f7 \ +" + +HOMEPAGE ="http://www.libimobiledevice.org/" + +DEPENDS = "libplist usbmuxd libusbmuxd libtasn1 gnutls libgcrypt" + +SRCREV = "fb71aeef10488ed7b0e60a1c8a553193301428c0" +PV = "1.2.0+git${SRCPV}" +SRC_URI = "\ + git://github.com/libimobiledevice/libimobiledevice;protocol=https \ + file://configure-fix-largefile.patch \ +" + +S = "${WORKDIR}/git" +inherit autotools pkgconfig + +EXTRA_OECONF = " --without-cython " diff --git a/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb b/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb index 4365aa4bc6..7284234326 100644 --- a/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb +++ b/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb @@ -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" -FILES_${PN} += "${base_libdir}/udev/rules.d/" +EXTRA_OECONF += "--without-preflight" -# fix usbmuxd installing files to /usr/lib64 on 64bit hosts: -EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" +FILES_${PN} += "${base_libdir}/udev/rules.d/" -PACKAGECONFIG ??= "" -PACKAGECONFIG[plist] = "-DWANT_PLIST=1,-DWANT_PLIST=0,libplist" +SYSTEMD_SERVICE_${PN} = "usbmuxd.service" -- cgit v1.2.3-54-g00ecf