summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-graphics/gphoto2
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-graphics/gphoto2')
-rw-r--r--meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb3
-rw-r--r--meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch41
-rw-r--r--meta-oe/recipes-graphics/gphoto2/libgphoto2/fix-build-with-gcc-14.patch36
-rw-r--r--meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb18
4 files changed, 41 insertions, 57 deletions
diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb b/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb
index 513845194d..63993bfbeb 100644
--- a/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb
+++ b/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb
@@ -19,3 +19,6 @@ EXTRA_OECONF += "--with-jpeg-prefix=${STAGING_INCDIR} \
19 --without-cdk \ 19 --without-cdk \
20" 20"
21 21
22do_compile:prepend() {
23 sed -i -e 's/--sysroot=[^ "]*//g' ${B}/config.h
24}
diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch b/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch
deleted file mode 100644
index fd647b7386..0000000000
--- a/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 31a5d2f7db18737aef08c34e8707b4f69f7e5156 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Sun, 21 Oct 2012 17:59:20 +0200
4Subject: [PATCH] configure.ac: remove AM_PO_SUBDIRS
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9together with oe autotools.bbclass this is done twice and causes:
10
11| autoreconf: running: aclocal --system-acdir=/home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/aclocal-copy/ --automake-acdir=/home/Superandy/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/share/aclocal-1.12 -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/auto-m4/ -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/m4m/ -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/auto-m4/ -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/m4m/ --force -I auto-m4 -I m4m
12| configure.ac:230: error: `po-directories' is already registered with AC_CONFIG_COMMANDS.
13
14Upstream-Status: Inappropriate [configuration]
15
16Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
17---
18 configure.ac | 1 -
19 libgphoto2_port/configure.ac | 1 -
20 2 files changed, 0 insertions(+), 2 deletions(-)
21
22--- a/configure.ac
23+++ b/configure.ac
24@@ -282,7 +282,6 @@ dnl ------------------------------------
25 GP_GETTEXT_SETUP([GETTEXT_PACKAGE_LIBGPHOTO2],
26 [${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}],
27 [po])
28-AM_PO_SUBDIRS()
29 AM_GNU_GETTEXT_VERSION([0.19.1])
30 AM_GNU_GETTEXT([external])
31 AM_ICONV()
32--- a/libgphoto2_port/configure.ac
33+++ b/libgphoto2_port/configure.ac
34@@ -122,7 +122,6 @@ dnl ------------------------------------
35 GP_GETTEXT_SETUP([GETTEXT_PACKAGE_LIBGPHOTO2_PORT],
36 [${PACKAGE}-${LIBGPHOTO2_PORT_CURRENT_MIN}],
37 [po])
38-AM_PO_SUBDIRS()
39 AM_GNU_GETTEXT_VERSION([0.19.1])
40 AM_GNU_GETTEXT([external])
41 AM_ICONV()
diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2/fix-build-with-gcc-14.patch b/meta-oe/recipes-graphics/gphoto2/libgphoto2/fix-build-with-gcc-14.patch
new file mode 100644
index 0000000000..0c2a8d4bd0
--- /dev/null
+++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2/fix-build-with-gcc-14.patch
@@ -0,0 +1,36 @@
1From 721f7f8c3ec8058d504607873e4c317aac0c99c5 Mon Sep 17 00:00:00 2001
2From: Marcus Meissner <marcus@jet.franken.de>
3Date: Mon, 4 Dec 2023 13:26:08 +0100
4Subject: [PATCH] align outlen length with jpeg jeaders. fixes
5 https://github.com/gphoto/libgphoto2/issues/941
6
7---
8Upstream-Status: Backport [https://github.com/gphoto/libgphoto2/commit/721f7f8c3ec8058d504607873e4c317aac0c99c5]
9
10 camlibs/ptp2/chdk.c | 6 +++---
11 1 file changed, 3 insertions(+), 3 deletions(-)
12
13diff --git a/camlibs/ptp2/chdk.c b/camlibs/ptp2/chdk.c
14index e1d898f378..e775ea1d4b 100644
15--- a/camlibs/ptp2/chdk.c
16+++ b/camlibs/ptp2/chdk.c
17@@ -1150,7 +1150,7 @@ static void yuv_live_to_jpeg(unsigned char *p_yuv,
18 struct jpeg_error_mgr jerr;
19 JSAMPROW row_ptr[1];
20 uint8_t *outbuf = NULL, *tmprowbuf = NULL;
21- uint64_t outlen = 0;
22+ unsigned long outlen = 0;
23 unsigned int row_inc;
24 int sshift, dshift, xshift, skip;
25
26@@ -1161,8 +1161,8 @@ static void yuv_live_to_jpeg(unsigned char *p_yuv,
27 sshift = 6;
28 dshift = (width/height > 2) ? 6 : 12;
29 xshift = 4;
30- /* Digic 6 cameras: 8 bit per element UYVY,
31- * 4 bytes used to encode 2 pixels, need 6 bytes raw YUV data for jpeg encoding */
32+ /* Digic 6 cameras: 8 bit per element UYVY,
33+ * 4 bytes used to encode 2 pixels, need 6 bytes raw YUV data for jpeg encoding */
34 } else {
35 row_inc = buf_width*2;
36 sshift = 4;
diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb
index cc42b6a9c6..0b58e8e75f 100644
--- a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb
+++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb
@@ -11,8 +11,8 @@ DEPENDS = "libtool jpeg virtual/libusb0 libexif zlib libxml2"
11 11
12SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2;name=libgphoto2 \ 12SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2;name=libgphoto2 \
13 file://40-libgphoto2.rules \ 13 file://40-libgphoto2.rules \
14 file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \
15 file://0001-configure-Filter-out-buildpaths-from-CC.patch \ 14 file://0001-configure-Filter-out-buildpaths-from-CC.patch \
15 file://fix-build-with-gcc-14.patch \
16" 16"
17SRC_URI[libgphoto2.sha256sum] = "4f81c34c0b812bee67afd5f144940fbcbe01a2055586a6a1fa2d0626024a545b" 17SRC_URI[libgphoto2.sha256sum] = "4f81c34c0b812bee67afd5f144940fbcbe01a2055586a6a1fa2d0626024a545b"
18 18
@@ -24,21 +24,9 @@ PACKAGECONFIG ??= ""
24PACKAGECONFIG[gd] = ",--without-gdlib,gd" 24PACKAGECONFIG[gd] = ",--without-gdlib,gd"
25PACKAGECONFIG[serial] = "--enable-serial,--disable-serial,lockdev" 25PACKAGECONFIG[serial] = "--enable-serial,--disable-serial,lockdev"
26 26
27do_configure:prepend() {
28 rm -rf ${S}/libgphoto2_port/auto-m4/*
29 rm -rf ${S}/auto-m4/*
30}
31
32do_configure:append() {
33 cp ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/libgphoto2_port/po/
34 cd ${S}/libgphoto2_port/
35 autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths
36 cd ${S}
37}
38
39do_install:append() { 27do_install:append() {
40 install -d ${D}${sysconfdir}/udev/rules.d/ 28 install -d ${D}${sysconfdir}/udev/rules.d/
41 install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/ 29 install -m 0644 ${UNPACKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/
42} 30}
43 31
44PACKAGES =+ "libgphotoport libgphoto2-camlibs" 32PACKAGES =+ "libgphotoport libgphoto2-camlibs"
@@ -48,6 +36,4 @@ RRECOMMENDS:${PN} = "libgphoto2-camlibs"
48FILES:libgphotoport = "${libdir}/libgphoto2_port.so.*" 36FILES:libgphotoport = "${libdir}/libgphoto2_port.so.*"
49 37
50FILES:${PN} += "${nonarch_base_libdir}/udev/*" 38FILES:${PN} += "${nonarch_base_libdir}/udev/*"
51FILES:${PN}-dbg += "${libdir}/*/*/.debug"
52FILES:${PN}-dev += "${libdir}/*/*/*.la"
53FILES:${PN}-doc += "${datadir}/libgphoto2_port/0.12.?/vcamera/README.txt" 39FILES:${PN}-doc += "${datadir}/libgphoto2_port/0.12.?/vcamera/README.txt"