Compare commits
No commits in common. "c8" and "c10s" have entirely different histories.
3
.gitignore
vendored
3
.gitignore
vendored
@ -1 +1,2 @@
|
||||
SOURCES/libgphoto2-2.5.16.tar.bz2
|
||||
/libgphoto2-2.*.tar.bz2
|
||||
/libgphoto2-2_5_21-release.tar.gz
|
||||
|
||||
@ -1 +0,0 @@
|
||||
f1736e4c0f7273a1154c28ac26b76f1be538b4f3 SOURCES/libgphoto2-2.5.16.tar.bz2
|
||||
66
0001-configure-fix-symver-support-checks.patch
Normal file
66
0001-configure-fix-symver-support-checks.patch
Normal file
@ -0,0 +1,66 @@
|
||||
From be61c7fd7d60f57dcc07e6a7c5d3d49938546b61 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ferenc=20W=C3=A1gner?= <wferi@debian.org>
|
||||
Date: Sat, 18 Jul 2020 12:35:30 +0200
|
||||
Subject: [PATCH] configure: fix symver support checks
|
||||
|
||||
The versioned test symbols must be external, so move them into the
|
||||
prologue, otherwise GCC 9.3 (at least) reports "Error: invalid attempt
|
||||
to declare external version name as default in symbol `f@@VER2'".
|
||||
Also suppress warnings about missing prototypes and return
|
||||
statements for these test functions.
|
||||
---
|
||||
configure.ac | 11 ++++++-----
|
||||
libgphoto2_port/configure.ac | 11 ++++++-----
|
||||
2 files changed, 12 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index f73c81d88..51d1e18b3 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -259,13 +259,14 @@ AC_SYS_LARGEFILE
|
||||
|
||||
AC_MSG_CHECKING([for asm .symver support])
|
||||
AC_COMPILE_IFELSE([dnl
|
||||
- AC_LANG_PROGRAM([[]],[[
|
||||
- int f1() { }
|
||||
- int f2() { }
|
||||
+ AC_LANG_PROGRAM([[
|
||||
+ void f1(void);
|
||||
+ void f1() {}
|
||||
+ void f2(void);
|
||||
+ void f2() {}
|
||||
asm(".symver f1, f@VER1");
|
||||
asm(".symver f2, f@@VER2");
|
||||
- int main(int argc, char **argv) { }
|
||||
- ]])dnl
|
||||
+ ]],[])dnl
|
||||
],[
|
||||
AC_DEFINE([HAVE_ASM_SYMVERS],1,[Define if there is asm .symver support.])
|
||||
VERSIONMAPLDFLAGS="-Wl,--version-script=\$(srcdir)/libgphoto2.ver"
|
||||
diff --git a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac
|
||||
index 6af8bd914..a8546aa36 100644
|
||||
--- a/libgphoto2_port/configure.ac
|
||||
+++ b/libgphoto2_port/configure.ac
|
||||
@@ -165,13 +165,14 @@ AC_CHECK_LIB([regex],[regexec])
|
||||
|
||||
AC_MSG_CHECKING([for asm .symver support])
|
||||
AC_COMPILE_IFELSE([dnl
|
||||
- AC_LANG_PROGRAM([[]],[[
|
||||
- int f1() { }
|
||||
- int f2() { }
|
||||
+ AC_LANG_PROGRAM([[
|
||||
+ void f1(void);
|
||||
+ void f1() {}
|
||||
+ void f2(void);
|
||||
+ void f2() {}
|
||||
asm(".symver f1, f@VER1");
|
||||
asm(".symver f2, f@@VER2");
|
||||
- int main(int argc, char **argv) { }
|
||||
- ]])dnl
|
||||
+ ]],[])dnl
|
||||
],[
|
||||
AC_DEFINE([HAVE_ASM_SYMVERS],1,[Define if there is asm .symver support.])
|
||||
VERSIONMAPLDFLAGS="-Wl,--version-script=\$(srcdir)/libgphoto2_port.ver"
|
||||
--
|
||||
2.26.2
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
From 242878ac1cefd1ef99c2e5d84a794f72e49e28be 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
|
||||
|
||||
Drah in the header for USBDEVFS_CONNECT.
|
||||
|
||||
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
|
||||
---
|
||||
libgphoto2_port/usb/libusb.c | 6 ++++++
|
||||
1 files changed, 6 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/libgphoto2_port/usb/libusb.c b/libgphoto2_port/usb/libusb.c
|
||||
index d1535a5..c8a63f1 100644
|
||||
--- a/libgphoto2_port/usb/libusb.c
|
||||
+++ b/libgphoto2_port/usb/libusb.c
|
||||
@@ -38,6 +38,12 @@
|
||||
#include <gphoto2/gphoto2-port-result.h>
|
||||
#include <gphoto2/gphoto2-port-log.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
|
||||
# include <libintl.h>
|
||||
# undef _
|
||||
--
|
||||
1.6.5.rc2
|
||||
|
||||
@ -1,168 +0,0 @@
|
||||
diff -up libgphoto2-2.4.7/packaging/generic/print-camera-list.c.storage libgphoto2-2.4.7/packaging/generic/print-camera-list.c
|
||||
--- libgphoto2-2.4.7/packaging/generic/print-camera-list.c.storage 2009-08-11 17:11:27.000000000 +0200
|
||||
+++ libgphoto2-2.4.7/packaging/generic/print-camera-list.c 2009-08-19 15:44:41.000000000 +0200
|
||||
@@ -819,6 +819,8 @@ fdi_begin_func (const func_params_t *par
|
||||
printf("<deviceinfo version=\"0.2\">\n");
|
||||
printf(" <device>\n");
|
||||
printf(" <match key=\"info.subsystem\" string=\"usb\">\n");
|
||||
+ printf(" <!-- skip USB Mass Storage Devices -->\n");
|
||||
+ printf(" <match key=\"usb.interface.class\" compare_ne=\"8\">\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -858,62 +860,62 @@ fdi_camera_func (const func_params_t *pa
|
||||
return 0;
|
||||
}
|
||||
if (a->usb_vendor) { /* usb product id might be 0! */
|
||||
- printf(" <match key=\"usb.vendor_id\" int=\"%d\">\n", a->usb_vendor);
|
||||
- printf(" <match key=\"usb.product_id\" int=\"%d\">\n", a->usb_product);
|
||||
+ printf(" <match key=\"usb.vendor_id\" int=\"%d\">\n", a->usb_vendor);
|
||||
+ printf(" <match key=\"usb.product_id\" int=\"%d\">\n", a->usb_product);
|
||||
if (a->usb_vendor == 0x05ac) { /* Apple iPhone, PTP user. */
|
||||
- printf(" <match key=\"usb.interface.class\" int=\"6\">\n");
|
||||
- printf(" <match key=\"usb.interface.subclass\" int=\"1\">\n");
|
||||
- printf(" <match key=\"usb.interface.protocol\" int=\"1\">\n");
|
||||
+ printf(" <match key=\"usb.interface.class\" int=\"6\">\n");
|
||||
+ printf(" <match key=\"usb.interface.subclass\" int=\"1\">\n");
|
||||
+ printf(" <match key=\"usb.interface.protocol\" int=\"1\">\n");
|
||||
}
|
||||
if (a->device_type & GP_DEVICE_AUDIO_PLAYER) {
|
||||
- printf(" <merge key=\"info.category\" type=\"string\">portable_audio_player</merge>\n");
|
||||
- printf(" <addset key=\"info.capabilities\" type=\"strlist\">portable_audio_player</addset>\n");
|
||||
- printf(" <merge key=\"portable_audio_player.access_method\" type=\"string\">user</merge>\n");
|
||||
- printf(" <merge key=\"portable_audio_player.type\" type=\"string\">mtp</merge>\n");
|
||||
+ printf(" <merge key=\"info.category\" type=\"string\">portable_audio_player</merge>\n");
|
||||
+ printf(" <addset key=\"info.capabilities\" type=\"strlist\">portable_audio_player</addset>\n");
|
||||
+ printf(" <merge key=\"portable_audio_player.access_method\" type=\"string\">user</merge>\n");
|
||||
+ printf(" <merge key=\"portable_audio_player.type\" type=\"string\">mtp</merge>\n");
|
||||
|
||||
/* FIXME: needs true formats ... But all of them can do MP3 */
|
||||
- printf(" <append key=\"portable_audio_player.output_formats\" type=\"strlist\">audio/mpeg</append>\n");
|
||||
+ printf(" <append key=\"portable_audio_player.output_formats\" type=\"strlist\">audio/mpeg</append>\n");
|
||||
} else {
|
||||
- printf(" <merge key=\"info.category\" type=\"string\">camera</merge>\n");
|
||||
- printf(" <addset key=\"info.capabilities\" type=\"strlist\">camera</addset>\n");
|
||||
+ printf(" <merge key=\"info.category\" type=\"string\">camera</merge>\n");
|
||||
+ printf(" <addset key=\"info.capabilities\" type=\"strlist\">camera</addset>\n");
|
||||
|
||||
/* HACK alert ... but the HAL / gnome-volume-manager guys want that */
|
||||
if (NULL!=strstr(a->library,"ptp"))
|
||||
- printf(" <merge key=\"camera.access_method\" type=\"string\">ptp</merge>\n");
|
||||
+ printf(" <merge key=\"camera.access_method\" type=\"string\">ptp</merge>\n");
|
||||
else
|
||||
- printf(" <merge key=\"camera.access_method\" type=\"string\">proprietary</merge>\n");
|
||||
+ printf(" <merge key=\"camera.access_method\" type=\"string\">proprietary</merge>\n");
|
||||
}
|
||||
/* leave them here even for audio players */
|
||||
- printf(" <merge key=\"camera.libgphoto2.name\" type=\"string\">%s</merge>\n", model);
|
||||
- printf(" <merge key=\"camera.libgphoto2.support\" type=\"bool\">true</merge>\n");
|
||||
+ printf(" <merge key=\"camera.libgphoto2.name\" type=\"string\">%s</merge>\n", model);
|
||||
+ printf(" <merge key=\"camera.libgphoto2.support\" type=\"bool\">true</merge>\n");
|
||||
if (a->usb_vendor == 0x05ac) { /* Apple iPhone */
|
||||
+ printf(" </match>\n");
|
||||
printf(" </match>\n");
|
||||
printf(" </match>\n");
|
||||
- printf(" </match>\n");
|
||||
}
|
||||
+ printf(" </match>\n");
|
||||
printf(" </match>\n");
|
||||
- printf(" </match>\n");
|
||||
|
||||
} else if ((a->usb_class) && (a->usb_class != 666)) {
|
||||
- printf(" <match key=\"usb.interface.class\" int=\"%d\">\n", a->usb_class);
|
||||
- printf(" <match key=\"usb.interface.subclass\" int=\"%d\">\n", a->usb_subclass);
|
||||
- printf(" <match key=\"usb.interface.protocol\" int=\"%d\">\n", a->usb_protocol);
|
||||
- printf(" <merge key=\"info.category\" type=\"string\">camera</merge>\n");
|
||||
- printf(" <addset key=\"info.capabilities\" type=\"strlist\">camera</addset>\n");
|
||||
+ printf(" <match key=\"usb.interface.class\" int=\"%d\">\n", a->usb_class);
|
||||
+ printf(" <match key=\"usb.interface.subclass\" int=\"%d\">\n", a->usb_subclass);
|
||||
+ printf(" <match key=\"usb.interface.protocol\" int=\"%d\">\n", a->usb_protocol);
|
||||
+ printf(" <merge key=\"info.category\" type=\"string\">camera</merge>\n");
|
||||
+ printf(" <addset key=\"info.capabilities\" type=\"strlist\">camera</addset>\n");
|
||||
if (a->usb_class == 6) {
|
||||
- printf(" <merge key=\"camera.access_method\" type=\"string\">ptp</merge>\n");
|
||||
+ printf(" <merge key=\"camera.access_method\" type=\"string\">ptp</merge>\n");
|
||||
} else {
|
||||
if (a->usb_class == 8) {
|
||||
- printf(" <merge key=\"camera.access_method\" type=\"string\">storage</merge>\n");
|
||||
+ printf(" <merge key=\"camera.access_method\" type=\"string\">storage</merge>\n");
|
||||
} else {
|
||||
- printf(" <merge key=\"camera.access_method\" type=\"string\">proprietary</merge>\n");
|
||||
+ printf(" <merge key=\"camera.access_method\" type=\"string\">proprietary</merge>\n");
|
||||
}
|
||||
}
|
||||
- printf(" <merge key=\"camera.libgphoto2.name\" type=\"string\">%s</merge>\n", model);
|
||||
- printf(" <merge key=\"camera.libgphoto2.support\" type=\"bool\">true</merge>\n");
|
||||
+ printf(" <merge key=\"camera.libgphoto2.name\" type=\"string\">%s</merge>\n", model);
|
||||
+ printf(" <merge key=\"camera.libgphoto2.support\" type=\"bool\">true</merge>\n");
|
||||
+ printf(" </match>\n");
|
||||
printf(" </match>\n");
|
||||
printf(" </match>\n");
|
||||
- printf(" </match>\n");
|
||||
}
|
||||
} /* camera has USB connection */
|
||||
return 0;
|
||||
@@ -922,6 +924,7 @@ fdi_camera_func (const func_params_t *pa
|
||||
static int
|
||||
fdi_end_func (const func_params_t *params, void *data)
|
||||
{
|
||||
+ printf(" </match>\n");
|
||||
printf(" </match>\n");
|
||||
printf(" </device>\n");
|
||||
printf("</deviceinfo>\n");
|
||||
@@ -948,6 +951,8 @@ fdi_device_begin_func (const func_params
|
||||
printf("<deviceinfo version=\"0.2\">\n");
|
||||
printf(" <device>\n");
|
||||
printf(" <match key=\"info.subsystem\" string=\"usb\">\n");
|
||||
+ printf(" <!-- skip USB Mass Storage Devices -->\n");
|
||||
+ printf(" <match key=\"usb.interface.class\" compare_ne=\"8\">\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -991,28 +996,28 @@ fdi_device_camera_func (const func_param
|
||||
/* do not set category. We don't really know what this device really is.
|
||||
* But we do now that is capable of being a camera, so add to capabilities
|
||||
*/
|
||||
- printf(" <match key=\"usb_device.vendor_id\" int=\"%d\">\n", a->usb_vendor);
|
||||
- printf(" <match key=\"usb_device.product_id\" int=\"%d\">\n", a->usb_product);
|
||||
+ printf(" <match key=\"usb_device.vendor_id\" int=\"%d\">\n", a->usb_vendor);
|
||||
+ printf(" <match key=\"usb_device.product_id\" int=\"%d\">\n", a->usb_product);
|
||||
if (params->add_comments) {
|
||||
printf(" <!-- %s -->\n", a->model);
|
||||
}
|
||||
if (a->device_type & GP_DEVICE_AUDIO_PLAYER)
|
||||
- printf(" <append key=\"info.capabilities\" type=\"strlist\">portable_audio_player</append>\n");
|
||||
+ printf(" <append key=\"info.capabilities\" type=\"strlist\">portable_audio_player</append>\n");
|
||||
else
|
||||
- printf(" <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n");
|
||||
+ printf(" <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n");
|
||||
+ printf(" </match>\n");
|
||||
printf(" </match>\n");
|
||||
- printf(" </match>\n");
|
||||
}
|
||||
#if 0
|
||||
/* would need to be able to merge upwards ... but cannot currently */
|
||||
else if ((a->usb_class) && (a->usb_class != 666)) {
|
||||
- printf(" <match key=\"usb.interface.class\" int=\"%d\">\n", a->usb_class);
|
||||
- printf(" <match key=\"usb.interface.subclass\" int=\"%d\">\n", a->usb_subclass);
|
||||
- printf(" <match key=\"usb.interface.protocol\" int=\"%d\">\n", a->usb_protocol);
|
||||
- printf(" <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n");
|
||||
+ printf(" <match key=\"usb.interface.class\" int=\"%d\">\n", a->usb_class);
|
||||
+ printf(" <match key=\"usb.interface.subclass\" int=\"%d\">\n", a->usb_subclass);
|
||||
+ printf(" <match key=\"usb.interface.protocol\" int=\"%d\">\n", a->usb_protocol);
|
||||
+ printf(" <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n");
|
||||
+ printf(" </match>\n");
|
||||
printf(" </match>\n");
|
||||
printf(" </match>\n");
|
||||
- printf(" </match>\n");
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@@ -1022,6 +1027,7 @@ fdi_device_camera_func (const func_param
|
||||
static int
|
||||
fdi_device_end_func (const func_params_t *params, void *data)
|
||||
{
|
||||
+ printf(" </match>\n");
|
||||
printf(" </match>\n");
|
||||
printf(" </device>\n");
|
||||
printf("</deviceinfo>\n");
|
||||
6
gating.yaml
Normal file
6
gating.yaml
Normal file
@ -0,0 +1,6 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-10
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
||||
51
gphoto2-device-return.patch
Normal file
51
gphoto2-device-return.patch
Normal file
@ -0,0 +1,51 @@
|
||||
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
|
||||
|
||||
Drah in the header for USBDEVFS_CONNECT.
|
||||
|
||||
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
|
||||
---
|
||||
libgphoto2_port/usb/libusb.c | 24 +++++++++++++++++++++++-
|
||||
1 file changed, 23 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libgphoto2_port/usb/libusb.c b/libgphoto2_port/usb/libusb.c
|
||||
index 3cd91fa..dfd347c 100644
|
||||
--- a/libgphoto2_port/usb/libusb.c
|
||||
+++ b/libgphoto2_port/usb/libusb.c
|
||||
@@ -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
|
||||
+# include <libintl.h>
|
||||
+# 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);}
|
||||
|
||||
--
|
||||
2.34.1
|
||||
|
||||
37
gphoto2-gcc14.patch
Normal file
37
gphoto2-gcc14.patch
Normal file
@ -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
|
||||
|
||||
@ -1,42 +1,48 @@
|
||||
%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.16
|
||||
Release: 3%{?dist}
|
||||
Version: 2.5.30
|
||||
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: GPLv2+ and 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)
|
||||
URL: http://www.gphoto.org/
|
||||
|
||||
Source0: http://downloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
|
||||
Patch1: gphoto2-pkgcfg.patch
|
||||
Patch2: gphoto2-storage.patch
|
||||
Patch3: gphoto2-device-return.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
|
||||
%endif
|
||||
BuildRequires: libtool-ltdl-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libcurl-devel
|
||||
BuildRequires: pkgconfig(libxml-2.0)
|
||||
BuildRequires: gd-devel
|
||||
BuildRequires: pkgconfig(libexif)
|
||||
# -----------------------------------
|
||||
# libgphoto2_port
|
||||
# -----------------------------------
|
||||
%if !0%{?flatpak}
|
||||
BuildRequires: lockdev-devel
|
||||
%endif
|
||||
BuildRequires: pkgconfig(libusb-1.0)
|
||||
Requires: lockdev
|
||||
# -----------------------------------
|
||||
|
||||
# Temporarily required for patch3
|
||||
BuildRequires: autoconf automake libtool gettext-devel
|
||||
|
||||
%description
|
||||
libgphoto2 is a library that can be used by applications to access
|
||||
various digital cameras. libgphoto2 itself is not a GUI application,
|
||||
@ -65,6 +71,9 @@ for f in AUTHORS ChangeLog COPYING libgphoto2_port/AUTHORS libgphoto2_port/COPYI
|
||||
done
|
||||
|
||||
%build
|
||||
# Temporarily required for patch3
|
||||
autoreconf -if
|
||||
|
||||
%configure \
|
||||
udevscriptdir='%{udevdir}' \
|
||||
--with-drivers=all \
|
||||
@ -86,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}
|
||||
@ -94,7 +103,11 @@ pushd packaging/linux-hotplug/
|
||||
# Output udev rules for device identification; this is used by GVfs gphoto2
|
||||
# backend and others.
|
||||
mkdir -p %{buildroot}%{_udevrulesdir}
|
||||
%{buildroot}%{_libdir}/%{name}/print-camera-list udev-rules version 136 > %{buildroot}%{_udevrulesdir}/40-libgphoto2.rules
|
||||
%{buildroot}%{_libdir}/%{name}/print-camera-list udev-rules version 201 > %{buildroot}%{_udevrulesdir}/40-libgphoto2.rules
|
||||
|
||||
# Add support for hwdb (#1658259)
|
||||
mkdir -p %{buildroot}%{_udevhwdbdir}
|
||||
%{buildroot}%{_libdir}/%{name}/print-camera-list hwdb version 201 > %{buildroot}%{_udevhwdbdir}/20-gphoto2.hwdb
|
||||
popd
|
||||
|
||||
# remove circular symlink in /usr/include/gphoto2 (#460807)
|
||||
@ -111,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/
|
||||
@ -119,7 +133,7 @@ rm -rf %{buildroot}%{_datadir}/libgphoto2_port/*/vcamera/
|
||||
|
||||
%files -f %{name}.lang
|
||||
%license COPYING
|
||||
%doc AUTHORS README NEWS
|
||||
%doc AUTHORS README.md NEWS
|
||||
%{_libdir}/%{name}.so.*
|
||||
%{_libdir}/%{name}_port.so.*
|
||||
%dir %{_libdir}/%{name}/
|
||||
@ -129,6 +143,7 @@ rm -rf %{buildroot}%{_datadir}/libgphoto2_port/*/vcamera/
|
||||
%{_libdir}/%{name}/%{version}/*.so
|
||||
%{_libdir}/%{name}_port/%{port_version}/*.so
|
||||
%{_udevrulesdir}/40-libgphoto2.rules
|
||||
%{_udevhwdbdir}/20-gphoto2.hwdb
|
||||
%{udevdir}/check-ptp-camera
|
||||
%{_datadir}/libgphoto2/
|
||||
|
||||
@ -145,6 +160,104 @@ rm -rf %{buildroot}%{_datadir}/libgphoto2_port/*/vcamera/
|
||||
%{_mandir}/man3/%{name}_port.3*
|
||||
|
||||
%changelog
|
||||
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.5.30-9
|
||||
- Bump release for October 2024 mass rebuild:
|
||||
Resolves: RHEL-64018
|
||||
|
||||
* 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
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.27-2
|
||||
- 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)
|
||||
|
||||
* Wed Jan 27 2021 Josef Ridky <jridky@redhat.com> - 2.5.26-1
|
||||
- New upstream release 2.5.26 (#1887201)
|
||||
- Add support for hwdb output (#1658259)
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.25-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Oct 07 2020 Josef Ridky <jridky@redhat.com> - 2.5.25-1
|
||||
- New upstream release 2.5.25 (#1839543)
|
||||
|
||||
* Thu Aug 6 2020 Daniel P. Berrangé <berrange@redhat.com> - 2.5.24-4
|
||||
- Fix configure check for symbol versioning with GCC 10 (rhbz #1862745)
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.24-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed May 13 2020 Daniel P. Berrangé <berrange@redhat.com> - 2.5.24-2
|
||||
- Add libcurl for Lumix WIFI support
|
||||
|
||||
* Wed May 13 2020 Daniel P. Berrangé <berrange@redhat.com> - 2.5.24-1
|
||||
- Update to 2.5.24 release
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.23-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Wed Aug 21 2019 Josef Řídký <jridky@redhat.com> - 2.5.23-1
|
||||
- New upstream release 2.5.23
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.21-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.21-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Tue Dec 11 2018 Bastien Nocera <bnocera@redhat.com> - 2.5.21-2
|
||||
- Fix camera mounts not showing up in GNOME
|
||||
|
||||
* Tue Dec 11 2018 Bastien Nocera <bnocera@redhat.com> - 2.5.21-1
|
||||
- Update to 2.5.21
|
||||
|
||||
* Tue Nov 27 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.5.20-1
|
||||
- Update to 2.5.20
|
||||
|
||||
* Sun Sep 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.5.19-1
|
||||
- Update to 2.5.19
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.18-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Mon May 14 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.5.18-1
|
||||
- Update to 2.5.18
|
||||
|
||||
* Fri Apr 20 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.5.17-1
|
||||
- Update to 2.5.17
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.16-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
Loading…
Reference in New Issue
Block a user