rpm/libgphoto2
SHA256
1
0
Fork 0
forked from pool/libgphoto2
Code Pull Requests Activity

Accepting request 1193735 from graphics

Browse Source 
- Adding libgphoto2-c99.patch so that the package builds for 32bit
  with GCC 14.
- Using %autosetup -p1 because this is the prefered way to apply
  patches.

If the request is ok, please forward it to factory soon so that it
is ready when the default compiler is switched. (forwarded request 1191710 from fkastl)

OBS-URL: https://build.opensuse.org/request/show/1193735
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libgphoto2?expand=0&rev=138
This commit is contained in:
Dominique Leuenberger 2024-08-14 12:14:03 +00:00 committed by Git OBS Bridge
commit 12b80b4868
3 changed files with 47 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libgphoto2-c99.patch Normal file
View File

@ -0,0 +1,35 @@
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 e1d898f378..e775ea1d4b 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;

8
libgphoto2.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Aug 5 12:07:01 UTC 2024 - Filip Kastl <filip.kastl@suse.com>
- Adding libgphoto2-c99.patch so that the package builds for 32bit
with GCC 14.
- Using %autosetup -p1 because this is the prefered way to apply
patches.
-------------------------------------------------------------------
Sat Sep 2 09:59:49 UTC 2023 - Marcus Meissner <meissner@suse.com>

7
libgphoto2.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package libgphoto2
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -61,6 +61,7 @@ Source0: https://downloads.sourceforge.net/project/gphoto/libgphoto/%vers
Source1: https://downloads.sourceforge.net/project/gphoto/libgphoto/%version/%name-%version.tar.xz.asc
Source2: %name.keyring
Source3: baselibs.conf
Patch0: libgphoto2-c99.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%package -n libgphoto2-%major
@ -69,7 +70,7 @@ Group: System/Libraries
Requires(pre): /sbin/ldconfig
Requires(post): /sbin/ldconfig
Requires(post): udev
Requires(postun):udev
Requires(postun): udev
%package -n libgphoto2_port12
Summary: Port drivers for the libgphoto2 digital camera library
@ -157,7 +158,7 @@ This is its API documentation in HTML format.
%lang_package -n libgphoto2-%major
%prep
%setup -q
%autosetup -p1
(cd doc && tar -xaf libgphoto2-api.html.tar.gz)
%build