rpms/libgphoto2
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to the new upstream version

Browse Source
This commit is contained in:
Josef Řídký 2022-03-10 17:03:40 +01:00
parent 9437cbb8c2
commit afcbc431a5
2 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gphoto2-device-return.patch
View File

@ -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> From: Lubomir Rintel <lkundrak@v3.sk>
Date: Fri, 23 Oct 2009 13:12:16 +0200 Date: Fri, 23 Oct 2009 13:12:16 +0200
Subject: [PATCH] Repair reattach of kernel driver if it was unbound 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> 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 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 --- a/libgphoto2_port/usb/libusb.c
+++ b/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-result.h>
#include <gphoto2/gphoto2-port-log.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) +#if defined(LIBUSB_HAS_GET_DRIVER_NP) && defined(LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP)
+/* Pull in USBDEVFS_CONNECT */ +/* Pull in USBDEVFS_CONNECT */
+#include <sys/ioctl.h> +#include <sys/ioctl.h>
+#include <linux/usbdevice_fs.h> +#include <linux/usbdevice_fs.h>
+#endif +#endif
+
#ifdef ENABLE_NLS +#ifdef ENABLE_NLS
# include <libintl.h> +# include <libintl.h>
# undef _ +# undef _
-- +# define _(String) dgettext (GETTEXT_PACKAGE, String)
1.6.5.rc2 +# 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);}
--
2.34.1

10
libgphoto2.spec
View File

@ -4,8 +4,8 @@
%global port_version 0.12.0 %global port_version 0.12.0
Name: libgphoto2 Name: libgphoto2
Version: 2.5.27 Version: 2.5.29
Release: 4%{?dist} Release: 1%{?dist}
Summary: Library for accessing digital cameras Summary: Library for accessing digital cameras
# GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2 # GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
License: GPLv2+ and GPLv2 License: GPLv2+ and GPLv2
@ -93,7 +93,7 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool libgphot
%install %install
%make_install INSTALL="install -p" mandir=%{_mandir} %make_install INSTALL="install -p" mandir=%{_mandir}
pushd packaging/linux-hotplug/ pushd packaging/generic/
export LIBDIR=%{buildroot}%{_libdir} export LIBDIR=%{buildroot}%{_libdir}
export CAMLIBS=%{buildroot}%{_libdir}/%{name}/%{version} export CAMLIBS=%{buildroot}%{_libdir}/%{name}/%{version}
export LD_LIBRARY_PATH=%{buildroot}%{_libdir} export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
@ -122,6 +122,7 @@ cat libgphoto2*.lang >> %{name}.lang
# https://fedoraproject.org/wiki/Packaging_tricks#With_.25doc # https://fedoraproject.org/wiki/Packaging_tricks#With_.25doc
mkdir __doc mkdir __doc
rm -rf %{buildroot}%{_pkgdocdir}_port/{AUTHORS,NEWS,README}
mv %{buildroot}%{_pkgdocdir}/* __doc mv %{buildroot}%{_pkgdocdir}/* __doc
rm -rf %{buildroot}%{_pkgdocdir} rm -rf %{buildroot}%{_pkgdocdir}
rm -rf %{buildroot}%{_datadir}/libgphoto2_port/*/vcamera/ rm -rf %{buildroot}%{_datadir}/libgphoto2_port/*/vcamera/
@ -157,6 +158,9 @@ rm -rf %{buildroot}%{_datadir}/libgphoto2_port/*/vcamera/
%{_mandir}/man3/%{name}_port.3* %{_mandir}/man3/%{name}_port.3*
%changelog %changelog
* 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 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.27-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild