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

Accepting request 401539 from graphics

Browse Source 
- require: udev in the library package for the hwdb refresher
  bsc#982339

- libgphoto2-newjpeg.patch: jpeg_mem_src gets a const buffer now
  in new libjpeg-turbo.

OBS-URL: https://build.opensuse.org/request/show/401539
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libgphoto2?expand=0&rev=106
This commit is contained in:
Dominique Leuenberger 2016-06-13 19:49:24 +00:00 committed by Git OBS Bridge
commit 61c417aeb3
3 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libgphoto2-newjpeg.patch Normal file
View File

@ -0,0 +1,26 @@
Index: libgphoto2-2.5.10/camlibs/ax203/jpeg_memsrcdest.h
===================================================================
--- libgphoto2-2.5.10.orig/camlibs/ax203/jpeg_memsrcdest.h
+++ libgphoto2-2.5.10/camlibs/ax203/jpeg_memsrcdest.h
@@ -1,7 +1,7 @@
#include <jpeglib.h>
void
-jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer,
+jpeg_mem_src (j_decompress_ptr cinfo, const unsigned char * buffer,
unsigned long bufsize);
void
Index: libgphoto2-2.5.10/camlibs/jl2005c/jpeg_memsrcdest.h
===================================================================
--- libgphoto2-2.5.10.orig/camlibs/jl2005c/jpeg_memsrcdest.h
+++ libgphoto2-2.5.10/camlibs/jl2005c/jpeg_memsrcdest.h
@@ -1,7 +1,7 @@
#include <jpeglib.h>
void
-jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer,
+jpeg_mem_src (j_decompress_ptr cinfo, const unsigned char * buffer,
unsigned long bufsize);
void

12
libgphoto2.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Jun 9 14:29:12 UTC 2016 - meissner@suse.com
- require: udev in the library package for the hwdb refresher
bsc#982339
-------------------------------------------------------------------
Thu Jun 9 13:55:38 UTC 2016 - meissner@suse.com
- libgphoto2-newjpeg.patch: jpeg_mem_src gets a const buffer now
in new libjpeg-turbo.
-------------------------------------------------------------------
Wed Mar 23 21:12:13 UTC 2016 - meissner@suse.com

6
libgphoto2.spec
View File

@ -55,6 +55,7 @@ Source0: https://downloads.sourceforge.net/project/gphoto/libgphoto/%{ver
Source1: https://downloads.sourceforge.net/project/gphoto/libgphoto/%{version}//%{name}-%{version}.tar.bz2.asc
Source2: %name.keyring
Source3: baselibs.conf
Patch0: libgphoto2-newjpeg.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Recommends: %{name}-%{major}-lang = %{version}
@ -62,6 +63,8 @@ Recommends: %{name}-%{major}-lang = %{version}
Summary: A Digital Camera Library
Group: Hardware/Camera
Recommends: %{name}-%{major}-lang = %{version}
Requires(post): udev
Requires(postun): udev
%package doc
Summary: A Digital Camera Library - documentation
@ -132,6 +135,9 @@ This is its API documentation in HTML format.
%prep
%setup -q
if pkg-config --atleast-version=1.5.0 libturbojpeg; then
%patch0 -p1
fi
(cd doc; tar xaf libgphoto2-api.html.tar.gz)
%build