From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-894386-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id E32AF13832E
for <garchives@archives.gentoo.org>; Sat, 30 Jul 2016 20:37:37 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 1769C21C0FA;
Sat, 30 Jul 2016 20:37:29 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id DF2B521C0EE
for <gentoo-commits@lists.gentoo.org>; Sat, 30 Jul 2016 20:37:27 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 3C737340D3E
for <gentoo-commits@lists.gentoo.org>; Sat, 30 Jul 2016 20:37:26 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 874342442
for <gentoo-commits@lists.gentoo.org>; Sat, 30 Jul 2016 20:37:21 +0000 (UTC)
From: "Pacho Ramos" <pacho@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" <pacho@gentoo.org>
Message-ID: <1469911024.dc3d9fbf3a2860cc932c5856a45f691128c28df6.pacho@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libgphoto2/files/, media-libs/libgphoto2/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/libgphoto2/files/libgphoto2-2.5.10-jpeg.patch media-libs/libgphoto2/libgphoto2-2.5.10.ebuild
X-VCS-Directories: media-libs/libgphoto2/ media-libs/libgphoto2/files/
X-VCS-Committer: pacho
X-VCS-Committer-Name: Pacho Ramos
X-VCS-Revision: dc3d9fbf3a2860cc932c5856a45f691128c28df6
X-VCS-Branch: master
Date: Sat, 30 Jul 2016 20:37:21 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 8fbaad84-a9d8-4d3f-a498-3c8578360bc0
X-Archives-Hash: fcd15df2b61e80984d50f671d1160ca3
commit: dc3d9fbf3a2860cc932c5856a45f691128c28df6
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 30 20:18:57 2016 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 20:37:04 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc3d9fbf
media-libs/libgphoto2: Fix build with latest jpeg-turbo (#586336 by Ulenrich)
Package-Manager: portage-2.3.0
.../libgphoto2/files/libgphoto2-2.5.10-jpeg.patch | 92 ++++++++++++++++++++++
media-libs/libgphoto2/libgphoto2-2.5.10.ebuild | 6 ++
2 files changed, 98 insertions(+)
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.5.10-jpeg.patch b/media-libs/libgphoto2/files/libgphoto2-2.5.10-jpeg.patch
new file mode 100644
index 0000000..34baead
--- /dev/null
+++ b/media-libs/libgphoto2/files/libgphoto2-2.5.10-jpeg.patch
@@ -0,0 +1,92 @@
+From 0df14db3eda1b780a27b1c54bc8f251d15afebbc Mon Sep 17 00:00:00 2001
+From: Patrick Ohly <patrick.ohly@intel.com>
+Date: Wed, 15 Jun 2016 10:33:24 +0200
+Subject: [PATCH] jpeg_memsrcdest: extend feature check
+
+libjpeg.h in OpenEmbedded master (from libjpeg-turbo 1.5.0) provides
+these methods if "JPEG_LIB_VERSION >= 80 ||
+defined(MEM_SRCDST_SUPPORTED)".
+
+The support for the jpeg_mem functions was added even when not
+emulating the libjpeg8 API, controlled via the MEM_SRCDST_SUPPORTED
+define, so checking for the version alone is not enough anymore.
+
+See https://github.com/libjpeg-turbo/libjpeg-turbo/commit/ab70623eb29e09e67222be5b9e1ea320fe5aa0e9
+
+This fixes errors about conflicting declarations (signed vs. unsigned
+char).
+
+Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
+---
+ camlibs/ax203/jpeg_memsrcdest.c | 4 ++--
+ camlibs/ax203/jpeg_memsrcdest.h | 4 ++++
+ camlibs/jl2005c/jpeg_memsrcdest.c | 4 ++--
+ camlibs/jl2005c/jpeg_memsrcdest.h | 4 ++++
+ 4 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/camlibs/ax203/jpeg_memsrcdest.c b/camlibs/ax203/jpeg_memsrcdest.c
+index 0ed83b1..5614573 100644
+--- a/camlibs/ax203/jpeg_memsrcdest.c
++++ b/camlibs/ax203/jpeg_memsrcdest.c
+@@ -25,8 +25,8 @@
+ #include "jpeg_memsrcdest.h"
+
+ /* libjpeg8 and later come with their own (API compatible) memory source
+- and dest */
+-#if JPEG_LIB_VERSION < 80
++ and dest, and older versions may have it backported */
++#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED)
+
+ /* Expanded data source object for memory input */
+
+diff --git a/camlibs/ax203/jpeg_memsrcdest.h b/camlibs/ax203/jpeg_memsrcdest.h
+index e971182..b13bf3f 100644
+--- a/camlibs/ax203/jpeg_memsrcdest.h
++++ b/camlibs/ax203/jpeg_memsrcdest.h
+@@ -1,5 +1,7 @@
+ #include <jpeglib.h>
+
++#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED)
++
+ void
+ jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer,
+ unsigned long bufsize);
+@@ -7,3 +9,5 @@ jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer,
+ void
+ jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer,
+ unsigned long * outsize);
++
++#endif
+diff --git a/camlibs/jl2005c/jpeg_memsrcdest.c b/camlibs/jl2005c/jpeg_memsrcdest.c
+index 321f926..b65310e 100644
+--- a/camlibs/jl2005c/jpeg_memsrcdest.c
++++ b/camlibs/jl2005c/jpeg_memsrcdest.c
+@@ -25,8 +25,8 @@
+ #include "jpeg_memsrcdest.h"
+
+ /* libjpeg8 and later come with their own (API compatible) memory source
+- and dest */
+-#if JPEG_LIB_VERSION < 80
++ and dest, and older versions may have it backported */
++#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED)
+
+ /* Expanded data source object for memory input */
+
+diff --git a/camlibs/jl2005c/jpeg_memsrcdest.h b/camlibs/jl2005c/jpeg_memsrcdest.h
+index e971182..b13bf3f 100644
+--- a/camlibs/jl2005c/jpeg_memsrcdest.h
++++ b/camlibs/jl2005c/jpeg_memsrcdest.h
+@@ -1,5 +1,7 @@
+ #include <jpeglib.h>
+
++#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED)
++
+ void
+ jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer,
+ unsigned long bufsize);
+@@ -7,3 +9,5 @@ jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer,
+ void
+ jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer,
+ unsigned long * outsize);
++
++#endif
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.10.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.10.ebuild
index 68f656a..47f1d21 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.10.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.10.ebuild
@@ -75,6 +75,12 @@ MULTILIB_CHOST_TOOLS=(
/usr/bin/gphoto2-config
)
+PATCHES=(
+ # Fix building with latest jpeg-turbo, bug #586336, fixed in the
+ # next version
+ "${FILESDIR}"/${P}-jpeg.patch
+)
+
pkg_pretend() {
if ! echo "${USE}" | grep "cameras_" > /dev/null 2>&1; then
einfo "No camera drivers will be built since you did not specify any."