[PR PATCH] libmtp: update to 1.1.22, adopt.

[PR PATCH] libmtp: update to 1.1.22, adopt.

[tornaria]

[-- Attachment #1: Type: text/plain, Size: 1226 bytes --]

There is a new pull request by tornaria against master on the void-packages repository

https://github.com/tornaria/void-packages libmtp
https://github.com/void-linux/void-packages/pull/53717

libmtp: update to 1.1.22, adopt.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/53717.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libmtp-53717.patch --]
[-- Type: text/x-diff, Size: 1436 bytes --]

From da5014bcbdd6507dbb14eee147d9cb8550143530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 27 Dec 2024 08:48:07 -0300
Subject: [PATCH] libmtp: update to 1.1.22, adopt.

---
 srcpkgs/libmtp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libmtp/template b/srcpkgs/libmtp/template
index 8f87793b08e4d8..fd27cc7e9275a3 100644
--- a/srcpkgs/libmtp/template
+++ b/srcpkgs/libmtp/template
@@ -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,12 +8,12 @@ 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

Re: [PR PATCH] [Updated] libmtp: update to 1.1.22, adopt.

[tornaria]

[-- Attachment #1: Type: text/plain, Size: 1231 bytes --]

There is an updated pull request by tornaria against master on the void-packages repository

https://github.com/tornaria/void-packages libmtp
https://github.com/void-linux/void-packages/pull/53717

libmtp: update to 1.1.22, adopt.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/53717.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libmtp-53717.patch --]
[-- Type: text/x-diff, Size: 1899 bytes --]

From 6f06785a659f638cb7f2a9db632e2ee34c380b84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 27 Dec 2024 08:48:07 -0300
Subject: [PATCH] libmtp: update to 1.1.22, fix cross, adopt.

---
 srcpkgs/libmtp/template | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/libmtp/template b/srcpkgs/libmtp/template
index 8f87793b08e4d8..1dd51481655274 100644
--- a/srcpkgs/libmtp/template
+++ b/srcpkgs/libmtp/template
@@ -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"

Re: [PR PATCH] [Updated] libmtp: update to 1.1.22, adopt.

[tornaria]

[-- Attachment #1: Type: text/plain, Size: 1231 bytes --]

There is an updated pull request by tornaria against master on the void-packages repository

https://github.com/tornaria/void-packages libmtp
https://github.com/void-linux/void-packages/pull/53717

libmtp: update to 1.1.22, adopt.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/53717.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libmtp-53717.patch --]
[-- Type: text/x-diff, Size: 2817 bytes --]

From bd23f87bc34246180597749a8b951e33543db3d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 27 Dec 2024 08:48:07 -0300
Subject: [PATCH] libmtp: update to 1.1.22, fix cross, adopt.

---
 srcpkgs/libmtp/patches/fix-warning.patch | 12 ++++++++++++
 srcpkgs/libmtp/template                  | 16 ++++++----------
 2 files changed, 18 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/libmtp/patches/fix-warning.patch

diff --git a/srcpkgs/libmtp/patches/fix-warning.patch b/srcpkgs/libmtp/patches/fix-warning.patch
new file mode 100644
index 00000000000000..8bfcc877ea4d6e
--- /dev/null
+++ b/srcpkgs/libmtp/patches/fix-warning.patch
@@ -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);
+     }
+ 
diff --git a/srcpkgs/libmtp/template b/srcpkgs/libmtp/template
index 8f87793b08e4d8..1dd51481655274 100644
--- a/srcpkgs/libmtp/template
+++ b/srcpkgs/libmtp/template
@@ -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"

Re: [PR PATCH] [Merged]: libmtp: update to 1.1.22, adopt.

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 1074 bytes --]

There's a merged pull request on the void-packages repository

libmtp: update to 1.1.22, adopt.
https://github.com/void-linux/void-packages/pull/53717

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->