libmtp: update to 1.1.22, fix cross, adopt.

This commit is contained in:
Gonzalo Tornaría 2024-12-27 08:48:07 -03:00 committed by Andrew J. Hesford
parent 4925d5f452
commit 0ed095946b
2 changed files with 18 additions and 10 deletions

View File

@ -0,0 +1,12 @@
--- a/src/libmtp.c
+++ b/src/libmtp.c
@@ -7498,7 +7498,8 @@ static LIBMTP_folder_t *get_subfolders_for_folder(LIBMTP_folder_t *list, uint32_
* we basically don't care. Hopefully parent_id is maintained for all
* children, because we rely on that instead.
*/
- if (ob->oi.AssociationDesc != 0x00000000U) {
+ if (ob->oi.AssociationDesc != 0x00000000U &&
+ ob->oi.AssociationDesc != 0x00000001U) {
LIBMTP_INFO("MTP extended association type 0x%08x encountered\n", ob->oi.AssociationDesc);
}

View File

@ -1,6 +1,6 @@
# Template file for 'libmtp'
pkgname=libmtp
version=1.1.21
version=1.1.22
revision=1
build_style=gnu-configure
configure_args="--disable-static --with-udev=/usr/lib/udev
@ -8,24 +8,20 @@ configure_args="--disable-static --with-udev=/usr/lib/udev
hostmakedepends="pkg-config"
makedepends="libgcrypt-devel libusb-devel"
short_desc="Library for Microsoft's Media Transfer Protocol (MTP)"
maintainer="Orphaned <orphan@voidlinux.org>"
maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="LGPL-2.1-or-later"
homepage="https://libmtp.sourceforge.net"
changelog="https://sourceforge.net/projects/libmtp/files/libmtp/${version}/README"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=c4ffa5ab8c8f48c91b0047f2e253c101c418d5696a5ed65c839922a4280872a7
checksum=c3fcf411aea9cb9643590cbc9df99fa5fe30adcac695024442973d76fa5f87bc
if [ "$CROSS_BUILD" ]; then
# XXX needs host mtp-hotplug
# use mtp-hotplug from host, needed to create udev rules and hwdb
configure_args+=" --enable-crossbuilddir"
# ... so, install mtp-hotplug in host
hostmakedepends+=" libmtp"
fi
pre_configure() {
if [ "$CROSS_BUILD" ]; then
vsed -e "s,\(util/mtp-hotplug \),mtp-hotplug ,g" -i Makefile.in
fi
}
libmtp-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"