libgphoto2: update to 2.5.11
This commit is contained in:
parent
0a27baed9a
commit
b802363248
@ -32,71 +32,71 @@ lrwxrwxrwx root/root usr/lib/libgphoto2.so -> libgphoto2.so.6.0.0
|
||||
lrwxrwxrwx root/root usr/lib/libgphoto2.so.6 -> libgphoto2.so.6.0.0
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2.so.6.0.0
|
||||
drwxr-xr-x root/root usr/lib/libgphoto2/
|
||||
drwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/adc65.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/agfa_cl20.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/aox.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/ax203.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/barbie.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/canon.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/casio_qv.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/clicksmart310.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/digigr8.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/digita.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/dimagev.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/dimera3500.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/directory.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/enigma13.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/fuji.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/gsmart300.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/hp215.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/iclick.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/jamcam.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/jd11.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/jl2005a.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/jl2005c.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/kodak_dc120.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/kodak_dc210.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/kodak_dc240.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/kodak_dc3200.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/kodak_ez200.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/konica.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/konica_qm150.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/largan.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/lg_gsm.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/mars.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/mustek.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/panasonic_coolshot.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/panasonic_dc1000.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/panasonic_dc1580.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/panasonic_l859.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/pccam300.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/pccam600.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/pentax.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/polaroid_pdc320.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/polaroid_pdc640.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/polaroid_pdc700.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/ptp2.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/ricoh.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/ricoh_g3.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/samsung.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/sierra.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/sipix_blink2.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/sipix_web2.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/smal.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/sonix.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/sony_dscf1.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/sony_dscf55.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/soundvision.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/spca50x.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/sq905.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/st2205.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/stv0674.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/stv0680.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/sx330z.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/topfield.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/toshiba_pdrm11.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/tp6801.so
|
||||
drwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/adc65.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/agfa_cl20.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/aox.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/ax203.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/barbie.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/canon.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/casio_qv.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/clicksmart310.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/digigr8.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/digita.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/dimagev.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/dimera3500.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/directory.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/enigma13.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/fuji.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/gsmart300.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/hp215.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/iclick.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/jamcam.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/jd11.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/jl2005a.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/jl2005c.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/kodak_dc120.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/kodak_dc210.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/kodak_dc240.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/kodak_dc3200.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/kodak_ez200.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/konica.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/konica_qm150.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/largan.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/lg_gsm.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/mars.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/mustek.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/panasonic_coolshot.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/panasonic_dc1000.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/panasonic_dc1580.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/panasonic_l859.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/pccam300.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/pccam600.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/pentax.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/polaroid_pdc320.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/polaroid_pdc640.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/polaroid_pdc700.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/ptp2.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/ricoh.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/ricoh_g3.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/samsung.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sierra.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sipix_blink2.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sipix_web2.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/smal.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sonix.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sony_dscf1.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sony_dscf55.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/soundvision.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/spca50x.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sq905.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/st2205.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/stv0674.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/stv0680.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sx330z.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/topfield.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/toshiba_pdrm11.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/tp6801.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/print-camera-list
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2_port.la
|
||||
lrwxrwxrwx root/root usr/lib/libgphoto2_port.so -> libgphoto2_port.so.12.0.0
|
||||
@ -116,14 +116,14 @@ drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/libgphoto2_port.pc
|
||||
drwxr-xr-x root/root usr/share/
|
||||
drwxr-xr-x root/root usr/share/libgphoto2/
|
||||
drwxr-xr-x root/root usr/share/libgphoto2/2.5.10/
|
||||
drwxr-xr-x root/root usr/share/libgphoto2/2.5.10/konica/
|
||||
-rw-r--r-- root/root usr/share/libgphoto2/2.5.10/konica/english
|
||||
-rw-r--r-- root/root usr/share/libgphoto2/2.5.10/konica/french
|
||||
-rw-r--r-- root/root usr/share/libgphoto2/2.5.10/konica/german
|
||||
-rw-r--r-- root/root usr/share/libgphoto2/2.5.10/konica/japanese
|
||||
-rw-r--r-- root/root usr/share/libgphoto2/2.5.10/konica/korean
|
||||
-rw-r--r-- root/root usr/share/libgphoto2/2.5.10/konica/spanish
|
||||
drwxr-xr-x root/root usr/share/libgphoto2/2.5.11/
|
||||
drwxr-xr-x root/root usr/share/libgphoto2/2.5.11/konica/
|
||||
-rw-r--r-- root/root usr/share/libgphoto2/2.5.11/konica/english
|
||||
-rw-r--r-- root/root usr/share/libgphoto2/2.5.11/konica/french
|
||||
-rw-r--r-- root/root usr/share/libgphoto2/2.5.11/konica/german
|
||||
-rw-r--r-- root/root usr/share/libgphoto2/2.5.11/konica/japanese
|
||||
-rw-r--r-- root/root usr/share/libgphoto2/2.5.11/konica/korean
|
||||
-rw-r--r-- root/root usr/share/libgphoto2/2.5.11/konica/spanish
|
||||
drwxr-xr-x root/root usr/share/libgphoto2_port/
|
||||
drwxr-xr-x root/root usr/share/libgphoto2_port/0.12.0/
|
||||
drwxr-xr-x root/root usr/share/libgphoto2_port/0.12.0/vcamera/
|
||||
|
||||
@ -1,2 +1 @@
|
||||
04132b5a9a650929cef68b7eb360a057 jpeg-1.5.0.patch
|
||||
f1e53e684a3ea51cc7958d7e4eee7f37 libgphoto2-2.5.10.tar.bz2
|
||||
2426511143e6f2fae4f3744e91acfbc3 libgphoto2-2.5.11.tar.bz2
|
||||
|
||||
@ -5,14 +5,12 @@
|
||||
# Depends on: libtool libusb-compat libjpeg-turbo libexif
|
||||
|
||||
name=libgphoto2
|
||||
version=2.5.10
|
||||
release=2
|
||||
source=(http://downloads.sourceforge.net/project/gphoto/libgphoto/$version/$name-$version.tar.bz2
|
||||
jpeg-1.5.0.patch)
|
||||
version=2.5.11
|
||||
release=1
|
||||
source=(http://downloads.sourceforge.net/project/gphoto/libgphoto/$version/$name-$version.tar.bz2)
|
||||
|
||||
build () {
|
||||
cd $name-$version
|
||||
patch -p1 -i $SRC/jpeg-1.5.0.patch
|
||||
|
||||
udevscriptdir=/lib/udev \
|
||||
./configure --prefix=/usr --disable-nls
|
||||
|
||||
@ -1,92 +0,0 @@
|
||||
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
|
||||
Loading…
x
Reference in New Issue
Block a user