itools: update to libimediadevice 2.0 libraries (#4985)

* itools: update to libimediadevice 2.0 libraries
- updated libraries have full support for configure and do not need autogen anymore
- use icon of libimediadevice

* adjust for DSM 7 compatibility

* update libplist to v2.3.0
- needs patches for libimobiledevice and usbmuxd
- drop support for OLD_PPC_ARCHS
- update libusb for supported toolchains and keep libusb_1.0.23 for others
- adjust python scripts for python2

* fix he853
- use libusb v1.0.23
- needs static libusb
- add options to build static libusb and to enable dependency of libudev

* libusb: update to v1.0.27

merged to get updated libusb in synocli-misc.
The migration of the scripts to python3 is still pending.

cross/he853/Makefile

@@ -2,17 +2,20 @@ PKG_NAME = he853-cli
 PKG_VERS = 1.0.3
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-v$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://github.com/hphde/$(PKG_NAME)/archive
+PKG_DIST_SITE = https://github.com/hphde/he853-cli/archive
 PKG_DIR = $(PKG_NAME)-$(PKG_NAME)-v$(PKG_VERS)
 
-DEPENDS = cross/libusb
+DEPENDS = cross/libusb_1.0.23
 
-HOMEPAGE = https://github.com/hphde/$(PKG_NAME)
-COMMENT  = HomeEasy HE853 USB device executable
+HOMEPAGE = https://github.com/hphde/he853-cli
+COMMENT  = HomeEasy HE853 USB device executable.
 LICENSE  = GPLv2
 
 CONFIGURE_TARGET = nop
 
+# need static libusb (when built without libudev)
+export LIBUSB_ENABLE_STATIC=1
+
 INSTALL_TARGET = he853_install
 
 include ../../mk/spksrc.cross-cc.mk

cross/ifuse/Makefile

@@ -1,12 +1,9 @@
 PKG_NAME = ifuse
-PKG_VERS = 1.1.3
-PKG_EXT = tar.gz
-PKG_DOWNLOAD_METHOD = git
-# commited on Oct 8, 2018
-PKG_GIT_HASH = e75d32c34d0e8b80320f0a007d5ecbb3f55ef7f0
-PKG_DIST_SITE = https://github.com/libimobiledevice/$(PKG_NAME).git
-PKG_DIST_FILE = $(PKG_NAME)-git$(PKG_GIT_HASH).$(PKG_EXT)
-PKG_DIR = $(PKG_NAME)-git$(PKG_GIT_HASH)
+PKG_VERS = 1.1.4
+PKG_EXT = tar.bz2
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/libimobiledevice/ifuse/releases/download/$(PKG_VERS)
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS = cross/libplist cross/libimobiledevice cross/fuse
 
@@ -15,23 +12,7 @@ COMMENT  = A fuse filesystem implementation to access the contents of iOS device
 LICENSE  = LGPL-2.1
 
 GNU_CONFIGURE = 1
-PRE_CONFIGURE_TARGET = ifuse_pre_configure
-INSTALL_TARGET = ifuse_install
-IFUSE_AUTOGEN_ARGS =
+# avoid prefix definition for make install
+INSTALL_MAKE_OPTIONS = install DESTDIR=$(INSTALL_DIR)
 
 include ../../mk/spksrc.cross-cc.mk
-
-ifeq ($(findstring $(ARCH),$(ARM_ARCHS)),$(ARCH))
-IFUSE_AUTOGEN_ARGS += --host=arm-linux
-endif
-ifeq ($(findstring $(ARCH),$(PPC_ARCHS)),$(ARCH))
-IFUSE_AUTOGEN_ARGS += --host=ppc-linux
-endif
-
-.PHONY ifuse_pre_configure:
-ifuse_pre_configure:
-	$(RUN) ./autogen.sh $(IFUSE_AUTOGEN_ARGS)
-
-.PHONY ifuse_install:
-ifuse_install:
-	$(RUN) $(MAKE) install DESTDIR=$(INSTALL_DIR)

cross/ifuse/digests

@@ -1,3 +1,3 @@
-ifuse-gite75d32c34d0e8b80320f0a007d5ecbb3f55ef7f0.tar.gz SHA1 d6c64b2f04f6feb28dbc7e8b438cf745b63c8f93
-ifuse-gite75d32c34d0e8b80320f0a007d5ecbb3f55ef7f0.tar.gz SHA256 11cebbea606fc05cf471ce1032c47bf3840f0d8b42b3a3b963c97ba00ebeb5ec
-ifuse-gite75d32c34d0e8b80320f0a007d5ecbb3f55ef7f0.tar.gz MD5 f4639d64c95090c318c456e2ee2ebd0a
+ifuse-1.1.4.tar.bz2 SHA1 eecac3d3aee59d2c1f956652f5705b713d160078
+ifuse-1.1.4.tar.bz2 SHA256 3550702ef94b2f5f16c7db91c6b3282b2aed1340665834a03e47458e09d98d87
+ifuse-1.1.4.tar.bz2 MD5 cd31fbd0ea945b2ff1e39eac8d198fdd

cross/libimobiledevice/Makefile

@@ -1,33 +1,21 @@
 PKG_NAME = libimobiledevice
-PKG_VERS = 1.2.0
-PKG_EXT = tar.gz
-PKG_DOWNLOAD_METHOD = git
-# with commits on Jun 13, 2019
-PKG_GIT_HASH = 6edc36fccb52a963c9ebfbb44ba7b91570e0fd06
-PKG_DIST_SITE = https://github.com/libimobiledevice/$(PKG_NAME).git
-PKG_DIST_FILE = $(PKG_NAME)-git$(PKG_GIT_HASH).$(PKG_EXT)
-PKG_DIR = $(PKG_NAME)-git$(PKG_GIT_HASH)
+PKG_VERS = 1.3.0
+PKG_EXT = tar.bz2
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/libimobiledevice/libimobiledevice/releases/download/$(PKG_VERS)
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-DEPENDS = cross/libplist cross/libusbmuxd cross/openssl
+DEPENDS = cross/libplist cross/libusbmuxd cross/openssl3
 
 HOMEPAGE = https://github.com/libimobiledevice/libimobiledevice/
 COMMENT  = A library to communicate with services of Apple iOS devices using native protocols.
 LICENSE  = LGPL-2.1
 
+PATCHES_LEVEL = 1
+
 GNU_CONFIGURE = 1
-PRE_CONFIGURE_TARGET = libimobiledevice_pre_configure
-CONFIGURE_ARGS = --disable-largefile --without-cython
-LIBIMOBILEDEVICE_AUTOGEN_ARGS = $(CONFIGURE_ARGS)
+CONFIGURE_ARGS  = --disable-static
+CONFIGURE_ARGS += --without-cython
+ADDITIONAL_CFLAGS = -O
 
 include ../../mk/spksrc.cross-cc.mk
-
-ifeq ($(findstring $(ARCH),$(ARM_ARCHS)),$(ARCH))
-	LIBIMOBILEDEVICE_AUTOGEN_ARGS += --host=arm-linux
-endif
-ifeq ($(findstring $(ARCH),$(PPC_ARCHS)),$(ARCH))
-	LIBIMOBILEDEVICE_AUTOGEN_ARGS += --host=ppc-linux
-endif
-
-.PHONY: libimobiledevice_pre_configure
-libimobiledevice_pre_configure:
-	$(RUN) NOCONFIGURE=1 ./autogen.sh $(LIBIMOBILEDEVICE_AUTOGEN_ARGS)

cross/libimobiledevice/PLIST

@@ -14,7 +14,8 @@ bin:bin/idevicenotificationproxy
 bin:bin/idevicepair
 bin:bin/ideviceprovision
 bin:bin/idevicescreenshot
+bin:bin/idevicesetlocation
 bin:bin/idevicesyslog
-lnk:lib/libimobiledevice.so
-lnk:lib/libimobiledevice.so.6
-lib:lib/libimobiledevice.so.6.0.0
+lnk:lib/libimobiledevice-1.0.so
+lnk:lib/libimobiledevice-1.0.so.6
+lib:lib/libimobiledevice-1.0.so.6.0.0

cross/libimobiledevice/digests

@@ -1,3 +1,3 @@
-libimobiledevice-git6edc36fccb52a963c9ebfbb44ba7b91570e0fd06.tar.gz SHA1 67155689b4d05bef94a8d590448a9057f1941159
-libimobiledevice-git6edc36fccb52a963c9ebfbb44ba7b91570e0fd06.tar.gz SHA256 9e1da1c3186055f8e3e024f37737494ef110b9de57a27f18672b49b6b7ea33dd
-libimobiledevice-git6edc36fccb52a963c9ebfbb44ba7b91570e0fd06.tar.gz MD5 3f445afcc913ab193d6aebc8136db9db
+libimobiledevice-1.3.0.tar.bz2 SHA1 783e928dd77f53a259da6a40fc43506ae0c42de6
+libimobiledevice-1.3.0.tar.bz2 SHA256 53f2640c6365cd9f302a6248f531822dc94a6cced3f17128d4479a77bd75b0f6
+libimobiledevice-1.3.0.tar.bz2 MD5 c50a3a32acf33dc8c9ec88137ad12ec4

cross/libimobiledevice/patches/001-libplist-2.3.0.patch

@@ -0,0 +1,35 @@
+# avoid duplicate definition of enum plist_format_t introduced in libplist 2.3.0
+# origin: https://github.com/archlinux/svntogit-packages/blob/packages/libimobiledevice/trunk/libplist-2.3.0.diff
+# 
+diff --git i/common/utils.c w/common/utils.c
+index 7f66ec2..7ebe997 100644
+--- i/common/utils.c
++++ w/common/utils.c
+@@ -314,7 +314,7 @@ int plist_read_from_filename(plist_t *plist, const char *filename)
+ 	return 1;
+ }
+
+-int plist_write_to_filename(plist_t plist, const char *filename, enum plist_format_t format)
++int plist_write_to_filename(plist_t plist, const char *filename, plist_format_t format)
+ {
+ 	char *buffer = NULL;
+ 	uint32_t length;
+diff --git i/common/utils.h w/common/utils.h
+index 2c3acec..4faa5bd 100644
+--- i/common/utils.h
++++ w/common/utils.h
+@@ -51,13 +51,8 @@ char *generate_uuid(void);
+ void buffer_read_from_filename(const char *filename, char **buffer, uint64_t *length);
+ void buffer_write_to_filename(const char *filename, const char *buffer, uint64_t length);
+
+-enum plist_format_t {
+-	PLIST_FORMAT_XML,
+-	PLIST_FORMAT_BINARY
+-};
+-
+ int plist_read_from_filename(plist_t *plist, const char *filename);
+-int plist_write_to_filename(plist_t plist, const char *filename, enum plist_format_t format);
++int plist_write_to_filename(plist_t plist, const char *filename, plist_format_t format);
+
+ void plist_print_to_stream(plist_t plist, FILE* stream);
+

cross/libplist/Makefile

@@ -1,31 +1,20 @@
 PKG_NAME = libplist
-PKG_VERS = 2.1.0
-PKG_EXT = tar.gz
-PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://github.com/libimobiledevice/$(PKG_NAME)/archive
-PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_VERS = 2.3.0
+PKG_EXT = tar.bz2
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/libimobiledevice/libplist/releases/download/$(PKG_VERS)
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
+UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
+
 DEPENDS =
 
-HOMEPAGE = https://github.com/libimobiledevice/libplist/
+HOMEPAGE = https://github.com/libimobiledevice/libplist
 COMMENT  = A small portable C library to handle Apple Property List files in binary or XML.
 LICENSE  = LGPL-2.1
 
 GNU_CONFIGURE = 1
-PRE_CONFIGURE_TARGET = libplist_pre_configure
-CONFIGURE_ARGS = --without-cython
-LIBPLIST_AUTOGEN_ARGS = $(CONFIGURE_ARGS)
+CONFIGURE_ARGS  = --without-cython
+CONFIGURE_ARGS += --disable-static
 
 include ../../mk/spksrc.cross-cc.mk
-
-ifeq ($(findstring $(ARCH),$(ARM_ARCHS)),$(ARCH))
-LIBPLIST_AUTOGEN_ARGS += --host=arm-linux
-endif
-ifeq ($(findstring $(ARCH),$(PPC_ARCHS)),$(ARCH))
-LIBPLIST_AUTOGEN_ARGS += --host=ppc-linux
-endif
-
-.PHONY: libplist_pre_configure
-libplist_pre_configure:
-	$(RUN) ; NOCONFIGURE=1 ./autogen.sh $(LIBPLIST_AUTOGEN_ARGS)

cross/libplist/PLIST

@@ -1,7 +1,7 @@
 bin:bin/plistutil
-lnk:lib/libplist.so
-lnk:lib/libplist.so.3
-lib:lib/libplist.so.3.2.0
-lnk:lib/libplist++.so
-lnk:lib/libplist++.so.3
-lib:lib/libplist++.so.3.2.0
+lnk:lib/libplist++-2.0.so
+lnk:lib/libplist++-2.0.so.4
+lib:lib/libplist++-2.0.so.4.3.0
+lnk:lib/libplist-2.0.so
+lnk:lib/libplist-2.0.so.4
+lib:lib/libplist-2.0.so.4.3.0

cross/libplist/digests

@@ -1,3 +1,3 @@
-libplist-2.1.0.tar.gz SHA1 4ced7eae4b3e0d8f132f094435089a4bf61f4ff2
-libplist-2.1.0.tar.gz SHA256 4b33f9af3f9208d54a3c3e1a8c149932513f451c98d1dd696fe42c06e30b7f03
-libplist-2.1.0.tar.gz MD5 051a93535f3b825eea5cdf284257e16d
+libplist-2.3.0.tar.bz2 SHA1 88d8a2c6b9c3add12f75aefe548f1c3a6cb37ec1
+libplist-2.3.0.tar.bz2 SHA256 4e8580d3f39d3dfa13cefab1a13f39ea85c4b0202e9305c5c8f63818182cac61
+libplist-2.3.0.tar.bz2 MD5 d6e2b9f713f18ae0a0f3353c03315bfd

cross/libusb/Makefile

@@ -1,32 +1,27 @@
 PKG_NAME = libusb
-PKG_VERS = 1.0.23
-PKG_EXT = tar.gz
-PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://github.com/libusb/libusb/archive
-PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_VERS = 1.0.27
+PKG_EXT = tar.bz2
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/libusb/libusb/releases/download/v$(PKG_VERS)
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS =
 
+# libusb >= v1.0.24 needs C11 compiler (not supported by OLD_PPC_ARCHS and ARMv5_ARCHS).
+# qoriq has C11 compiler, but fails with "configure: error: Linux netlink header not found"
+UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(ARMv7L_ARCHS) $(PPC_ARCHS)
+
 HOMEPAGE = https://libusb.info/
 COMMENT  = C library that provides generic access to USB devices. It is intended to be used by developers to facilitate the production of applications that communicate with USB hardware.
 LICENSE  = LGPL-2.1
 
 GNU_CONFIGURE = 1
-PRE_CONFIGURE_TARGET = libusb_pre_configure
-CONFIGURE_ARGS = --disable-udev --disable-debug-log --disable-examples-build
-LIBUSB_AUTOGEN_ARGS = $(CONFIGURE_ARGS)
-
-include ../../mk/spksrc.cross-cc.mk
-
-
-ifeq ($(findstring $(ARCH),$(ARM_ARCHS)),$(ARCH))
-LIBUSB_AUTOGEN_ARGS += --host=arm-linux
+ifneq ($(strip $(LIBUSB_ENABLE_STATIC)),1)
+CONFIGURE_ARGS += --disable-static
 endif
-ifeq ($(findstring $(ARCH),$(PPC_ARCHS)),$(ARCH))
-LIBUSB_AUTOGEN_ARGS += --host=ppc-linux
+ifneq ($(strip $(LIBUSB_WITH_LIBUDEV)),1)
+CONFIGURE_ARGS += --disable-udev
 endif
+ADDITIONAL_CFLAGS = -O
 
-.PHONY: libusb_pre_configure
-libusb_pre_configure:
-	$(RUN) ; ./autogen.sh $(LIBUSB_AUTOGEN_ARGS)
+include ../../mk/spksrc.cross-cc.mk

cross/libusb/PLIST

@@ -1,3 +1,3 @@
 lnk:lib/libusb-1.0.so
 lnk:lib/libusb-1.0.so.0
-lib:lib/libusb-1.0.so.0.2.0
+lib:lib/libusb-1.0.so.0.4.0

cross/libusb/digests

@@ -1,3 +1,3 @@
-libusb-1.0.23.tar.gz SHA1 c8ebcc7d0a14f910151b3066326d8ba126894b88
-libusb-1.0.23.tar.gz SHA256 02620708c4eea7e736240a623b0b156650c39bfa93a14bcfa5f3e05270313eba
-libusb-1.0.23.tar.gz MD5 009e75e0ef3ed54ebbc085468feeec28
+libusb-1.0.27.tar.bz2 SHA1 7c169047f5970e767d937b598f60979de5f036e3
+libusb-1.0.27.tar.bz2 SHA256 ffaa41d741a8a3bee244ac8e54a72ea05bf2879663c098c82fc5757853441575
+libusb-1.0.27.tar.bz2 MD5 1fb61afe370e94f902a67e03eb39c51f

cross/libusb_1.0.23/Makefile

@@ -0,0 +1,27 @@
+PKG_NAME = libusb
+PKG_VERS = 1.0.23
+PKG_EXT = tar.bz2
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/libusb/libusb/releases/download/v$(PKG_VERS)
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+# this is the latest version that builds with C99 compiler.
+# libusb >= v1.0.24 needs C11 compiler (not supported by OLD_PPC_ARCHS, ARMv5_ARCHS and ARMv7L_ARCHS).
+# qoriq has C11 compiler, but fails with "configure: error: Linux netlink header not found"
+
+DEPENDS =
+
+HOMEPAGE = https://libusb.info/
+COMMENT  = C library that provides generic access to USB devices. It is intended to be used by developers to facilitate the production of applications that communicate with USB hardware.
+LICENSE  = LGPL-2.1
+
+GNU_CONFIGURE = 1
+ifneq ($(strip $(LIBUSB_ENABLE_STATIC)),1)
+CONFIGURE_ARGS += --disable-static
+endif
+ifneq ($(strip $(LIBUSB_WITH_LIBUDEV)),1)
+CONFIGURE_ARGS += --disable-udev
+endif
+ADDITIONAL_CFLAGS = -O
+
+include ../../mk/spksrc.cross-cc.mk

cross/libusb_1.0.23/PLIST

@@ -0,0 +1,3 @@
+lnk:lib/libusb-1.0.so
+lnk:lib/libusb-1.0.so.0
+lib:lib/libusb-1.0.so.0.2.0

cross/libusb_1.0.23/digests

@@ -0,0 +1,3 @@
+libusb-1.0.23.tar.bz2 SHA1 0140200398306b5e91c294d4a3c0f63aa0ef07b3
+libusb-1.0.23.tar.bz2 SHA256 db11c06e958a82dac52cf3c65cb4dd2c3f339c8a988665110e0d24d19312ad8d
+libusb-1.0.23.tar.bz2 MD5 1e29700f6a134766d32b36b8d1d61a95

cross/libusbmuxd/Makefile

@@ -1,9 +1,8 @@
 PKG_NAME = libusbmuxd
-PKG_VERS = 2.0.1
-PKG_EXT = tar.gz
-PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://github.com/libimobiledevice/$(PKG_NAME)/archive
-PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_VERS = 2.0.2
+PKG_EXT = tar.bz2
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/libimobiledevice/libusbmuxd/releases/download/$(PKG_VERS)
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS = cross/libplist
@@ -13,19 +12,6 @@ COMMENT  = A client library to multiplex connections from and to iOS devices by
 LICENSE  = LGPL-2.1
 
 GNU_CONFIGURE = 1
-PRE_CONFIGURE_TARGET = libusbmuxd_pre_configure
 CONFIGURE_ARGS = ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes
-LIBUSBMUXD_AUTOGEN_ARGS =
 
 include ../../mk/spksrc.cross-cc.mk
-
-ifeq ($(findstring $(ARCH),$(ARM_ARCHS)),$(ARCH))
-	LIBUSBMUXD_AUTOGEN_ARGS += --host=arm-linux
-endif
-ifeq ($(findstring $(ARCH),$(PPC_ARCHS)),$(ARCH))
-	LIBUSBMUXD_AUTOGEN_ARGS += --host=ppc-linux
-endif
-
-.PHONY: libusbmuxd_pre_configure
-libusbmuxd_pre_configure:
-	$(RUN) NOCONFIGURE=1 ./autogen.sh $(LIBUSBMUXD_AUTOGEN_ARGS)

cross/libusbmuxd/PLIST

@@ -1,5 +1,5 @@
 bin:bin/inetcat
 bin:bin/iproxy
-lnk:lib/libusbmuxd.so
-lnk:lib/libusbmuxd.so.6
-lib:lib/libusbmuxd.so.6.0.0
+lnk:lib/libusbmuxd-2.0.so
+lnk:lib/libusbmuxd-2.0.so.6
+lib:lib/libusbmuxd-2.0.so.6.0.0

cross/libusbmuxd/digests

@@ -1,3 +1,3 @@
-libusbmuxd-2.0.1.tar.gz SHA1 e48593d1b444399b7e6d476d775a53f461cb25a2
-libusbmuxd-2.0.1.tar.gz SHA256 f93faf3b3a73e283646f4d62b3421aeccf58142266b0eb22b2b13dd4b2362eb8
-libusbmuxd-2.0.1.tar.gz MD5 d99194d65f4fb46aa61a01efe15faaf1
+libusbmuxd-2.0.2.tar.bz2 SHA1 e3c2c846471ba7c171c01d87cb37d379d53d5f02
+libusbmuxd-2.0.2.tar.bz2 SHA256 cc6a808553da4efa9fa5638be256d5ae020498795d9d260d280b87074e799b20
+libusbmuxd-2.0.2.tar.bz2 MD5 f1ae06b1342a7a795cc3a4fc76750f6e