From 500312b938a0719e26bf451ecaf1a8fb129190fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?=
 <miloskomarcevic@aim.com>
Date: Sun, 6 Mar 2022 15:05:31 +0100
Subject: [PATCH] libgphoto2: update to 2.5.29

---
 mingw-w64-libgphoto2/PKGBUILD                       |  9 +++------
 .../libgphoto2-gp_system_filename-fix.patch         | 13 -------------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/mingw-w64-libgphoto2/PKGBUILD b/mingw-w64-libgphoto2/PKGBUILD
index d0c7e1a172..0a86510124 100644
--- a/mingw-w64-libgphoto2/PKGBUILD
+++ b/mingw-w64-libgphoto2/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=libgphoto2
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=2.5.28
+pkgver=2.5.29
 pkgrel=1
 pkgdesc="The libgphoto2 camera access and control library (mingw-w64)"
 arch=('any')
@@ -23,19 +23,16 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-autotools"
              "${MINGW_PACKAGE_PREFIX}-doxygen")
 source=("https://github.com/gphoto/libgphoto2/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.xz"{,.asc}
         "libgphoto2-gp_system_filename-fix.patch"
-        "libgphoto2-fix-lumix.patch"::https://github.com/gphoto/libgphoto2/commit/ad8263f0c56841de44e23ff9dfb9f474b488cc99.diff
         "libgphoto2-configure-ws232.patch")
-sha256sums=('9881bcd8d3caeaffbd392a369bca8dcc4ae34771cccbdf24ed88a52259be4612'
+sha256sums=('4b439ec10af3ae4d7696d4a75655a1fe259dea5c1ccc692af58a0cc5024e7754'
             'SKIP'
-            '27c558cdf88bee6ce1f3f564d6dfbc0b78809c33b98d20c9e58e40e335d7b0dd'
-            '6ca3b73cb1d75d219551d359cc525dd33a3ec0edddff02e2d07db3da3d76a89f'
+            'e5a7aa783c9dacc2be3fa8457b8b8b608721a73ac3426a8c08f54f11c538e813'
             'f78e44472874db12d56e4a1f49f41bb76fee676fc27d7c6fc538dbdae6d8933e')
 validpgpkeys=('7C4AFD61D8AAE7570796A5172209D6902F969C95') # Marcus Meissner 
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
   patch -Np1 -i "${srcdir}/libgphoto2-gp_system_filename-fix.patch"
-  patch -Np1 -i "${srcdir}/libgphoto2-fix-lumix.patch"
   patch -Np1 -i "${srcdir}/libgphoto2-configure-ws232.patch"
 
   autoreconf -fiv
diff --git a/mingw-w64-libgphoto2/libgphoto2-gp_system_filename-fix.patch b/mingw-w64-libgphoto2/libgphoto2-gp_system_filename-fix.patch
index 6b802a74b0..0393a53a6c 100644
--- a/mingw-w64-libgphoto2/libgphoto2-gp_system_filename-fix.patch
+++ b/mingw-w64-libgphoto2/libgphoto2-gp_system_filename-fix.patch
@@ -11,19 +11,6 @@ diff -Naur libgphoto2-2.5.10.orig/libgphoto2/gphoto2-filesys.c libgphoto2-2.5.10
  	ret = internal_append (fs, f, filename, context);
  	if (ret == GP_ERROR_FILE_EXISTS) /* not an error here ... just in case we add files twice to the list */
  		ret = GP_OK;
-diff -Naur libgphoto2-2.5.10.orig/libgphoto2_port/gphoto2/gphoto2-port-portability.h libgphoto2-2.5.10/libgphoto2_port/gphoto2/gphoto2-port-portability.h
---- libgphoto2-2.5.10.orig/libgphoto2_port/gphoto2/gphoto2-port-portability.h	2016-01-25 20:29:59.000000000 +0100
-+++ libgphoto2-2.5.10/libgphoto2_port/gphoto2/gphoto2-port-portability.h	2016-10-21 00:20:35.357889900 +0200
-@@ -48,7 +48,9 @@
- 
- #define __func__ __FUNCTION__
- 
-+#ifndef _SSIZE_T_DEFINED
- typedef SSIZE_T ssize_t;
-+#endif
- 
- /* Work-around for readdir() */
- typedef struct {
 diff -Naur libgphoto2-2.5.10.orig/libgphoto2_port/libgphoto2_port/gphoto2-port-portability.c libgphoto2-2.5.10/libgphoto2_port/libgphoto2_port/gphoto2-port-portability.c
 --- libgphoto2-2.5.10.orig/libgphoto2_port/libgphoto2_port/gphoto2-port-portability.c	2016-01-25 20:29:59.000000000 +0100
 +++ libgphoto2-2.5.10/libgphoto2_port/libgphoto2_port/gphoto2-port-portability.c	2016-10-20 20:32:40.376682900 +0200