added my Recipes
This commit is contained in:
@@ -0,0 +1,50 @@
|
||||
From 366930ccc1a261c3eb883da2bf3c655162ccd75f Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 1 Mar 2023 22:58:37 -0800
|
||||
Subject: [PATCH] Match prototypes of callbacks with libgphoto
|
||||
|
||||
In https://github.com/gphoto/gphoto2/pull/535/commits/ccc4c1f092bd21ebc713f4d7b9be85be49f92f1e
|
||||
we tried to fix by using pthread_t but it also needs to make changes in
|
||||
libgphoto and these changes can be invasive, therefore lets revert to
|
||||
older types and to fix musl problem fix it via type casts
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/gphoto/gphoto2/pull/569]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
gphoto2/main.c | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/gphoto2/main.c b/gphoto2/main.c
|
||||
index 0dac947..cd3c990 100644
|
||||
--- a/gphoto2/main.c
|
||||
+++ b/gphoto2/main.c
|
||||
@@ -1198,7 +1198,7 @@ thread_func (void *data)
|
||||
pthread_cleanup_pop (1);
|
||||
}
|
||||
|
||||
-static pthread_t
|
||||
+static unsigned int
|
||||
start_timeout_func (Camera *camera, unsigned int timeout,
|
||||
CameraTimeoutFunc func, void __unused__ *data)
|
||||
{
|
||||
@@ -1215,14 +1215,14 @@ start_timeout_func (Camera *camera, unsigned int timeout,
|
||||
|
||||
pthread_create (&tid, NULL, thread_func, td);
|
||||
|
||||
- return (tid);
|
||||
+ return (unsigned int)tid;
|
||||
}
|
||||
|
||||
static void
|
||||
-stop_timeout_func (Camera __unused__ *camera, pthread_t id,
|
||||
+stop_timeout_func (Camera __unused__ *camera, unsigned int id,
|
||||
void __unused__ *data)
|
||||
{
|
||||
- pthread_t tid = id;
|
||||
+ pthread_t tid = (pthread_t)id;
|
||||
|
||||
pthread_cancel (tid);
|
||||
pthread_join (tid, NULL);
|
||||
--
|
||||
2.39.2
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
From 60b6d5c95ca3632e02031ac04fb5486dd209011c Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Baak <andreas.baak@gmail.com>
|
||||
Date: Sun, 12 Jul 2015 01:02:15 -0700
|
||||
Subject: [PATCH] configure.ac remove AM_PO_SUBDIRS
|
||||
|
||||
This is done twice together with oe autotools.bbclass.
|
||||
|
||||
---
|
||||
configure.ac | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -46,7 +46,6 @@ dnl i18n support
|
||||
dnl ---------------------------------------------------------------------------
|
||||
GP_GETTEXT_HACK([],[Lutz Müller and others],[${MAIL_GPHOTO_TRANSLATION}])
|
||||
ALL_LINGUAS="az cs da de en_GB es eu fi fr hu id is it ja nl pa pl pt_BR ro ru rw sk sr sv uk vi zh_CN zh_TW"
|
||||
-AM_PO_SUBDIRS()
|
||||
AM_GNU_GETTEXT_VERSION([0.14.1])
|
||||
AM_GNU_GETTEXT([external])
|
||||
AM_ICONV()
|
||||
@@ -0,0 +1,39 @@
|
||||
From 23c67e93e51f700d0aeecfc08277e39f51201fc3 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 2 Sep 2022 12:59:46 -0700
|
||||
Subject: [PATCH] gphoto2: Use pthread_t abstract type for thead IDs
|
||||
|
||||
This is not a plain old datatype in every libc, e.g. with musl this
|
||||
would fail in type conversion
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/gphoto/gphoto2/pull/535]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
gphoto2/main.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gphoto2/main.c b/gphoto2/main.c
|
||||
index 2bf5964..9a6b05d 100644
|
||||
--- a/gphoto2/main.c
|
||||
+++ b/gphoto2/main.c
|
||||
@@ -1198,7 +1198,7 @@ thread_func (void *data)
|
||||
pthread_cleanup_pop (1);
|
||||
}
|
||||
|
||||
-static unsigned int
|
||||
+static pthread_t
|
||||
start_timeout_func (Camera *camera, unsigned int timeout,
|
||||
CameraTimeoutFunc func, void __unused__ *data)
|
||||
{
|
||||
@@ -1219,7 +1219,7 @@ start_timeout_func (Camera *camera, unsigned int timeout,
|
||||
}
|
||||
|
||||
static void
|
||||
-stop_timeout_func (Camera __unused__ *camera, unsigned int id,
|
||||
+stop_timeout_func (Camera __unused__ *camera, pthread_t id,
|
||||
void __unused__ *data)
|
||||
{
|
||||
pthread_t tid = id;
|
||||
--
|
||||
2.37.3
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
SUMMARY = "gphoto2 - a command-line frontend to libgphoto2"
|
||||
HOMEPAGE = "http://www.gphoto.com/"
|
||||
LICENSE = "GPL-2.0-only"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
|
||||
|
||||
DEPENDS = "libgphoto2 popt readline"
|
||||
RDEPENDS:gphoto2 = "libgphoto2"
|
||||
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2;name=gphoto2 \
|
||||
file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \
|
||||
file://0001-gphoto2-Use-pthread_t-abstract-type-for-thead-IDs.patch \
|
||||
file://0001-Match-prototypes-of-callbacks-with-libgphoto.patch \
|
||||
"
|
||||
SRC_URI[gphoto2.sha256sum] = "2a648dcdf12da19e208255df4ebed3e7d2a02f905be4165f2443c984cf887375"
|
||||
|
||||
inherit autotools pkgconfig gettext
|
||||
|
||||
EXTRA_OECONF += "--with-jpeg-prefix=${STAGING_INCDIR} \
|
||||
--without-cdk \
|
||||
"
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
From 06be633b8f4e2241bd37d4faf62b49606ad778e7 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 25 May 2023 19:01:36 -0700
|
||||
Subject: [PATCH] configure: Filter out buildpaths from CC
|
||||
|
||||
Upstream-Status: Inappropriate [Cross-compile specific]
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
configure.ac | 4 +++-
|
||||
libgphoto2_port/configure.ac | 6 ++++--
|
||||
2 files changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 17216b1..39c8cc4 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -261,7 +261,9 @@ GP_CONFIG_MSG([Compiler],[${CC}])
|
||||
GP_CONFIG_MSG([libltdl includes],[$LTDLINCL])
|
||||
GP_CONFIG_MSG([libltdl library],[$LIBLTDL])
|
||||
|
||||
-AC_DEFINE_UNQUOTED([HAVE_CC], ["$CC"],
|
||||
+CC_NO_SYSROOT=`echo $CC | sed -e \
|
||||
+ 's|--sysroot=.*\b||g'`
|
||||
+AC_DEFINE_UNQUOTED([HAVE_CC], ["$CC_NO_SYSROOT"],
|
||||
[The C compiler we are using])
|
||||
|
||||
|
||||
diff --git a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac
|
||||
index 1086b8e..59f3c34 100644
|
||||
--- a/libgphoto2_port/configure.ac
|
||||
+++ b/libgphoto2_port/configure.ac
|
||||
@@ -103,8 +103,10 @@ GP_CONFIG_MSG([Compiler],[${CC}])
|
||||
GP_CONFIG_MSG([libltdl includes],[$LTDLINCL])
|
||||
GP_CONFIG_MSG([libltdl library],[$LIBLTDL])
|
||||
|
||||
-AC_DEFINE_UNQUOTED([HAVE_CC], ["$CC"],
|
||||
- [The C compiler we're using])
|
||||
+CC_NO_SYSROOT=`echo $CC | sed -e \
|
||||
+ 's|--sysroot=.*\b||g'`
|
||||
+AC_DEFINE_UNQUOTED([HAVE_CC], ["$CC_NO_SYSROOT"],
|
||||
+ [The C compiler we are using])
|
||||
|
||||
AM_CPPFLAGS=""
|
||||
|
||||
--
|
||||
2.40.1
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
From 31a5d2f7db18737aef08c34e8707b4f69f7e5156 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Sun, 21 Oct 2012 17:59:20 +0200
|
||||
Subject: [PATCH] configure.ac: remove AM_PO_SUBDIRS
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
together with oe autotools.bbclass this is done twice and causes:
|
||||
|
||||
| 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
|
||||
| configure.ac:230: error: `po-directories' is already registered with AC_CONFIG_COMMANDS.
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
configure.ac | 1 -
|
||||
libgphoto2_port/configure.ac | 1 -
|
||||
2 files changed, 0 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -282,7 +282,6 @@ dnl ------------------------------------
|
||||
GP_GETTEXT_SETUP([GETTEXT_PACKAGE_LIBGPHOTO2],
|
||||
[${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}],
|
||||
[po])
|
||||
-AM_PO_SUBDIRS()
|
||||
AM_GNU_GETTEXT_VERSION([0.19.1])
|
||||
AM_GNU_GETTEXT([external])
|
||||
AM_ICONV()
|
||||
--- a/libgphoto2_port/configure.ac
|
||||
+++ b/libgphoto2_port/configure.ac
|
||||
@@ -122,7 +122,6 @@ dnl ------------------------------------
|
||||
GP_GETTEXT_SETUP([GETTEXT_PACKAGE_LIBGPHOTO2_PORT],
|
||||
[${PACKAGE}-${LIBGPHOTO2_PORT_CURRENT_MIN}],
|
||||
[po])
|
||||
-AM_PO_SUBDIRS()
|
||||
AM_GNU_GETTEXT_VERSION([0.19.1])
|
||||
AM_GNU_GETTEXT([external])
|
||||
AM_ICONV()
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,53 @@
|
||||
SUMMARY = "libgphoto2 allows you to access digital cameras"
|
||||
SECTION = "libs"
|
||||
LICENSE = "LGPL-2.1-only"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=477378d78dfeeaa93826ee4ec7c643fb"
|
||||
|
||||
DEPENDS = "libtool jpeg virtual/libusb0 libexif zlib libxml2"
|
||||
|
||||
# The .fdi and .rules files were generated with:
|
||||
# libgphoto2-2.5.8/packaging/generic$ qemu-arm -s 1048576 -r 2.6.24 -L /OE/angstrom-dev/staging/armv5te-angstrom-linux-gnueabi/ .libs/print-camera-list
|
||||
# They are release specific, so please regen when adding new releases
|
||||
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2;name=libgphoto2 \
|
||||
file://40-libgphoto2.rules \
|
||||
file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \
|
||||
file://0001-configure-Filter-out-buildpaths-from-CC.patch \
|
||||
"
|
||||
SRC_URI[libgphoto2.sha256sum] = "ee61a1dac6ad5cf711d114e06b90a6d431961a6e7ec59f4b757a7cd77b1c0fb4"
|
||||
|
||||
inherit autotools pkgconfig gettext lib_package
|
||||
|
||||
EXTRA_OECONF = " --with-drivers=all udevscriptdir=${nonarch_base_libdir}/udev ac_cv_lib_ltdl_lt_dlcaller_register=yes"
|
||||
|
||||
PACKAGECONFIG ??= ""
|
||||
PACKAGECONFIG[gd] = ",--without-gdlib,gd"
|
||||
PACKAGECONFIG[serial] = "--enable-serial,--disable-serial,lockdev"
|
||||
|
||||
do_configure:prepend() {
|
||||
rm -rf ${S}/libgphoto2_port/auto-m4/*
|
||||
rm -rf ${S}/auto-m4/*
|
||||
}
|
||||
|
||||
do_configure:append() {
|
||||
cp ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/libgphoto2_port/po/
|
||||
cd ${S}/libgphoto2_port/
|
||||
autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths
|
||||
cd ${S}
|
||||
}
|
||||
|
||||
do_install:append() {
|
||||
install -d ${D}${sysconfdir}/udev/rules.d/
|
||||
install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/
|
||||
}
|
||||
|
||||
PACKAGES =+ "libgphotoport libgphoto2-camlibs"
|
||||
FILES:libgphoto2-camlibs = "${libdir}/libgphoto2*/*/*.so*"
|
||||
RRECOMMENDS:${PN} = "libgphoto2-camlibs"
|
||||
|
||||
FILES:libgphotoport = "${libdir}/libgphoto2_port.so.*"
|
||||
|
||||
FILES:${PN} += "${nonarch_base_libdir}/udev/*"
|
||||
FILES:${PN}-dbg += "${libdir}/*/*/.debug"
|
||||
FILES:${PN}-dev += "${libdir}/*/*/*.la"
|
||||
FILES:${PN}-doc += "${datadir}/libgphoto2_port/0.12.?/vcamera/README.txt"
|
||||
Reference in New Issue
Block a user