From 3048b27f9677e303184c4c7f17af4f4560a207ebc6ce77c0402e17f840dded40 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 9 Jun 2016 13:56:15 +0000 Subject: [PATCH 1/4] - libgphoto2-newjpeg.patch: jpeg_mem_src gets a const buffer now in new libjpeg-turbo. OBS-URL: https://build.opensuse.org/package/show/graphics/libgphoto2?expand=0&rev=153 --- libgphoto2-newjpeg.patch | 26 ++++++++++++++++++++++++++ libgphoto2.changes | 6 ++++++ libgphoto2.spec | 4 ++++ 3 files changed, 36 insertions(+) create mode 100644 libgphoto2-newjpeg.patch diff --git a/libgphoto2-newjpeg.patch b/libgphoto2-newjpeg.patch new file mode 100644 index 0000000..895c943 --- /dev/null +++ b/libgphoto2-newjpeg.patch @@ -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 + + 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 + + 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 diff --git a/libgphoto2.changes b/libgphoto2.changes index 40d84fa..071170d 100644 --- a/libgphoto2.changes +++ b/libgphoto2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/libgphoto2.spec b/libgphoto2.spec index 3ffdd8f..c0be613 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -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} @@ -132,6 +133,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 From 295f035430d2da2a67451e6e8410440fe5ec172830044971dd2faca730e95519 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 9 Jun 2016 14:30:21 +0000 Subject: [PATCH 2/4] - Prereq: udev in the library package for the hwdb refresher bsc#982339 OBS-URL: https://build.opensuse.org/package/show/graphics/libgphoto2?expand=0&rev=154 --- libgphoto2.changes | 6 ++++++ libgphoto2.spec | 1 + 2 files changed, 7 insertions(+) diff --git a/libgphoto2.changes b/libgphoto2.changes index 071170d..c8e0e3c 100644 --- a/libgphoto2.changes +++ b/libgphoto2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 9 14:29:12 UTC 2016 - meissner@suse.com + +- Prereq: udev in the library package for the hwdb refresher + bsc#982339 + ------------------------------------------------------------------- Thu Jun 9 13:55:38 UTC 2016 - meissner@suse.com diff --git a/libgphoto2.spec b/libgphoto2.spec index c0be613..40001bd 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -63,6 +63,7 @@ Recommends: %{name}-%{major}-lang = %{version} Summary: A Digital Camera Library Group: Hardware/Camera Recommends: %{name}-%{major}-lang = %{version} +Prerequires: udev %package doc Summary: A Digital Camera Library - documentation From de9ca9bb9b08b70aa4db5437215759d1ecce0695e53000884187346e975266ae Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 9 Jun 2016 15:19:55 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/graphics/libgphoto2?expand=0&rev=155 --- libgphoto2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libgphoto2.spec b/libgphoto2.spec index 40001bd..8a66ad4 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -63,7 +63,7 @@ Recommends: %{name}-%{major}-lang = %{version} Summary: A Digital Camera Library Group: Hardware/Camera Recommends: %{name}-%{major}-lang = %{version} -Prerequires: udev +PreReq: udev %package doc Summary: A Digital Camera Library - documentation From e70750983c1e0e2964b4501b929ba1cbaea59dc6d3ad479bf2cd1f15b720aa7f Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 12 Jun 2016 19:02:23 +0000 Subject: [PATCH 4/4] - require: udev in the library package for the hwdb refresher OBS-URL: https://build.opensuse.org/package/show/graphics/libgphoto2?expand=0&rev=156 --- libgphoto2.changes | 2 +- libgphoto2.spec | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libgphoto2.changes b/libgphoto2.changes index c8e0e3c..04c2d08 100644 --- a/libgphoto2.changes +++ b/libgphoto2.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu Jun 9 14:29:12 UTC 2016 - meissner@suse.com -- Prereq: udev in the library package for the hwdb refresher +- require: udev in the library package for the hwdb refresher bsc#982339 ------------------------------------------------------------------- diff --git a/libgphoto2.spec b/libgphoto2.spec index 8a66ad4..963bf59 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -63,7 +63,8 @@ Recommends: %{name}-%{major}-lang = %{version} Summary: A Digital Camera Library Group: Hardware/Camera Recommends: %{name}-%{major}-lang = %{version} -PreReq: udev +Requires(post): udev +Requires(postun): udev %package doc Summary: A Digital Camera Library - documentation