[ptxdist] [PATCH 2/2] libcamera: Add package
libcamera is a new library to ease usage and configuration for camera devices. Currently, libcamera has no release tags. This version is based on commit 5154e14b from 2021-03-22. Signed-off-by: Marian Cichy --- rules/libcamera.in | 75 +++ rules/libcamera.make | 117 +++ 2 files changed, 192 insertions(+) create mode 100644 rules/libcamera.in create mode 100644 rules/libcamera.make diff --git a/rules/libcamera.in b/rules/libcamera.in new file mode 100644 index 0..886f716f6 --- /dev/null +++ b/rules/libcamera.in @@ -0,0 +1,75 @@ +## SECTION=multimedia_libs + +menuconfig LIBCAMERA + tristate + prompt "libcamera " + select HOST_MESON + select HOST_SYSTEM_PYTHON3 + select HOST_SYSTEM_PYTHON3_PLY + select HOST_SYSTEM_PYTHON3_PYYAML + select HOST_SYSTEM_PYTHON3_JINJA2 + select GNUTLS + select OPENSSL + select BOOSTif LIBCAMERA_PIPELINES_RASPBERRYPI + select GSTREAMER1 if LIBCAMERA_GSTREAMER + select GST_PLUGINS_BASE1if LIBCAMERA_GSTREAMER + select LIBEVENT if LIBCAMERA_CAM + select QT5 if LIBCAMERA_QCAM + help + libcamera is a library to ease configuration and usage of camera devices/ + +if LIBCAMERA + +config LIBCAMERA_GSTREAMER + bool + prompt "libcamera GStreamer plugin" + help + Gstreamer libcamerasrc element + +config LIBCAMERA_CAM + bool + prompt "cam test application" + help + Demo application for libcamera + +config LIBCAMERA_QCAM + bool + prompt "qcam test application" + help + Qt demo application for libcamera + +config LIBCAMERA_TRACING + bool + prompt "Enable tracing" + +config LIBCAMERA_V4L2 + bool + prompt "V4L2 compatibility layer" + +comment "Pipelines" + +config LIBCAMERA_PIPELINES_IPU3 + bool + prompt "ipu3" + +config LIBCAMERA_PIPELINES_RASPBERRYPI + bool + prompt "raspberrypi" + +config LIBCAMERA_PIPELINES_RKISP1 + bool + prompt "rkisp1" + +config LIBCAMERA_PIPELINES_SIMPLE + bool + prompt "simple" + +config LIBCAMERA_PIPELINES_UVCVIDEO + bool + prompt "uvcvideo" + +config LIBCAMERA_PIPELINES_VIMC + bool + prompt "vimc" + +endif diff --git a/rules/libcamera.make b/rules/libcamera.make new file mode 100644 index 00000..7e1ab6ae7 --- /dev/null +++ b/rules/libcamera.make @@ -0,0 +1,117 @@ +# -*-makefile-*- +# +# Copyright (C) 2021 by Marian Cichy +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_LIBCAMERA) += libcamera + +# +# Paths and names +# +LIBCAMERA_VERSION := 2021-02-01-g5154e14b +LIBCAMERA_MD5 := df003c77b6e6bda22d5ef72fed2540ad +LIBCAMERA := libcamera-$(LIBCAMERA_VERSION) +LIBCAMERA_SUFFIX := tar.xz +LIBCAMERA_URL := git://linuxtv.org/libcamera.git;tag=$(LIBCAMERA_VERSION) +LIBCAMERA_SOURCE := $(SRCDIR)/$(LIBCAMERA).$(LIBCAMERA_SUFFIX) +LIBCAMERA_DIR := $(BUILDDIR)/$(LIBCAMERA) +LIBCAMERA_LICENSE := unknown + +# +# Get +# + +#$(LIBCAMERA_SOURCE): +# @$(call targetinfo) +# @$(call get, LIBCAMERA) + +# +# Prepare +# + +#LIBCAMERA_CONF_ENV:= $(CROSS_ENV) + +LIBCAMERA_PIPELINES-$(PTXCONF_LIBCAMERA_PIPELINES_IPU3)+= ipu3 +LIBCAMERA_PIPELINES-$(PTXCONF_LIBCAMERA_PIPELINES_RASPBERRYPI) += raspberrypi +LIBCAMERA_PIPELINES-$(PTXCONF_LIBCAMERA_PIPELINES_RKISP1) += rkisp1 +LIBCAMERA_PIPELINES-$(PTXCONF_LIBCAMERA_PIPELINES_SIMPLE) += simple +LIBCAMERA_PIPELINES-$(PTXCONF_LIBCAMERA_PIPELINES_UVCVIDEO)+= uvcvideo +LIBCAMERA_PIPELINES-$(PTXCONF_LIBCAMERA_PIPELINES_VIMC)+= vimc + +LIBCAMERA_CONF_TOOL:= meson +LIBCAMERA_CONF_OPT := \ + $(CROSS_MESON_USR) \ + -Dandroid=disabled\ + -Ddocumentation=disabled \ + -Dgstreamer=$(call ptx/endis, PTXCONF_LIBCAMERA_GSTREAMER)d \ + -Dpipelines=$(subst $(space),$(comma),$(LIBCAMERA_PIPELINES-y)) \ + -Dqcam=$(call ptx/endis, PTXCONF_LIBCAMERA_QCAM)d \ + -Dtest=$(call ptx/truefalse, PTXCONF_LIBCAMERA_TEST) \ + -Dtracing=$(call ptx/endis, PTXCONF_LIBCAMERA_TRACING)d \ + -Dv4l2=$(call ptx/truefalse, PTXCONF_LIBCAMERA_V4
[ptxdist] [PATCH 1/2] host-system-python3: Add flags for ply, pyyaml, jinja2
These modules are a dependency for libcamera. Signed-off-by: Marian Cichy --- rules/host-system-python3.in | 9 + rules/host-system-python3.make | 18 ++ 2 files changed, 27 insertions(+) diff --git a/rules/host-system-python3.in b/rules/host-system-python3.in index c6ce3360a..3a0df4307 100644 --- a/rules/host-system-python3.in +++ b/rules/host-system-python3.in @@ -20,4 +20,13 @@ config HOST_SYSTEM_PYTHON3_SETUPTOOLS config HOST_SYSTEM_PYTHON3_SIX bool +config HOST_SYSTEM_PYTHON3_PLY + bool + +config HOST_SYSTEM_PYTHON3_PYYAML + bool + +config HOST_SYSTEM_PYTHON3_JINJA2 + bool + endif diff --git a/rules/host-system-python3.make b/rules/host-system-python3.make index 7f97f9349..81c400473 100644 --- a/rules/host-system-python3.make +++ b/rules/host-system-python3.make @@ -53,6 +53,24 @@ ifdef PTXCONF_HOST_SYSTEM_PYTHON3_SIX @$(SYSTEMPYTHON3) -c 'import six' 2>/dev/null || \ ptxd_bailout "Python six module not found! \ Please install python3-six (debian)"; +endif +ifdef PTXCONF_HOST_SYSTEM_PYTHON3_PLY + @echo "Checking for Python ply ..." + @$(SYSTEMPYTHON3) -c 'import ply' 2>/dev/null || \ + ptxd_bailout "Python ply module not found! \ + Please install python3-ply (debian)"; +endif +ifdef PTXCONF_HOST_SYSTEM_PYTHON3_JINJA2 + @echo "Checking for Python jinja2 ..." + @$(SYSTEMPYTHON3) -c 'import jinja2' 2>/dev/null || \ + ptxd_bailout "Python jinja2 module not found! \ + Please install python3-jinja2 (debian)"; +endif +ifdef PTXCONF_HOST_SYSTEM_PYTHON3_PYYAML + @echo "Checking for Python pyyaml ..." + @$(SYSTEMPYTHON3) -c 'import yaml' 2>/dev/null || \ + ptxd_bailout "Python pyyaml module not found! \ + Please install python3-yaml (debian)"; endif @$(call touch) -- 2.29.2 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH v2] ptxdist: add cgdb command
cgdb is a curses-frontend for gdb with some
visual conveniences for debugging. ptxdist already
has a 'ptxdist gdb' command to invoke gdb with
configured sysroot etc., and it would be nice
to have when we can also use cgdb.
Signed-off-by: Marian Cichy
---
bin/ptxdist | 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/bin/ptxdist b/bin/ptxdist
index 0d5e4328e..0a252e4ab 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -765,6 +765,8 @@ Misc:
use 'newpackage help' for a longer description
nfsroot run a userspace NFS server and export the
nfsroot
gdb run cross gdb with configured sysroot etc.
+ cgdb run cross gdb with configured sysroot etc.
+ with cgdb as frontend
bsp-info print some basic information about the BSP
package-infoprint some basic information about the package
print print the contents of a variable, in the way
@@ -1761,11 +1763,18 @@ EOF
ptxd_make_log export_src EXPORTDIR="${1}"
exit
;;
- gdb)
+ gdb|cgdb)
+ local -a prefix
+ if [ "${cmd}" = "cgdb" ]; then
+ if [ \! -x "$(which cgdb 2>/dev/null)" ]; then
+ ptxd_bailout "cgdb is required to be
installed on your host-machine."
+ fi
+ prefix=( cgdb -d )
+ fi
check_premake_compiler &&
compiler_prefix="$(ptxd_get_ptxconf
PTXCONF_COMPILER_PREFIX)" &&
ptxdist_trap_exit_handler &&
- exec
"${PTXDIST_PLATFORMDIR}/sysroot-host/lib/wrapper/${compiler_prefix}gdb" "${@}"
+ exec "${prefix[@]}"
"${PTXDIST_PLATFORMDIR}/sysroot-host/lib/wrapper/${compiler_prefix}gdb" "${@}"
;;
get|urlcheck)
declare -a pkgs
--
2.20.1
___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] ptxdist: let newpackage use qt5 by default
when using 'ptxdist newpackage src-qmake-prog, ptxdist generates rule-files that uses qt4 build-tools. Since qt4 is quite obsolete, lets switch to qt5 as default. Signed-off-by: Marian Cichy --- rules/templates/template-src-qmake-prog-in | 2 +- rules/templates/template-src-qmake-prog-make | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/rules/templates/template-src-qmake-prog-in b/rules/templates/template-src-qmake-prog-in index 914b6816c..a20378948 100644 --- a/rules/templates/template-src-qmake-prog-in +++ b/rules/templates/template-src-qmake-prog-in @@ -3,6 +3,6 @@ config @PACKAGE@ bool prompt "@package@" - select QT4 + select QT5 help FIXME diff --git a/rules/templates/template-src-qmake-prog-make b/rules/templates/template-src-qmake-prog-make index 142a1d039..dd2dbfb31 100644 --- a/rules/templates/template-src-qmake-prog-make +++ b/rules/templates/template-src-qmake-prog-make @@ -38,6 +38,7 @@ PACKAGES-$(PTXCONF_@PACKAGE@) += @package@ # # qmake # +@PACKAGE@_PATH := PATH=$(PTXDIST_SYSROOT_CROSS)/bin/qt5:$(CROSS_PATH) @PACKAGE@_CONF_TOOL:= qmake @PACKAGE@_CONF_OPT := $(CROSS_QMAKE_OPT) PREFIX=/usr -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] ptxdist: add cgdb command
cgdb is a curses-frontend for gdb with some
visual conveniences for debugging. ptxdist already
has a 'ptxdist gdb' command to invoke gdb with
configured sysroot etc., and it would be nice
to have when we can also use cgdb.
Signed-off-by: Marian Cichy
---
bin/ptxdist | 15 +++
1 file changed, 15 insertions(+)
diff --git a/bin/ptxdist b/bin/ptxdist
index 0d5e4328e..91af19cc3 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -765,6 +765,8 @@ Misc:
use 'newpackage help' for a longer description
nfsroot run a userspace NFS server and export the
nfsroot
gdb run cross gdb with configured sysroot etc.
+ cgdb run cross gdb with configured sysroot etc.
+ with cgdb as frontend
bsp-info print some basic information about the BSP
package-infoprint some basic information about the package
print print the contents of a variable, in the way
@@ -1706,6 +1708,19 @@ EOF
check_deps &&
ptxd_make_log bsp-info
;;
+ cgdb)
+ if ! command -v cgdb &>/dev/null
+ then
+ echo
+ echo "error: cgdb is required to be installed
on your host-machine."
+ echo
+ exit 1
+ fi
+ check_premake_compiler &&
+ compiler_prefix="$(ptxd_get_ptxconf
PTXCONF_COMPILER_PREFIX)" &&
+ ptxdist_trap_exit_handler &&
+ exec cgdb -d
"${PTXDIST_PLATFORMDIR}/sysroot-host/lib/wrapper/${compiler_prefix}gdb" "${@}"
+ ;;
clean)
check_config &&
check_deps &&
--
2.20.1
___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH v4 3/3] gst-bayer2rgb-neon: add package
Signed-off-by: Marian Cichy --- Changes since v3: - fix _LICENSE_FILES syntax - remove redundant _CONV_ENF - break a line --- rules/gst-bayer2rgb-neon.in | 11 +++ rules/gst-bayer2rgb-neon.make | 58 +++ 2 files changed, 69 insertions(+) create mode 100644 rules/gst-bayer2rgb-neon.in create mode 100644 rules/gst-bayer2rgb-neon.make diff --git a/rules/gst-bayer2rgb-neon.in b/rules/gst-bayer2rgb-neon.in new file mode 100644 index 0..1f4feeb8b --- /dev/null +++ b/rules/gst-bayer2rgb-neon.in @@ -0,0 +1,11 @@ +## SECTION=multimedia_gstreamer1 + +config GST_BAYER2RGB_NEON + tristate + prompt "gst-bayer2rgb-neon" + select BAYER2RGB3 + select GSTREAMER1 + select GST_PLUGINS_BASE1 + help + Inofficial Gstreamer-plugin that utilizes + NEON-extension to convert video/x-bayer to RGB. diff --git a/rules/gst-bayer2rgb-neon.make b/rules/gst-bayer2rgb-neon.make new file mode 100644 index 0..4bd003161 --- /dev/null +++ b/rules/gst-bayer2rgb-neon.make @@ -0,0 +1,58 @@ +# -*-makefile-*- +# +# Copyright (C) 2020 by Marian Cichy +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_GST_BAYER2RGB_NEON) += gst-bayer2rgb-neon + +# +# Paths and names +# +GST_BAYER2RGB_NEON_VERSION := 0.3 +GST_BAYER2RGB_NEON_MD5 := 73f05f8504e29c03d6b1164ee37b4fb9 +GST_BAYER2RGB_NEON := gst-bayer2rgb-neon-$(GST_BAYER2RGB_NEON_VERSION) +GST_BAYER2RGB_NEON_SUFFIX := tar.bz2 +GST_BAYER2RGB_NEON_URL := https://git.phytec.de/gst-bayer2rgb-neon/snapshot/$(GST_BAYER2RGB_NEON).$(GST_BAYER2RGB_NEON_SUFFIX) +GST_BAYER2RGB_NEON_SOURCE := $(SRCDIR)/$(GST_BAYER2RGB_NEON).$(GST_BAYER2RGB_NEON_SUFFIX) +GST_BAYER2RGB_NEON_DIR := $(BUILDDIR)/$(GST_BAYER2RGB_NEON) +GST_BAYER2RGB_NEON_LICENSE := GPL-3.0-only +GST_BAYER2RGB_NEON_LICENSE_FILES:= file://COPYING;md5=d32239bcb673463ab874e80d47fae504 + +# +# Prepare +# + +# +# autoconf +# +GST_BAYER2RGB_NEON_CONF_TOOL := autoconf +GST_BAYER2RGB_NEON_CONF_OPT:= \ + $(CROSS_AUTOCONF_USR) \ + --with-plugindir=/usr/lib/gstreamer-1.0 + +# +# Target-Install +# + +$(STATEDIR)/gst-bayer2rgb-neon.targetinstall: + @$(call targetinfo) + + @$(call install_init, gst-bayer2rgb-neon) + @$(call install_fixup, gst-bayer2rgb-neon,PRIORITY,optional) + @$(call install_fixup, gst-bayer2rgb-neon,SECTION,base) + @$(call install_fixup, gst-bayer2rgb-neon,AUTHOR,"Marian Cichy ") + @$(call install_fixup, gst-bayer2rgb-neon,DESCRIPTION,missing) + + @$(call install_lib, gst-bayer2rgb-neon, 0, 0, 644, \ + gstreamer-1.0/gstbayer2rgbneon) + @$(call install_finish, gst-bayer2rgb-neon) + + @$(call touch) + +# vim: syntax=make -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH v4 2/3] bayer2rgb3: add package
Signed-off-by: Marian Cichy --- Changes since v3: - fix _LICENSE_FILES syntax - add _CONF_TOOL and _CONF_OPT parameters --- rules/bayer2rgb3.in | 18 + rules/bayer2rgb3.make | 63 +++ 2 files changed, 81 insertions(+) create mode 100644 rules/bayer2rgb3.in create mode 100644 rules/bayer2rgb3.make diff --git a/rules/bayer2rgb3.in b/rules/bayer2rgb3.in new file mode 100644 index 0..ecc149c70 --- /dev/null +++ b/rules/bayer2rgb3.in @@ -0,0 +1,18 @@ +## SECTION=multimedia_tools + +menuconfig BAYER2RGB3 + tristate + prompt "bayer2rgb3" + select HOST_GENGETOPT + help + bayer2rgb will convert naked (no header) bayer grid data into rgb data. + +if BAYER2RGB3 + +config BAYER2RGB3_COMMAND_TOOL + bool + prompt "bayer2rgb3 command line tool" + help + install additional command line tool along the lib + +endif diff --git a/rules/bayer2rgb3.make b/rules/bayer2rgb3.make new file mode 100644 index 0..9a0d9b9b5 --- /dev/null +++ b/rules/bayer2rgb3.make @@ -0,0 +1,63 @@ +# -*-makefile-*- +# +# Copyright (C) 2020 by Marian Cichy +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_BAYER2RGB3) += bayer2rgb3 + +# +# Paths and names +# +BAYER2RGB3_VERSION := 0.4.1 +BAYER2RGB3_MD5 := 5362a93d4251eb012d38c1409af0182e +BAYER2RGB3 := bayer2rgb3-$(BAYER2RGB3_VERSION) +BAYER2RGB3_SUFFIX := zip +BAYER2RGB3_URL := https://gitlab-ext.sigma-chemnitz.de/ensc/bayer2rgb/-/archive/master/bayer2rgb-master.zip +BAYER2RGB3_SOURCE := $(SRCDIR)/$(BAYER2RGB3).$(BAYER2RGB3_SUFFIX) +BAYER2RGB3_DIR := $(BUILDDIR)/$(BAYER2RGB3) +BAYER2RGB3_LICENSE := GPL-3.0-only +BAYER2RGB3_LICENSE_FILES := file://COPYING;md5=d32239bcb673463ab874e80d47fae504 + +# +# Prepare +# + +# +# autoconf +# +BAYER2RGB3_CONF_TOOL := autoconf +BAYER2RGB3_CONF_OPT:= \ + $(CROSS_AUTOCONF_USR) \ + --enable-as-needed \ + --$(call ptx/endis, PTXCONF_BAYER2RGB3_COMMAND_TOOL)-cplusplus \ + --$(call ptx/endis, PTXCONF_BAYER2RGB3_COMMAND_TOOL)-c + +# +# Target-Install +# + +$(STATEDIR)/bayer2rgb3.targetinstall: + @$(call targetinfo) + + @$(call install_init, bayer2rgb3) + @$(call install_fixup, bayer2rgb3,PRIORITY,optional) + @$(call install_fixup, bayer2rgb3,SECTION,base) + @$(call install_fixup, bayer2rgb3,AUTHOR,"Marian Cichy ") + @$(call install_fixup, bayer2rgb3,DESCRIPTION,missing) + +ifdef PTXCONF_BAYER2RGB3_COMMAND_TOOL + @$(call install_copy, bayer2rgb3, 0, 0, 0755, -, /usr/bin/bayer2rgb) +endif + @$(call install_lib, bayer2rgb3, 0, 0, 0644, libbayer2rgb3) + + @$(call install_finish, bayer2rgb3) + + @$(call touch) + +# vim: syntax=make -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH v4 1/3] host-gengetopt: add package
Signed-off-by: Marian Cichy --- Changes since v3: - add _CONF_TOOL and _CONF_OPT parameters --- rules/host-gengetopt.in | 9 + rules/host-gengetopt.make | 40 +++ 2 files changed, 49 insertions(+) create mode 100644 rules/host-gengetopt.in create mode 100644 rules/host-gengetopt.make diff --git a/rules/host-gengetopt.in b/rules/host-gengetopt.in new file mode 100644 index 0..f6855ab5f --- /dev/null +++ b/rules/host-gengetopt.in @@ -0,0 +1,9 @@ +## SECTION=hosttools + +config HOST_GENGETOPT + tristate + prompt "gengetopt" + help + Gengetopt is a tool to write command line option + parsing code for C programs. + diff --git a/rules/host-gengetopt.make b/rules/host-gengetopt.make new file mode 100644 index 0..b937ba383 --- /dev/null +++ b/rules/host-gengetopt.make @@ -0,0 +1,40 @@ +# -*-makefile-*- +# +# Copyright (C) 2020 by Marian Cichy +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_GENGETOPT) += host-gengetopt + +# +# Paths and names +# +HOST_GENGETOPT_VERSION := 2.23 +HOST_GENGETOPT_MD5 := ea165d618640dbdecb42ae4491337965 +HOST_GENGETOPT := gengetopt-$(HOST_GENGETOPT_VERSION) +HOST_GENGETOPT_SUFFIX := tar.xz +HOST_GENGETOPT_URL := https://ftp.gnu.org/gnu/gengetopt/$(HOST_GENGETOPT).$(HOST_GENGETOPT_SUFFIX) +HOST_GENGETOPT_SOURCE := $(SRCDIR)/$(HOST_GENGETOPT).$(HOST_GENGETOPT_SUFFIX) +HOST_GENGETOPT_DIR := $(HOST_BUILDDIR)/$(HOST_GENGETOPT) +HOST_GENGETOPT_LICENSE := GPL-3.0-only +HOST_GENGETOPT_LICENSE_FILES := file://COPYING;md5=ff95bfe019feaf92f524b73dd79e76eb + +# +# Prepare +# + +# +# autoconf +# +HOST_GENGETOPT_CONF_TOOL := autoconf +HOST_GENGETOPT_CONF_OPT:= \ + $(HOST_AUTOCONF) \ + --with-gengen=false \ + --with-gengetopt=false + +# vim: syntax=make -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH v3 1/3] host-gengetopt: add package
I understand now that every new version should be a diff relative to the previous version. However, I frigged up by generating v1 in a ptxdist-repo and v2 in a BSP (and now v3 again in ptxdist). So a version-diff now will probably break everything. Sorry for the inconvenience. On 6/5/20 4:46 PM, Marian Cichy wrote: --- rules/host-gengetopt.in | 9 + rules/host-gengetopt.make | 26 ++ 2 files changed, 35 insertions(+) create mode 100644 rules/host-gengetopt.in create mode 100644 rules/host-gengetopt.make diff --git a/rules/host-gengetopt.in b/rules/host-gengetopt.in new file mode 100644 index 0..f6855ab5f --- /dev/null +++ b/rules/host-gengetopt.in @@ -0,0 +1,9 @@ +## SECTION=hosttools + +config HOST_GENGETOPT + tristate + prompt "gengetopt" + help + Gengetopt is a tool to write command line option + parsing code for C programs. + diff --git a/rules/host-gengetopt.make b/rules/host-gengetopt.make new file mode 100644 index 0..2c1b3bb0d --- /dev/null +++ b/rules/host-gengetopt.make @@ -0,0 +1,26 @@ +# -*-makefile-*- +# +# Copyright (C) 2020 by Marian Cichy +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_GENGETOPT) += host-gengetopt + +# +# Paths and names +# +HOST_GENGETOPT_VERSION := 2.23 +HOST_GENGETOPT_MD5 := ea165d618640dbdecb42ae4491337965 +HOST_GENGETOPT := gengetopt-$(HOST_GENGETOPT_VERSION) +HOST_GENGETOPT_SUFFIX := tar.xz +HOST_GENGETOPT_URL := https://ftp.gnu.org/gnu/gengetopt/$(HOST_GENGETOPT).$(HOST_GENGETOPT_SUFFIX) +HOST_GENGETOPT_SOURCE := $(SRCDIR)/$(HOST_GENGETOPT).$(HOST_GENGETOPT_SUFFIX) +HOST_GENGETOPT_DIR := $(HOST_BUILDDIR)/$(HOST_GENGETOPT) +HOST_GENGETOPT_LICENSE := GPL-3.0-only +HOST_GENGETOPT_LICENSE_FILES := file://COPYING;md5=ff95bfe019feaf92f524b73dd79e76eb +# vim: syntax=make ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH v3 1/3] host-gengetopt: add package
--- rules/host-gengetopt.in | 9 + rules/host-gengetopt.make | 26 ++ 2 files changed, 35 insertions(+) create mode 100644 rules/host-gengetopt.in create mode 100644 rules/host-gengetopt.make diff --git a/rules/host-gengetopt.in b/rules/host-gengetopt.in new file mode 100644 index 0..f6855ab5f --- /dev/null +++ b/rules/host-gengetopt.in @@ -0,0 +1,9 @@ +## SECTION=hosttools + +config HOST_GENGETOPT + tristate + prompt "gengetopt" + help + Gengetopt is a tool to write command line option + parsing code for C programs. + diff --git a/rules/host-gengetopt.make b/rules/host-gengetopt.make new file mode 100644 index 0..2c1b3bb0d --- /dev/null +++ b/rules/host-gengetopt.make @@ -0,0 +1,26 @@ +# -*-makefile-*- +# +# Copyright (C) 2020 by Marian Cichy +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_GENGETOPT) += host-gengetopt + +# +# Paths and names +# +HOST_GENGETOPT_VERSION := 2.23 +HOST_GENGETOPT_MD5 := ea165d618640dbdecb42ae4491337965 +HOST_GENGETOPT := gengetopt-$(HOST_GENGETOPT_VERSION) +HOST_GENGETOPT_SUFFIX := tar.xz +HOST_GENGETOPT_URL := https://ftp.gnu.org/gnu/gengetopt/$(HOST_GENGETOPT).$(HOST_GENGETOPT_SUFFIX) +HOST_GENGETOPT_SOURCE := $(SRCDIR)/$(HOST_GENGETOPT).$(HOST_GENGETOPT_SUFFIX) +HOST_GENGETOPT_DIR := $(HOST_BUILDDIR)/$(HOST_GENGETOPT) +HOST_GENGETOPT_LICENSE := GPL-3.0-only +HOST_GENGETOPT_LICENSE_FILES := file://COPYING;md5=ff95bfe019feaf92f524b73dd79e76eb +# vim: syntax=make -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH v3 2/3] bayer2rgb3: add package
--- patches/bayer2rgb3-0.4.1/autogen.sh | 1 + rules/bayer2rgb3.in | 18 +++ rules/bayer2rgb3.make | 49 + 3 files changed, 68 insertions(+) create mode 12 patches/bayer2rgb3-0.4.1/autogen.sh create mode 100644 rules/bayer2rgb3.in create mode 100644 rules/bayer2rgb3.make diff --git a/patches/bayer2rgb3-0.4.1/autogen.sh b/patches/bayer2rgb3-0.4.1/autogen.sh new file mode 12 index 0..9f8a4cb7d --- /dev/null +++ b/patches/bayer2rgb3-0.4.1/autogen.sh @@ -0,0 +1 @@ +../autogen.sh \ No newline at end of file diff --git a/rules/bayer2rgb3.in b/rules/bayer2rgb3.in new file mode 100644 index 0..ecc149c70 --- /dev/null +++ b/rules/bayer2rgb3.in @@ -0,0 +1,18 @@ +## SECTION=multimedia_tools + +menuconfig BAYER2RGB3 + tristate + prompt "bayer2rgb3" + select HOST_GENGETOPT + help + bayer2rgb will convert naked (no header) bayer grid data into rgb data. + +if BAYER2RGB3 + +config BAYER2RGB3_COMMAND_TOOL + bool + prompt "bayer2rgb3 command line tool" + help + install additional command line tool along the lib + +endif diff --git a/rules/bayer2rgb3.make b/rules/bayer2rgb3.make new file mode 100644 index 0..8833e18b0 --- /dev/null +++ b/rules/bayer2rgb3.make @@ -0,0 +1,49 @@ +# -*-makefile-*- +# +# Copyright (C) 2020 by Marian Cichy +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_BAYER2RGB3) += bayer2rgb3 + +# +# Paths and names +# +BAYER2RGB3_VERSION := 0.4.1 +BAYER2RGB3_MD5 := 5362a93d4251eb012d38c1409af0182e +BAYER2RGB3 := bayer2rgb3-$(BAYER2RGB3_VERSION) +BAYER2RGB3_SUFFIX := zip +BAYER2RGB3_URL := https://gitlab-ext.sigma-chemnitz.de/ensc/bayer2rgb/-/archive/master/bayer2rgb-master.zip +BAYER2RGB3_SOURCE := $(SRCDIR)/$(BAYER2RGB3).$(BAYER2RGB3_SUFFIX) +BAYER2RGB3_DIR := $(BUILDDIR)/$(BAYER2RGB3) +BAYER2RGB3_LICENSE := GPL-3.0-only +BAYER2RGB3_LICENSE_FILES := files://COPYING;md5sum=d32239bcb673463ab874e80d47fae504 + +# +# Target-Install +# + +$(STATEDIR)/bayer2rgb3.targetinstall: + @$(call targetinfo) + + @$(call install_init, bayer2rgb3) + @$(call install_fixup, bayer2rgb3,PRIORITY,optional) + @$(call install_fixup, bayer2rgb3,SECTION,base) + @$(call install_fixup, bayer2rgb3,AUTHOR,"Marian Cichy ") + @$(call install_fixup, bayer2rgb3,DESCRIPTION,missing) + +ifdef PTXCONF_BAYER2RGB3_COMMAND_TOOL + @$(call install_copy, bayer2rgb3, 0, 0, 0755, -, /usr/bin/bayer2rgb) +endif + @$(call install_lib, bayer2rgb3, 0, 0, 0644, libbayer2rgb3) + + @$(call install_finish, bayer2rgb3) + + @$(call touch) + +# vim: syntax=make -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH v3 3/3] gst-bayer2rgb-neon: add package
--- patches/gst-bayer2rgb-neon-0.3/autogen.sh | 1 + rules/gst-bayer2rgb-neon.in | 11 + rules/gst-bayer2rgb-neon.make | 56 +++ 3 files changed, 68 insertions(+) create mode 12 patches/gst-bayer2rgb-neon-0.3/autogen.sh create mode 100644 rules/gst-bayer2rgb-neon.in create mode 100644 rules/gst-bayer2rgb-neon.make diff --git a/patches/gst-bayer2rgb-neon-0.3/autogen.sh b/patches/gst-bayer2rgb-neon-0.3/autogen.sh new file mode 12 index 0..9f8a4cb7d --- /dev/null +++ b/patches/gst-bayer2rgb-neon-0.3/autogen.sh @@ -0,0 +1 @@ +../autogen.sh \ No newline at end of file diff --git a/rules/gst-bayer2rgb-neon.in b/rules/gst-bayer2rgb-neon.in new file mode 100644 index 0..1f4feeb8b --- /dev/null +++ b/rules/gst-bayer2rgb-neon.in @@ -0,0 +1,11 @@ +## SECTION=multimedia_gstreamer1 + +config GST_BAYER2RGB_NEON + tristate + prompt "gst-bayer2rgb-neon" + select BAYER2RGB3 + select GSTREAMER1 + select GST_PLUGINS_BASE1 + help + Inofficial Gstreamer-plugin that utilizes + NEON-extension to convert video/x-bayer to RGB. diff --git a/rules/gst-bayer2rgb-neon.make b/rules/gst-bayer2rgb-neon.make new file mode 100644 index 0..eea13ca78 --- /dev/null +++ b/rules/gst-bayer2rgb-neon.make @@ -0,0 +1,56 @@ +# -*-makefile-*- +# +# Copyright (C) 2020 by Marian Cichy +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_GST_BAYER2RGB_NEON) += gst-bayer2rgb-neon + +# +# Paths and names +# +GST_BAYER2RGB_NEON_VERSION := 0.3 +GST_BAYER2RGB_NEON_MD5 := 73f05f8504e29c03d6b1164ee37b4fb9 +GST_BAYER2RGB_NEON := gst-bayer2rgb-neon-$(GST_BAYER2RGB_NEON_VERSION) +GST_BAYER2RGB_NEON_SUFFIX := tar.bz2 +GST_BAYER2RGB_NEON_URL := https://git.phytec.de/gst-bayer2rgb-neon/snapshot/$(GST_BAYER2RGB_NEON).$(GST_BAYER2RGB_NEON_SUFFIX) +GST_BAYER2RGB_NEON_SOURCE := $(SRCDIR)/$(GST_BAYER2RGB_NEON).$(GST_BAYER2RGB_NEON_SUFFIX) +GST_BAYER2RGB_NEON_DIR := $(BUILDDIR)/$(GST_BAYER2RGB_NEON) +GST_BAYER2RGB_NEON_LICENSE := GPL-3.0-only +GST_BAYER2RGB_NEON_LICENSE_FILES:= file://COPYING;md5sum=d32239bcb673463ab874e80d47fae504 + +# +# Prepare +# + +GST_BAYER2RGB_NEON_CONF_ENV:= $(CROSS_ENV) + +GST_BAYER2RGB_NEON_CONF_TOOL := autoconf +GST_BAYER2RGB_NEON_CONF_OPT:= \ + $(CROSS_AUTOCONF_USR) \ + --with-plugindir=/usr/lib/gstreamer-1.0 + +# +# Target-Install +# + +$(STATEDIR)/gst-bayer2rgb-neon.targetinstall: + @$(call targetinfo) + + @$(call install_init, gst-bayer2rgb-neon) + @$(call install_fixup, gst-bayer2rgb-neon,PRIORITY,optional) + @$(call install_fixup, gst-bayer2rgb-neon,SECTION,base) + @$(call install_fixup, gst-bayer2rgb-neon,AUTHOR,"Marian Cichy ") + @$(call install_fixup, gst-bayer2rgb-neon,DESCRIPTION,missing) + + @$(call install_lib, gst-bayer2rgb-neon, 0, 0, 644, gstreamer-1.0/gstbayer2rgbneon) + @$(call install_finish, gst-bayer2rgb-neon) + + @$(call touch) + +# vim: syntax=make -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH v2 1/3] host-gengetopt: add package
On 6/2/20 3:18 PM, Michael Olbrich wrote: On Mon, Jun 01, 2020 at 11:49:39AM +0200, Marian Cichy wrote: this package is a dependency for bayer2rgb3, which is a dependency for gst-bayer2rgb-neon --- This is a v2 patch, so it should be marked as such. I did use git format-patch -v 2 to mark it. Should I also mention v2 in the commit message? configs/ptxconfig | 1 + rules/host-gengetopt.in | 9 + rules/host-gengetopt.make | 26 ++ 3 files changed, 36 insertions(+) create mode 100644 rules/host-gengetopt.in create mode 100644 rules/host-gengetopt.make diff --git a/configs/ptxconfig b/configs/ptxconfig index 972e7615..67200af3 100644 --- a/configs/ptxconfig +++ b/configs/ptxconfig This file does not exist. I guess you created the patch from a BSP? Michael Yes. I thought that we need to update the ptxconfig entries with every new package. @@ -105,6 +105,7 @@ PTXCONF__ptxconfig_MAGIC__=y PTXCONF_HOST_BSDIFF=y # PTXCONF_HOST_DFU_UTIL is not set PTXCONF_HOST_FILE_STACK=y +# PTXCONF_HOST_GENGETOPT is not set # PTXCONF_HOST_OPENOCD is not set # PTXCONF_HOST_QEMU is not set # PTXCONF_HOST_TESTFRAMEWORK is not set diff --git a/rules/host-gengetopt.in b/rules/host-gengetopt.in new file mode 100644 index ..f6855ab5 --- /dev/null +++ b/rules/host-gengetopt.in @@ -0,0 +1,9 @@ +## SECTION=hosttools + +config HOST_GENGETOPT + tristate + prompt "gengetopt" + help + Gengetopt is a tool to write command line option + parsing code for C programs. + diff --git a/rules/host-gengetopt.make b/rules/host-gengetopt.make new file mode 100644 index ..2c1b3bb0 --- /dev/null +++ b/rules/host-gengetopt.make @@ -0,0 +1,26 @@ +# -*-makefile-*- +# +# Copyright (C) 2020 by Marian Cichy +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_GENGETOPT) += host-gengetopt + +# +# Paths and names +# +HOST_GENGETOPT_VERSION := 2.23 +HOST_GENGETOPT_MD5 := ea165d618640dbdecb42ae4491337965 +HOST_GENGETOPT := gengetopt-$(HOST_GENGETOPT_VERSION) +HOST_GENGETOPT_SUFFIX := tar.xz +HOST_GENGETOPT_URL := https://ftp.gnu.org/gnu/gengetopt/$(HOST_GENGETOPT).$(HOST_GENGETOPT_SUFFIX) +HOST_GENGETOPT_SOURCE := $(SRCDIR)/$(HOST_GENGETOPT).$(HOST_GENGETOPT_SUFFIX) +HOST_GENGETOPT_DIR := $(HOST_BUILDDIR)/$(HOST_GENGETOPT) +HOST_GENGETOPT_LICENSE := GPL-3.0-only +HOST_GENGETOPT_LICENSE_FILES := file://COPYING;md5=ff95bfe019feaf92f524b73dd79e76eb +# vim: syntax=make -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de mci ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH v2 3/3] gst-bayer2rgb-neon: add package
--- configs/ptxconfig | 1 + patches/gst-bayer2rgb-neon-0.3/autogen.sh | 1 + rules/gst-bayer2rgb-neon.in | 10 rules/gst-bayer2rgb-neon.make | 56 +++ 4 files changed, 68 insertions(+) create mode 12 patches/gst-bayer2rgb-neon-0.3/autogen.sh create mode 100644 rules/gst-bayer2rgb-neon.in create mode 100644 rules/gst-bayer2rgb-neon.make diff --git a/configs/ptxconfig b/configs/ptxconfig index 16db79a0..d1e896ca 100644 --- a/configs/ptxconfig +++ b/configs/ptxconfig @@ -13,6 +13,7 @@ PTXCONF_FIRMWARE_IMX=y # PTXCONF_FIRMWARE_IMX_VPU_IMX6DL is not set PTXCONF_FIRMWARE_IMX_VPU_IMX6Q=y PTXCONF_FIX_SYSTEMD=y +# PTXCONF_GST_BAYER2RGB_NEON is not set PTXCONF_MTD_HANDLING=y PTXCONF_MTD_HANDLING_UDEV_RULES=y PTXCONF_MTD_HANDLING_MTDDATA_ATTACH_CREATE_MOUNT=y diff --git a/patches/gst-bayer2rgb-neon-0.3/autogen.sh b/patches/gst-bayer2rgb-neon-0.3/autogen.sh new file mode 12 index ..9f8a4cb7 --- /dev/null +++ b/patches/gst-bayer2rgb-neon-0.3/autogen.sh @@ -0,0 +1 @@ +../autogen.sh \ No newline at end of file diff --git a/rules/gst-bayer2rgb-neon.in b/rules/gst-bayer2rgb-neon.in new file mode 100644 index ..653a65b5 --- /dev/null +++ b/rules/gst-bayer2rgb-neon.in @@ -0,0 +1,10 @@ +## SECTION=multimedia_gstreamer1 + +config GST_BAYER2RGB_NEON + tristate + prompt "gst-bayer2rgb-neon" + select BAYER2RGB3 + select GSTREAMER1 + select GST_PLUGINS_BASE1 + help + Inofficial Gstreamer-plugin that utilizes NEON-extension to convert video/x-bayer to RGB. diff --git a/rules/gst-bayer2rgb-neon.make b/rules/gst-bayer2rgb-neon.make new file mode 100644 index ..eea13ca7 --- /dev/null +++ b/rules/gst-bayer2rgb-neon.make @@ -0,0 +1,56 @@ +# -*-makefile-*- +# +# Copyright (C) 2020 by Marian Cichy +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_GST_BAYER2RGB_NEON) += gst-bayer2rgb-neon + +# +# Paths and names +# +GST_BAYER2RGB_NEON_VERSION := 0.3 +GST_BAYER2RGB_NEON_MD5 := 73f05f8504e29c03d6b1164ee37b4fb9 +GST_BAYER2RGB_NEON := gst-bayer2rgb-neon-$(GST_BAYER2RGB_NEON_VERSION) +GST_BAYER2RGB_NEON_SUFFIX := tar.bz2 +GST_BAYER2RGB_NEON_URL := https://git.phytec.de/gst-bayer2rgb-neon/snapshot/$(GST_BAYER2RGB_NEON).$(GST_BAYER2RGB_NEON_SUFFIX) +GST_BAYER2RGB_NEON_SOURCE := $(SRCDIR)/$(GST_BAYER2RGB_NEON).$(GST_BAYER2RGB_NEON_SUFFIX) +GST_BAYER2RGB_NEON_DIR := $(BUILDDIR)/$(GST_BAYER2RGB_NEON) +GST_BAYER2RGB_NEON_LICENSE := GPL-3.0-only +GST_BAYER2RGB_NEON_LICENSE_FILES:= file://COPYING;md5sum=d32239bcb673463ab874e80d47fae504 + +# +# Prepare +# + +GST_BAYER2RGB_NEON_CONF_ENV:= $(CROSS_ENV) + +GST_BAYER2RGB_NEON_CONF_TOOL := autoconf +GST_BAYER2RGB_NEON_CONF_OPT:= \ + $(CROSS_AUTOCONF_USR) \ + --with-plugindir=/usr/lib/gstreamer-1.0 + +# +# Target-Install +# + +$(STATEDIR)/gst-bayer2rgb-neon.targetinstall: + @$(call targetinfo) + + @$(call install_init, gst-bayer2rgb-neon) + @$(call install_fixup, gst-bayer2rgb-neon,PRIORITY,optional) + @$(call install_fixup, gst-bayer2rgb-neon,SECTION,base) + @$(call install_fixup, gst-bayer2rgb-neon,AUTHOR,"Marian Cichy ") + @$(call install_fixup, gst-bayer2rgb-neon,DESCRIPTION,missing) + + @$(call install_lib, gst-bayer2rgb-neon, 0, 0, 644, gstreamer-1.0/gstbayer2rgbneon) + @$(call install_finish, gst-bayer2rgb-neon) + + @$(call touch) + +# vim: syntax=make -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH v2 2/3] bayer2rgb3: add package
this package is a dependency for gst-bayer2rgb-neon --- configs/ptxconfig | 1 + patches/bayer2rgb3-0.4.1/autogen.sh | 1 + rules/bayer2rgb3.in | 18 +++ rules/bayer2rgb3.make | 49 + 4 files changed, 69 insertions(+) create mode 12 patches/bayer2rgb3-0.4.1/autogen.sh create mode 100644 rules/bayer2rgb3.in create mode 100644 rules/bayer2rgb3.make diff --git a/configs/ptxconfig b/configs/ptxconfig index 67200af3..16db79a0 100644 --- a/configs/ptxconfig +++ b/configs/ptxconfig @@ -2,6 +2,7 @@ # Automatically generated file; DO NOT EDIT. # PTXdist 2020.02.0 # +# PTXCONF_BAYER2RGB3 is not set PTXCONF_BOOTCOUNT=y PTXCONF_BOOTCOUNT_SYSTEMD_UNIT=y PTXCONF_COMPOSE_INITRD=y diff --git a/patches/bayer2rgb3-0.4.1/autogen.sh b/patches/bayer2rgb3-0.4.1/autogen.sh new file mode 12 index ..9f8a4cb7 --- /dev/null +++ b/patches/bayer2rgb3-0.4.1/autogen.sh @@ -0,0 +1 @@ +../autogen.sh \ No newline at end of file diff --git a/rules/bayer2rgb3.in b/rules/bayer2rgb3.in new file mode 100644 index ..7e72a5b7 --- /dev/null +++ b/rules/bayer2rgb3.in @@ -0,0 +1,18 @@ +## SECTION=multimedia_tools + +config BAYER2RGB3 + tristate + prompt "bayer2rgb3" + select HOST_GENGETOPT + help + bayer2rgb will convert naked (no header) bayer grid data into rgb data. + +if BAYER2RGB3 +config BAYER2RGB3_COMMAND_TOOL + bool + default n + prompt "bayer2rgb3 command line tool" + help + install additional command line tool along the lib + +endif diff --git a/rules/bayer2rgb3.make b/rules/bayer2rgb3.make new file mode 100644 index ..8833e18b --- /dev/null +++ b/rules/bayer2rgb3.make @@ -0,0 +1,49 @@ +# -*-makefile-*- +# +# Copyright (C) 2020 by Marian Cichy +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_BAYER2RGB3) += bayer2rgb3 + +# +# Paths and names +# +BAYER2RGB3_VERSION := 0.4.1 +BAYER2RGB3_MD5 := 5362a93d4251eb012d38c1409af0182e +BAYER2RGB3 := bayer2rgb3-$(BAYER2RGB3_VERSION) +BAYER2RGB3_SUFFIX := zip +BAYER2RGB3_URL := https://gitlab-ext.sigma-chemnitz.de/ensc/bayer2rgb/-/archive/master/bayer2rgb-master.zip +BAYER2RGB3_SOURCE := $(SRCDIR)/$(BAYER2RGB3).$(BAYER2RGB3_SUFFIX) +BAYER2RGB3_DIR := $(BUILDDIR)/$(BAYER2RGB3) +BAYER2RGB3_LICENSE := GPL-3.0-only +BAYER2RGB3_LICENSE_FILES := files://COPYING;md5sum=d32239bcb673463ab874e80d47fae504 + +# +# Target-Install +# + +$(STATEDIR)/bayer2rgb3.targetinstall: + @$(call targetinfo) + + @$(call install_init, bayer2rgb3) + @$(call install_fixup, bayer2rgb3,PRIORITY,optional) + @$(call install_fixup, bayer2rgb3,SECTION,base) + @$(call install_fixup, bayer2rgb3,AUTHOR,"Marian Cichy ") + @$(call install_fixup, bayer2rgb3,DESCRIPTION,missing) + +ifdef PTXCONF_BAYER2RGB3_COMMAND_TOOL + @$(call install_copy, bayer2rgb3, 0, 0, 0755, -, /usr/bin/bayer2rgb) +endif + @$(call install_lib, bayer2rgb3, 0, 0, 0644, libbayer2rgb3) + + @$(call install_finish, bayer2rgb3) + + @$(call touch) + +# vim: syntax=make -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH v2 1/3] host-gengetopt: add package
this package is a dependency for bayer2rgb3, which is a dependency for gst-bayer2rgb-neon --- configs/ptxconfig | 1 + rules/host-gengetopt.in | 9 + rules/host-gengetopt.make | 26 ++ 3 files changed, 36 insertions(+) create mode 100644 rules/host-gengetopt.in create mode 100644 rules/host-gengetopt.make diff --git a/configs/ptxconfig b/configs/ptxconfig index 972e7615..67200af3 100644 --- a/configs/ptxconfig +++ b/configs/ptxconfig @@ -105,6 +105,7 @@ PTXCONF__ptxconfig_MAGIC__=y PTXCONF_HOST_BSDIFF=y # PTXCONF_HOST_DFU_UTIL is not set PTXCONF_HOST_FILE_STACK=y +# PTXCONF_HOST_GENGETOPT is not set # PTXCONF_HOST_OPENOCD is not set # PTXCONF_HOST_QEMU is not set # PTXCONF_HOST_TESTFRAMEWORK is not set diff --git a/rules/host-gengetopt.in b/rules/host-gengetopt.in new file mode 100644 index ..f6855ab5 --- /dev/null +++ b/rules/host-gengetopt.in @@ -0,0 +1,9 @@ +## SECTION=hosttools + +config HOST_GENGETOPT + tristate + prompt "gengetopt" + help + Gengetopt is a tool to write command line option + parsing code for C programs. + diff --git a/rules/host-gengetopt.make b/rules/host-gengetopt.make new file mode 100644 index ..2c1b3bb0 --- /dev/null +++ b/rules/host-gengetopt.make @@ -0,0 +1,26 @@ +# -*-makefile-*- +# +# Copyright (C) 2020 by Marian Cichy +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_GENGETOPT) += host-gengetopt + +# +# Paths and names +# +HOST_GENGETOPT_VERSION := 2.23 +HOST_GENGETOPT_MD5 := ea165d618640dbdecb42ae4491337965 +HOST_GENGETOPT := gengetopt-$(HOST_GENGETOPT_VERSION) +HOST_GENGETOPT_SUFFIX := tar.xz +HOST_GENGETOPT_URL := https://ftp.gnu.org/gnu/gengetopt/$(HOST_GENGETOPT).$(HOST_GENGETOPT_SUFFIX) +HOST_GENGETOPT_SOURCE := $(SRCDIR)/$(HOST_GENGETOPT).$(HOST_GENGETOPT_SUFFIX) +HOST_GENGETOPT_DIR := $(HOST_BUILDDIR)/$(HOST_GENGETOPT) +HOST_GENGETOPT_LICENSE := GPL-3.0-only +HOST_GENGETOPT_LICENSE_FILES := file://COPYING;md5=ff95bfe019feaf92f524b73dd79e76eb +# vim: syntax=make -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 3/3] gst-bayer2rgb-neon: add package
--- patches/gst-bayer2rgb-neon-0.3/autogen.sh | 1 + rules/gst-bayer2rgb-neon.in | 10 rules/gst-bayer2rgb-neon.make | 56 +++ 3 files changed, 67 insertions(+) create mode 12 patches/gst-bayer2rgb-neon-0.3/autogen.sh create mode 100644 rules/gst-bayer2rgb-neon.in create mode 100644 rules/gst-bayer2rgb-neon.make diff --git a/patches/gst-bayer2rgb-neon-0.3/autogen.sh b/patches/gst-bayer2rgb-neon-0.3/autogen.sh new file mode 12 index 0..9f8a4cb7d --- /dev/null +++ b/patches/gst-bayer2rgb-neon-0.3/autogen.sh @@ -0,0 +1 @@ +../autogen.sh \ No newline at end of file diff --git a/rules/gst-bayer2rgb-neon.in b/rules/gst-bayer2rgb-neon.in new file mode 100644 index 0..653a65b53 --- /dev/null +++ b/rules/gst-bayer2rgb-neon.in @@ -0,0 +1,10 @@ +## SECTION=multimedia_gstreamer1 + +config GST_BAYER2RGB_NEON + tristate + prompt "gst-bayer2rgb-neon" + select BAYER2RGB3 + select GSTREAMER1 + select GST_PLUGINS_BASE1 + help + Inofficial Gstreamer-plugin that utilizes NEON-extension to convert video/x-bayer to RGB. diff --git a/rules/gst-bayer2rgb-neon.make b/rules/gst-bayer2rgb-neon.make new file mode 100644 index 0..fcb518f23 --- /dev/null +++ b/rules/gst-bayer2rgb-neon.make @@ -0,0 +1,56 @@ +# -*-makefile-*- +# +# Copyright (C) 2020 by Marian Cichy +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_GST_BAYER2RGB_NEON) += gst-bayer2rgb-neon + +# +# Paths and names +# +GST_BAYER2RGB_NEON_VERSION := 0.3 +GST_BAYER2RGB_NEON_MD5 := 73f05f8504e29c03d6b1164ee37b4fb9 +GST_BAYER2RGB_NEON := gst-bayer2rgb-neon-$(GST_BAYER2RGB_NEON_VERSION) +GST_BAYER2RGB_NEON_SUFFIX := tar.bz2 +GST_BAYER2RGB_NEON_URL := https://git.phytec.de/gst-bayer2rgb-neon/snapshot/$(GST_BAYER2RGB_NEON).$(GST_BAYER2RGB_NEON_SUFFIX) +GST_BAYER2RGB_NEON_SOURCE := $(SRCDIR)/$(GST_BAYER2RGB_NEON).$(GST_BAYER2RGB_NEON_SUFFIX) +GST_BAYER2RGB_NEON_DIR := $(BUILDDIR)/$(GST_BAYER2RGB_NEON) +GST_BAYER2RGB_NEON_LICENSE := GPL-3.0 +GST_BAYER2RGB_NEON_LICENSE_FILES:= file://COPYING;md5sum=d32239bcb673463ab874e80d47fae504 + +# +# Prepare +# + +GST_BAYER2RGB_NEON_CONF_ENV:= $(CROSS_ENV) + +GST_BAYER2RGB_NEON_CONF_TOOL := autoconf +GST_BAYER2RGB_NEON_CONF_OPT:= \ + $(CROSS_AUTOCONF_USR) \ + --with-plugindir=/usr/lib/gstreamer-1.0 + +# +# Target-Install +# + +$(STATEDIR)/gst-bayer2rgb-neon.targetinstall: + @$(call targetinfo) + + @$(call install_init, gst-bayer2rgb-neon) + @$(call install_fixup, gst-bayer2rgb-neon,PRIORITY,optional) + @$(call install_fixup, gst-bayer2rgb-neon,SECTION,base) + @$(call install_fixup, gst-bayer2rgb-neon,AUTHOR,"Marian Cichy ") + @$(call install_fixup, gst-bayer2rgb-neon,DESCRIPTION,missing) + + @$(call install_lib, gst-bayer2rgb-neon, 0, 0, 644, gstreamer-1.0/gstbayer2rgbneon) + @$(call install_finish, gst-bayer2rgb-neon) + + @$(call touch) + +# vim: syntax=make -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/3] bayer2rgb3: add package
--- patches/bayer2rgb3-0.4.1/autogen.sh | 1 + rules/bayer2rgb3.in | 8 + rules/bayer2rgb3.make | 47 + 3 files changed, 56 insertions(+) create mode 12 patches/bayer2rgb3-0.4.1/autogen.sh create mode 100644 rules/bayer2rgb3.in create mode 100644 rules/bayer2rgb3.make diff --git a/patches/bayer2rgb3-0.4.1/autogen.sh b/patches/bayer2rgb3-0.4.1/autogen.sh new file mode 12 index 0..9f8a4cb7d --- /dev/null +++ b/patches/bayer2rgb3-0.4.1/autogen.sh @@ -0,0 +1 @@ +../autogen.sh \ No newline at end of file diff --git a/rules/bayer2rgb3.in b/rules/bayer2rgb3.in new file mode 100644 index 0..8a184e577 --- /dev/null +++ b/rules/bayer2rgb3.in @@ -0,0 +1,8 @@ +## SECTION=multimedia_tools + +config BAYER2RGB3 + tristate + prompt "bayer2rgb3" + select HOST_GENGETOPT + help + bayer2rgb will convert naked (no header) bayer grid data into rgb data. diff --git a/rules/bayer2rgb3.make b/rules/bayer2rgb3.make new file mode 100644 index 0..28de61896 --- /dev/null +++ b/rules/bayer2rgb3.make @@ -0,0 +1,47 @@ +# -*-makefile-*- +# +# Copyright (C) 2020 by Marian Cichy +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_BAYER2RGB3) += bayer2rgb3 + +# +# Paths and names +# +BAYER2RGB3_VERSION := 0.4.1 +BAYER2RGB3_MD5 := 5362a93d4251eb012d38c1409af0182e +BAYER2RGB3 := bayer2rgb3-$(BAYER2RGB3_VERSION) +BAYER2RGB3_SUFFIX := zip +BAYER2RGB3_URL := https://gitlab-ext.sigma-chemnitz.de/ensc/bayer2rgb/-/archive/master/bayer2rgb-master.zip +BAYER2RGB3_SOURCE := $(SRCDIR)/$(BAYER2RGB3).$(BAYER2RGB3_SUFFIX) +BAYER2RGB3_DIR := $(BUILDDIR)/$(BAYER2RGB3) +BAYER2RGB3_LICENSE := GPL-3.0 +BAYER2RGB3_LICENSE_FILES := files://COPYING;md5sum=d32239bcb673463ab874e80d47fae504 + +# +# Target-Install +# + +$(STATEDIR)/bayer2rgb3.targetinstall: + @$(call targetinfo) + + @$(call install_init, bayer2rgb3) + @$(call install_fixup, bayer2rgb3,PRIORITY,optional) + @$(call install_fixup, bayer2rgb3,SECTION,base) + @$(call install_fixup, bayer2rgb3,AUTHOR,"Marian Cichy ") + @$(call install_fixup, bayer2rgb3,DESCRIPTION,missing) + + @$(call install_copy, bayer2rgb3, 0, 0, 0755, -, /usr/bin/bayer2rgb) + @$(call install_lib, bayer2rgb3, 0, 0, 0644, libbayer2rgb3) + + @$(call install_finish, bayer2rgb3) + + @$(call touch) + +# vim: syntax=make -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/3] host-gengetopt: add package
--- rules/host-gengetopt.in | 9 + rules/host-gengetopt.make | 26 ++ 2 files changed, 35 insertions(+) create mode 100644 rules/host-gengetopt.in create mode 100644 rules/host-gengetopt.make diff --git a/rules/host-gengetopt.in b/rules/host-gengetopt.in new file mode 100644 index 0..f6855ab5f --- /dev/null +++ b/rules/host-gengetopt.in @@ -0,0 +1,9 @@ +## SECTION=hosttools + +config HOST_GENGETOPT + tristate + prompt "gengetopt" + help + Gengetopt is a tool to write command line option + parsing code for C programs. + diff --git a/rules/host-gengetopt.make b/rules/host-gengetopt.make new file mode 100644 index 0..d1edf3439 --- /dev/null +++ b/rules/host-gengetopt.make @@ -0,0 +1,26 @@ +# -*-makefile-*- +# +# Copyright (C) 2020 by Marian Cichy +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_GENGETOPT) += host-gengetopt + +# +# Paths and names +# +HOST_GENGETOPT_VERSION := 2.23 +HOST_GENGETOPT_MD5 := ea165d618640dbdecb42ae4491337965 +HOST_GENGETOPT := gengetopt-$(HOST_GENGETOPT_VERSION) +HOST_GENGETOPT_SUFFIX := tar.xz +HOST_GENGETOPT_URL := https://ftp.gnu.org/gnu/gengetopt/$(HOST_GENGETOPT).$(HOST_GENGETOPT_SUFFIX) +HOST_GENGETOPT_SOURCE := $(SRCDIR)/$(HOST_GENGETOPT).$(HOST_GENGETOPT_SUFFIX) +HOST_GENGETOPT_DIR := $(HOST_BUILDDIR)/$(HOST_GENGETOPT) +HOST_GENGETOPT_LICENSE := GPL-3.0 +HOST_GENGETOPT_LICENSE_FILES := file://COPYING;md5=ff95bfe019feaf92f524b73dd79e76eb +# vim: syntax=make -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v4 3/8] OpenCV: Clean up configure_helper output
Signed-off-by: Marian Cichy --- rules/opencv.make | 161 +++--- 1 file changed, 109 insertions(+), 52 deletions(-) diff --git a/rules/opencv.make b/rules/opencv.make index 1d97066a1..e08d90a3b 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -27,7 +27,7 @@ OPENCV_URL:= \ OPENCV_SOURCE := $(SRCDIR)/$(OPENCV).$(OPENCV_SUFFIX) OPENCV_DIR := $(BUILDDIR)/$(OPENCV) OPENCV_LICENSE := BSD - +OPENCV_BUILD_DIR := $(OPENCV_DIR)-build # # Prepare # @@ -37,94 +37,153 @@ OPENCV_CONF_TOOL := cmake OPENCV_CONF_OPT:= \ $(CROSS_CMAKE_USR) \ -DANT_EXECUTABLE:FILEPATH= \ - -DPYTHON_EXECUTABLE= \ + -DBUILD_CUDA_STUBS:BOOL=OFF \ -DBUILD_DOCS:BOOL=OFF \ -DBUILD_EXAMPLES:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_EXAMPLES) \ + -DBUILD_ITT=ON \ + -DBUILD_JASPER=OFF \ + -DBUILD_JAVA=OFF \ + -DBUILD_JPEG=OFF \ + -DBUILD_LIST= \ + -DBUILD_OPENEXR=OFF \ -DBUILD_PACKAGE:BOOL=OFF \ - -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_PERF_TESTS=OFF \ + -DBUILD_PNG=OFF \ + -DBUILD_PROTOBUF=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DBUILD_TBB=OFF \ -DBUILD_TESTS=OFF \ - -DBUILD_PERF_TESTS=OFF \ + -DBUILD_TIFF=OFF \ + -DBUILD_USE_SYMLINKS=OFF \ + -DBUILD_WEBP=OFF \ -DBUILD_WITH_DEBUG_INFO=OFF \ - -DBUILD_CUDA_STUBS:BOOL=OFF \ - -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_USE_RELATIVE_PATHS=OFF \ + -DBUILD_WITH_DYNAMIC_IPP=OFF \ + -DBUILD_ZLIB=OFF \ + -DBUILD_opencv_apps:BOOL=OFF \ + -DBUILD_opencv_calib3d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_CALIB3D,ON,OFF) \ + -DBUILD_opencv_core:BOOL=ON \ + -DBUILD_opencv_dnn=OFF \ + -DBUILD_opencv_features2d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FEATURES2D,ON,OFF) \ + -DBUILD_opencv_flann:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FLANN,ON,OFF) \ + -DBUILD_opencv_highgui:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_HIGHGUI,ON,OFF) \ + -DBUILD_opencv_imgcodecs=$(call ptx/ifdef,PTXCONF_OPENCV_IMGCODECS,ON,OFF) \ + -DBUILD_opencv_imgproc:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_IMGPROC,ON,OFF) \ + -DBUILD_opencv_java_bindings_generator=ON \ + -DBUILD_opencv_js=OFF \ + -DBUILD_opencv_ml:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_ML,ON,OFF) \ + -DBUILD_opencv_objdetect:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_OBJDETECT,ON,OFF) \ + -DBUILD_opencv_photo:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_PHOTO,ON,OFF) \ + -DBUILD_opencv_python_bindings_generator=ON \ + -DBUILD_opencv_python_tests=ON \ + -DBUILD_opencv_stitching:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_STITCHING,ON,OFF) \ + -DBUILD_opencv_ts:BOOL=OFF \ + -DBUILD_opencv_video:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_VIDEO,ON,OFF) \ + -DBUILD_opencv_videoio:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_VIDEOIO) \ + -DBUILD_opencv_world:BOOL=OFF \ + -DCAROTENE_NS=carotene_o4t \ + -DCPU_BASELINE=DETECT \ + -DCPU_DISPATCH= \ + -DCV_DISABLE_OPTIMIZATION=OFF \ + -DCV_ENABLE_INTRINSICS=ON \ + -DCV_TRACE=ON \ + -DENABLE_BUILD_HARDENING=OFF \ + -DENABLE_CCACHE=OFF \ + -DENABLE_CONFIG_VERIFICATION=OFF \ + -DENABLE_COVERAGE=OFF \ -DENABLE_FAST_MATH=ON \ + -DENABLE_GNU_STL_DEBUG=OFF \ + -DENABLE_IMPL_COLLECTION=OFF \ + -DENABLE_INSTRUMENTATION=OFF \ + -DENABLE_LTO=OFF \ + -DENABLE_NEON:BOOL=$(call ptx/ifdef,PTXCONF_ARCH_ARM_NEON,ON,OFF) \ -DENABLE_NOISY_WARNINGS=OFF \ -DENABLE_OMIT_FRAME_POINTER=ON \ - -DENABLE_PRECOMPILED_HEADERS=OFF \ + -DENABLE_PIC=ON \ -DENABLE_PROFILING=OFF \ -DENABLE_SOLUTION_FOLDERS=OFF \ - -DWITH_GTK:BOOL=OFF \ - -DWITH_TBB:BOOL=OFF \ - -DWITH_TIFF:BOOL=OFF \ - -DWITH_CUDA:BOOL=OFF \ - -DWITH_EIGEN:BOOL=OFF \ - -DENABLE_NEON:BOOL=$(call ptx/ifdef,PTXCONF_ARCH_ARM_NEON,ON,OFF) \ -DENABLE_VFPV3:BOOL=OFF \ - -DWITH_GIGEAPI:BOOL=OFF \ + -DGENERATE_ABI_DESCRIPTOR=OFF \ -DINSTALL_CREATE_DISTRIB:BOOL=OFF \ - -DINSTALL_C_EXAMPLES:BOOL=OFF \ + -DINSTALL_C_EXAMPLES:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_EXAMPLES) \ -DINSTALL_PYTHON_EXAMPLES:BOOL=OFF \ + -DINSTALL_TESTS=OFF \ -DINSTALL_TO_MANGLED_PATHS:BOOL=OFF \ + -DMKL_WITH_OPENMP=OFF \ + -DMKL_WITH_TBB=OFF \ + -DOPENCV_DOWNLOAD_PATH=$(OPENCV_DIR)/.cache \ + -DOPENCV_DUMP_HOOKS_FLOW=OFF \ + -DOPENCV_ENABLE_MEMALIGN=ON \ + -DOPENCV_ENABLE_MEMORY_SANITIZER=OFF \ + -DOPENCV_ENABLE_NONFREE=OFF \ -DOPENCV_EXTRA_MODULES_PATH:PATH= \ + -DOPENCV_FORCE_3RDPARTY_BUILD=OFF
[ptxdist] [PATCH v4 4/8] OpenCV: Changed QT-Support from 4 to 5
Signed-off-by: Marian Cichy --- rules/opencv.in | 7 +++ rules/opencv.make | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/rules/opencv.in b/rules/opencv.in index e8b9e36df..16e7b56db 100644 --- a/rules/opencv.in +++ b/rules/opencv.in @@ -8,10 +8,9 @@ menuconfig OPENCV select ZLIB select LIBPNG select LIBJPEG - select QT4 if OPENCV_QT - select QT4_BUILD_QTESTLIB if OPENCV_QT - select QT4_BUILD_GUIif OPENCV_QT - select QT4_STL if OPENCV_QT + select QT5 if OPENCV_QT + select QT5_TEST if OPENCV_QT + select QT5_GUI if OPENCV_QT select GSTREAMERif OPENCV_GSTREAMER select V4L_UTILSif OPENCV_V4L_LIBV4L2 select V4L_UTILS_LIBV4L1if OPENCV_V4L_LIBV4L2 diff --git a/rules/opencv.make b/rules/opencv.make index e08d90a3b..1cc692855 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -170,7 +170,7 @@ OPENCV_CONF_OPT := \ -DWITH_PROTOBUF=ON \ -DWITH_PTHREADS_PF:BOOL=OFF \ -DWITH_PVAPI:BOOL=OFF \ - -DWITH_QT:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_QT,4,OFF) \ + -DWITH_QT:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_QT,5,OFF) \ -DWITH_QUIRC=ON \ -DWITH_TBB:BOOL=OFF \ -DWITH_TIFF:BOOL=OFF \ -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v4 8/8] OpenCV: make build generate pkg-config file
OpenCV usually depends on CMake when some application wants to find its libraries. However, PTXDist usually relies on pkg-config when building custom software. NOTE: This is a workaround since OpenCV marks the usage of pkg-config as deprecated. --- rules/opencv.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/opencv.make b/rules/opencv.make index 73582af38..ce10e9033 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -182,6 +182,7 @@ OPENCV_CONF_OPT := \ -DWITH_WEBP:BOOL=OFF \ -DWITH_XIMEA:BOOL=OFF \ -DWITH_XINE:BOOL=OFF \ + -DOPENCV_GENERATE_PKGCONFIG=ON \ $(STATEDIR)/opencv.install: -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v4 6/8] OpenCV: changed ptx/ifdef usage to ptx/onoff
CMake switches used ptx/ifdef with an ON/OFF define, but we have ptx/onoff for this case. Using this to sustain uniformity. Signed-off-by: Marian Cichy --- rules/opencv.make | 32 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/rules/opencv.make b/rules/opencv.make index 9ec11dc51..50bcd5997 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -60,25 +60,25 @@ OPENCV_CONF_OPT := \ -DBUILD_WITH_DYNAMIC_IPP=OFF \ -DBUILD_ZLIB=OFF \ -DBUILD_opencv_apps:BOOL=OFF \ - -DBUILD_opencv_calib3d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_CALIB3D,ON,OFF) \ + -DBUILD_opencv_calib3d:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_CALIB3D) \ -DBUILD_opencv_core:BOOL=ON \ - -DBUILD_opencv_dnn=$(call ptx/ifdef,PTXCONF_OPENCV_DNN,ON,OFF) \ - -DBUILD_opencv_features2d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FEATURES2D,ON,OFF) \ - -DBUILD_opencv_flann:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FLANN,ON,OFF) \ - -DBUILD_opencv_highgui:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_HIGHGUI,ON,OFF) \ - -DBUILD_opencv_imgcodecs=$(call ptx/ifdef,PTXCONF_OPENCV_IMGCODECS,ON,OFF) \ - -DBUILD_opencv_imgproc:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_IMGPROC,ON,OFF) \ + -DBUILD_opencv_dnn=$(call ptx/onff,PTXCONF_OPENCV_DNN) \ + -DBUILD_opencv_features2d:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_FEATURES2D) \ + -DBUILD_opencv_flann:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_FLANN) \ + -DBUILD_opencv_highgui:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_HIGHGUI) \ + -DBUILD_opencv_imgcodecs=$(call ptx/onoff,PTXCONF_OPENCV_IMGCODECS) \ + -DBUILD_opencv_imgproc:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_IMGPROC) \ -DBUILD_opencv_java_bindings_generator=ON \ -DBUILD_opencv_js=OFF \ - -DBUILD_opencv_ml:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_ML,ON,OFF) \ - -DBUILD_opencv_objdetect:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_OBJDETECT,ON,OFF) \ - -DBUILD_opencv_photo:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_PHOTO,ON,OFF) \ + -DBUILD_opencv_ml:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_ML) \ + -DBUILD_opencv_objdetect:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_OBJDETECT) \ + -DBUILD_opencv_photo:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_PHOTO) \ -DBUILD_opencv_python_bindings_generator=ON \ -DBUILD_opencv_python_tests=ON \ - -DBUILD_opencv_stitching:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_STITCHING,ON,OFF) \ + -DBUILD_opencv_stitching:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_STITCHING) \ -DBUILD_opencv_ts:BOOL=OFF \ - -DBUILD_opencv_video:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_VIDEO,ON,OFF) \ -DBUILD_opencv_videoio:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_VIDEOIO) \ + -DBUILD_opencv_video:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_VIDEO) \ -DBUILD_opencv_world:BOOL=OFF \ -DCAROTENE_NS=carotene_o4t \ -DCPU_BASELINE=DETECT \ @@ -95,7 +95,7 @@ OPENCV_CONF_OPT := \ -DENABLE_IMPL_COLLECTION=OFF \ -DENABLE_INSTRUMENTATION=OFF \ -DENABLE_LTO=OFF \ - -DENABLE_NEON:BOOL=$(call ptx/ifdef,PTXCONF_ARCH_ARM_NEON,ON,OFF) \ + -DENABLE_NEON:BOOL=$(call ptx/onoff,PTXCONF_ARCH_ARM_NEON) \ -DENABLE_NOISY_WARNINGS=OFF \ -DENABLE_OMIT_FRAME_POINTER=ON \ -DENABLE_PIC=ON \ @@ -136,7 +136,7 @@ OPENCV_CONF_OPT := \ -DWITH_GDCM=OFF \ -DWITH_GIGEAPI:BOOL=OFF \ -DWITH_GPHOTO2:BOOL=OFF \ - -DWITH_GSTREAMER:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_GSTREAMER,ON,OFF) \ + -DWITH_GSTREAMER:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_GSTREAMER) \ -DWITH_GTK:BOOL=OFF \ -DWITH_GTK_2_X=OFF \ -DWITH_HALIDE=OFF \ @@ -153,7 +153,7 @@ OPENCV_CONF_OPT := \ -DWITH_JPEG:BOOL=ON \ -DWITH_LAPACK=ON \ -DWITH_LIBREALSENSE=OFF \ - -DWITH_LIBV4L:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_V4L_LIBV4L2,ON,OFF) \ + -DWITH_LIBV4L:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_V4L_LIBV4L2) \ -DWITH_MFX=OFF \ -DWITH_NVCUVID:BOOL=OFF \ -DWITH_OPENCL:BOOL=ON \ @@ -175,7 +175,7 @@ OPENCV_CONF_OPT := \ -DWITH_TBB:BOOL=OFF \ -DWITH_TIFF:BOOL=OFF \ -DWITH_UNICAP:BOOL=OFF \ - -DWITH_V4L:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_V4L,ON,OFF) \ + -DWITH_V4L:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_V4L) \ -DWITH_VA=OFF \ -DWITH_VA_INTEL=OFF \ -DWITH_VULKAN=OFF \ -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v4 1/8] OpenCV: Update to Version 4.1.2.
Removed the modules opencv_superres and opencv_videostab because they are not part of the opencv main repository anymore but have been moved to the opencv_contrib repository. Signed-off-by: Marian Cichy --- rules/opencv.in | 66 + rules/opencv.make | 68 +++ 2 files changed, 41 insertions(+), 93 deletions(-) diff --git a/rules/opencv.in b/rules/opencv.in index cd43563ea..37fd32758 100644 --- a/rules/opencv.in +++ b/rules/opencv.in @@ -1,6 +1,4 @@ -## SECTION=staging -## old section: -### SECTION=multimedia_libs +## SECTION=multimedia_libs menuconfig OPENCV tristate @@ -21,9 +19,6 @@ menuconfig OPENCV help Open Source Computer Vision Library - STAGING: remove in ptxdist-2020.06.0 - Old version that need to be updated. Fails to build with gcc >= 7.x. - if OPENCV config OPENCV_CALIB3D @@ -33,17 +28,6 @@ config OPENCV_CALIB3D help Camera Calibration and 3D Reconstruction -config OPENCV_CONTRIB - bool - prompt "contrib" - select OPENCV_CALIB3D - select OPENCV_IMGPROC - select OPENCV_ML - select OPENCV_OBJDETECT - select OPENCV_VIDEO - help - Contributed/Experimental Stuff - config OPENCV_FEATURES2D bool prompt "features2d" @@ -58,16 +42,6 @@ config OPENCV_FLANN help Clustering and Search in Multi-Dimensional Spaces -config OPENCV_GPU - bool - prompt "gpu" - select OPENCV_LEGACY - select OPENCV_PHOTO - select OPENCV_OBJDETECT - select OPENCV_HIGHGUI - help - GPU-accelerated Computer Vision - config OPENCV_HIGHGUI bool prompt "highgui" @@ -81,14 +55,11 @@ config OPENCV_IMGPROC help Image Processing -config OPENCV_LEGACY +config OPENCV_IMGCODECS bool - prompt "legacy" - select OPENCV_CALIB3D - select OPENCV_ML - select OPENCV_VIDEO + prompt "imgcodecs" help - Deprecated stuff + Image Codecs config OPENCV_ML bool @@ -96,15 +67,6 @@ config OPENCV_ML help Machine Learning -config OPENCV_NONFREE - bool - prompt "nonfree" - select OPENCV_CALIB3D - select OPENCV_IMGPROC - select OPENCV_FEATURES2D - help - Non-free functionality - config OPENCV_OBJDETECT bool prompt "objdetect" @@ -128,14 +90,6 @@ config OPENCV_STITCHING help Images stitching -config OPENCV_SUPERRES - bool - prompt "superres" - select OPENCV_IMGPROC - select OPENCV_VIDEO - help - Super Resolution - config OPENCV_VIDEO bool prompt "video" @@ -143,17 +97,11 @@ config OPENCV_VIDEO help Video Analysis -config OPENCV_VIDEOSTAB +config OPENCV_VIDEOIO bool - prompt "videostab" - select OPENCV_CALIB3D - select OPENCV_FEATURES2D - select OPENCV_HIGHGUI - select OPENCV_OBJDETECT - select OPENCV_PHOTO - select OPENCV_VIDEO + prompt "videoio" help - Video Stabilization + Video I/O config OPENCV_GSTREAMER bool diff --git a/rules/opencv.make b/rules/opencv.make index 65125e3b7..44ee4fd0c 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -17,14 +17,13 @@ PACKAGES-$(PTXCONF_OPENCV) += opencv # Paths and names # -OPENCV_VERSION := 2.4.8 -OPENCV_MD5 := 50cc1433b3654074206f5b3dbfd49848 \ - 5270b5b5480d3f02018e14a953dc3720 +OPENCV_VERSION := 4.1.2 +OPENCV_MD5 := 6b390578d57131ae9d6c2a183257399d OPENCV := opencv-$(OPENCV_VERSION) OPENCV_SUFFIX := zip OPENCV_URL := \ $(call ptx/mirror, SF, opencvlibrary/opencv-unix/$(OPENCV_VERSION)/$(OPENCV).$(OPENCV_SUFFIX)) \ - https://github.com/Itseez/opencv/archive/$(OPENCV_VERSION).$(OPENCV_SUFFIX) + https://github.com/opencv/opencv/archive/$(OPENCV_VERSION).$(OPENCV_SUFFIX) OPENCV_SOURCE := $(SRCDIR)/$(OPENCV).$(OPENCV_SUFFIX) OPENCV_DIR := $(BUILDDIR)/$(OPENCV) OPENCV_LICENSE := BSD @@ -47,6 +46,7 @@ OPENCV_CONF_OPT := \ -DBUILD_TESTS=OFF \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_WITH_DEBUG_INFO=OFF \ + -DBUILD_CUDA_STUBS:BOOL=OFF \ -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF \ -DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_USE_RELATIVE_PATHS=OFF \ @@ -56,14 +56,12 @@ OPENCV_CONF_OPT := \ -DENABLE_PRECOMPILED_HEADERS=OFF \ -DENABLE_PROFILING=OFF \ -DENABLE_SOLUTION_FOLDERS=OFF \ - -DOPENCV_CAN_BREAK_BINARY_COMPATIBILITY=ON \ -DWITH_GTK:BOOL=OFF \ -DWITH_TBB:BOOL=OFF \ -DWITH_TIFF:BOOL=OFF \ - -DCMAKE_VERBOSE:BOOL=OFF \
[ptxdist] [PATCH v4 5/8] OpenCV: added switch to turn on/off DNN support
Signed-off-by: Marian Cichy --- rules/opencv.in | 6 ++ rules/opencv.make | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/rules/opencv.in b/rules/opencv.in index 16e7b56db..a917d79c7 100644 --- a/rules/opencv.in +++ b/rules/opencv.in @@ -102,6 +102,12 @@ config OPENCV_VIDEOIO help Video I/O +config OPENCV_DNN + bool + prompt "DNN" + help + Deep Neural Network Library + config OPENCV_GSTREAMER bool prompt "gstreamer" diff --git a/rules/opencv.make b/rules/opencv.make index 1cc692855..9ec11dc51 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -62,7 +62,7 @@ OPENCV_CONF_OPT := \ -DBUILD_opencv_apps:BOOL=OFF \ -DBUILD_opencv_calib3d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_CALIB3D,ON,OFF) \ -DBUILD_opencv_core:BOOL=ON \ - -DBUILD_opencv_dnn=OFF \ + -DBUILD_opencv_dnn=$(call ptx/ifdef,PTXCONF_OPENCV_DNN,ON,OFF) \ -DBUILD_opencv_features2d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FEATURES2D,ON,OFF) \ -DBUILD_opencv_flann:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FLANN,ON,OFF) \ -DBUILD_opencv_highgui:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_HIGHGUI,ON,OFF) \ -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v4 7/8] OpenCV: Update to version 4.2.0
Update version and add new dependencies --- rules/opencv.in | 1 + rules/opencv.make | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rules/opencv.in b/rules/opencv.in index a917d79c7..8380506ad 100644 --- a/rules/opencv.in +++ b/rules/opencv.in @@ -99,6 +99,7 @@ config OPENCV_VIDEO config OPENCV_VIDEOIO bool prompt "videoio" + select OPENCV_IMGCODECS help Video I/O diff --git a/rules/opencv.make b/rules/opencv.make index 50bcd5997..73582af38 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_OPENCV) += opencv # Paths and names # -OPENCV_VERSION := 4.1.2 -OPENCV_MD5 := 6b390578d57131ae9d6c2a183257399d +OPENCV_VERSION := 4.2.0 +OPENCV_MD5 := b02b54115f1f99cb9e885d1e5988ff70 OPENCV := opencv-$(OPENCV_VERSION) OPENCV_SUFFIX := zip OPENCV_URL := \ -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v4 2/8] OpenCV: Added flag to build and integrate Examples
Signed-off-by: Marian Cichy --- rules/opencv.in | 17 + rules/opencv.make | 13 ++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/rules/opencv.in b/rules/opencv.in index 37fd32758..e8b9e36df 100644 --- a/rules/opencv.in +++ b/rules/opencv.in @@ -131,4 +131,21 @@ config OPENCV_QT help QT GUI Support +config OPENCV_EXAMPLES + bool + prompt "Build Examples" + select OPENCV_IMGPROC + select OPENCV_FLANN + select OPENCV_IMGCODECS + select OPENCV_VIDEOIO + select OPENCV_HIGHGUI + select OPENCV_ML + select OPENCV_VIDEO + select OPENCV_OBJDETECT + select OPENCV_PHOTO + select OPENCV_FEATURES2D + select OPENCV_CALIB3D + select OPENCV_STITCHING + help + Build the OpenCV example applications and install them into /usr/share/opencv/examples. endif diff --git a/rules/opencv.make b/rules/opencv.make index 44ee4fd0c..1d97066a1 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -39,7 +39,7 @@ OPENCV_CONF_OPT := \ -DANT_EXECUTABLE:FILEPATH= \ -DPYTHON_EXECUTABLE= \ -DBUILD_DOCS:BOOL=OFF \ - -DBUILD_EXAMPLES:BOOL=OFF \ + -DBUILD_EXAMPLES:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_EXAMPLES) \ -DBUILD_PACKAGE:BOOL=OFF \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS:BOOL=ON \ @@ -122,6 +122,14 @@ OPENCV_CONF_OPT:= \ -DWITH_OPENGL:BOOL=OFF \ -DWITH_QT:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_QT,4,OFF) + +OPENCV_BUILD_DIR := $(OPENCV_DIR)-build + +$(STATEDIR)/opencv.install: + @$(call targetinfo) + @$(call world/install, OPENCV) + @$(call touch) + # # Target-Install # @@ -153,9 +161,8 @@ $(STATEDIR)/opencv.targetinstall: @$(foreach lib, $(OPENCV_LIBS-y), \ $(call install_lib, opencv, 0, 0, 0644, $(lib));) - + @$(call install_tree, opencv, 0, 0, $(OPENCV_BUILD_DIR)/bin, /bin) @$(call install_finish, opencv) - @$(call touch) # vim: syntax=make -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v3 7/8] OpenCV: Update to version 4.2.0
Update version and add new dependencies --- rules/opencv.in | 13 + rules/opencv.make | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/rules/opencv.in b/rules/opencv.in index 12b44606f..8380506ad 100644 --- a/rules/opencv.in +++ b/rules/opencv.in @@ -99,6 +99,7 @@ config OPENCV_VIDEO config OPENCV_VIDEOIO bool prompt "videoio" + select OPENCV_IMGCODECS help Video I/O @@ -139,6 +140,18 @@ config OPENCV_QT config OPENCV_EXAMPLES bool prompt "Build Examples" + select OPENCV_IMGPROC + select OPENCV_FLANN + select OPENCV_IMGCODECS + select OPENCV_VIDEOIO + select OPENCV_HIGHGUI + select OPENCV_ML + select OPENCV_VIDEO + select OPENCV_OBJDETECT + select OPENCV_PHOTO + select OPENCV_FEATURES2D + select OPENCV_CALIB3D + select OPENCV_STITCHING help Build the OpenCV example applications and install them into /usr/share/opencv/examples. endif diff --git a/rules/opencv.make b/rules/opencv.make index 029293225..9d8120040 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_OPENCV) += opencv # Paths and names # -OPENCV_VERSION := 4.1.2 -OPENCV_MD5 := 6b390578d57131ae9d6c2a183257399d +OPENCV_VERSION := 4.2.0 +OPENCV_MD5 := b02b54115f1f99cb9e885d1e5988ff70 OPENCV := opencv-$(OPENCV_VERSION) OPENCV_SUFFIX := zip OPENCV_URL := \ -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v3 5/8] OpenCV: added switch to turn on/off DNN support
Signed-off-by: Marian Cichy --- rules/opencv.in | 6 ++ rules/opencv.make | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/rules/opencv.in b/rules/opencv.in index 415db9e1e..12b44606f 100644 --- a/rules/opencv.in +++ b/rules/opencv.in @@ -102,6 +102,12 @@ config OPENCV_VIDEOIO help Video I/O +config OPENCV_DNN + bool + prompt "DNN" + help + Deep Neural Network Library + config OPENCV_GSTREAMER bool prompt "gstreamer" diff --git a/rules/opencv.make b/rules/opencv.make index f2a16f213..78dc138ad 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -62,7 +62,7 @@ OPENCV_CONF_OPT := \ -DBUILD_opencv_apps:BOOL=OFF \ -DBUILD_opencv_calib3d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_CALIB3D,ON,OFF) \ -DBUILD_opencv_core:BOOL=ON \ - -DBUILD_opencv_dnn=OFF \ + -DBUILD_opencv_dnn=$(call ptx/ifdef,PTXCONF_OPENCV_DNN,ON,OFF) \ -DBUILD_opencv_features2d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FEATURES2D,ON,OFF) \ -DBUILD_opencv_flann:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FLANN,ON,OFF) \ -DBUILD_opencv_highgui:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_HIGHGUI,ON,OFF) \ -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v3 1/8] OpenCV: Update to Version 4.1.2.
Removed the modules opencv_superres and opencv_videostab because they are not part of the opencv main repository anymore but have been moved to the opencv_contrib repository. Signed-off-by: Marian Cichy --- rules/opencv.in | 66 + rules/opencv.make | 68 +++ 2 files changed, 41 insertions(+), 93 deletions(-) diff --git a/rules/opencv.in b/rules/opencv.in index cd43563ea..37fd32758 100644 --- a/rules/opencv.in +++ b/rules/opencv.in @@ -1,6 +1,4 @@ -## SECTION=staging -## old section: -### SECTION=multimedia_libs +## SECTION=multimedia_libs menuconfig OPENCV tristate @@ -21,9 +19,6 @@ menuconfig OPENCV help Open Source Computer Vision Library - STAGING: remove in ptxdist-2020.06.0 - Old version that need to be updated. Fails to build with gcc >= 7.x. - if OPENCV config OPENCV_CALIB3D @@ -33,17 +28,6 @@ config OPENCV_CALIB3D help Camera Calibration and 3D Reconstruction -config OPENCV_CONTRIB - bool - prompt "contrib" - select OPENCV_CALIB3D - select OPENCV_IMGPROC - select OPENCV_ML - select OPENCV_OBJDETECT - select OPENCV_VIDEO - help - Contributed/Experimental Stuff - config OPENCV_FEATURES2D bool prompt "features2d" @@ -58,16 +42,6 @@ config OPENCV_FLANN help Clustering and Search in Multi-Dimensional Spaces -config OPENCV_GPU - bool - prompt "gpu" - select OPENCV_LEGACY - select OPENCV_PHOTO - select OPENCV_OBJDETECT - select OPENCV_HIGHGUI - help - GPU-accelerated Computer Vision - config OPENCV_HIGHGUI bool prompt "highgui" @@ -81,14 +55,11 @@ config OPENCV_IMGPROC help Image Processing -config OPENCV_LEGACY +config OPENCV_IMGCODECS bool - prompt "legacy" - select OPENCV_CALIB3D - select OPENCV_ML - select OPENCV_VIDEO + prompt "imgcodecs" help - Deprecated stuff + Image Codecs config OPENCV_ML bool @@ -96,15 +67,6 @@ config OPENCV_ML help Machine Learning -config OPENCV_NONFREE - bool - prompt "nonfree" - select OPENCV_CALIB3D - select OPENCV_IMGPROC - select OPENCV_FEATURES2D - help - Non-free functionality - config OPENCV_OBJDETECT bool prompt "objdetect" @@ -128,14 +90,6 @@ config OPENCV_STITCHING help Images stitching -config OPENCV_SUPERRES - bool - prompt "superres" - select OPENCV_IMGPROC - select OPENCV_VIDEO - help - Super Resolution - config OPENCV_VIDEO bool prompt "video" @@ -143,17 +97,11 @@ config OPENCV_VIDEO help Video Analysis -config OPENCV_VIDEOSTAB +config OPENCV_VIDEOIO bool - prompt "videostab" - select OPENCV_CALIB3D - select OPENCV_FEATURES2D - select OPENCV_HIGHGUI - select OPENCV_OBJDETECT - select OPENCV_PHOTO - select OPENCV_VIDEO + prompt "videoio" help - Video Stabilization + Video I/O config OPENCV_GSTREAMER bool diff --git a/rules/opencv.make b/rules/opencv.make index 65125e3b7..44ee4fd0c 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -17,14 +17,13 @@ PACKAGES-$(PTXCONF_OPENCV) += opencv # Paths and names # -OPENCV_VERSION := 2.4.8 -OPENCV_MD5 := 50cc1433b3654074206f5b3dbfd49848 \ - 5270b5b5480d3f02018e14a953dc3720 +OPENCV_VERSION := 4.1.2 +OPENCV_MD5 := 6b390578d57131ae9d6c2a183257399d OPENCV := opencv-$(OPENCV_VERSION) OPENCV_SUFFIX := zip OPENCV_URL := \ $(call ptx/mirror, SF, opencvlibrary/opencv-unix/$(OPENCV_VERSION)/$(OPENCV).$(OPENCV_SUFFIX)) \ - https://github.com/Itseez/opencv/archive/$(OPENCV_VERSION).$(OPENCV_SUFFIX) + https://github.com/opencv/opencv/archive/$(OPENCV_VERSION).$(OPENCV_SUFFIX) OPENCV_SOURCE := $(SRCDIR)/$(OPENCV).$(OPENCV_SUFFIX) OPENCV_DIR := $(BUILDDIR)/$(OPENCV) OPENCV_LICENSE := BSD @@ -47,6 +46,7 @@ OPENCV_CONF_OPT := \ -DBUILD_TESTS=OFF \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_WITH_DEBUG_INFO=OFF \ + -DBUILD_CUDA_STUBS:BOOL=OFF \ -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF \ -DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_USE_RELATIVE_PATHS=OFF \ @@ -56,14 +56,12 @@ OPENCV_CONF_OPT := \ -DENABLE_PRECOMPILED_HEADERS=OFF \ -DENABLE_PROFILING=OFF \ -DENABLE_SOLUTION_FOLDERS=OFF \ - -DOPENCV_CAN_BREAK_BINARY_COMPATIBILITY=ON \ -DWITH_GTK:BOOL=OFF \ -DWITH_TBB:BOOL=OFF \ -DWITH_TIFF:BOOL=OFF \ - -DCMAKE_VERBOSE:BOOL=OFF \
[ptxdist] [PATCH v3 2/8] OpenCV: Added flag to build and integrate Examples
Signed-off-by: Marian Cichy --- rules/opencv.in | 5 + rules/opencv.make | 21 ++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/rules/opencv.in b/rules/opencv.in index 37fd32758..ac096d60c 100644 --- a/rules/opencv.in +++ b/rules/opencv.in @@ -131,4 +131,9 @@ config OPENCV_QT help QT GUI Support +config OPENCV_EXAMPLES + bool + prompt "Build Examples" + help + Build the OpenCV example applications and install them into /usr/share/opencv/examples. endif diff --git a/rules/opencv.make b/rules/opencv.make index 44ee4fd0c..0ae4776d2 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -39,7 +39,7 @@ OPENCV_CONF_OPT := \ -DANT_EXECUTABLE:FILEPATH= \ -DPYTHON_EXECUTABLE= \ -DBUILD_DOCS:BOOL=OFF \ - -DBUILD_EXAMPLES:BOOL=OFF \ + -DBUILD_EXAMPLES:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_EXAMPLES) \ -DBUILD_PACKAGE:BOOL=OFF \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS:BOOL=ON \ @@ -122,6 +122,20 @@ OPENCV_CONF_OPT:= \ -DWITH_OPENGL:BOOL=OFF \ -DWITH_QT:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_QT,4,OFF) + +OPENCV_BUILD_DIR := $(OPENCV_DIR)-build + +$(STATEDIR)/opencv.install: + @$(call targetinfo) + @$(call world/install, OPENCV) +ifdef PTXCONF_OPENCV_EXAMPLES + @mkdir -p $(OPENCV_PKGDIR)/usr/share/opencv/examples + find $(OPENCV_BUILD_DIR)/bin -type f | while read file; do \ + install -v -m 755 "$$file" $(OPENCV_PKGDIR)/usr/share/opencv/examples; \ + done +endif + @$(call touch) + # # Target-Install # @@ -153,9 +167,10 @@ $(STATEDIR)/opencv.targetinstall: @$(foreach lib, $(OPENCV_LIBS-y), \ $(call install_lib, opencv, 0, 0, 0644, $(lib));) - +ifdef PTXCONF_OPENCV_EXAMPLES + $(call install_tree, opencv, 0, 0, - , /usr/share/opencv/examples) +endif @$(call install_finish, opencv) - @$(call touch) # vim: syntax=make -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v3 6/8] OpenCV: changed ptx/ifdef usage to ptx/onoff
CMake switches used ptx/ifdef with an ON/OFF define, but we have ptx/onoff for this case. Using this to sustain uniformity. Signed-off-by: Marian Cichy --- rules/opencv.make | 32 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/rules/opencv.make b/rules/opencv.make index 78dc138ad..029293225 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -60,25 +60,25 @@ OPENCV_CONF_OPT := \ -DBUILD_WITH_DYNAMIC_IPP=OFF \ -DBUILD_ZLIB=OFF \ -DBUILD_opencv_apps:BOOL=OFF \ - -DBUILD_opencv_calib3d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_CALIB3D,ON,OFF) \ + -DBUILD_opencv_calib3d:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_CALIB3D) \ -DBUILD_opencv_core:BOOL=ON \ - -DBUILD_opencv_dnn=$(call ptx/ifdef,PTXCONF_OPENCV_DNN,ON,OFF) \ - -DBUILD_opencv_features2d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FEATURES2D,ON,OFF) \ - -DBUILD_opencv_flann:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FLANN,ON,OFF) \ - -DBUILD_opencv_highgui:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_HIGHGUI,ON,OFF) \ - -DBUILD_opencv_imgcodecs=$(call ptx/ifdef,PTXCONF_OPENCV_IMGCODECS,ON,OFF) \ - -DBUILD_opencv_imgproc:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_IMGPROC,ON,OFF) \ + -DBUILD_opencv_dnn=$(call ptx/onff,PTXCONF_OPENCV_DNN) \ + -DBUILD_opencv_features2d:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_FEATURES2D) \ + -DBUILD_opencv_flann:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_FLANN) \ + -DBUILD_opencv_highgui:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_HIGHGUI) \ + -DBUILD_opencv_imgcodecs=$(call ptx/onoff,PTXCONF_OPENCV_IMGCODECS) \ + -DBUILD_opencv_imgproc:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_IMGPROC) \ -DBUILD_opencv_java_bindings_generator=ON \ -DBUILD_opencv_js=OFF \ - -DBUILD_opencv_ml:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_ML,ON,OFF) \ - -DBUILD_opencv_objdetect:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_OBJDETECT,ON,OFF) \ - -DBUILD_opencv_photo:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_PHOTO,ON,OFF) \ + -DBUILD_opencv_ml:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_ML) \ + -DBUILD_opencv_objdetect:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_OBJDETECT) \ + -DBUILD_opencv_photo:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_PHOTO) \ -DBUILD_opencv_python_bindings_generator=ON \ -DBUILD_opencv_python_tests=ON \ - -DBUILD_opencv_stitching:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_STITCHING,ON,OFF) \ + -DBUILD_opencv_stitching:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_STITCHING) \ -DBUILD_opencv_ts:BOOL=OFF \ - -DBUILD_opencv_video:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_VIDEO,ON,OFF) \ -DBUILD_opencv_videoio:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_VIDEOIO) \ + -DBUILD_opencv_video:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_VIDEO) \ -DBUILD_opencv_world:BOOL=OFF \ -DCAROTENE_NS=carotene_o4t \ -DCPU_BASELINE=DETECT \ @@ -95,7 +95,7 @@ OPENCV_CONF_OPT := \ -DENABLE_IMPL_COLLECTION=OFF \ -DENABLE_INSTRUMENTATION=OFF \ -DENABLE_LTO=OFF \ - -DENABLE_NEON:BOOL=$(call ptx/ifdef,PTXCONF_ARCH_ARM_NEON,ON,OFF) \ + -DENABLE_NEON:BOOL=$(call ptx/onoff,PTXCONF_ARCH_ARM_NEON) \ -DENABLE_NOISY_WARNINGS=OFF \ -DENABLE_OMIT_FRAME_POINTER=ON \ -DENABLE_PIC=ON \ @@ -136,7 +136,7 @@ OPENCV_CONF_OPT := \ -DWITH_GDCM=OFF \ -DWITH_GIGEAPI:BOOL=OFF \ -DWITH_GPHOTO2:BOOL=OFF \ - -DWITH_GSTREAMER:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_GSTREAMER,ON,OFF) \ + -DWITH_GSTREAMER:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_GSTREAMER) \ -DWITH_GTK:BOOL=OFF \ -DWITH_GTK_2_X=OFF \ -DWITH_HALIDE=OFF \ @@ -153,7 +153,7 @@ OPENCV_CONF_OPT := \ -DWITH_JPEG:BOOL=ON \ -DWITH_LAPACK=ON \ -DWITH_LIBREALSENSE=OFF \ - -DWITH_LIBV4L:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_V4L_LIBV4L2,ON,OFF) \ + -DWITH_LIBV4L:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_V4L_LIBV4L2) \ -DWITH_MFX=OFF \ -DWITH_NVCUVID:BOOL=OFF \ -DWITH_OPENCL:BOOL=ON \ @@ -175,7 +175,7 @@ OPENCV_CONF_OPT := \ -DWITH_TBB:BOOL=OFF \ -DWITH_TIFF:BOOL=OFF \ -DWITH_UNICAP:BOOL=OFF \ - -DWITH_V4L:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_V4L,ON,OFF) \ + -DWITH_V4L:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_V4L) \ -DWITH_VA=OFF \ -DWITH_VA_INTEL=OFF \ -DWITH_VULKAN=OFF \ -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v3 8/8] OpenCV: make build generate pkg-config file
OpenCV usually depends on CMake when some application wants to find its libraries. However, PTXDist usually relies on pkg-config when building custom software. NOTE: This is a workaround since OpenCV marks the usage of pkg-config as deprecated. --- rules/opencv.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/opencv.make b/rules/opencv.make index 9d8120040..943b5831b 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -182,6 +182,7 @@ OPENCV_CONF_OPT := \ -DWITH_WEBP:BOOL=OFF \ -DWITH_XIMEA:BOOL=OFF \ -DWITH_XINE:BOOL=OFF \ + -DOPENCV_GENERATE_PKGCONFIG=ON \ $(STATEDIR)/opencv.install: -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v3 4/8] OpenCV: Changed QT-Support from 4 to 5
Signed-off-by: Marian Cichy --- rules/opencv.in | 7 +++ rules/opencv.make | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/rules/opencv.in b/rules/opencv.in index ac096d60c..415db9e1e 100644 --- a/rules/opencv.in +++ b/rules/opencv.in @@ -8,10 +8,9 @@ menuconfig OPENCV select ZLIB select LIBPNG select LIBJPEG - select QT4 if OPENCV_QT - select QT4_BUILD_QTESTLIB if OPENCV_QT - select QT4_BUILD_GUIif OPENCV_QT - select QT4_STL if OPENCV_QT + select QT5 if OPENCV_QT + select QT5_TEST if OPENCV_QT + select QT5_GUI if OPENCV_QT select GSTREAMERif OPENCV_GSTREAMER select V4L_UTILSif OPENCV_V4L_LIBV4L2 select V4L_UTILS_LIBV4L1if OPENCV_V4L_LIBV4L2 diff --git a/rules/opencv.make b/rules/opencv.make index a8c4057c2..f2a16f213 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -170,7 +170,7 @@ OPENCV_CONF_OPT := \ -DWITH_PROTOBUF=ON \ -DWITH_PTHREADS_PF:BOOL=OFF \ -DWITH_PVAPI:BOOL=OFF \ - -DWITH_QT:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_QT,4,OFF) \ + -DWITH_QT:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_QT,5,OFF) \ -DWITH_QUIRC=ON \ -DWITH_TBB:BOOL=OFF \ -DWITH_TIFF:BOOL=OFF \ -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v3 3/8] OpenCV: Clean up configure_helper output
Signed-off-by: Marian Cichy --- rules/opencv.make | 159 +++--- 1 file changed, 108 insertions(+), 51 deletions(-) diff --git a/rules/opencv.make b/rules/opencv.make index 0ae4776d2..a8c4057c2 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -27,7 +27,7 @@ OPENCV_URL:= \ OPENCV_SOURCE := $(SRCDIR)/$(OPENCV).$(OPENCV_SUFFIX) OPENCV_DIR := $(BUILDDIR)/$(OPENCV) OPENCV_LICENSE := BSD - +OPENCV_BUILD_DIR := $(OPENCV_DIR)-build # # Prepare # @@ -37,94 +37,153 @@ OPENCV_CONF_TOOL := cmake OPENCV_CONF_OPT:= \ $(CROSS_CMAKE_USR) \ -DANT_EXECUTABLE:FILEPATH= \ - -DPYTHON_EXECUTABLE= \ + -DBUILD_CUDA_STUBS:BOOL=OFF \ -DBUILD_DOCS:BOOL=OFF \ -DBUILD_EXAMPLES:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_EXAMPLES) \ + -DBUILD_ITT=ON \ + -DBUILD_JASPER=OFF \ + -DBUILD_JAVA=OFF \ + -DBUILD_JPEG=OFF \ + -DBUILD_LIST= \ + -DBUILD_OPENEXR=OFF \ -DBUILD_PACKAGE:BOOL=OFF \ - -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_PERF_TESTS=OFF \ + -DBUILD_PNG=OFF \ + -DBUILD_PROTOBUF=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DBUILD_TBB=OFF \ -DBUILD_TESTS=OFF \ - -DBUILD_PERF_TESTS=OFF \ + -DBUILD_TIFF=OFF \ + -DBUILD_USE_SYMLINKS=OFF \ + -DBUILD_WEBP=OFF \ -DBUILD_WITH_DEBUG_INFO=OFF \ - -DBUILD_CUDA_STUBS:BOOL=OFF \ - -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_USE_RELATIVE_PATHS=OFF \ + -DBUILD_WITH_DYNAMIC_IPP=OFF \ + -DBUILD_ZLIB=OFF \ + -DBUILD_opencv_apps:BOOL=OFF \ + -DBUILD_opencv_calib3d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_CALIB3D,ON,OFF) \ + -DBUILD_opencv_core:BOOL=ON \ + -DBUILD_opencv_dnn=OFF \ + -DBUILD_opencv_features2d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FEATURES2D,ON,OFF) \ + -DBUILD_opencv_flann:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FLANN,ON,OFF) \ + -DBUILD_opencv_highgui:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_HIGHGUI,ON,OFF) \ + -DBUILD_opencv_imgcodecs=$(call ptx/ifdef,PTXCONF_OPENCV_IMGCODECS,ON,OFF) \ + -DBUILD_opencv_imgproc:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_IMGPROC,ON,OFF) \ + -DBUILD_opencv_java_bindings_generator=ON \ + -DBUILD_opencv_js=OFF \ + -DBUILD_opencv_ml:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_ML,ON,OFF) \ + -DBUILD_opencv_objdetect:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_OBJDETECT,ON,OFF) \ + -DBUILD_opencv_photo:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_PHOTO,ON,OFF) \ + -DBUILD_opencv_python_bindings_generator=ON \ + -DBUILD_opencv_python_tests=ON \ + -DBUILD_opencv_stitching:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_STITCHING,ON,OFF) \ + -DBUILD_opencv_ts:BOOL=OFF \ + -DBUILD_opencv_video:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_VIDEO,ON,OFF) \ + -DBUILD_opencv_videoio:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_VIDEOIO) \ + -DBUILD_opencv_world:BOOL=OFF \ + -DCAROTENE_NS=carotene_o4t \ + -DCPU_BASELINE=DETECT \ + -DCPU_DISPATCH= \ + -DCV_DISABLE_OPTIMIZATION=OFF \ + -DCV_ENABLE_INTRINSICS=ON \ + -DCV_TRACE=ON \ + -DENABLE_BUILD_HARDENING=OFF \ + -DENABLE_CCACHE=OFF \ + -DENABLE_CONFIG_VERIFICATION=OFF \ + -DENABLE_COVERAGE=OFF \ -DENABLE_FAST_MATH=ON \ + -DENABLE_GNU_STL_DEBUG=OFF \ + -DENABLE_IMPL_COLLECTION=OFF \ + -DENABLE_INSTRUMENTATION=OFF \ + -DENABLE_LTO=OFF \ + -DENABLE_NEON:BOOL=$(call ptx/ifdef,PTXCONF_ARCH_ARM_NEON,ON,OFF) \ -DENABLE_NOISY_WARNINGS=OFF \ -DENABLE_OMIT_FRAME_POINTER=ON \ - -DENABLE_PRECOMPILED_HEADERS=OFF \ + -DENABLE_PIC=ON \ -DENABLE_PROFILING=OFF \ -DENABLE_SOLUTION_FOLDERS=OFF \ - -DWITH_GTK:BOOL=OFF \ - -DWITH_TBB:BOOL=OFF \ - -DWITH_TIFF:BOOL=OFF \ - -DWITH_CUDA:BOOL=OFF \ - -DWITH_EIGEN:BOOL=OFF \ - -DENABLE_NEON:BOOL=$(call ptx/ifdef,PTXCONF_ARCH_ARM_NEON,ON,OFF) \ -DENABLE_VFPV3:BOOL=OFF \ - -DWITH_GIGEAPI:BOOL=OFF \ + -DGENERATE_ABI_DESCRIPTOR=OFF \ -DINSTALL_CREATE_DISTRIB:BOOL=OFF \ -DINSTALL_C_EXAMPLES:BOOL=OFF \ -DINSTALL_PYTHON_EXAMPLES:BOOL=OFF \ + -DINSTALL_TESTS=OFF \ -DINSTALL_TO_MANGLED_PATHS:BOOL=OFF \ + -DMKL_WITH_OPENMP=OFF \ + -DMKL_WITH_TBB=OFF \ + -DOPENCV_DOWNLOAD_PATH=$(OPENCV_DIR)/.cache \ + -DOPENCV_DUMP_HOOKS_FLOW=OFF \ + -DOPENCV_ENABLE_MEMALIGN=ON \ + -DOPENCV_ENABLE_MEMORY_SANITIZER=OFF \ + -DOPENCV_ENABLE_NONFREE=OFF \ -DOPENCV_EXTRA_MODULES_PATH:PATH= \ + -DOPENCV_FORCE_3RDPARTY_BUILD=OFF \ + -DOPENCV_GENERATE_PKGCONFIG=ON \ + -DOPENCV_GENERATE_SETUPVARS
[ptxdist] [PATCH v2 7/7] OpenCV: fix download in PTXDist prepare stage
OpenCV wants to download the additional framework ADE while executing
CMake. Therefore, files will be downloaded during PTXDist's prepare
stage. This is not wanted. We now try to download the files during the
Get stage and copy the files to the same locations at the Extract.post
stage. If we cannot download the files during the Get stage, a new
CMake Flag can be used to abort during the prepare stage if download is
tried again.
Signed-off-by: Marian Cichy
---
...option-to-disallow-download-of-files.patch | 42 +++
patches/opencv-4.1.2/series | 1 +
rules/opencv.make | 70 +++
3 files changed, 100 insertions(+), 13 deletions(-)
create mode 100644
patches/opencv-4.1.2/0001-add-option-to-disallow-download-of-files.patch
create mode 100644 patches/opencv-4.1.2/series
diff --git
a/patches/opencv-4.1.2/0001-add-option-to-disallow-download-of-files.patch
b/patches/opencv-4.1.2/0001-add-option-to-disallow-download-of-files.patch
new file mode 100644
index 0..0e1504a96
--- /dev/null
+++ b/patches/opencv-4.1.2/0001-add-option-to-disallow-download-of-files.patch
@@ -0,0 +1,42 @@
+From b71bfe426a68a4603c9b814da68b117602a8b55f Mon Sep 17 00:00:00 2001
+From: Marian Cichy
+Date: Wed, 22 Jan 2020 17:14:05 +0100
+Subject: [PATCH] add option to disallow download of files
+
+OpenCV wants to download files for the ADE Framework when it is at
+the prepare stage of PTXDist. This is not wanted. The PTXDist rule
+will download the file during the Get stage and put it at the same
+location where OpenCV would put it. If the Download at the Get stage
+does not succeed and if OPENCV_ALLOW_DOWNLOADS is OFF, OpenCV will abort
+with this patch at the Prepare stage.
+---
+ cmake/OpenCVDownload.cmake | 6 ++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/cmake/OpenCVDownload.cmake b/cmake/OpenCVDownload.cmake
+index 63cf6d3238b1..cd7e50b4edf1 100644
+--- a/cmake/OpenCVDownload.cmake
b/cmake/OpenCVDownload.cmake
+@@ -14,6 +14,7 @@
+ #RELATIVE_URL - if set, then URL is treated as a base, and FILENAME will
be appended to it
+ # Note: uses OPENCV_DOWNLOAD_PATH folder as cache, default is /.cache
+
++set(OPENCV_ALLOW_DOWNLOADS ON CACHE BOOL "Allow downloads")
+ set(HELP_OPENCV_DOWNLOAD_PATH "Cache directory for downloaded files")
+ if(DEFINED ENV{OPENCV_DOWNLOAD_PATH})
+ set(OPENCV_DOWNLOAD_PATH "$ENV{OPENCV_DOWNLOAD_PATH}" CACHE PATH
"${HELP_OPENCV_DOWNLOAD_PATH}")
+@@ -156,6 +157,11 @@ function(ocv_download)
+
+ # Download
+ if(NOT EXISTS "${CACHE_CANDIDATE}")
++if(NOT OPENCV_ALLOW_DOWNLOADS)
++message(FATAL_ERROR "Not going to download ${DL_FILENAME}")
++return()
++endif()
++
+ ocv_download_log("#cmake_download \"${CACHE_CANDIDATE}\" \"${DL_URL}\"")
+ foreach(try ${OPENCV_DOWNLOAD_TRIES_LIST})
+ ocv_download_log("#try ${try}")
+--
+2.20.1
+
diff --git a/patches/opencv-4.1.2/series b/patches/opencv-4.1.2/series
new file mode 100644
index 0..aaa28ce52
--- /dev/null
+++ b/patches/opencv-4.1.2/series
@@ -0,0 +1 @@
+0001-add-option-to-disallow-download-of-files.patch
diff --git a/rules/opencv.make b/rules/opencv.make
index 0a6fd7a12..29261329f 100644
--- a/rules/opencv.make
+++ b/rules/opencv.make
@@ -17,25 +17,69 @@ PACKAGES-$(PTXCONF_OPENCV) += opencv
# Paths and names
#
-OPENCV_VERSION := 4.1.2
-OPENCV_MD5 := 6b390578d57131ae9d6c2a183257399d
-OPENCV := opencv-$(OPENCV_VERSION)
-OPENCV_SUFFIX := zip
-OPENCV_URL := \
- $(call ptx/mirror, SF,
opencvlibrary/opencv-unix/$(OPENCV_VERSION)/$(OPENCV).$(OPENCV_SUFFIX)) \
-
https://github.com/opencv/opencv/archive/$(OPENCV_VERSION).$(OPENCV_SUFFIX)
-OPENCV_SOURCE := $(SRCDIR)/$(OPENCV).$(OPENCV_SUFFIX)
-OPENCV_DIR := $(BUILDDIR)/$(OPENCV)
-OPENCV_LICENSE := BSD
-OPENCV_BUILD_DIR := $(OPENCV_DIR)-build
+OPENCV_VERSION := 4.1.2
+OPENCV_MD5 := 6b390578d57131ae9d6c2a183257399d
+OPENCV := opencv-$(OPENCV_VERSION)
+OPENCV_SUFFIX := zip
+OPENCV_URL := \
+ $(call ptx/mirror, SF,
opencvlibrary/opencv-unix/$(OPENCV_VERSION)/$(OPENCV).$(OPENCV_SUFFIX)) \
+
https://github.com/opencv/opencv/archive/$(OPENCV_VERSION).$(OPENCV_SUFFIX)
+OPENCV_SOURCE := $(SRCDIR)/$(OPENCV).$(OPENCV_SUFFIX)
+OPENCV_DIR := $(BUILDDIR)/$(OPENCV)
+OPENCV_LICENSE := BSD
+OPENCV_BUILD_DIR := $(OPENCV_DIR)-build
+
+OPENCV_ADE_VERSION := v0.1.1f
+OPENCV_ADE_MD5 := b624b995ec9c439cbc2e9e6ee940d3a2
+OPENCV_ADE := opencv-ade-$(OPENCV_ADE_VERSION)
+OPENCV_ADE_SUFFIX := zip
+OPENCV_ADE_URL :=
https://github.com/opencv/ade/archive/$(OPENCV_ADE_VERSION).$(OPENCV_ADE_SUFFIX)
+OPENCV_ADE_SOURCE := $(SRCDIR)/$(OPENCV_ADE).$(OPENCV_AD
[ptxdist] [PATCH v2 3/7] OpenCV: Clean up configure_helper output
Signed-off-by: Marian Cichy --- rules/opencv.make | 158 +++--- 1 file changed, 107 insertions(+), 51 deletions(-) diff --git a/rules/opencv.make b/rules/opencv.make index 0ae4776d2..94d280c01 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -27,7 +27,7 @@ OPENCV_URL:= \ OPENCV_SOURCE := $(SRCDIR)/$(OPENCV).$(OPENCV_SUFFIX) OPENCV_DIR := $(BUILDDIR)/$(OPENCV) OPENCV_LICENSE := BSD - +OPENCV_BUILD_DIR := $(OPENCV_DIR)-build # # Prepare # @@ -37,94 +37,152 @@ OPENCV_CONF_TOOL := cmake OPENCV_CONF_OPT:= \ $(CROSS_CMAKE_USR) \ -DANT_EXECUTABLE:FILEPATH= \ - -DPYTHON_EXECUTABLE= \ + -DBUILD_CUDA_STUBS:BOOL=OFF \ -DBUILD_DOCS:BOOL=OFF \ -DBUILD_EXAMPLES:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_EXAMPLES) \ + -DBUILD_ITT=ON \ + -DBUILD_JASPER=OFF \ + -DBUILD_JAVA=OFF \ + -DBUILD_JPEG=OFF \ + -DBUILD_LIST= \ + -DBUILD_OPENEXR=OFF \ -DBUILD_PACKAGE:BOOL=OFF \ - -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_PERF_TESTS=OFF \ + -DBUILD_PNG=OFF \ + -DBUILD_PROTOBUF=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DBUILD_TBB=OFF \ -DBUILD_TESTS=OFF \ - -DBUILD_PERF_TESTS=OFF \ + -DBUILD_TIFF=OFF \ + -DBUILD_USE_SYMLINKS=OFF \ + -DBUILD_WEBP=OFF \ -DBUILD_WITH_DEBUG_INFO=OFF \ - -DBUILD_CUDA_STUBS:BOOL=OFF \ - -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_USE_RELATIVE_PATHS=OFF \ + -DBUILD_WITH_DYNAMIC_IPP=OFF \ + -DBUILD_ZLIB=OFF \ + -DBUILD_opencv_apps:BOOL=OFF \ + -DBUILD_opencv_calib3d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_CALIB3D,ON,OFF) \ + -DBUILD_opencv_core:BOOL=ON \ + -DBUILD_opencv_dnn=OFF \ + -DBUILD_opencv_features2d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FEATURES2D,ON,OFF) \ + -DBUILD_opencv_flann:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FLANN,ON,OFF) \ + -DBUILD_opencv_highgui:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_HIGHGUI,ON,OFF) \ + -DBUILD_opencv_imgcodecs=$(call ptx/ifdef,PTXCONF_OPENCV_IMGCODECS,ON,OFF) \ + -DBUILD_opencv_imgproc:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_IMGPROC,ON,OFF) \ + -DBUILD_opencv_java_bindings_generator=ON \ + -DBUILD_opencv_js=OFF \ + -DBUILD_opencv_ml:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_ML,ON,OFF) \ + -DBUILD_opencv_objdetect:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_OBJDETECT,ON,OFF) \ + -DBUILD_opencv_photo:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_PHOTO,ON,OFF) \ + -DBUILD_opencv_python_bindings_generator=ON \ + -DBUILD_opencv_python_tests=ON \ + -DBUILD_opencv_stitching:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_STITCHING,ON,OFF) \ + -DBUILD_opencv_ts:BOOL=OFF \ + -DBUILD_opencv_video:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_VIDEO,ON,OFF) \ + -DBUILD_opencv_videoio=ON \ + -DBUILD_opencv_world:BOOL=OFF \ + -DCAROTENE_NS=carotene_o4t \ + -DCPU_BASELINE=DETECT \ + -DCPU_DISPATCH= \ + -DCV_DISABLE_OPTIMIZATION=OFF \ + -DCV_ENABLE_INTRINSICS=ON \ + -DCV_TRACE=ON \ + -DENABLE_BUILD_HARDENING=OFF \ + -DENABLE_CCACHE=OFF \ + -DENABLE_CONFIG_VERIFICATION=OFF \ + -DENABLE_COVERAGE=OFF \ -DENABLE_FAST_MATH=ON \ + -DENABLE_GNU_STL_DEBUG=OFF \ + -DENABLE_IMPL_COLLECTION=OFF \ + -DENABLE_INSTRUMENTATION=OFF \ + -DENABLE_LTO=OFF \ + -DENABLE_NEON:BOOL=$(call ptx/ifdef,PTXCONF_ARCH_ARM_NEON,ON,OFF) \ -DENABLE_NOISY_WARNINGS=OFF \ -DENABLE_OMIT_FRAME_POINTER=ON \ - -DENABLE_PRECOMPILED_HEADERS=OFF \ + -DENABLE_PIC=ON \ -DENABLE_PROFILING=OFF \ -DENABLE_SOLUTION_FOLDERS=OFF \ - -DWITH_GTK:BOOL=OFF \ - -DWITH_TBB:BOOL=OFF \ - -DWITH_TIFF:BOOL=OFF \ - -DWITH_CUDA:BOOL=OFF \ - -DWITH_EIGEN:BOOL=OFF \ - -DENABLE_NEON:BOOL=$(call ptx/ifdef,PTXCONF_ARCH_ARM_NEON,ON,OFF) \ -DENABLE_VFPV3:BOOL=OFF \ - -DWITH_GIGEAPI:BOOL=OFF \ + -DGENERATE_ABI_DESCRIPTOR=OFF \ -DINSTALL_CREATE_DISTRIB:BOOL=OFF \ -DINSTALL_C_EXAMPLES:BOOL=OFF \ -DINSTALL_PYTHON_EXAMPLES:BOOL=OFF \ + -DINSTALL_TESTS=OFF \ -DINSTALL_TO_MANGLED_PATHS:BOOL=OFF \ + -DMKL_WITH_OPENMP=OFF \ + -DMKL_WITH_TBB=OFF \ + -DOPENCV_DOWNLOAD_PATH=$(OPENCV_DIR)/.cache \ + -DOPENCV_DUMP_HOOKS_FLOW=OFF \ + -DOPENCV_ENABLE_MEMALIGN=ON \ + -DOPENCV_ENABLE_MEMORY_SANITIZER=OFF \ + -DOPENCV_ENABLE_NONFREE=OFF \ -DOPENCV_EXTRA_MODULES_PATH:PATH= \ + -DOPENCV_FORCE_3RDPARTY_BUILD=OFF \ + -DOPENCV_GENERATE_PKGCONFIG=ON \ + -DOPENCV_GENERATE_SETUPVARS=ON \ + -DOPENCV_PYTHON3_VERSION=OFF
[ptxdist] [PATCH v2 5/7] OpenCV: added switch to turn on/off DNN support
Signed-off-by: Marian Cichy --- rules/opencv.in | 6 ++ rules/opencv.make | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/rules/opencv.in b/rules/opencv.in index 415db9e1e..12b44606f 100644 --- a/rules/opencv.in +++ b/rules/opencv.in @@ -102,6 +102,12 @@ config OPENCV_VIDEOIO help Video I/O +config OPENCV_DNN + bool + prompt "DNN" + help + Deep Neural Network Library + config OPENCV_GSTREAMER bool prompt "gstreamer" diff --git a/rules/opencv.make b/rules/opencv.make index 9652fbb4f..8ff85591e 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -62,7 +62,7 @@ OPENCV_CONF_OPT := \ -DBUILD_opencv_apps:BOOL=OFF \ -DBUILD_opencv_calib3d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_CALIB3D,ON,OFF) \ -DBUILD_opencv_core:BOOL=ON \ - -DBUILD_opencv_dnn=OFF \ + -DBUILD_opencv_dnn=$(call ptx/ifdef,PTXCONF_OPENCV_DNN,ON,OFF) \ -DBUILD_opencv_features2d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FEATURES2D,ON,OFF) \ -DBUILD_opencv_flann:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FLANN,ON,OFF) \ -DBUILD_opencv_highgui:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_HIGHGUI,ON,OFF) \ -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 4/7] OpenCV: Changed QT-Support from 4 to 5
Signed-off-by: Marian Cichy --- rules/opencv.in | 7 +++ rules/opencv.make | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/rules/opencv.in b/rules/opencv.in index ac096d60c..415db9e1e 100644 --- a/rules/opencv.in +++ b/rules/opencv.in @@ -8,10 +8,9 @@ menuconfig OPENCV select ZLIB select LIBPNG select LIBJPEG - select QT4 if OPENCV_QT - select QT4_BUILD_QTESTLIB if OPENCV_QT - select QT4_BUILD_GUIif OPENCV_QT - select QT4_STL if OPENCV_QT + select QT5 if OPENCV_QT + select QT5_TEST if OPENCV_QT + select QT5_GUI if OPENCV_QT select GSTREAMERif OPENCV_GSTREAMER select V4L_UTILSif OPENCV_V4L_LIBV4L2 select V4L_UTILS_LIBV4L1if OPENCV_V4L_LIBV4L2 diff --git a/rules/opencv.make b/rules/opencv.make index 94d280c01..9652fbb4f 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -169,7 +169,7 @@ OPENCV_CONF_OPT := \ -DWITH_PROTOBUF=ON \ -DWITH_PTHREADS_PF:BOOL=OFF \ -DWITH_PVAPI:BOOL=OFF \ - -DWITH_QT:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_QT,4,OFF) \ + -DWITH_QT:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_QT,5,OFF) \ -DWITH_QUIRC=ON \ -DWITH_TBB:BOOL=OFF \ -DWITH_TIFF:BOOL=OFF \ -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 2/7] OpenCV: Added flag to build and integrate Examples
Signed-off-by: Marian Cichy --- rules/opencv.in | 5 + rules/opencv.make | 21 ++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/rules/opencv.in b/rules/opencv.in index 37fd32758..ac096d60c 100644 --- a/rules/opencv.in +++ b/rules/opencv.in @@ -131,4 +131,9 @@ config OPENCV_QT help QT GUI Support +config OPENCV_EXAMPLES + bool + prompt "Build Examples" + help + Build the OpenCV example applications and install them into /usr/share/opencv/examples. endif diff --git a/rules/opencv.make b/rules/opencv.make index 44ee4fd0c..0ae4776d2 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -39,7 +39,7 @@ OPENCV_CONF_OPT := \ -DANT_EXECUTABLE:FILEPATH= \ -DPYTHON_EXECUTABLE= \ -DBUILD_DOCS:BOOL=OFF \ - -DBUILD_EXAMPLES:BOOL=OFF \ + -DBUILD_EXAMPLES:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_EXAMPLES) \ -DBUILD_PACKAGE:BOOL=OFF \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS:BOOL=ON \ @@ -122,6 +122,20 @@ OPENCV_CONF_OPT:= \ -DWITH_OPENGL:BOOL=OFF \ -DWITH_QT:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_QT,4,OFF) + +OPENCV_BUILD_DIR := $(OPENCV_DIR)-build + +$(STATEDIR)/opencv.install: + @$(call targetinfo) + @$(call world/install, OPENCV) +ifdef PTXCONF_OPENCV_EXAMPLES + @mkdir -p $(OPENCV_PKGDIR)/usr/share/opencv/examples + find $(OPENCV_BUILD_DIR)/bin -type f | while read file; do \ + install -v -m 755 "$$file" $(OPENCV_PKGDIR)/usr/share/opencv/examples; \ + done +endif + @$(call touch) + # # Target-Install # @@ -153,9 +167,10 @@ $(STATEDIR)/opencv.targetinstall: @$(foreach lib, $(OPENCV_LIBS-y), \ $(call install_lib, opencv, 0, 0, 0644, $(lib));) - +ifdef PTXCONF_OPENCV_EXAMPLES + $(call install_tree, opencv, 0, 0, - , /usr/share/opencv/examples) +endif @$(call install_finish, opencv) - @$(call touch) # vim: syntax=make -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 6/7] OpenCV: changed ptx/ifdef usage to ptx/onoff
CMake switches used ptx/ifdef with an ON/OFF define, but we have ptx/onoff for this case. Using this to sustain uniformity. Signed-off-by: Marian Cichy --- rules/opencv.make | 32 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/rules/opencv.make b/rules/opencv.make index 8ff85591e..0a6fd7a12 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -60,24 +60,24 @@ OPENCV_CONF_OPT := \ -DBUILD_WITH_DYNAMIC_IPP=OFF \ -DBUILD_ZLIB=OFF \ -DBUILD_opencv_apps:BOOL=OFF \ - -DBUILD_opencv_calib3d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_CALIB3D,ON,OFF) \ + -DBUILD_opencv_calib3d:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_CALIB3D) \ -DBUILD_opencv_core:BOOL=ON \ - -DBUILD_opencv_dnn=$(call ptx/ifdef,PTXCONF_OPENCV_DNN,ON,OFF) \ - -DBUILD_opencv_features2d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FEATURES2D,ON,OFF) \ - -DBUILD_opencv_flann:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FLANN,ON,OFF) \ - -DBUILD_opencv_highgui:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_HIGHGUI,ON,OFF) \ - -DBUILD_opencv_imgcodecs=$(call ptx/ifdef,PTXCONF_OPENCV_IMGCODECS,ON,OFF) \ - -DBUILD_opencv_imgproc:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_IMGPROC,ON,OFF) \ + -DBUILD_opencv_dnn=$(call ptx/onff,PTXCONF_OPENCV_DNN) \ + -DBUILD_opencv_features2d:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_FEATURES2D) \ + -DBUILD_opencv_flann:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_FLANN) \ + -DBUILD_opencv_highgui:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_HIGHGUI) \ + -DBUILD_opencv_imgcodecs=$(call ptx/onoff,PTXCONF_OPENCV_IMGCODECS) \ + -DBUILD_opencv_imgproc:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_IMGPROC) \ -DBUILD_opencv_java_bindings_generator=ON \ -DBUILD_opencv_js=OFF \ - -DBUILD_opencv_ml:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_ML,ON,OFF) \ - -DBUILD_opencv_objdetect:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_OBJDETECT,ON,OFF) \ - -DBUILD_opencv_photo:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_PHOTO,ON,OFF) \ + -DBUILD_opencv_ml:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_ML) \ + -DBUILD_opencv_objdetect:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_OBJDETECT) \ + -DBUILD_opencv_photo:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_PHOTO) \ -DBUILD_opencv_python_bindings_generator=ON \ -DBUILD_opencv_python_tests=ON \ - -DBUILD_opencv_stitching:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_STITCHING,ON,OFF) \ + -DBUILD_opencv_stitching:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_STITCHING) \ -DBUILD_opencv_ts:BOOL=OFF \ - -DBUILD_opencv_video:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_VIDEO,ON,OFF) \ + -DBUILD_opencv_video:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_VIDEO) \ -DBUILD_opencv_videoio=ON \ -DBUILD_opencv_world:BOOL=OFF \ -DCAROTENE_NS=carotene_o4t \ @@ -95,7 +95,7 @@ OPENCV_CONF_OPT := \ -DENABLE_IMPL_COLLECTION=OFF \ -DENABLE_INSTRUMENTATION=OFF \ -DENABLE_LTO=OFF \ - -DENABLE_NEON:BOOL=$(call ptx/ifdef,PTXCONF_ARCH_ARM_NEON,ON,OFF) \ + -DENABLE_NEON:BOOL=$(call ptx/onoff,PTXCONF_ARCH_ARM_NEON) \ -DENABLE_NOISY_WARNINGS=OFF \ -DENABLE_OMIT_FRAME_POINTER=ON \ -DENABLE_PIC=ON \ @@ -136,7 +136,7 @@ OPENCV_CONF_OPT := \ -DWITH_GDCM=OFF \ -DWITH_GIGEAPI:BOOL=OFF \ -DWITH_GPHOTO2:BOOL=OFF \ - -DWITH_GSTREAMER:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_GSTREAMER,ON,OFF) \ + -DWITH_GSTREAMER:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_GSTREAMER) \ -DWITH_GTK:BOOL=OFF \ -DWITH_GTK_2_X=OFF \ -DWITH_HALIDE=OFF \ @@ -152,7 +152,7 @@ OPENCV_CONF_OPT := \ -DWITH_JPEG:BOOL=ON \ -DWITH_LAPACK=ON \ -DWITH_LIBREALSENSE=OFF \ - -DWITH_LIBV4L:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_V4L_LIBV4L2,ON,OFF) \ + -DWITH_LIBV4L:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_V4L_LIBV4L2) \ -DWITH_MFX=OFF \ -DWITH_NVCUVID:BOOL=OFF \ -DWITH_OPENCL:BOOL=ON \ @@ -174,7 +174,7 @@ OPENCV_CONF_OPT := \ -DWITH_TBB:BOOL=OFF \ -DWITH_TIFF:BOOL=OFF \ -DWITH_UNICAP:BOOL=OFF \ - -DWITH_V4L:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_V4L,ON,OFF) \ + -DWITH_V4L:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_V4L) \ -DWITH_VA=OFF \ -DWITH_VA_INTEL=OFF \ -DWITH_VULKAN=OFF \ -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 1/7] OpenCV: Update to Version 4.1.2.
Removed the modules opencv_superres and opencv_videostab because they are not part of the opencv main repository anymore but have been moved to the opencv_contrib repository. Signed-off-by: Marian Cichy --- rules/opencv.in | 66 + rules/opencv.make | 68 +++ 2 files changed, 41 insertions(+), 93 deletions(-) diff --git a/rules/opencv.in b/rules/opencv.in index cd43563ea..37fd32758 100644 --- a/rules/opencv.in +++ b/rules/opencv.in @@ -1,6 +1,4 @@ -## SECTION=staging -## old section: -### SECTION=multimedia_libs +## SECTION=multimedia_libs menuconfig OPENCV tristate @@ -21,9 +19,6 @@ menuconfig OPENCV help Open Source Computer Vision Library - STAGING: remove in ptxdist-2020.06.0 - Old version that need to be updated. Fails to build with gcc >= 7.x. - if OPENCV config OPENCV_CALIB3D @@ -33,17 +28,6 @@ config OPENCV_CALIB3D help Camera Calibration and 3D Reconstruction -config OPENCV_CONTRIB - bool - prompt "contrib" - select OPENCV_CALIB3D - select OPENCV_IMGPROC - select OPENCV_ML - select OPENCV_OBJDETECT - select OPENCV_VIDEO - help - Contributed/Experimental Stuff - config OPENCV_FEATURES2D bool prompt "features2d" @@ -58,16 +42,6 @@ config OPENCV_FLANN help Clustering and Search in Multi-Dimensional Spaces -config OPENCV_GPU - bool - prompt "gpu" - select OPENCV_LEGACY - select OPENCV_PHOTO - select OPENCV_OBJDETECT - select OPENCV_HIGHGUI - help - GPU-accelerated Computer Vision - config OPENCV_HIGHGUI bool prompt "highgui" @@ -81,14 +55,11 @@ config OPENCV_IMGPROC help Image Processing -config OPENCV_LEGACY +config OPENCV_IMGCODECS bool - prompt "legacy" - select OPENCV_CALIB3D - select OPENCV_ML - select OPENCV_VIDEO + prompt "imgcodecs" help - Deprecated stuff + Image Codecs config OPENCV_ML bool @@ -96,15 +67,6 @@ config OPENCV_ML help Machine Learning -config OPENCV_NONFREE - bool - prompt "nonfree" - select OPENCV_CALIB3D - select OPENCV_IMGPROC - select OPENCV_FEATURES2D - help - Non-free functionality - config OPENCV_OBJDETECT bool prompt "objdetect" @@ -128,14 +90,6 @@ config OPENCV_STITCHING help Images stitching -config OPENCV_SUPERRES - bool - prompt "superres" - select OPENCV_IMGPROC - select OPENCV_VIDEO - help - Super Resolution - config OPENCV_VIDEO bool prompt "video" @@ -143,17 +97,11 @@ config OPENCV_VIDEO help Video Analysis -config OPENCV_VIDEOSTAB +config OPENCV_VIDEOIO bool - prompt "videostab" - select OPENCV_CALIB3D - select OPENCV_FEATURES2D - select OPENCV_HIGHGUI - select OPENCV_OBJDETECT - select OPENCV_PHOTO - select OPENCV_VIDEO + prompt "videoio" help - Video Stabilization + Video I/O config OPENCV_GSTREAMER bool diff --git a/rules/opencv.make b/rules/opencv.make index 65125e3b7..44ee4fd0c 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -17,14 +17,13 @@ PACKAGES-$(PTXCONF_OPENCV) += opencv # Paths and names # -OPENCV_VERSION := 2.4.8 -OPENCV_MD5 := 50cc1433b3654074206f5b3dbfd49848 \ - 5270b5b5480d3f02018e14a953dc3720 +OPENCV_VERSION := 4.1.2 +OPENCV_MD5 := 6b390578d57131ae9d6c2a183257399d OPENCV := opencv-$(OPENCV_VERSION) OPENCV_SUFFIX := zip OPENCV_URL := \ $(call ptx/mirror, SF, opencvlibrary/opencv-unix/$(OPENCV_VERSION)/$(OPENCV).$(OPENCV_SUFFIX)) \ - https://github.com/Itseez/opencv/archive/$(OPENCV_VERSION).$(OPENCV_SUFFIX) + https://github.com/opencv/opencv/archive/$(OPENCV_VERSION).$(OPENCV_SUFFIX) OPENCV_SOURCE := $(SRCDIR)/$(OPENCV).$(OPENCV_SUFFIX) OPENCV_DIR := $(BUILDDIR)/$(OPENCV) OPENCV_LICENSE := BSD @@ -47,6 +46,7 @@ OPENCV_CONF_OPT := \ -DBUILD_TESTS=OFF \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_WITH_DEBUG_INFO=OFF \ + -DBUILD_CUDA_STUBS:BOOL=OFF \ -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF \ -DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_USE_RELATIVE_PATHS=OFF \ @@ -56,14 +56,12 @@ OPENCV_CONF_OPT := \ -DENABLE_PRECOMPILED_HEADERS=OFF \ -DENABLE_PROFILING=OFF \ -DENABLE_SOLUTION_FOLDERS=OFF \ - -DOPENCV_CAN_BREAK_BINARY_COMPATIBILITY=ON \ -DWITH_GTK:BOOL=OFF \ -DWITH_TBB:BOOL=OFF \ -DWITH_TIFF:BOOL=OFF \ - -DCMAKE_VERBOSE:BOOL=OFF \
[ptxdist] [PATCH] OpenCV: fix download in PTXDist prepare stage
OpenCV wants to download the additional framework ADE while executing
CMake. Therefore, files will be downloaded during PTXDist's prepare
stage. This is not wanted. We now try to download the files during the
Get stage and copy the files to the same locations at the Extract.post
stage. If we cannot download the files during the Get stage, a new
CMake Flag can be used to abort during the prepare stage if download is
tried again.
---
...option-to-disallow-download-of-files.patch | 42 +++
patches/opencv-4.1.2/series | 1 +
rules/opencv.make | 74 +++
3 files changed, 102 insertions(+), 15 deletions(-)
create mode 100644
patches/opencv-4.1.2/0001-add-option-to-disallow-download-of-files.patch
create mode 100644 patches/opencv-4.1.2/series
diff --git
a/patches/opencv-4.1.2/0001-add-option-to-disallow-download-of-files.patch
b/patches/opencv-4.1.2/0001-add-option-to-disallow-download-of-files.patch
new file mode 100644
index 0..0e1504a96
--- /dev/null
+++ b/patches/opencv-4.1.2/0001-add-option-to-disallow-download-of-files.patch
@@ -0,0 +1,42 @@
+From b71bfe426a68a4603c9b814da68b117602a8b55f Mon Sep 17 00:00:00 2001
+From: Marian Cichy
+Date: Wed, 22 Jan 2020 17:14:05 +0100
+Subject: [PATCH] add option to disallow download of files
+
+OpenCV wants to download files for the ADE Framework when it is at
+the prepare stage of PTXDist. This is not wanted. The PTXDist rule
+will download the file during the Get stage and put it at the same
+location where OpenCV would put it. If the Download at the Get stage
+does not succeed and if OPENCV_ALLOW_DOWNLOADS is OFF, OpenCV will abort
+with this patch at the Prepare stage.
+---
+ cmake/OpenCVDownload.cmake | 6 ++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/cmake/OpenCVDownload.cmake b/cmake/OpenCVDownload.cmake
+index 63cf6d3238b1..cd7e50b4edf1 100644
+--- a/cmake/OpenCVDownload.cmake
b/cmake/OpenCVDownload.cmake
+@@ -14,6 +14,7 @@
+ #RELATIVE_URL - if set, then URL is treated as a base, and FILENAME will
be appended to it
+ # Note: uses OPENCV_DOWNLOAD_PATH folder as cache, default is /.cache
+
++set(OPENCV_ALLOW_DOWNLOADS ON CACHE BOOL "Allow downloads")
+ set(HELP_OPENCV_DOWNLOAD_PATH "Cache directory for downloaded files")
+ if(DEFINED ENV{OPENCV_DOWNLOAD_PATH})
+ set(OPENCV_DOWNLOAD_PATH "$ENV{OPENCV_DOWNLOAD_PATH}" CACHE PATH
"${HELP_OPENCV_DOWNLOAD_PATH}")
+@@ -156,6 +157,11 @@ function(ocv_download)
+
+ # Download
+ if(NOT EXISTS "${CACHE_CANDIDATE}")
++if(NOT OPENCV_ALLOW_DOWNLOADS)
++message(FATAL_ERROR "Not going to download ${DL_FILENAME}")
++return()
++endif()
++
+ ocv_download_log("#cmake_download \"${CACHE_CANDIDATE}\" \"${DL_URL}\"")
+ foreach(try ${OPENCV_DOWNLOAD_TRIES_LIST})
+ ocv_download_log("#try ${try}")
+--
+2.20.1
+
diff --git a/patches/opencv-4.1.2/series b/patches/opencv-4.1.2/series
new file mode 100644
index 0..aaa28ce52
--- /dev/null
+++ b/patches/opencv-4.1.2/series
@@ -0,0 +1 @@
+0001-add-option-to-disallow-download-of-files.patch
diff --git a/rules/opencv.make b/rules/opencv.make
index 0a6fd7a12..2eab4c9ea 100644
--- a/rules/opencv.make
+++ b/rules/opencv.make
@@ -17,25 +17,70 @@ PACKAGES-$(PTXCONF_OPENCV) += opencv
# Paths and names
#
-OPENCV_VERSION := 4.1.2
-OPENCV_MD5 := 6b390578d57131ae9d6c2a183257399d
-OPENCV := opencv-$(OPENCV_VERSION)
-OPENCV_SUFFIX := zip
-OPENCV_URL := \
- $(call ptx/mirror, SF,
opencvlibrary/opencv-unix/$(OPENCV_VERSION)/$(OPENCV).$(OPENCV_SUFFIX)) \
-
https://github.com/opencv/opencv/archive/$(OPENCV_VERSION).$(OPENCV_SUFFIX)
-OPENCV_SOURCE := $(SRCDIR)/$(OPENCV).$(OPENCV_SUFFIX)
-OPENCV_DIR := $(BUILDDIR)/$(OPENCV)
-OPENCV_LICENSE := BSD
-OPENCV_BUILD_DIR := $(OPENCV_DIR)-build
+OPENCV_VERSION := 4.1.2
+OPENCV_MD5 := 6b390578d57131ae9d6c2a183257399d
+OPENCV := opencv-$(OPENCV_VERSION)
+OPENCV_SUFFIX := zip
+OPENCV_URL := \
+ $(call ptx/mirror, SF,
opencvlibrary/opencv-unix/$(OPENCV_VERSION)/$(OPENCV).$(OPENCV_SUFFIX)) \
+
https://github.com/opencv/opencv/archive/$(OPENCV_VERSION).$(OPENCV_SUFFIX)
+OPENCV_SOURCE := $(SRCDIR)/$(OPENCV).$(OPENCV_SUFFIX)
+OPENCV_DIR := $(BUILDDIR)/$(OPENCV)
+OPENCV_LICENSE := BSD
+OPENCV_BUILD_DIR := $(OPENCV_DIR)-build
+
+OPENCV_ADE_VERSION := v0.1.1f
+OPENCV_ADE_MD5 := b624b995ec9c439cbc2e9e6ee940d3a2
+OPENCV_ADE := opencv-ade-$(OPENCV_ADE_VERSION)
+OPENCV_ADE_SUFFIX := zip
+OPENCV_ADE_URL :=
https://github.com/opencv/ade/archive/$(OPENCV_ADE_VERSION).$(OPENCV_ADE_SUFFIX)
+OPENCV_ADE_SOURCE := $(SRCDIR)/$(OPENCV_ADE).$(OPENCV_ADE_SUFFIX)
+$(OPENCV_ADE_SOURCE) := O
[ptxdist] [PATCH 2/4] OpenCV: added -v flag when installing examples
--- rules/opencv.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/opencv.make b/rules/opencv.make index 2602bb253..ecd47c722 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -215,7 +215,7 @@ $(STATEDIR)/opencv.install: ifdef PTXCONF_OPENCV_EXAMPLES @mkdir -p $(OPENCV_PKGDIR)/usr/share/opencv/examples find $(OPENCV_BUILD_DIR)/bin -type f | while read file; do \ - install -m 755 "$$file" $(OPENCV_PKGDIR)/usr/share/opencv/examples; \ + install -v -m 755 "$$file" $(OPENCV_PKGDIR)/usr/share/opencv/examples; \ done endif @$(call touch) -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 3/4] OpenCV: removed unnecessary source in install_tree
--- rules/opencv.make | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rules/opencv.make b/rules/opencv.make index ecd47c722..531b3bbf4 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -252,10 +252,9 @@ $(STATEDIR)/opencv.targetinstall: @$(foreach lib, $(OPENCV_LIBS-y), \ $(call install_lib, opencv, 0, 0, 0644, $(lib));) ifdef PTXCONF_OPENCV_EXAMPLES - $(call install_tree, opencv, 0, 0, $(OPENCV_PKGDIR)/usr/share/opencv/examples, /usr/share/opencv/examples) + $(call install_tree, opencv, 0, 0, - , /usr/share/opencv/examples) endif @$(call install_finish, opencv) - @$(call touch) # vim: syntax=make -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/4] OpenCV: Removed blank lines
--- rules/opencv.make | 2 -- 1 file changed, 2 deletions(-) diff --git a/rules/opencv.make b/rules/opencv.make index d2fb5aa44..2602bb253 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -210,8 +210,6 @@ OPENCV_CONF_OPT := \ $(STATEDIR)/opencv.install: - - @$(call targetinfo) @$(call world/install, OPENCV) ifdef PTXCONF_OPENCV_EXAMPLES -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 4/4] changed and removed various cmake-flags
various flags are not specified anymore or automatically set by Cmake, i.e. any *-NOTFOUND or *-FOUND flag is autoset any paths to external program(libraries) like LAPACK or Python are auto-detected platform/hardware-support like NEON or VFPV3 are auto-detected we may want to have OPENCV_GENERATE_PKGCONFIG=ON libopencv_legacy and libopencv_shape do not exist anymore --- rules/opencv.make | 30 +- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/rules/opencv.make b/rules/opencv.make index 531b3bbf4..0a6fd7a12 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -37,9 +37,6 @@ OPENCV_CONF_TOOL := cmake OPENCV_CONF_OPT:= \ $(CROSS_CMAKE_USR) \ -DANT_EXECUTABLE:FILEPATH= \ - -DAtlas_BLAS_LIBRARY=Atlas_BLAS_LIBRARY-NOTFOUND \ - -DAtlas_CBLAS_LIBRARY=Atlas_CBLAS_LIBRARY-NOTFOUND \ - -DAtlas_LAPACK_LIBRARY=Atlas_LAPACK_LIBRARY-NOTFOUND \ -DBUILD_CUDA_STUBS:BOOL=OFF \ -DBUILD_DOCS:BOOL=OFF \ -DBUILD_EXAMPLES:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_EXAMPLES) \ @@ -84,10 +81,7 @@ OPENCV_CONF_OPT := \ -DBUILD_opencv_videoio=ON \ -DBUILD_opencv_world:BOOL=OFF \ -DCAROTENE_NS=carotene_o4t \ - -DCMAKE_CONFIGURATION_TYPES="Debug;Release" \ -DCPU_BASELINE=DETECT \ - -DCPU_BASELINE_DISABLE=";VFPV3" \ - -DCPU_BASELINE_REQUIRE=";NEON" \ -DCPU_DISPATCH= \ -DCV_DISABLE_OPTIMIZATION=OFF \ -DCV_ENABLE_INTRINSICS=ON \ @@ -108,21 +102,14 @@ OPENCV_CONF_OPT := \ -DENABLE_PROFILING=OFF \ -DENABLE_SOLUTION_FOLDERS=OFF \ -DENABLE_VFPV3:BOOL=OFF \ - -DEXECUTABLE_OUTPUT_PATH=$(OPENCV_BUILD_DIR)/bin \ -DGENERATE_ABI_DESCRIPTOR=OFF \ -DINSTALL_CREATE_DISTRIB:BOOL=OFF \ -DINSTALL_C_EXAMPLES:BOOL=OFF \ -DINSTALL_PYTHON_EXAMPLES:BOOL=OFF \ -DINSTALL_TESTS=OFF \ -DINSTALL_TO_MANGLED_PATHS:BOOL=OFF \ - -DLAPACK_CBLAS_H= \ - -DLAPACK_IMPL=Unknown \ - -DLAPACK_LAPACKE_H= \ - -DLAPACK_LIBRARIES= \ - -DMKL_INCLUDE_DIRS=MKL_ROOT_DIR-NOTFOUND/include \ -DMKL_WITH_OPENMP=OFF \ -DMKL_WITH_TBB=OFF \ - -DOPENCL_FOUND=ON \ -DOPENCV_DOWNLOAD_PATH=$(OPENCV_DIR)/.cache \ -DOPENCV_DUMP_HOOKS_FLOW=OFF \ -DOPENCV_ENABLE_MEMALIGN=ON \ @@ -130,24 +117,11 @@ OPENCV_CONF_OPT := \ -DOPENCV_ENABLE_NONFREE=OFF \ -DOPENCV_EXTRA_MODULES_PATH:PATH= \ -DOPENCV_FORCE_3RDPARTY_BUILD=OFF \ - -DOPENCV_GENERATE_PKGCONFIG=OFF \ + -DOPENCV_GENERATE_PKGCONFIG=ON \ -DOPENCV_GENERATE_SETUPVARS=ON \ - -DOPENCV_MATHJAX_RELPATH=https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0 \ -DOPENCV_PYTHON3_VERSION=OFF \ -DOPENCV_WARNINGS_ARE_ERRORS:BOOL=OFF \ -DPROTOBUF_UPDATE_FILES=OFF \ - -DPYTHON2_EXECUTABLE= \ - -DPYTHON2_INCLUDE_DIR2= \ - -DPYTHON2_LIBRARY= \ - -DPYTHON2_LIBRARY_DEBUG= \ - -DPYTHON2_NUMPY_INCLUDE_DIRS= \ - -DPYTHON2_PACKAGES_PATH= \ - -DPYTHON3_EXECUTABLE=/usr/bin/python3 \ - -DPYTHON3_INCLUDE_DIR2= \ - -DPYTHON3_LIBRARY= \ - -DPYTHON3_LIBRARY_DEBUG= \ - -DPYTHON3_NUMPY_INCLUDE_DIRS= \ - -DPYTHON3_PACKAGES_PATH=lib/python3.7/dist-packages \ -DWITH_1394:BOOL=OFF \ -DWITH_ADE=ON \ -DWITH_ARAVIS=OFF \ @@ -231,12 +205,10 @@ OPENCV_LIBS-$(PTXCONF_OPENCV_FLANN) += libopencv_flann OPENCV_LIBS-$(PTXCONF_OPENCV_HIGHGUI) += libopencv_highgui OPENCV_LIBS-$(PTXCONF_OPENCV_IMGCODECS)+= libopencv_imgcodecs OPENCV_LIBS-$(PTXCONF_OPENCV_IMGPROC) += libopencv_imgproc -OPENCV_LIBS-$(PTXCONF_OPENCV_LEGACY) += libopencv_legacy OPENCV_LIBS-$(PTXCONF_OPENCV_ML) += libopencv_ml OPENCV_LIBS-$(PTXCONF_OPENCV_OBJDETECT)+= libopencv_objdetect OPENCV_LIBS-$(PTXCONF_OPENCV_PHOTO)+= libopencv_photo OPENCV_LIBS-$(PTXCONF_OPENCV_STITCHING)+= libopencv_stitching -OPENCV_LIBS-$(PTXCONF_OPENCV_SHAPE)+= libopencv_shape OPENCV_LIBS-$(PTXCONF_OPENCV_VIDEO)+= libopencv_video OPENCV_LIBS-$(PTXCONF_OPENCV_VIDEOIO) += libopencv_videoio -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 4/6] OpenCV: Changed QT-Support from 4 to 5
Signed-off-by: Marian Cichy --- rules/opencv.in | 7 +++ rules/opencv.make | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/rules/opencv.in b/rules/opencv.in index ac096d60c..415db9e1e 100644 --- a/rules/opencv.in +++ b/rules/opencv.in @@ -8,10 +8,9 @@ menuconfig OPENCV select ZLIB select LIBPNG select LIBJPEG - select QT4 if OPENCV_QT - select QT4_BUILD_QTESTLIB if OPENCV_QT - select QT4_BUILD_GUIif OPENCV_QT - select QT4_STL if OPENCV_QT + select QT5 if OPENCV_QT + select QT5_TEST if OPENCV_QT + select QT5_GUI if OPENCV_QT select GSTREAMERif OPENCV_GSTREAMER select V4L_UTILSif OPENCV_V4L_LIBV4L2 select V4L_UTILS_LIBV4L1if OPENCV_V4L_LIBV4L2 diff --git a/rules/opencv.make b/rules/opencv.make index 1656f605a..c2d91f9b5 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -195,7 +195,7 @@ OPENCV_CONF_OPT := \ -DWITH_PROTOBUF=ON \ -DWITH_PTHREADS_PF:BOOL=OFF \ -DWITH_PVAPI:BOOL=OFF \ - -DWITH_QT:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_QT,4,OFF) \ + -DWITH_QT:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_QT,5,OFF) \ -DWITH_QUIRC=ON \ -DWITH_TBB:BOOL=OFF \ -DWITH_TIFF:BOOL=OFF \ -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/6] OpenCV: Added flag to build and integrate Examples
Signed-off-by: Marian Cichy --- rules/opencv.in | 5 + rules/opencv.make | 22 -- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/rules/opencv.in b/rules/opencv.in index 37fd32758..ac096d60c 100644 --- a/rules/opencv.in +++ b/rules/opencv.in @@ -131,4 +131,9 @@ config OPENCV_QT help QT GUI Support +config OPENCV_EXAMPLES + bool + prompt "Build Examples" + help + Build the OpenCV example applications and install them into /usr/share/opencv/examples. endif diff --git a/rules/opencv.make b/rules/opencv.make index 44ee4fd0c..fc6243753 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -39,7 +39,7 @@ OPENCV_CONF_OPT := \ -DANT_EXECUTABLE:FILEPATH= \ -DPYTHON_EXECUTABLE= \ -DBUILD_DOCS:BOOL=OFF \ - -DBUILD_EXAMPLES:BOOL=OFF \ + -DBUILD_EXAMPLES:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_EXAMPLES) \ -DBUILD_PACKAGE:BOOL=OFF \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS:BOOL=ON \ @@ -122,6 +122,22 @@ OPENCV_CONF_OPT:= \ -DWITH_OPENGL:BOOL=OFF \ -DWITH_QT:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_QT,4,OFF) + +OPENCV_BUILD_DIR := $(OPENCV_DIR)-build + +$(STATEDIR)/opencv.install: + + + @$(call targetinfo) + @$(call world/install, OPENCV) +ifdef PTXCONF_OPENCV_EXAMPLES + @mkdir -p $(OPENCV_PKGDIR)/usr/share/opencv/examples + find $(OPENCV_BUILD_DIR)/bin -type f | while read file; do \ + install -m 755 "$$file" $(OPENCV_PKGDIR)/usr/share/opencv/examples; \ + done +endif + @$(call touch) + # # Target-Install # @@ -153,7 +169,9 @@ $(STATEDIR)/opencv.targetinstall: @$(foreach lib, $(OPENCV_LIBS-y), \ $(call install_lib, opencv, 0, 0, 0644, $(lib));) - +ifdef PTXCONF_OPENCV_EXAMPLES + $(call install_tree, opencv, 0, 0, $(OPENCV_PKGDIR)/usr/share/opencv/examples, /usr/share/opencv/examples) +endif @$(call install_finish, opencv) @$(call touch) -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/6] OpenCV: Update to Version 4.1.2.
Removed the modules opencv_superres and opencv_videostab because they are not part of the opencv main repository anymore but have been moved to the opencv_contrib repository. Signed-off-by: Marian Cichy --- rules/opencv.in | 66 + rules/opencv.make | 68 +++ 2 files changed, 41 insertions(+), 93 deletions(-) diff --git a/rules/opencv.in b/rules/opencv.in index cd43563ea..37fd32758 100644 --- a/rules/opencv.in +++ b/rules/opencv.in @@ -1,6 +1,4 @@ -## SECTION=staging -## old section: -### SECTION=multimedia_libs +## SECTION=multimedia_libs menuconfig OPENCV tristate @@ -21,9 +19,6 @@ menuconfig OPENCV help Open Source Computer Vision Library - STAGING: remove in ptxdist-2020.06.0 - Old version that need to be updated. Fails to build with gcc >= 7.x. - if OPENCV config OPENCV_CALIB3D @@ -33,17 +28,6 @@ config OPENCV_CALIB3D help Camera Calibration and 3D Reconstruction -config OPENCV_CONTRIB - bool - prompt "contrib" - select OPENCV_CALIB3D - select OPENCV_IMGPROC - select OPENCV_ML - select OPENCV_OBJDETECT - select OPENCV_VIDEO - help - Contributed/Experimental Stuff - config OPENCV_FEATURES2D bool prompt "features2d" @@ -58,16 +42,6 @@ config OPENCV_FLANN help Clustering and Search in Multi-Dimensional Spaces -config OPENCV_GPU - bool - prompt "gpu" - select OPENCV_LEGACY - select OPENCV_PHOTO - select OPENCV_OBJDETECT - select OPENCV_HIGHGUI - help - GPU-accelerated Computer Vision - config OPENCV_HIGHGUI bool prompt "highgui" @@ -81,14 +55,11 @@ config OPENCV_IMGPROC help Image Processing -config OPENCV_LEGACY +config OPENCV_IMGCODECS bool - prompt "legacy" - select OPENCV_CALIB3D - select OPENCV_ML - select OPENCV_VIDEO + prompt "imgcodecs" help - Deprecated stuff + Image Codecs config OPENCV_ML bool @@ -96,15 +67,6 @@ config OPENCV_ML help Machine Learning -config OPENCV_NONFREE - bool - prompt "nonfree" - select OPENCV_CALIB3D - select OPENCV_IMGPROC - select OPENCV_FEATURES2D - help - Non-free functionality - config OPENCV_OBJDETECT bool prompt "objdetect" @@ -128,14 +90,6 @@ config OPENCV_STITCHING help Images stitching -config OPENCV_SUPERRES - bool - prompt "superres" - select OPENCV_IMGPROC - select OPENCV_VIDEO - help - Super Resolution - config OPENCV_VIDEO bool prompt "video" @@ -143,17 +97,11 @@ config OPENCV_VIDEO help Video Analysis -config OPENCV_VIDEOSTAB +config OPENCV_VIDEOIO bool - prompt "videostab" - select OPENCV_CALIB3D - select OPENCV_FEATURES2D - select OPENCV_HIGHGUI - select OPENCV_OBJDETECT - select OPENCV_PHOTO - select OPENCV_VIDEO + prompt "videoio" help - Video Stabilization + Video I/O config OPENCV_GSTREAMER bool diff --git a/rules/opencv.make b/rules/opencv.make index 65125e3b7..44ee4fd0c 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -17,14 +17,13 @@ PACKAGES-$(PTXCONF_OPENCV) += opencv # Paths and names # -OPENCV_VERSION := 2.4.8 -OPENCV_MD5 := 50cc1433b3654074206f5b3dbfd49848 \ - 5270b5b5480d3f02018e14a953dc3720 +OPENCV_VERSION := 4.1.2 +OPENCV_MD5 := 6b390578d57131ae9d6c2a183257399d OPENCV := opencv-$(OPENCV_VERSION) OPENCV_SUFFIX := zip OPENCV_URL := \ $(call ptx/mirror, SF, opencvlibrary/opencv-unix/$(OPENCV_VERSION)/$(OPENCV).$(OPENCV_SUFFIX)) \ - https://github.com/Itseez/opencv/archive/$(OPENCV_VERSION).$(OPENCV_SUFFIX) + https://github.com/opencv/opencv/archive/$(OPENCV_VERSION).$(OPENCV_SUFFIX) OPENCV_SOURCE := $(SRCDIR)/$(OPENCV).$(OPENCV_SUFFIX) OPENCV_DIR := $(BUILDDIR)/$(OPENCV) OPENCV_LICENSE := BSD @@ -47,6 +46,7 @@ OPENCV_CONF_OPT := \ -DBUILD_TESTS=OFF \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_WITH_DEBUG_INFO=OFF \ + -DBUILD_CUDA_STUBS:BOOL=OFF \ -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF \ -DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_USE_RELATIVE_PATHS=OFF \ @@ -56,14 +56,12 @@ OPENCV_CONF_OPT := \ -DENABLE_PRECOMPILED_HEADERS=OFF \ -DENABLE_PROFILING=OFF \ -DENABLE_SOLUTION_FOLDERS=OFF \ - -DOPENCV_CAN_BREAK_BINARY_COMPATIBILITY=ON \ -DWITH_GTK:BOOL=OFF \ -DWITH_TBB:BOOL=OFF \ -DWITH_TIFF:BOOL=OFF \ - -DCMAKE_VERBOSE:BOOL=OFF \
[ptxdist] [PATCH 5/6] OpenCV: added switch to turn on/off DNN support
Signed-off-by: Marian Cichy --- rules/opencv.in | 6 ++ rules/opencv.make | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/rules/opencv.in b/rules/opencv.in index 415db9e1e..12b44606f 100644 --- a/rules/opencv.in +++ b/rules/opencv.in @@ -102,6 +102,12 @@ config OPENCV_VIDEOIO help Video I/O +config OPENCV_DNN + bool + prompt "DNN" + help + Deep Neural Network Library + config OPENCV_GSTREAMER bool prompt "gstreamer" diff --git a/rules/opencv.make b/rules/opencv.make index c2d91f9b5..c37ee5e2e 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -65,7 +65,7 @@ OPENCV_CONF_OPT := \ -DBUILD_opencv_apps:BOOL=OFF \ -DBUILD_opencv_calib3d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_CALIB3D,ON,OFF) \ -DBUILD_opencv_core:BOOL=ON \ - -DBUILD_opencv_dnn=OFF \ + -DBUILD_opencv_dnn=$(call ptx/ifdef,PTXCONF_OPENCV_DNN,ON,OFF) \ -DBUILD_opencv_features2d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FEATURES2D,ON,OFF) \ -DBUILD_opencv_flann:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FLANN,ON,OFF) \ -DBUILD_opencv_highgui:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_HIGHGUI,ON,OFF) \ -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 6/6] OpenCV: changed ptx/ifdef usage to ptx/onoff
CMake switches used ptx/ifdef with an ON/OFF define, but we have ptx/onoff for this case. Using this to sustain uniformity. Signed-off-by: Marian Cichy --- rules/opencv.make | 32 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/rules/opencv.make b/rules/opencv.make index c37ee5e2e..d2fb5aa44 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -63,24 +63,24 @@ OPENCV_CONF_OPT := \ -DBUILD_WITH_DYNAMIC_IPP=OFF \ -DBUILD_ZLIB=OFF \ -DBUILD_opencv_apps:BOOL=OFF \ - -DBUILD_opencv_calib3d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_CALIB3D,ON,OFF) \ + -DBUILD_opencv_calib3d:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_CALIB3D) \ -DBUILD_opencv_core:BOOL=ON \ - -DBUILD_opencv_dnn=$(call ptx/ifdef,PTXCONF_OPENCV_DNN,ON,OFF) \ - -DBUILD_opencv_features2d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FEATURES2D,ON,OFF) \ - -DBUILD_opencv_flann:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FLANN,ON,OFF) \ - -DBUILD_opencv_highgui:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_HIGHGUI,ON,OFF) \ - -DBUILD_opencv_imgcodecs=$(call ptx/ifdef,PTXCONF_OPENCV_IMGCODECS,ON,OFF) \ - -DBUILD_opencv_imgproc:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_IMGPROC,ON,OFF) \ + -DBUILD_opencv_dnn=$(call ptx/onff,PTXCONF_OPENCV_DNN) \ + -DBUILD_opencv_features2d:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_FEATURES2D) \ + -DBUILD_opencv_flann:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_FLANN) \ + -DBUILD_opencv_highgui:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_HIGHGUI) \ + -DBUILD_opencv_imgcodecs=$(call ptx/onoff,PTXCONF_OPENCV_IMGCODECS) \ + -DBUILD_opencv_imgproc:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_IMGPROC) \ -DBUILD_opencv_java_bindings_generator=ON \ -DBUILD_opencv_js=OFF \ - -DBUILD_opencv_ml:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_ML,ON,OFF) \ - -DBUILD_opencv_objdetect:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_OBJDETECT,ON,OFF) \ - -DBUILD_opencv_photo:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_PHOTO,ON,OFF) \ + -DBUILD_opencv_ml:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_ML) \ + -DBUILD_opencv_objdetect:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_OBJDETECT) \ + -DBUILD_opencv_photo:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_PHOTO) \ -DBUILD_opencv_python_bindings_generator=ON \ -DBUILD_opencv_python_tests=ON \ - -DBUILD_opencv_stitching:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_STITCHING,ON,OFF) \ + -DBUILD_opencv_stitching:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_STITCHING) \ -DBUILD_opencv_ts:BOOL=OFF \ - -DBUILD_opencv_video:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_VIDEO,ON,OFF) \ + -DBUILD_opencv_video:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_VIDEO) \ -DBUILD_opencv_videoio=ON \ -DBUILD_opencv_world:BOOL=OFF \ -DCAROTENE_NS=carotene_o4t \ @@ -101,7 +101,7 @@ OPENCV_CONF_OPT := \ -DENABLE_IMPL_COLLECTION=OFF \ -DENABLE_INSTRUMENTATION=OFF \ -DENABLE_LTO=OFF \ - -DENABLE_NEON:BOOL=$(call ptx/ifdef,PTXCONF_ARCH_ARM_NEON,ON,OFF) \ + -DENABLE_NEON:BOOL=$(call ptx/onoff,PTXCONF_ARCH_ARM_NEON) \ -DENABLE_NOISY_WARNINGS=OFF \ -DENABLE_OMIT_FRAME_POINTER=ON \ -DENABLE_PIC=ON \ @@ -162,7 +162,7 @@ OPENCV_CONF_OPT := \ -DWITH_GDCM=OFF \ -DWITH_GIGEAPI:BOOL=OFF \ -DWITH_GPHOTO2:BOOL=OFF \ - -DWITH_GSTREAMER:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_GSTREAMER,ON,OFF) \ + -DWITH_GSTREAMER:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_GSTREAMER) \ -DWITH_GTK:BOOL=OFF \ -DWITH_GTK_2_X=OFF \ -DWITH_HALIDE=OFF \ @@ -178,7 +178,7 @@ OPENCV_CONF_OPT := \ -DWITH_JPEG:BOOL=ON \ -DWITH_LAPACK=ON \ -DWITH_LIBREALSENSE=OFF \ - -DWITH_LIBV4L:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_V4L_LIBV4L2,ON,OFF) \ + -DWITH_LIBV4L:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_V4L_LIBV4L2) \ -DWITH_MFX=OFF \ -DWITH_NVCUVID:BOOL=OFF \ -DWITH_OPENCL:BOOL=ON \ @@ -200,7 +200,7 @@ OPENCV_CONF_OPT := \ -DWITH_TBB:BOOL=OFF \ -DWITH_TIFF:BOOL=OFF \ -DWITH_UNICAP:BOOL=OFF \ - -DWITH_V4L:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_V4L,ON,OFF) \ + -DWITH_V4L:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_V4L) \ -DWITH_VA=OFF \ -DWITH_VA_INTEL=OFF \ -DWITH_VULKAN=OFF \ -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 3/6] OpenCV: Clean up configure_helper output
Signed-off-by: Marian Cichy --- rules/opencv.make | 182 +- 1 file changed, 133 insertions(+), 49 deletions(-) diff --git a/rules/opencv.make b/rules/opencv.make index fc6243753..1656f605a 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -27,7 +27,7 @@ OPENCV_URL:= \ OPENCV_SOURCE := $(SRCDIR)/$(OPENCV).$(OPENCV_SUFFIX) OPENCV_DIR := $(BUILDDIR)/$(OPENCV) OPENCV_LICENSE := BSD - +OPENCV_BUILD_DIR := $(OPENCV_DIR)-build # # Prepare # @@ -37,94 +37,178 @@ OPENCV_CONF_TOOL := cmake OPENCV_CONF_OPT:= \ $(CROSS_CMAKE_USR) \ -DANT_EXECUTABLE:FILEPATH= \ - -DPYTHON_EXECUTABLE= \ + -DAtlas_BLAS_LIBRARY=Atlas_BLAS_LIBRARY-NOTFOUND \ + -DAtlas_CBLAS_LIBRARY=Atlas_CBLAS_LIBRARY-NOTFOUND \ + -DAtlas_LAPACK_LIBRARY=Atlas_LAPACK_LIBRARY-NOTFOUND \ + -DBUILD_CUDA_STUBS:BOOL=OFF \ -DBUILD_DOCS:BOOL=OFF \ -DBUILD_EXAMPLES:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_EXAMPLES) \ + -DBUILD_ITT=ON \ + -DBUILD_JASPER=OFF \ + -DBUILD_JAVA=OFF \ + -DBUILD_JPEG=OFF \ + -DBUILD_LIST= \ + -DBUILD_OPENEXR=OFF \ -DBUILD_PACKAGE:BOOL=OFF \ - -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_PERF_TESTS=OFF \ + -DBUILD_PNG=OFF \ + -DBUILD_PROTOBUF=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ + -DBUILD_TBB=OFF \ -DBUILD_TESTS=OFF \ - -DBUILD_PERF_TESTS=OFF \ + -DBUILD_TIFF=OFF \ + -DBUILD_USE_SYMLINKS=OFF \ + -DBUILD_WEBP=OFF \ -DBUILD_WITH_DEBUG_INFO=OFF \ - -DBUILD_CUDA_STUBS:BOOL=OFF \ - -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_USE_RELATIVE_PATHS=OFF \ + -DBUILD_WITH_DYNAMIC_IPP=OFF \ + -DBUILD_ZLIB=OFF \ + -DBUILD_opencv_apps:BOOL=OFF \ + -DBUILD_opencv_calib3d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_CALIB3D,ON,OFF) \ + -DBUILD_opencv_core:BOOL=ON \ + -DBUILD_opencv_dnn=OFF \ + -DBUILD_opencv_features2d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FEATURES2D,ON,OFF) \ + -DBUILD_opencv_flann:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FLANN,ON,OFF) \ + -DBUILD_opencv_highgui:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_HIGHGUI,ON,OFF) \ + -DBUILD_opencv_imgcodecs=$(call ptx/ifdef,PTXCONF_OPENCV_IMGCODECS,ON,OFF) \ + -DBUILD_opencv_imgproc:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_IMGPROC,ON,OFF) \ + -DBUILD_opencv_java_bindings_generator=ON \ + -DBUILD_opencv_js=OFF \ + -DBUILD_opencv_ml:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_ML,ON,OFF) \ + -DBUILD_opencv_objdetect:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_OBJDETECT,ON,OFF) \ + -DBUILD_opencv_photo:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_PHOTO,ON,OFF) \ + -DBUILD_opencv_python_bindings_generator=ON \ + -DBUILD_opencv_python_tests=ON \ + -DBUILD_opencv_stitching:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_STITCHING,ON,OFF) \ + -DBUILD_opencv_ts:BOOL=OFF \ + -DBUILD_opencv_video:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_VIDEO,ON,OFF) \ + -DBUILD_opencv_videoio=ON \ + -DBUILD_opencv_world:BOOL=OFF \ + -DCAROTENE_NS=carotene_o4t \ + -DCMAKE_CONFIGURATION_TYPES="Debug;Release" \ + -DCPU_BASELINE=DETECT \ + -DCPU_BASELINE_DISABLE=";VFPV3" \ + -DCPU_BASELINE_REQUIRE=";NEON" \ + -DCPU_DISPATCH= \ + -DCV_DISABLE_OPTIMIZATION=OFF \ + -DCV_ENABLE_INTRINSICS=ON \ + -DCV_TRACE=ON \ + -DENABLE_BUILD_HARDENING=OFF \ + -DENABLE_CCACHE=OFF \ + -DENABLE_CONFIG_VERIFICATION=OFF \ + -DENABLE_COVERAGE=OFF \ -DENABLE_FAST_MATH=ON \ + -DENABLE_GNU_STL_DEBUG=OFF \ + -DENABLE_IMPL_COLLECTION=OFF \ + -DENABLE_INSTRUMENTATION=OFF \ + -DENABLE_LTO=OFF \ + -DENABLE_NEON:BOOL=$(call ptx/ifdef,PTXCONF_ARCH_ARM_NEON,ON,OFF) \ -DENABLE_NOISY_WARNINGS=OFF \ -DENABLE_OMIT_FRAME_POINTER=ON \ - -DENABLE_PRECOMPILED_HEADERS=OFF \ + -DENABLE_PIC=ON \ -DENABLE_PROFILING=OFF \ -DENABLE_SOLUTION_FOLDERS=OFF \ - -DWITH_GTK:BOOL=OFF \ - -DWITH_TBB:BOOL=OFF \ - -DWITH_TIFF:BOOL=OFF \ - -DWITH_CUDA:BOOL=OFF \ - -DWITH_EIGEN:BOOL=OFF \ - -DENABLE_NEON:BOOL=$(call ptx/ifdef,PTXCONF_ARCH_ARM_NEON,ON,OFF) \ -DENABLE_VFPV3:BOOL=OFF \ - -DWITH_GIGEAPI:BOOL=OFF \ + -DEXECUTABLE_OUTPUT_PATH=$(OPENCV_BUILD_DIR)/bin \ + -DGENERATE_ABI_DESCRIPTOR=OFF \ -DINSTALL_CREATE_DISTRIB:BOOL=OFF \ -DINSTALL_C_EXAMPLES:BOOL=OFF \ -DINSTALL_PYTHON_EXAMPLES:BOOL=OFF \ + -DINSTALL_TESTS=OFF \ -DINSTALL_TO_MANGLED_PATHS:BOOL=OFF \ + -DLAPACK_CBLAS_H= \ + -DLAPACK_IMPL=Unknown \ + -DLAPACK_LAPACKE_H
