.gitignore

@@ -1 +1 @@
-SOURCES/libgphoto2-2.5.27.tar.bz2
+SOURCES/libgphoto2-2.5.30.tar.bz2

.libgphoto2.metadata

@@ -1 +1 @@
-5b71a66418eadc5177d7df19e9d8b64609a961b6 SOURCES/libgphoto2-2.5.27.tar.bz2
+f124c5d96a6f4bd320c00aac4c03f51c6af7f64d SOURCES/libgphoto2-2.5.30.tar.bz2

SOURCES/gphoto2-device-return.patch

@@ -1,4 +1,4 @@
-From 242878ac1cefd1ef99c2e5d84a794f72e49e28be Mon Sep 17 00:00:00 2001
+From 189602f17a2b3363d5b358ce726924a866a4979a Mon Sep 17 00:00:00 2001
 From: Lubomir Rintel <lkundrak@v3.sk>
 Date: Fri, 23 Oct 2009 13:12:16 +0200
 Subject: [PATCH] Repair reattach of kernel driver if it was unbound
@@ -7,26 +7,45 @@ Drah in the header for USBDEVFS_CONNECT.
 
 Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
 ---
- libgphoto2_port/usb/libusb.c |    6 ++++++
+ libgphoto2_port/usb/libusb.c | 24 +++++++++++++++++++++++-
- 1 files changed, 6 insertions(+), 0 deletions(-)
+ 1 file changed, 23 insertions(+), 1 deletion(-)
 
 diff --git a/libgphoto2_port/usb/libusb.c b/libgphoto2_port/usb/libusb.c
-index d1535a5..c8a63f1 100644
+index 3cd91fa..dfd347c 100644
 --- a/libgphoto2_port/usb/libusb.c
 +++ b/libgphoto2_port/usb/libusb.c
-@@ -38,6 +38,12 @@
+@@ -44,8 +44,30 @@
  #include <gphoto2/gphoto2-port-result.h>
  #include <gphoto2/gphoto2-port-log.h>
  
+-#include "libgphoto2_port/i18n.h"
 +#if defined(LIBUSB_HAS_GET_DRIVER_NP) && defined(LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP)
 +/* Pull in USBDEVFS_CONNECT */
 +#include <sys/ioctl.h>
 +#include <linux/usbdevice_fs.h>
 +#endif
-+
+ 
- #ifdef ENABLE_NLS
++#ifdef ENABLE_NLS
- #  include <libintl.h>
++#  include <libintl.h>
- #  undef _
++#  undef _
++#  define _(String) dgettext (GETTEXT_PACKAGE, String)
++#  ifdef gettext_noop
++#    define N_(String) gettext_noop (String)
++#  else
++#    define N_(String) (String)
++#  endif
++#else
++#  define textdomain(String) (String)
++#  define gettext(String) (String)
++#  define dgettext(Domain,Message) (Message)
++#  define dcgettext(Domain,Message,Type) (Message)
++#  define bindtextdomain(Domain,Directory) (Domain)
++#  define _(String) (String)
++#  define N_(String) (String)
++#endif
+ 
+ #define CHECK(result) {int r=(result); if (r<0) return (r);}
+ 
 -- 
-1.6.5.rc2
+2.34.1
 

SOURCES/gphoto2-gcc14.patch

@@ -0,0 +1,37 @@
+From 721f7f8c3ec8058d504607873e4c317aac0c99c5 Mon Sep 17 00:00:00 2001
+From: Marcus Meissner <marcus@jet.franken.de>
+Date: Mon, 4 Dec 2023 13:26:08 +0100
+Subject: [PATCH] align outlen length with jpeg jeaders. fixes
+ https://github.com/gphoto/libgphoto2/issues/941
+
+---
+ camlibs/ptp2/chdk.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/camlibs/ptp2/chdk.c b/camlibs/ptp2/chdk.c
+index e1d898f37..e775ea1d4 100644
+--- a/camlibs/ptp2/chdk.c
++++ b/camlibs/ptp2/chdk.c
+@@ -1150,7 +1150,7 @@ static void yuv_live_to_jpeg(unsigned char *p_yuv,
+ 	struct		jpeg_error_mgr jerr;
+ 	JSAMPROW	row_ptr[1];
+ 	uint8_t		*outbuf = NULL, *tmprowbuf = NULL;
+-	uint64_t	outlen = 0;
++	unsigned long	outlen = 0;
+ 	unsigned int	row_inc;
+ 	int		sshift, dshift, xshift, skip;
+ 
+@@ -1161,8 +1161,8 @@ static void yuv_live_to_jpeg(unsigned char *p_yuv,
+ 		sshift = 6;
+ 		dshift = (width/height > 2) ? 6 : 12;
+ 		xshift = 4;
+-	/* Digic 6 cameras: 8 bit per element UYVY,
+-	 * 4 bytes used to encode 2 pixels, need 6 bytes raw YUV data for jpeg encoding */
++		/* Digic 6 cameras: 8 bit per element UYVY,
++		 * 4 bytes used to encode 2 pixels, need 6 bytes raw YUV data for jpeg encoding */
+ 	} else {
+ 		row_inc = buf_width*2;
+ 		sshift = 4;
+-- 
+2.43.0
+

SPECS/libgphoto2.spec

@@ -1,24 +1,26 @@
 %bcond_with gp2ddb
 
 %global udevdir %(pkg-config --variable=udevdir udev)
-%global port_version 0.12.0
+%global port_version 0.12.1
 
 Name:           libgphoto2
-Version:        2.5.27
+Version:        2.5.30
-Release:        3%{?dist}
+Release:        9%{?dist}
 Summary:        Library for accessing digital cameras
-# GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
+License:        GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-3.0-or-later AND BSD-3-Clause AND IJG-short AND (MIT OR Unlicense)
-License:        GPLv2+ and GPLv2
 URL:            http://www.gphoto.org/
 
 Source0:        http://downloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
 Patch1:         gphoto2-pkgcfg.patch
 Patch2:         gphoto2-device-return.patch
+# Upstream fix for GCC 14
+Patch3:         gphoto2-gcc14.patch
 
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  make
-BuildRequires:  systemd
+BuildRequires:  systemd-rpm-macros
+BuildRequires:  pkgconfig(udev)
 %if %{with gp2ddb}
 BuildRequires:  flex
 BuildRequires:  bison
@@ -32,9 +34,10 @@ BuildRequires:  pkgconfig(libexif)
 # -----------------------------------
 # libgphoto2_port
 # -----------------------------------
+%if !0%{?flatpak}
 BuildRequires:  lockdev-devel
+%endif
 BuildRequires:  pkgconfig(libusb-1.0)
-Requires:       lockdev
 # -----------------------------------
 
 # Temporarily required for patch3
@@ -92,7 +95,7 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool libgphot
 %install
 %make_install INSTALL="install -p" mandir=%{_mandir}
 
-pushd packaging/linux-hotplug/
+pushd packaging/generic/
   export LIBDIR=%{buildroot}%{_libdir}
   export CAMLIBS=%{buildroot}%{_libdir}/%{name}/%{version}
   export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
@@ -121,6 +124,7 @@ cat libgphoto2*.lang >> %{name}.lang
 
 # https://fedoraproject.org/wiki/Packaging_tricks#With_.25doc
 mkdir __doc
+rm -rf %{buildroot}%{_pkgdocdir}_port/{AUTHORS,NEWS,README}
 mv %{buildroot}%{_pkgdocdir}/* __doc
 rm -rf %{buildroot}%{_pkgdocdir}
 rm -rf %{buildroot}%{_datadir}/libgphoto2_port/*/vcamera/
@@ -156,12 +160,48 @@ rm -rf %{buildroot}%{_datadir}/libgphoto2_port/*/vcamera/
 %{_mandir}/man3/%{name}_port.3*
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.5.27-3
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.5.30-9
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Bump release for October 2024 mass rebuild:
-  Related: rhbz#1991688
+  Resolves: RHEL-64018
+
+* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2.5.30-8
+- Rebuilt for MSVSphere 10
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.5.30-8
+- Bump release for June 2024 mass rebuild
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.30-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.30-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.30-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.30-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.30-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jul 07 2022 Josef Ridky <jridky@redhat.com> - 2.5.30-2
+- Spec bump
+
+* Thu Jul 07 2022 Josef Ridky <jridky@redhat.com> - 2.5.30-1
+- New upstream release 2.5.30 (#2103339)
+
+* Thu Mar 10 2022 Josef Ridky <jridky@redhat.com> - 2.5.29-1
+- New upstream release 2.5.29 (#2036612)
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.27-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Oct 06 2021 Kalev Lember <klember@redhat.com> - 2.5.27-3
+- Don't use lockdev for flatpak builds
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.5.27-2
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.27-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
 * Wed Mar 10 2021 Josef Ridky <jridky@redhat.com> - 2.5.27-1
 - New upstream release 2.5.27 (#1931187)