From eff27476badc5d48b544a07f9f4748a96506c8d7 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 29 Oct 2021 15:35:00 -0500 Subject: subtree updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit poky: 80f2b56ad8..d78650b980: Ahmed Hossam (1): go.bbclass: Allow adding parameters to go ldflags Alejandro Hernandez Samaniego (1): baremetal-image: Fix do_image dependencies Alexander Kanavin (153): meson: update 0.58.1 -> 0.59.1 libcap: update 2.51 -> 2.54 lua: add a recipe from meta-oe lua: update 5.3.6 -> 5.4.3 rpm: update 4.16.1.3 -> 4.17.0 libdnf: fix the rpm sqlite-only target setup libsolv: disable rpm bdb format support perl: do not build berkeley db module by default package_rpm: use zstd instead of xz qemu: update 6.0.0 -> 6.1.0 runqemu: correct vga-virtio option to keep virgl enabled gnupg: update 2.3.1 -> 2.3.2 pinentry: update 1.1.1 -> 1.2.0 spirv-tools: update 2021.2 -> 2021.3 glslang: update 11.5.0 -> 11.6.0 shaderc: update 2021.1 -> 2021.2 inetutils: update 2.1 -> 2.2 systemd: update 249.3 -> 249.4 lsof: update 4.91 -> 4.94.0 libpam: update 1.5.1 -> 1.5.2 rt-tests: update 2.1 -> 2.2 libgit2: update 1.1.1 -> 1.2.0 libssh2: update 1.9.0 -> 1.10.0 libhandy: update 1.2.3 -> 1.4.0 qemu: install qmp module without hardcoding the python version in oeqa scripts lttng-tools: replace ad hoc ptest fixup with upstream fixes rust: drop PV from include file names rust: update 1.54.0 -> 1.55.0 librsvg: update 2.40.21 -> 2.52.0 (transition to rust!) librsvg: do not enable nativesdk librsvg: add backports to fix big endian targets (e.g. mips) librsvg: use only the target architecture to determine availability of atomic primitives librsvg: restore reproducibility adwaita-icon-theme: update 3.34/38 -> 41.0 gstreamer1.0-plugins-bad: disable rsvg on x32 rust/cargo: exclude UNINATIVE_LOADER from task signature rust-common.bbclass: rewrite toolchain wrappers in (native) python rust: do not write ar into target json definitions rust: generate target definitions from (arch, abi), not just arch openssl: update 1.1.1l -> 3.0.0 cryptodev-tests: do not use -Werror with openssl 3 serf: add a openssl 3 compatibility fix ruby: disable openssl extension glib-2.0: update 2.68.4 -> 2.70.0 glib-networking: update 2.68.2 -> 2.70.0 bison: update 3.7.6 -> 3.8.1 libdnf: update 0.63.1 -> 0.64.0 libexif: update 0.6.22 -> 0.6.23 sudo: update 1.9.7p2 -> 1.9.8p1 wget: update 1.21.1 -> 1.21.2 coreutils: update 8.32 -> 9.0 itstool: update 2.0.6 -> 2.0.7 nghttp2: add recipe from meta-oe libsoup: add a 3.x recipe webkitgtk: trim down DEPENDS epiphany: trim down DEPENDS webkitgtk: update 2.32.3 -> 2.34.0 epiphany: update 40.3 -> 41.0 python3: update 3.9.7 -> 3.10.0 libjitterentropy: update 3.1.0 -> 3.3.0 kea: update 1.8.2 -> 2.0.0 ghostscript: update 9.54.0 -> 9.55.0 lighttpd: update 1.4.59 -> 1.4.60 bluez5: update 5.61 -> 5.62 ovmf: update 202105 -> 202108 systemd: update 249.4 -> 249.5 meson: update 0.59.1 -> 0.59.2 python3-pip: update 21.2.4 -> 21.3 valgrind: update 3.17.0 -> 3.18.1 librsvg: update 2.52.0 -> 2.52.2 libva: update 2.12.0 -> 2.13.0 liberation-fonts: update 2.1.4 -> 2.1.5 ca-certificates: update 20210119 -> 20211016 curl: update 7.78.0 -> 7.79.1 libgit2: update 1.2.0 -> 1.3.0 libxcrypt: upgrade 4.4.25 -> 4.4.26 bison: upgrade 3.8.1 -> 3.8.2 cmake: update 3.21.2 -> 3.21.3 git: upgrade 2.33.0 -> 2.33.1 tzdata: upgrade 2021a -> 2021d ofono: upgrade 1.32 -> 1.33 openssh: upgrade 8.7p1 -> 8.8p1 sysvinit: upgrade 2.99 -> 3.00 btrfs-tools: upgrade 5.13.1 -> 5.14.2 ccache: upgrade 4.4 -> 4.4.2 createrepo-c: upgrade 0.17.5 -> 0.17.6 libcomps: upgrade 0.1.17 -> 0.1.18 libedit: upgrade 20210714-3.1 -> 20210910-3.1 librepo: upgrade 1.14.1 -> 1.14.2 python3-jinja2: upgrade 3.0.1 -> 3.0.2 python3-pygobject: upgrade 3.40.1 -> 3.42.0 python3-setuptools: upgrade 58.0.4 -> 58.2.0 vala: upgrade 0.52.5 -> 0.54.2 acpica: upgrade 20210730 -> 20210930 asciidoc: upgrade 9.1.0 -> 9.1.1 libarchive: upgrade 3.5.1 -> 3.5.2 msmtp: upgrade 1.8.15 -> 1.8.17 sudo: upgrade 1.9.8p1 -> 1.9.8p2 gobject-introspection: upgrade 1.68.0 -> 1.70.0 gsettings-desktop-schemas: upgrade 40.0 -> 41.0 json-glib: upgrade 1.6.4 -> 1.6.6 libdazzle: upgrade 3.40.0 -> 3.42.0 harfbuzz: upgrade 2.9.1 -> 3.0.0 pango: upgrade 1.48.9 -> 1.48.10 libinput: upgrade 1.19.0 -> 1.19.1 linux-firmware: upgrade 20210818 -> 20210919 wireless-regdb: upgrade 2021.07.14 -> 2021.08.28 mpg123: upgrade 1.28.2 -> 1.29.0 puzzles: upgrade to latest revision libwpe: upgrade 1.10.1 -> 1.12.0 diffoscope: upgrade 182 -> 187 fribidi: upgrade 1.0.10 -> 1.0.11 iso-codes: upgrade 4.6.0 -> 4.7.0 libatomic-ops: upgrade 7.6.10 -> 7.6.12 libcap: upgrade 2.54 -> 2.59 libmd: upgrade 1.0.3 -> 1.0.4 libsoup-2.4: upgrade 2.72.0 -> 2.74.0 gnupg: update 2.3.2 -> 2.3.3 libssh2: skip one of the ptests until openssh 8.8 compatibility is fixed systemd: disable seccomp on mips32 waffle: convert to git, website is down u-boot: upgrade 2021.07 -> 2021.10 psplash: upgrade to latest revision stress-ng: convert to git, website is down json-c: correct upstream version check createrepo-c: upgrade 0.17.6 -> 0.17.7 python3-numpy: upgrade 1.21.2 -> 1.21.3 python3-pip: upgrade 21.3 -> 21.3.1 python3-setuptools: upgrade 58.2.0 -> 58.3.0 msmtp: upgrade 1.8.17 -> 1.8.18 gi-docgen: upgrade 2021.7 -> 2021.8 piglit: upgrade to latest revision libinput: upgrade 1.19.1 -> 1.19.2 mpg123: upgrade 1.29.0 -> 1.29.2 puzzles: upgrade to latest revision webkitgtk: upgrade 2.34.0 -> 2.34.1 wpebackend-fdo: upgrade 1.10.0 -> 1.12.0 diffoscope: upgrade 187 -> 188 libcap: upgrade 2.59 -> 2.60 vte: upgrade 0.64.2 -> 0.66.0 ncurses: update 6.2 -> 6.3 tzdata: update 2021d -> 2021e asciidoc: update 9.1.1 -> 10.0.0 waffle: update 1.6.1 -> 1.7.0 virgl: skip headless test on specific older distros and fail otherwise gptfdisk: address ncurses 6.3 compatibility powertop: address ncurses 6.3 compatibility systemtap: address ncurses 6.3 compatibility igt-gpu-tools: address meson 0.60 compatibility python3-pygobject: do not supply unknown g-i options gstreamer1.0-python: do not supply unknown g-i options webkitgtk: drop unnecessary SSE disabling patch cups: exclude beta/rc versions from version check Alexandre Belloni (5): inetutils: drop CVE-2021-40491 patch oeqa/selftest/sstatetests: fix typo ware -> were maintainers.inc: fix up rust-cross entry libevent,btrfs-tools: fix Upstream-Status tag ruby: fix Upstream-Status Andreas Müller (1): webkitgtk: add gperf-native to DEPENDS to fix build Andrei Gherzan (1): qemu: Define libnfs PACKAGECONFIG Andrej Valek (3): busybox: 1.34.0 -> 1.34.1 featimage: refactor style kernel-fitimage: use correct kernel image Andres Beltran (1): buildhistory: Fix package output files for SDKs Bruce Ashfield (15): linux-yocto/5.14: scripts/gcc-plugins: consistently use HOSTCC linux-yocto/5.14: update to v5.14.8 linux-yocto/5.14: bsp/qemuarm*-gfx: use virtio graphics linux-yocto/5.10: update to v5.10.69 linux-yocto/5.10: update to v5.10.70 linux-yocto/5.14: update to v5.14.9 kernel-yocto: don't apply config metadata patches twice linux-yocto/5.14: revert: scripts/gcc-plugins: consistently use HOSTCC linux-yocto/5.10: update to v5.10.73 linux-yocto/5.14: update to v5.14.12 linux-yocto/5.14: update to v5.14.13 linux-yocto/5.10: update to v5.10.74 linux-yocto/5.14: common-pc: enable CONFIG_ATA_PIIX as built-in linux-yocto/5.14: update to v5.14.14 linux-yocto/5.10: update to v5.10.75 Caner Altinbasak (2): bitbake: npmsw: Avoid race condition with multiple npm fetchers bitbake: fetch2: Do not attempt to verify donestamp if download is not complete Changhyeok Bae (2): iproute2: update to 5.14.0 ethtool: update to 5.14 Changqing Li (1): lttng-ust: fix do_compile failure for arm32 with DEBUG_BUILD enabled Daiane Angolini (2): machine/qemuarm*: Fix UBOOT_MACHINE value ref-manual: Update how to set a useradd password Daniel McGregor (3): bison: prevent checking for textstyle. bitbake.conf: Add gpg-agent as a host tool sstate: Allow validation of sstate singatures against list of keys David Joyner (1): rust: add support for big endian 64-bit PowerPC Denys Dmytriyenko (2): wayland-protocols: upgrade 1.21 -> 1.22 wayland-protocols: upgrade 1.22 -> 1.23 Fred Liu (1): glibc: Drop libcidn package Henry Kleynhans (1): sstate: Switch to ZStandard compressor support Hsia-Jun(Randy) Li (1): meson: install native file in sdk Ian Ray (1): archiver: Configurable tarball compression Jon Mason (10): oeqa/manual: Fix no longer valid URLs bitbake: bitbake:toaster:test: Update SSTATE URL yocto-bsp/poky: replace http with https for URLs bitbake: bitbake: replace http with https for URLs documentation: update sources mirror URL documentation: replace http with https for URLs documentation: use YOCTO_DL_URL dev-manual: remove errant / runqemu: add DEPLOY_DIR_IMAGE replacement in QB_OPT_APPEND bitbake: bitbake-user-manual: update sources mirror URL Jose Quaresma (15): gstreamer1.0: 1.18.4 -> 1.18.5 gstreamer1.0-plugins-base: 1.18.4 -> 1.18.5 gstreamer1.0-plugins-good: 1.18.4 -> 1.18.5 gstreamer1.0-plugins-bad: 1.18.4 -> 1.18.5 gstreamer1.0-plugins-ugly: 1.18.4 -> 1.18.5 gstreamer1.0-rtsp-server: 1.18.4 -> 1.18.5 gstreamer1.0-libav: 1.18.4 -> 1.18.5 gstreamer1.0-vaapi: 1.18.4 -> 1.18.5 gstreamer1.0-omx: 1.18.4 -> 1.18.5 gstreamer1.0-python: 1.18.4 -> 1.18.5 gst-devtools: 1.18.4 -> 1.18.5 gst-examples: 1.18.4 -> 1.18.5 patch.bbclass: when the patch fails show more info on the fatal error sstate.bbclass: count the files on mirrors using the pre local files sstate: fix touching files inside pseudo Joshua Watt (4): bitbake: async: Close sync client event loop bitbake: hashserv: Add tests for diverging reports bitbake: hashserv: Fix diverging report race condition classes/populate_sdk_base: Add setscene tasks Kai Kang (1): sudo: update multilib patch for sudo.conf Khem Raj (11): pkgconfig: Update to latest libseccomp: Upgrade to 2.5.2 and beyond openssl: Drop riscv32 upstreamed patches opensbi-payloads.inc: Use strings for fallback mesa: Enable svga for x86 only qemu: Add knob for enabling PMDK pmem support opensbi-payloads: Add dependency on kernel if fdt is set librsvg: Fix vendored libc to work on riscv and musl librsvg: Bump to 2.52.0 -> 2.52.2 rust: Upgrade to 1.56.0 librsvg: Disable 64bit atomics in crossbeam for rv32 Kiran Surendran (1): ffmpeg: fix CVE-2021-38114 Konrad Weihmann (1): libical: fix append in DEPENDS Lukasz Majewski (1): glibc: Extract common code to build tests to glibc-tests.inc Marek Vasut (1): piglit: upgrade to latest revision Martin Jansa (2): webkitgtk: add PACKAGECONFIG for opengl-or-es boost: allow searching for python310 Maximilian Blenk (1): mount-copybind: add rootcontext mountoption for overlayfs Michael Halstead (2): scripts/autobuilder-worker-prereq-tests: jinja2 check releases: update to include 3.4 honister Michael Opdenacker (18): manuals: font fixes ref-manual: document DEBUG_PREFIX_MAP manuals: replace "apt-get" by "apt" Makefile: allow epub and latexpdf outputs to use diagrams from SVG sources conf.py: use PNG first in EPUB output overview-manual: SVG diagram for the git workflow docs: add "make all" to build old types of docs (html, epub, pdf) at once manuals: introduce 'yocto_sstate' extlink overview-manual: simplify expression dev-manual: correct NO_GENERIC_LICENSE section title dev-manual: warn about license compliance issues when static libraries are used devpyshell: rename to pydevshell ref-manual: document TOOLCHAIN_HOST_TASK_ESDK manuals: rename "devpyshell" to "pydevshell" ref-manual: document SOURCE_DATE_EPOCH ref-manual: fix description of SOURCE_DATE_EPOCH releases.rst: fix release number for 3.3.3 docs: poky.yaml: updates for 3.4 Mike Crowe (2): lib/oe/qa,insane: Move extra error handling functions to library insane,license,license_image: Allow treating license problems as errors Mingli Yu (1): packagedata.py: silence a DeprecationWarning Oleh Matiusha (1): findutils: add ptest Oleksandr Kravchuk (15): python3: update to 3.9.7 python3-git: update to 3.1.24 python3-dbusmock: update to 0.24.0 python3-setuptools: update to 58.0.4 python3-setuptools: minor cleanup xf86-input-libinput: update to 1.2.0 libinput: update to 1.19.0 libxi: update to 1.8 xorgproto: update to 2021.5 xkeyboard-config: update to 2.34 libxkbcommon: update to 1.3.1 mirrors.bbclass: remove dead infozip mirrors man-pages: update to 5.13 python3-smmap: update to 5.0.0 python3-pyparsing: update to 3.0.0 Pablo Saavedra Rodi?o (1): mesa: upgrade 21.2.1 -> 21.2.4 Paul Barker (1): bitbake: doc: bitbake-user-manual: Document BB_GIT_SHALLOW and friends Paul Eggleton (7): migration-3.4: tweak overrides change section ref-manual: remove meta class poky.yaml: add lz4 and zstd to essential host packages migration-3.4: add additional migration info migration: tweak introduction section poky.yaml: fix lz4 package name for older Ubuntu versions migration-3.4: add some extra packaging notes Pavel Zhukov (1): weston: wrapper for weston modules argument Peter Hoyes (2): u-boot: Convert ${UBOOT_ENV}.cmd into ${UBOOT_ENV}.scr u-boot: Fix syntax error in ${UBOOT_ENV}.scr compilation Peter Kjellerstedt (2): meson.bblcass: Remove empty egg-info directories before running meson qemu.inc: Remove empty egg-info directories before running meson Petr Vorel (1): ltp: Update to 20210927 Pgowda (2): Fix rust-native build issue when debug is enabled rust-cross: Fix directory not deleted for race glibc vs. musl Ralph Siemsen (1): tar: filter CVEs using vendor name Randy Li (1): meson: move lang args to the right section Richard Purdie (54): sstatesig: Only apply group/other permissions to pseudo files rpm: Deterministically set vendor macro entry abi_version/sstate: Bump to fix rpm corruption issues multilib: Avoid sysroot race issues when multilib enabled bitbake: knotty/uihelper: Show setscene task progress in summary output bitbake: bitbake-worker: Handle pseudo shutdown in Ctrl+C case poky.conf: Update tested distros list with recent changes bitbake: hashserv: Improve behaviour for better determinism/sstate reuse poky.conf: Bump version for 3.4 honister release build-appliance-image: Update to honister head revision bitbake: bitbake: Bump to version 1.52.0 build-appliance-image: Update to honister head revision layer.conf: Extend recipes not to install without explict dependencies libxml2: Use python3targetconfig to fix reproducibility issue libnewt: Use python3targetconfig to fix reproducibility issue bootchart2: Don't compile python modules linux-yocto-dev: Ensure DEPENDS matches recent 5.14 kernel changes base/insane: Import oe.qa by default base: Clean up unneeded len() calls base: Use repr() for printing exceptions bitbake.conf: Add BB_CURRENTTASK to BB_HASHEXCLUDE reproducible_build: Drop obsolete sstate workaround python: Update now reproducibile builds are the default bitbake: bitbake-worker: Set BB_CURRENTTASK earlier bitbake: compress: Allow to operate on file descriptor bitbake: siggen: Change file format of siginfo files to use zstd compressed json sstate: Fixes for eSDK generation after zstd switch patch: Use repr() with exceptions instead of str() reproducible_build: Drop now unneeded compiler warning reproducible: Move class function code into library reproducible: Move variable definitions to bitbake.conf reproducible: Merge code into base.bbclass kernel: Add KERNEL_DEBUG_TIMESTAMPS variable reproducible: Drop BUILD_REPRODUCIBLE_BINARIES variable kernel: Rework kernel make flag to variable mappings oeqa: Update cleanup code to wait for hashserv exit poky: Reproducible builds are now the default bitbake: tests/runqueue: Ensure hashserv exits before deleting files bitbake: bitbake-worker: Add debug when unpickle fails bitbake: siggen: Fix type conversion issues bitbake: test/fetch: Update urls to match upstream branch name changes libtool: Update patchset to match those submitted upstream staging: Fix autoconf-native rebuild failure patch: Fix exception reporting with repr() bitbake: fetch2/perforce: Fix typo bitbake: bitbake: Bump to post release verion 1.53.0 poky.conf: Post release version bump gcc: Merge three related patches together gcc: Drop sdt (dtrace) header patch gcc: Drop broken/unneeded patch bitbake: tests/runqueue: Drop python version test decorators gcc: Update patches submitted/merged upstream gcc: Drop testsuite failure fix patch gcc: Add missing patch Upstream-Status Ross Burton (21): bitbake: tests/utils: mark a regex as a raw string bitbake: tests/fetch: prefix the FetcherTest temporary directory bitbake: fetch2: clarify the command-no-found error message bitbake: fetch2/gitsm: remove the 'nugget' SRCREV caching linux-yocto: add libmpc-native to DEPENDS bitbake: fetch2: document checkstatus API curl: fix CVE-2021-22945 through -22947 oe/license: implement ast.NodeVisitor.visit_Constant license.bbclass: implement ast.NodeVisitor.visit_Constant bitbake: codegen: implement ast.NodeVisitor.visit_Constant testimage: fix unclosed testdata file oe/utils: log exceptions in ThreadedWorker functions sstate: don't silently handle all exceptions in sstate_checkhashes gawk: replace AR patch with upstreamed patch gawk: reduce strictness of the time test strace: remove obsolete patch strace: remove TOOLCHAIN assignment oeqa/runtime: load modules using importlib oeqa/runtime: search sys.path explicitly for modules testimage: remove target_modules_path strace: show test suite log on failure Sakib Sajal (1): go: upgrade 1.16.7 -> 1.16.8 Saul Wold (3): spdx.py: Add annotation to relationship create-spdx: add create_annotation function create-spdx: cross recipes are native also Stefan Herbrechtsmeier (17): bitbake: fetch2: npm: Support npm archives with missing search directory mode bitbake: fetch2: npm: Create config npmrc in environment instantiation bitbake: fetch2: npmsw: Add support for local tarball and link sources npm: Add support for EXTRA_OENPM arguments recipetool: Move license md5sums into CSV files recipetool: Skip common source files in guess_license recipetool: Change default paramter fallback_licenses of function split_pkg_licenses from None to [] recipetool: ignore empty license files recipetool: Add logger info for missing license entries recipetool: Add support for linenumbers to licenses.csv recipetool: npm: Do not add package.json files to LIC_FILES_CHKSUM recipetool: npm: Use README as license fallback npm: Add variable NPM_NODEDIR with default value npm: Use configs for npm environment and args for npm run command recipetool: Rework crunch_license to recognize more variants recipetool: Simplify common source files skip in guess_license npm: Remove unnecessary configs argument from npm run command Teoh Jay Shen (1): oeqa/runtime/parselogs: modified drm error in common errors list Thomas Perrot (1): image_types: allow the creation of block devices on top of UBI volumes Tim Orling (17): ptest-runner: install -collect-system-data script python3-hypothesis: upgrade 6.15.0 -> 6.23.2 python3-importlib-metadata: upgrade 4.6.4 -> 4.8.1 python3-more-itertools: upgrade 8.9.0 -> 8.10.0 python3-zipp: upgrade 3.5.0 -> 3.6.0 libconvert-asn1-perl: upgrade 0.31 -> 0.33 python3-pytest: upgrade 6.2.4 -> 6.2.5 at-spi2-core: upgrade 2.40.3 -> 2.42.0 python3-packaging: DEPENDS on python3-setuptools-native python3-packaging: BBCLASSEXTEND nativesdk python3-tomli: add recipe for 1.2.1 python3-setuptools-scm: upgrade 6.0.1 -> 6.3.2 python3-setuptools: _distutils/sysconfig fix python3-pyyaml: upgrade 5.4.1 -> 6.0 python3-manifest: -pprint RDEPENDS on -profile python3-hypothesis: upgrade 6.23.2 -> 6.24.0 python3-tomli: upgrade 1.2.1 -> 1.2.2 Tobias Kaufmann (1): mount-copybind: add SELinux support Yureka (1): systemd: add missing include for musl Zoltán Böszörményi (1): libpam: Fix build with DISTRO_FEATURES usrmerge hongxu (1): libcap: fix nativesdk-libcap relocate failure wangmy (20): diffoscope: upgrade 181 -> 182 cmake: upgrade 3.21.1 -> 3.21.2 gzip: upgrade 1.10 -> 1.11 harfbuzz: upgrade 2.9.0 -> 2.9.1 vulkan-headers: upgrade 1.2.182 -> 1.2.191 vulkan-loader: upgrade 1.2.182 -> 1.2.191 vulkan-tools: upgrade 1.2.182 -> 1.2.191 help2man: upgrade 1.48.4 -> 1.48.5 python3-more-itertools: upgrade 8.8.0 -> 8.9.0 acpid: upgrade 2.0.32 -> 2.0.33 bind: upgrade 9.16.20 -> 9.16.21 createrepo-c: upgrade 0.17.4 -> 0.17.5 dnf: upgrade 4.8.0 -> 4.9.0 ell: upgrade 0.43 -> 0.44 libical: upgrade 3.0.10 -> 3.0.11 dhcpcd: upgrade 9.4.0 -> 9.4.1 dnf: upgrade 4.9.0 -> 4.10.0 file: upgrade 5.40 -> 5.41 libdnf: upgrade 0.64.0 -> 0.65.0 lttng-tools: upgrade 2.13.0 -> 2.13.1 zhengruoqin (2): libsolv: upgrade 0.7.19 -> 0.7.20 python3-pycryptodome: upgrade 3.10.1 -> 3.11.0 meta-security: a85fbe980e..e81c15f851: Armin Kuster (1): python3-fail2ban: fix build failure and cleanup Kai Kang (1): sssd: re-package to fix QA issues Kristian Klausen (1): swtpm: update to 0.6.1 Liwei Song (1): recipes-security/chipsec: platform security assessment framework meta-openembedded: 23dc4f060f..2f6797d8d6: Alexander Kanavin (23): python3-yappi: add python 3.10 fix python3-gmpy2: update 2.0.8 -> 2.1.0rc1 python3-m2crypto: address build failure with openssl 3.x lua: remove recipe as it is now in oe-core nghttp2: remove recipe as it is now in oe-core kronosnet: update 1.20 -> 1.22 polkit: update 0.116 -> 0.119 openflow: disable openssl PACKAGECONFIG openipmi: add a python 3.10 compatibility patch strongswan: disable openssl PACKAGECONFIG pkcs11-helper: backport a openssl 3.x patch nodejs: use -fpermissive nodejs: add a python 3.10 compatibility patch php: disable openssl PACKAGECONFIG libsigrokdecode: add a python 3.10 compatibility patch freerdp: backport openssl 3.x patches opensc: do not use -Werror cfengine: blacklist due to openssl 3.x incompatibility netplan: do not use -Werror boinc-client: blacklist due to openssl 3.x incompatibility ldns: blacklist due to openssl 3.x incompatibility surf: add a webkit 2.34 compatibility patch mozjs: update 60.9.0 -> 91.1.0 Alexander Thoma (1): keyutils: fix install path Armin Kuster (1): Apache: Several CVE fixes Chen Qi (1): ntfs-3g-ntfsprogs: upgrade to 2021.8.22 Gianfranco (2): vboxguestdrivers: upgrade 6.1.26 -> 6.1.28 vboxguestdrivers: Fix build failure due to the last update. Ivan Maidanski (1): bdwgc: upgrade 8.0.4 -> 8.0.6 Jeremy Kerr (1): mctp: Add MCTP control utilities Joshua Watt (2): colord-native: Inherit pkgconfig mutter: Move gsettings to a separate package Justin Bronder (2): python3-mccabe: fix LICENSE and RDEPENDS python3-pyflakes: fix LICENSE, HOMEPAGE and RDEPENDS Khem Raj (44): packagegroup-meta-oe: Add lv-drivers and lvgl python3-pystache: Remove need for python2x python3-behave: Switch to using github src_uri python3-simpleeval: Remove use_2to3 python3-parse-type: Do not ask for 2to3 python3-anyjson: Do not enable 2to3 python3-pybluez: Do not set 2to3 packagegroup-meta-networking: Remove nghttp2 packagegroup-meta-oe: Remove lua gjs: Inherit pkgconfig luaposix: Use lua 5.4 devilspie2: Switch to using github repo devilspie2: Add missing dependency on libxinerama kronosnet: Correct path to poll.h luaposix: Upgrade to 35.1 xfce.bbclass: Mark string as raw in a regexp nodejs: add -fpermissive BUILD_CXXFLAGS pcimem: Add riscv64 into COMPATIBLE_HOST luaposix: Depend on libxcrypt-native libcrypt-openssl-rsa-perl: Upgrade to 0.32 xrdp: Upgrade to 0.9.17 yelp,yelp-xsl,yelp-tools: Upgrade to 41 release mozjs: Disable JIT on mips libcrypt-openssl-rsa-perl: Fix build with openssl3+ nodejs: Upgrade to 14.18.1 librest: Use master with libsoup3 support gnome-online-accounts: Upgrade to 3.43.1 iwd: Fix build with musl xrdp: Exclude from builds xorgxrdp: Add to exclusion list for now bluepy: Set PV and correct syntax for RDEPENDS python3-kivy: Use new override syntax in RDEPENDS bluepy: Fix permissions on tarball nodejs: Upgrade to 16.11.1 mozjs: Fix build on mips/musl mozjs: Fix musl miscompiles with HAVE_THREAD_TLS_KEYWORD luaposix: Use virtual/crypt instread of hardcoding libxcrypt packagegroup-meta-oe: Add libjs-jquery-globalize and libjs-jquery-cookie mozjs: Add riscv32 support driverctl: Rename to have PV in recipe name tbb: Link with libatomic when using clang compiler on rv32 gimp: Disable vector icons on mips/rv32 using clang mozjs: Update to 91.2.0 mozjs: Fix build for 32bit systems disabling JIT Kurt Kiefer (2): mozjs: move large static library into staticdev package gyp: fix for compatibility with Python 3.10 Leon Anavi (6): python3-aiohue: Upgrade 2.6.1 -> 2.6.3 python3-paho-mqtt: Upgrade 1.5.1 -> 1.6.1 python3-thrift: Upgrade 0.13.0 -> 0.15.0 python3-prompt-toolkit: Upgrade 3.0.19 -> 3.0.21 python3-traitlets: Upgrade 5.1.0 -> 5.1.1 python3-prettytable: Upgrade 2.1.0 -> 2.2.1 LiweiSong (1): Revert "chipsec: platform security assessment framework" Marco Cavallini (1): bluepy_git.bb: Added recipe for BluePy Python interface to Bluetooth LE on Linux (v2) Marek Vasut (3): apitrace: Upgrade to latest version apitrace: Conditionally enable X11 support yavta: Upgrade to latest version and drop downstream patch Martin Jansa (4): protobuf: import a patch from meta-webosose to fix building protobuf-c with gold linker grpc: revert GRPCPP_ABSEIL_SYNC change from 1.40.0 to fix undefined references to absl::lts_20210324::Mutex::~Mutex() luaposix: depend on target libxcrypt instead of native lv-lib-png: add wayland to REQUIRED_DISTRO_FEATURES Matthias Klein (1): gpsd: Install also the generated parts of the Python library Matthias Schiffer (1): byacc: switch to official HTTPS mirror Mingli Yu (1): opencv: remove setup_vars_opencv4.sh Oleksandr Kravchuk (72): iwd: update to 1.18 nano: update to 5.9 ostree: update to 2021.5 pegtl: update to 3.2.1 pmdk: update to 1.11.1 protobuf-c: update to 1.4.0 thingsboard-gateway: update to 2.8 libbpf: fix PV libcdio-paranoia: update to 10.2+2.0.1 ttf-abyssinica: update to 2.100 ttf-dejavu: add UPSTREAM_CHECK_URI ttf-vlgothic: update to 20200720 networkmanager: update to 1.32.12 nng: update to 1.4.0 opensaf: update to 5.21.09 python3-absl: update 0.14.1 python3-alembic: update to 1.7.4 python3-astroid: update to 2.8.2 python3-cantools: update to 36.4.0 python3-certifi: update to 2021.10.8 python3-cffi: update to 1.15.0 python3-colorlog: update to 6.5.0 python3-coverage: update to 6.0.2 python3-cryptography-vectors: update to 35.0.0 python3-dateparser: update to 1.1.0 python3-elementpath: update to 2.3.2 python3-eventlet: update to 0.32.0 python3-google-api-core: update to 2.1.1 python3-google-api-python-client: update to 2.26.1 python3-google-auth: update to 2.3.0 python3-grpcio-tools: update to 1.41.0 python3-grpcio: update to 1.41.0 python3-h2: update to 4.1.0 python3-haversine: update to 2.5.1 python3-httplib2: update to 0.20.1 python3-idna: update to 3.3 python3-iso3166: update to 2.0.2 python3-joblib: update to 1.1.0 python3-jsonrpcserver: update to 5.0.3 python3-paramiko: update to 2.8.0 python3-portion: update to 2.2.0 python3-protobuf: update to 3.18.1 python3-pulsectl: update to 21.10.4 python3-pycodestyle: update to 2.8.0 python3-pyephem: update to 4.1 python3-pyflakes: update to 2.4.0 python3-pyjwt: update to 2.2.0 python3-pykickstart: update to 3.34 python3-pyopenssl: update to 21.0.0 python3-pyperf: update to 2.3.0 python3-pytest-timeout: update 2.0.1 python3-pytz: update to 2021.3 python3-regex: update to 2021.10.8 python3-sentry-sdk: update to 1.4.3 python3-sympy: udpate to 1.9 python3-twitter: update to 4.1.0 python3-uritemplate: update to 4.1.1 python3-websockets: update to 10.0 python3-wrapt: update to 1.13.2 python3-xlsxwriter: update to 3.0.1 python3-xmlschema: update to 1.8.0 python3-yarl: update to 1.7.0 python3-typeguard: update to 2.13.0 python3-pyatspi: update to 2.38.1 python3-h5py: update to 3.5.0 python3-pybind11-json: update to 0.2.11 python3-pychromecast: update to 9.3.1 python3-tzlocal: update to 4.0.1 python3-zeroconf: update to 0.36.9 leptonica: update to 1.82.0 redis-plus-plus: update to 1.3.2 hiredis: update to 1.0.2 Peter Bergin (3): pipewire: remove manpages class pipewire: also handle pipewire-media-session in systemd class pipewire: rework PACKAGECONFIG for systemd service files Philippe Coval (5): lvgl: Add recipe for Lightweight Graphics Library lv-drivers: Add recipe for lvgl lib lv-lib-png: Add recipe for LVGL for handling PNG format lvgl: Add lv_lib_png to packagegroup lvgl: Lint recipe Roland Hieber (1): rapidjson: override hard-coded lib install dir Shiping Ji (1): Add recipe for driverctl Tim Orling (6): unicode-ucd: upgrade 12.1.0 -> 14.0.0 gnome-screenshot: add recipe for 40.0 libgweather: upgrade 3.36.2 -> 40.0 colord: inherit pkgconfig gfbgraph: patch to build with latest rest gnome-calendar: upgrade 3.38.1 -> 41.0 Trevor Gamblin (3): python3-posix-ipc: Add recipe for version 1.0.5 python3-pyinotify: Add fcntl, logging to RDEPENDS python3-cvxopt: upgrade 1.2.6 -> 1.2.7 Vyacheslav Yurkov (3): grpc: fix cross-compilation of grpc applications grpc: fix cross-compilation of grpc applications grpc: upgrade 1.38.1 -> 1.41.0 Wang Mingyu (1): poppler: upgrade 21.09.0 -> 21.10.0 Yi Zhao (3): samba: upgrade 4.14.7 -> 4.14.8 audit: upgrade 3.0.5 -> 3.0.6 strongswan: upgrade 5.9.3 -> 5.9.4 Zoltán Böszörményi (1): python3-jsmin: Upgrade to version 3.0.0 wangmy (11): openvpn: upgrade 2.5.3 -> 2.5.4 redis: upgrade 6.2.5 -> 6.2.6 span-lite: upgrade 0.10.1 -> 0.10.3 bdwgc: upgrade 8.0.6 -> 8.2.0 icewm: upgrade 2.7.0 -> 2.8.0 ifenslave: upgrade 2.12 -> 2.13 asio: upgrade 1.18.1.bb -> 1.20.0 libgusb: upgrade 0.3.7 -> 0.3.8 libxmlb: upgrade 0.3.2 -> 0.3.3 xdebug: upgrade 2.9.5 -> 3.1.1 cryptsetup: upgrade 2.3.6 -> 2.4.1 zangrc (25): python3-ipython: upgrade 7.27.0 -> 7.28.0 python3-jdatetime: upgrade 3.6.2 -> 3.6.4 python3-multidict: upgrade 5.1.0 -> 5.2.0 python3-openpyxl: upgrade 3.0.8 -> 3.0.9 python3-pyscaffold: upgrade 4.0.2 -> 4.1 python3-transitions: upgrade 0.8.9 -> 0.8.10 networkmanager-openvpn: upgrade 1.8.14 -> 1.8.16 ser2net: upgrade 4.3.3 -> 4.3.4 python3-humanize: upgrade 3.11.0 -> 3.12.0 python3-nmap: upgrade 1.5.0 -> 1.5.1 libjs-jquery-cookie: Add recipe libjs-jquery-globalize: Add recipe python3-cachetools: upgrade 4.2.2 -> 4.2.4 python3-cbor2: upgrade 5.4.1 -> 5.4.2 python3-click: upgrade 8.0.1 -> 8.0.3 python3-configargparse : upgrade 1.5.2 -> 1.5.3 python3-flask: upgrade 2.0.1 -> 2.0.2 python3-pyscaffold: upgrade 4.1 -> 4.1.1 python3-werkzeug: upgrade 2.0.1 -> 2.0.2 python3-absl: upgrade 0.14.1 -> 0.15.0 python3-pandas: upgrade 1.3.3 -> 1.3.4 python3-pulsectl: upgrade 21.10.4 -> 21.10.5 python3-pyjwt: upgrade 2.2.0 -> 2.3.0 python3-pytest-asyncio: upgrade 0.15.1 -> 0.16.0 python3-robotframework: upgrade 4.1.1 -> 4.1.2 zhengruoqin (15): python3-ujson: upgrade 4.1.0 -> 4.2.0 python3-urllib3: upgrade 1.26.6 -> 1.26.7 python3-watchdog: upgrade 2.1.5 -> 2.1.6 gensio: upgrade 2.2.9 -> 2.3.1 nlohmann-json: upgrade 3.10.2 -> 3.10.4 libencode-perl: upgrade 3.12 -> 3.16 python3-socketio: upgrade 5.4.0 -> 5.4.1 python3-sqlalchemy: upgrade 1.4.23 -> 1.4.26 python3-stevedore: upgrade 3.4.0 -> 3.5.0 autofs: upgrade 5.1.7 -> 5.1.8 links: upgrade 2.22 -> 2.25 atftp: upgrade 0.7.4 -> 0.7.5 python3-gmqtt: upgrade 0.6.10 -> 0.6.11 python3-google-api-python-client: upgrade 2.26.1 -> 2.27.0 python3-greenlet: upgrade 1.1.1 -> 1.1.2 meta-raspberrypi: 9eb4879cf4..90b3ac6fb3: Zygmunt Krynicki (1): rpi-config: warn on config.txt lines exceeding 80 bytes Signed-off-by: Andrew Geissler Change-Id: I9e75d5bd606a913fbe69e6735c9ecafc436441ba --- .../libcdio/libcdio-paranoia_10.2+0.93+1.bb | 24 - .../libcdio/libcdio-paranoia_10.2+2.0.1.bb | 24 + ...mode-to-allow-streaming-over-the-network-.patch | 961 --------------------- .../recipes-multimedia/v4l2apps/yavta_git.bb | 4 +- 4 files changed, 26 insertions(+), 987 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+0.93+1.bb create mode 100644 meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/yavta/0001-Add-stdout-mode-to-allow-streaming-over-the-network-.patch (limited to 'meta-openembedded/meta-oe/recipes-multimedia') diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+0.93+1.bb b/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+0.93+1.bb deleted file mode 100644 index d6b898c188..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+0.93+1.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "library to read digital audio CDs with error correction" -HOMEPAGE = "http://www.gnu.org/software/libcdio/" -SECTION = "libs" -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -DEPENDS = "libcdio" - -SRC_URI = "${GNU_MIRROR}/libcdio/${BP}.tar.bz2" -SRC_URI[md5sum] = "0255aa50e660db7f2c39658b9c565814" -SRC_URI[sha256sum] = "ec1d9b1d5a28cc042f2cb33a7cc0a2b5ce5525f102bc4c15db1fac322559a493" - -inherit autotools pkgconfig - -PACKAGES += "${PN}-utils" - -FILES:${PN} = "${libdir}/${BPN}${SOLIB}" -FILES:${PN}-utils = "${bindir}/*" - -python libcdio_split_packages() { - libdir = d.expand('${libdir}') - do_split_packages(d, libdir, '^lib(.*)\.so\..*', 'lib%s', 'libcdio %s library', extra_depends='', allow_links=True) -} - -PACKAGESPLITFUNCS =+ "libcdio_split_packages" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb new file mode 100644 index 0000000000..441defea43 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb @@ -0,0 +1,24 @@ +SUMMARY = "library to read digital audio CDs with error correction" +HOMEPAGE = "http://www.gnu.org/software/libcdio/" +BUGTRUCKER = "https://github.com/rocky/libcdio-paranoia/issues/" +SECTION = "libs" +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +DEPENDS = "libcdio" + +SRC_URI = "${GNU_MIRROR}/libcdio/${BP}.tar.bz2" +SRC_URI[sha256sum] = "33b1cf305ccfbfd03b43936975615000ce538b119989c4bec469577570b60e8a" + +inherit autotools pkgconfig + +PACKAGES += "${PN}-utils" + +FILES:${PN} = "${libdir}/${BPN}${SOLIB}" +FILES:${PN}-utils = "${bindir}/*" + +python libcdio_split_packages() { + libdir = d.expand('${libdir}') + do_split_packages(d, libdir, '^lib(.*)\.so\..*', 'lib%s', 'libcdio %s library', extra_depends='', allow_links=True) +} + +PACKAGESPLITFUNCS =+ "libcdio_split_packages" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/yavta/0001-Add-stdout-mode-to-allow-streaming-over-the-network-.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/yavta/0001-Add-stdout-mode-to-allow-streaming-over-the-network-.patch deleted file mode 100644 index 41a5dbf4fd..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/yavta/0001-Add-stdout-mode-to-allow-streaming-over-the-network-.patch +++ /dev/null @@ -1,961 +0,0 @@ -From 141d3b3593722eb3d588e7c4b1542f810bc25853 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Thu, 5 Jun 2014 11:29:20 -0500 -Subject: [PATCH] Add stdout mode to allow streaming over the network with nc - -Signed-off-by: Koen Kooi -Signed-off-by: Chase Maupin ---- - yavta.c | 315 ++++++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 169 insertions(+), 146 deletions(-) - -diff --git a/yavta.c b/yavta.c -index 32adc26..b398da0 100644 ---- a/yavta.c -+++ b/yavta.c -@@ -309,7 +309,7 @@ static bool video_has_fd(struct device *dev) - static int video_set_fd(struct device *dev, int fd) - { - if (video_has_fd(dev)) { -- printf("Can't set fd (already open).\n"); -+ fprintf(stderr, "Can't set fd (already open).\n"); - return -1; - } - -@@ -321,18 +321,18 @@ static int video_set_fd(struct device *dev, int fd) - static int video_open(struct device *dev, const char *devname) - { - if (video_has_fd(dev)) { -- printf("Can't open device (already open).\n"); -+ fprintf(stderr, "Can't open device (already open).\n"); - return -1; - } - - dev->fd = open(devname, O_RDWR); - if (dev->fd < 0) { -- printf("Error opening device %s: %s (%d).\n", devname, -+ fprintf(stderr, "Error opening device %s: %s (%d).\n", devname, - strerror(errno), errno); - return dev->fd; - } - -- printf("Device %s opened.\n", devname); -+ fprintf(stderr, "Device %s opened.\n", devname); - - dev->opened = 1; - -@@ -352,7 +352,7 @@ static int video_querycap(struct device *dev, unsigned int *capabilities) - *capabilities = cap.capabilities & V4L2_CAP_DEVICE_CAPS - ? cap.device_caps : cap.capabilities; - -- printf("Device `%s' on `%s' is a video %s (%s mplanes) device.\n", -+ fprintf(stderr, "Device `%s' on `%s' is a video %s (%s mplanes) device.\n", - cap.card, cap.bus_info, - video_is_capture(dev) ? "capture" : "output", - video_is_mplane(dev) ? "with" : "without"); -@@ -370,7 +370,7 @@ static int cap_get_buf_type(unsigned int capabilities) - } else if (capabilities & V4L2_CAP_VIDEO_OUTPUT) { - return V4L2_BUF_TYPE_VIDEO_OUTPUT; - } else { -- printf("Device supports neither capture nor output.\n"); -+ fprintf(stderr, "Device supports neither capture nor output.\n"); - return -EINVAL; - } - -@@ -440,7 +440,7 @@ static int get_control(struct device *dev, unsigned int id, int type, - } - } - -- printf("unable to get control 0x%8.8x: %s (%d).\n", -+ fprintf(stderr, "unable to get control 0x%8.8x: %s (%d).\n", - id, strerror(errno), errno); - return -1; - } -@@ -484,12 +484,12 @@ static void set_control(struct device *dev, unsigned int id, int type, - val = old.value; - } - if (ret == -1) { -- printf("unable to set control 0x%8.8x: %s (%d).\n", -+ fprintf(stderr, "unable to set control 0x%8.8x: %s (%d).\n", - id, strerror(errno), errno); - return; - } - -- printf("Control 0x%08x set to %" PRId64 ", is %" PRId64 "\n", -+ fprintf(stderr, "Control 0x%08x set to %" PRId64 ", is %" PRId64 "\n", - id, old_val, val); - } - -@@ -504,7 +504,7 @@ static int video_get_format(struct device *dev) - - ret = ioctl(dev->fd, VIDIOC_G_FMT, &fmt); - if (ret < 0) { -- printf("Unable to get format: %s (%d).\n", strerror(errno), -+ fprintf(stderr, "Unable to get format: %s (%d).\n", strerror(errno), - errno); - return ret; - } -@@ -514,7 +514,7 @@ static int video_get_format(struct device *dev) - dev->height = fmt.fmt.pix_mp.height; - dev->num_planes = fmt.fmt.pix_mp.num_planes; - -- printf("Video format: %s (%08x) %ux%u field %s, %u planes: \n", -+ fprintf(stderr, "Video format: %s (%08x) %ux%u field %s, %u planes: \n", - v4l2_format_name(fmt.fmt.pix_mp.pixelformat), fmt.fmt.pix_mp.pixelformat, - fmt.fmt.pix_mp.width, fmt.fmt.pix_mp.height, - v4l2_field_name(fmt.fmt.pix_mp.field), -@@ -527,7 +527,7 @@ static int video_get_format(struct device *dev) - fmt.fmt.pix_mp.plane_fmt[i].bytesperline ? - fmt.fmt.pix_mp.plane_fmt[i].sizeimage : 0; - -- printf(" * Stride %u, buffer size %u\n", -+ fprintf(stderr, " * Stride %u, buffer size %u\n", - fmt.fmt.pix_mp.plane_fmt[i].bytesperline, - fmt.fmt.pix_mp.plane_fmt[i].sizeimage); - } -@@ -539,7 +539,7 @@ static int video_get_format(struct device *dev) - dev->plane_fmt[0].bytesperline = fmt.fmt.pix.bytesperline; - dev->plane_fmt[0].sizeimage = fmt.fmt.pix.bytesperline ? fmt.fmt.pix.sizeimage : 0; - -- printf("Video format: %s (%08x) %ux%u (stride %u) field %s buffer size %u\n", -+ fprintf(stderr, "Video format: %s (%08x) %ux%u (stride %u) field %s buffer size %u\n", - v4l2_format_name(fmt.fmt.pix.pixelformat), fmt.fmt.pix.pixelformat, - fmt.fmt.pix.width, fmt.fmt.pix.height, fmt.fmt.pix.bytesperline, - v4l2_field_name(fmt.fmt.pix_mp.field), -@@ -581,25 +581,25 @@ static int video_set_format(struct device *dev, unsigned int w, unsigned int h, - - ret = ioctl(dev->fd, VIDIOC_S_FMT, &fmt); - if (ret < 0) { -- printf("Unable to set format: %s (%d).\n", strerror(errno), -+ fprintf(stderr, "Unable to set format: %s (%d).\n", strerror(errno), - errno); - return ret; - } - - if (video_is_mplane(dev)) { -- printf("Video format set: %s (%08x) %ux%u field %s, %u planes: \n", -+ fprintf(stderr, "Video format set: %s (%08x) %ux%u field %s, %u planes: \n", - v4l2_format_name(fmt.fmt.pix_mp.pixelformat), fmt.fmt.pix_mp.pixelformat, - fmt.fmt.pix_mp.width, fmt.fmt.pix_mp.height, - v4l2_field_name(fmt.fmt.pix_mp.field), - fmt.fmt.pix_mp.num_planes); - - for (i = 0; i < fmt.fmt.pix_mp.num_planes; i++) { -- printf(" * Stride %u, buffer size %u\n", -+ fprintf(stderr, " * Stride %u, buffer size %u\n", - fmt.fmt.pix_mp.plane_fmt[i].bytesperline, - fmt.fmt.pix_mp.plane_fmt[i].sizeimage); - } - } else { -- printf("Video format set: %s (%08x) %ux%u (stride %u) field %s buffer size %u\n", -+ fprintf(stderr, "Video format set: %s (%08x) %ux%u (stride %u) field %s buffer size %u\n", - v4l2_format_name(fmt.fmt.pix.pixelformat), fmt.fmt.pix.pixelformat, - fmt.fmt.pix.width, fmt.fmt.pix.height, fmt.fmt.pix.bytesperline, - v4l2_field_name(fmt.fmt.pix.field), -@@ -619,16 +619,16 @@ static int video_set_framerate(struct device *dev, struct v4l2_fract *time_per_f - - ret = ioctl(dev->fd, VIDIOC_G_PARM, &parm); - if (ret < 0) { -- printf("Unable to get frame rate: %s (%d).\n", -+ fprintf(stderr, "Unable to get frame rate: %s (%d).\n", - strerror(errno), errno); - return ret; - } - -- printf("Current frame rate: %u/%u\n", -+ fprintf(stderr, "Current frame rate: %u/%u\n", - parm.parm.capture.timeperframe.numerator, - parm.parm.capture.timeperframe.denominator); - -- printf("Setting frame rate to: %u/%u\n", -+ fprintf(stderr, "Setting frame rate to: %u/%u\n", - time_per_frame->numerator, - time_per_frame->denominator); - -@@ -637,19 +637,19 @@ static int video_set_framerate(struct device *dev, struct v4l2_fract *time_per_f - - ret = ioctl(dev->fd, VIDIOC_S_PARM, &parm); - if (ret < 0) { -- printf("Unable to set frame rate: %s (%d).\n", strerror(errno), -+ fprintf(stderr, "Unable to set frame rate: %s (%d).\n", strerror(errno), - errno); - return ret; - } - - ret = ioctl(dev->fd, VIDIOC_G_PARM, &parm); - if (ret < 0) { -- printf("Unable to get frame rate: %s (%d).\n", strerror(errno), -+ fprintf(stderr, "Unable to get frame rate: %s (%d).\n", strerror(errno), - errno); - return ret; - } - -- printf("Frame rate set: %u/%u\n", -+ fprintf(stderr, "Frame rate set: %u/%u\n", - parm.parm.capture.timeperframe.numerator, - parm.parm.capture.timeperframe.denominator); - return 0; -@@ -674,7 +674,7 @@ static int video_buffer_mmap(struct device *dev, struct buffer *buffer, - buffer->mem[i] = mmap(0, length, PROT_READ | PROT_WRITE, MAP_SHARED, - dev->fd, offset); - if (buffer->mem[i] == MAP_FAILED) { -- printf("Unable to map buffer %u/%u: %s (%d)\n", -+ fprintf(stderr, "Unable to map buffer %u/%u: %s (%d)\n", - buffer->idx, i, strerror(errno), errno); - return -1; - } -@@ -682,7 +682,7 @@ static int video_buffer_mmap(struct device *dev, struct buffer *buffer, - buffer->size[i] = length; - buffer->padding[i] = 0; - -- printf("Buffer %u/%u mapped at address %p.\n", -+ fprintf(stderr, "Buffer %u/%u mapped at address %p.\n", - buffer->idx, i, buffer->mem[i]); - } - -@@ -697,7 +697,7 @@ static int video_buffer_munmap(struct device *dev, struct buffer *buffer) - for (i = 0; i < dev->num_planes; i++) { - ret = munmap(buffer->mem[i], buffer->size[i]); - if (ret < 0) { -- printf("Unable to unmap buffer %u/%u: %s (%d)\n", -+ fprintf(stderr, "Unable to unmap buffer %u/%u: %s (%d)\n", - buffer->idx, i, strerror(errno), errno); - } - -@@ -725,7 +725,7 @@ static int video_buffer_alloc_userptr(struct device *dev, struct buffer *buffer, - ret = posix_memalign(&buffer->mem[i], page_size, - length + offset + padding); - if (ret < 0) { -- printf("Unable to allocate buffer %u/%u (%d)\n", -+ fprintf(stderr, "Unable to allocate buffer %u/%u (%d)\n", - buffer->idx, i, ret); - return -ENOMEM; - } -@@ -734,7 +734,7 @@ static int video_buffer_alloc_userptr(struct device *dev, struct buffer *buffer, - buffer->size[i] = length; - buffer->padding[i] = padding; - -- printf("Buffer %u/%u allocated at address %p.\n", -+ fprintf(stderr, "Buffer %u/%u allocated at address %p.\n", - buffer->idx, i, buffer->mem[i]); - } - -@@ -809,12 +809,12 @@ static int video_alloc_buffers(struct device *dev, int nbufs, - - ret = ioctl(dev->fd, VIDIOC_REQBUFS, &rb); - if (ret < 0) { -- printf("Unable to request buffers: %s (%d).\n", strerror(errno), -+ fprintf(stderr, "Unable to request buffers: %s (%d).\n", strerror(errno), - errno); - return ret; - } - -- printf("%u buffers requested.\n", rb.count); -+ fprintf(stderr, "%u buffers requested.\n", rb.count); - - buffers = malloc(rb.count * sizeof buffers[0]); - if (buffers == NULL) -@@ -835,12 +835,12 @@ static int video_alloc_buffers(struct device *dev, int nbufs, - - ret = ioctl(dev->fd, VIDIOC_QUERYBUF, &buf); - if (ret < 0) { -- printf("Unable to query buffer %u: %s (%d).\n", i, -+ fprintf(stderr, "Unable to query buffer %u: %s (%d).\n", i, - strerror(errno), errno); - return ret; - } - get_ts_flags(buf.flags, &ts_type, &ts_source); -- printf("length: %u offset: %u timestamp type/source: %s/%s\n", -+ fprintf(stderr, "length: %u offset: %u timestamp type/source: %s/%s\n", - buf.length, buf.m.offset, ts_type, ts_source); - - buffers[i].idx = i; -@@ -899,12 +899,12 @@ static int video_free_buffers(struct device *dev) - - ret = ioctl(dev->fd, VIDIOC_REQBUFS, &rb); - if (ret < 0) { -- printf("Unable to release buffers: %s (%d).\n", -+ fprintf(stderr, "Unable to release buffers: %s (%d).\n", - strerror(errno), errno); - return ret; - } - -- printf("%u buffers released.\n", dev->nbufs); -+ fprintf(stderr, "%u buffers released.\n", dev->nbufs); - - free(dev->buffers); - dev->nbufs = 0; -@@ -974,7 +974,7 @@ static int video_queue_buffer(struct device *dev, int index, enum buffer_fill_mo - - ret = ioctl(dev->fd, VIDIOC_QBUF, &buf); - if (ret < 0) -- printf("Unable to queue buffer: %s (%d).\n", -+ fprintf(stderr, "Unable to queue buffer: %s (%d).\n", - strerror(errno), errno); - - return ret; -@@ -987,7 +987,7 @@ static int video_enable(struct device *dev, int enable) - - ret = ioctl(dev->fd, enable ? VIDIOC_STREAMON : VIDIOC_STREAMOFF, &type); - if (ret < 0) { -- printf("Unable to %s streaming: %s (%d).\n", -+ fprintf(stderr, "Unable to %s streaming: %s (%d).\n", - enable ? "start" : "stop", strerror(errno), errno); - return ret; - } -@@ -1009,10 +1009,10 @@ static void video_query_menu(struct device *dev, struct v4l2_queryctrl *query, - continue; - - if (query->type == V4L2_CTRL_TYPE_MENU) -- printf(" %u: %.32s%s\n", menu.index, menu.name, -+ fprintf(stderr, " %u: %.32s%s\n", menu.index, menu.name, - menu.index == value ? " (*)" : ""); - else -- printf(" %u: %lld%s\n", menu.index, menu.value, -+ fprintf(stderr, " %u: %lld%s\n", menu.index, menu.value, - menu.index == value ? " (*)" : ""); - }; - } -@@ -1043,7 +1043,7 @@ static void video_list_controls(struct device *dev) - continue; - - if (query.type == V4L2_CTRL_TYPE_CTRL_CLASS) { -- printf("--- %s (class 0x%08x) ---\n", query.name, query.id); -+ fprintf(stderr, "--- %s (class 0x%08x) ---\n", query.name, query.id); - continue; - } - -@@ -1053,7 +1053,7 @@ static void video_list_controls(struct device *dev) - else - sprintf(value, "%" PRId64, val64); - -- printf("control 0x%08x `%s' min %d max %d step %d default %d current %s.\n", -+ fprintf(stderr, "control 0x%08x `%s' min %d max %d step %d default %d current %s.\n", - query.id, query.name, query.minimum, query.maximum, - query.step, query.default_value, value); - -@@ -1065,9 +1065,9 @@ static void video_list_controls(struct device *dev) - } - - if (nctrls) -- printf("%u control%s found.\n", nctrls, nctrls > 1 ? "s" : ""); -+ fprintf(stderr, "%u control%s found.\n", nctrls, nctrls > 1 ? "s" : ""); - else -- printf("No control found.\n"); -+ fprintf(stderr, "No control found.\n"); - } - - static void video_enum_frame_intervals(struct device *dev, __u32 pixelformat, -@@ -1088,30 +1088,30 @@ static void video_enum_frame_intervals(struct device *dev, __u32 pixelformat, - break; - - if (i != ival.index) -- printf("Warning: driver returned wrong ival index " -+ fprintf(stderr, "Warning: driver returned wrong ival index " - "%u.\n", ival.index); - if (pixelformat != ival.pixel_format) -- printf("Warning: driver returned wrong ival pixel " -+ fprintf(stderr, "Warning: driver returned wrong ival pixel " - "format %08x.\n", ival.pixel_format); - if (width != ival.width) -- printf("Warning: driver returned wrong ival width " -+ fprintf(stderr, "Warning: driver returned wrong ival width " - "%u.\n", ival.width); - if (height != ival.height) -- printf("Warning: driver returned wrong ival height " -+ fprintf(stderr, "Warning: driver returned wrong ival height " - "%u.\n", ival.height); - - if (i != 0) -- printf(", "); -+ fprintf(stderr, ", "); - - switch (ival.type) { - case V4L2_FRMIVAL_TYPE_DISCRETE: -- printf("%u/%u", -+ fprintf(stderr, "%u/%u", - ival.discrete.numerator, - ival.discrete.denominator); - break; - - case V4L2_FRMIVAL_TYPE_CONTINUOUS: -- printf("%u/%u - %u/%u", -+ fprintf(stderr, "%u/%u - %u/%u", - ival.stepwise.min.numerator, - ival.stepwise.min.denominator, - ival.stepwise.max.numerator, -@@ -1119,7 +1119,7 @@ static void video_enum_frame_intervals(struct device *dev, __u32 pixelformat, - return; - - case V4L2_FRMIVAL_TYPE_STEPWISE: -- printf("%u/%u - %u/%u (by %u/%u)", -+ fprintf(stderr, "%u/%u - %u/%u (by %u/%u)", - ival.stepwise.min.numerator, - ival.stepwise.min.denominator, - ival.stepwise.max.numerator, -@@ -1149,23 +1149,23 @@ static void video_enum_frame_sizes(struct device *dev, __u32 pixelformat) - break; - - if (i != frame.index) -- printf("Warning: driver returned wrong frame index " -+ fprintf(stderr, "Warning: driver returned wrong frame index " - "%u.\n", frame.index); - if (pixelformat != frame.pixel_format) -- printf("Warning: driver returned wrong frame pixel " -+ fprintf(stderr, "Warning: driver returned wrong frame pixel " - "format %08x.\n", frame.pixel_format); - - switch (frame.type) { - case V4L2_FRMSIZE_TYPE_DISCRETE: -- printf("\tFrame size: %ux%u (", frame.discrete.width, -+ fprintf(stderr, "\tFrame size: %ux%u (", frame.discrete.width, - frame.discrete.height); - video_enum_frame_intervals(dev, frame.pixel_format, - frame.discrete.width, frame.discrete.height); -- printf(")\n"); -+ fprintf(stderr, ")\n"); - break; - - case V4L2_FRMSIZE_TYPE_CONTINUOUS: -- printf("\tFrame size: %ux%u - %ux%u (", -+ fprintf(stderr, "\tFrame size: %ux%u - %ux%u (", - frame.stepwise.min_width, - frame.stepwise.min_height, - frame.stepwise.max_width, -@@ -1173,11 +1173,11 @@ static void video_enum_frame_sizes(struct device *dev, __u32 pixelformat) - video_enum_frame_intervals(dev, frame.pixel_format, - frame.stepwise.max_width, - frame.stepwise.max_height); -- printf(")\n"); -+ fprintf(stderr, ")\n"); - break; - - case V4L2_FRMSIZE_TYPE_STEPWISE: -- printf("\tFrame size: %ux%u - %ux%u (by %ux%u) (\n", -+ fprintf(stderr, "\tFrame size: %ux%u - %ux%u (by %ux%u) (\n", - frame.stepwise.min_width, - frame.stepwise.min_height, - frame.stepwise.max_width, -@@ -1187,7 +1187,7 @@ static void video_enum_frame_sizes(struct device *dev, __u32 pixelformat) - video_enum_frame_intervals(dev, frame.pixel_format, - frame.stepwise.max_width, - frame.stepwise.max_height); -- printf(")\n"); -+ fprintf(stderr, ")\n"); - break; - - default: -@@ -1211,19 +1211,19 @@ static void video_enum_formats(struct device *dev, enum v4l2_buf_type type) - break; - - if (i != fmt.index) -- printf("Warning: driver returned wrong format index " -+ fprintf(stderr, "Warning: driver returned wrong format index " - "%u.\n", fmt.index); - if (type != fmt.type) -- printf("Warning: driver returned wrong format type " -+ fprintf(stderr, "Warning: driver returned wrong format type " - "%u.\n", fmt.type); - -- printf("\tFormat %u: %s (%08x)\n", i, -+ fprintf(stderr, "\tFormat %u: %s (%08x)\n", i, - v4l2_format_name(fmt.pixelformat), fmt.pixelformat); -- printf("\tType: %s (%u)\n", v4l2_buf_type_name(fmt.type), -+ fprintf(stderr, "\tType: %s (%u)\n", v4l2_buf_type_name(fmt.type), - fmt.type); -- printf("\tName: %.32s\n", fmt.description); -+ fprintf(stderr, "\tName: %.32s\n", fmt.description); - video_enum_frame_sizes(dev, fmt.pixelformat); -- printf("\n"); -+ fprintf(stderr, "\n"); - } - } - -@@ -1241,13 +1241,13 @@ static void video_enum_inputs(struct device *dev) - break; - - if (i != input.index) -- printf("Warning: driver returned wrong input index " -+ fprintf(stderr, "Warning: driver returned wrong input index " - "%u.\n", input.index); - -- printf("\tInput %u: %s.\n", i, input.name); -+ fprintf(stderr, "\tInput %u: %s.\n", i, input.name); - } - -- printf("\n"); -+ fprintf(stderr, "\n"); - } - - static int video_get_input(struct device *dev) -@@ -1257,7 +1257,7 @@ static int video_get_input(struct device *dev) - - ret = ioctl(dev->fd, VIDIOC_G_INPUT, &input); - if (ret < 0) { -- printf("Unable to get current input: %s (%d).\n", -+ fprintf(stderr, "Unable to get current input: %s (%d).\n", - strerror(errno), errno); - return ret; - } -@@ -1272,7 +1272,7 @@ static int video_set_input(struct device *dev, unsigned int input) - - ret = ioctl(dev->fd, VIDIOC_S_INPUT, &_input); - if (ret < 0) -- printf("Unable to select input %u: %s (%d).\n", input, -+ fprintf(stderr, "Unable to select input %u: %s (%d).\n", input, - strerror(errno), errno); - - return ret; -@@ -1291,14 +1291,14 @@ static int video_set_quality(struct device *dev, unsigned int quality) - - ret = ioctl(dev->fd, VIDIOC_S_JPEGCOMP, &jpeg); - if (ret < 0) { -- printf("Unable to set quality to %u: %s (%d).\n", quality, -+ fprintf(stderr, "Unable to set quality to %u: %s (%d).\n", quality, - strerror(errno), errno); - return ret; - } - - ret = ioctl(dev->fd, VIDIOC_G_JPEGCOMP, &jpeg); - if (ret >= 0) -- printf("Quality set to %u\n", jpeg.quality); -+ fprintf(stderr, "Quality set to %u\n", jpeg.quality); - - return 0; - } -@@ -1313,7 +1313,7 @@ static int video_load_test_pattern(struct device *dev, const char *filename) - if (filename != NULL) { - fd = open(filename, O_RDONLY); - if (fd == -1) { -- printf("Unable to open test pattern file '%s': %s (%d).\n", -+ fprintf(stderr, "Unable to open test pattern file '%s': %s (%d).\n", - filename, strerror(errno), errno); - return -errno; - } -@@ -1331,7 +1331,7 @@ static int video_load_test_pattern(struct device *dev, const char *filename) - if (filename != NULL) { - ret = read(fd, dev->pattern[plane], size); - if (ret != (int)size && dev->plane_fmt[plane].bytesperline != 0) { -- printf("Test pattern file size %u doesn't match image size %u\n", -+ fprintf(stderr, "Test pattern file size %u doesn't match image size %u\n", - ret, size); - ret = -EINVAL; - goto done; -@@ -1341,7 +1341,7 @@ static int video_load_test_pattern(struct device *dev, const char *filename) - unsigned int i; - - if (dev->plane_fmt[plane].bytesperline == 0) { -- printf("Compressed format detected for plane %u and no test pattern filename given.\n" -+ fprintf(stderr, "Compressed format detected for plane %u and no test pattern filename given.\n" - "The test pattern can't be generated automatically.\n", plane); - ret = -EINVAL; - goto done; -@@ -1410,7 +1410,7 @@ static void video_verify_buffer(struct device *dev, struct v4l2_buffer *buf) - - if (dev->plane_fmt[plane].sizeimage && - dev->plane_fmt[plane].sizeimage != length) -- printf("Warning: bytes used %u != image size %u for plane %u\n", -+ fprintf(stderr, "Warning: bytes used %u != image size %u for plane %u\n", - length, dev->plane_fmt[plane].sizeimage, plane); - - if (buffer->padding[plane] == 0) -@@ -1424,16 +1424,16 @@ static void video_verify_buffer(struct device *dev, struct v4l2_buffer *buf) - } - - if (errors) { -- printf("Warning: %u bytes overwritten among %u first padding bytes for plane %u\n", -+ fprintf(stderr, "Warning: %u bytes overwritten among %u first padding bytes for plane %u\n", - errors, dirty, plane); - - dirty = (dirty + 15) & ~15; - dirty = dirty > 32 ? 32 : dirty; - - for (i = 0; i < dirty; ++i) { -- printf("%02x ", data[i]); -+ fprintf(stderr, "%02x ", data[i]); - if (i % 16 == 15) -- printf("\n"); -+ fprintf(stderr, "\n"); - } - } - } -@@ -1481,18 +1481,32 @@ static void video_save_image(struct device *dev, struct v4l2_buffer *buf, - - ret = write(fd, dev->buffers[buf->index].mem[i], length); - if (ret < 0) { -- printf("write error: %s (%d)\n", strerror(errno), errno); -+ fprintf(stderr, "write error: %s (%d)\n", strerror(errno), errno); - break; - } else if (ret != (int)length) -- printf("write error: only %d bytes written instead of %u\n", -+ fprintf(stderr, "write error: only %d bytes written instead of %u\n", - ret, length); - } - close(fd); - } - -+static void video_stdout_image(struct device *dev, struct v4l2_buffer *buf) -+{ -+ int ret; -+ -+ fprintf(stderr, "stdout"); -+ ret = fwrite(dev->buffers[buf->index].mem, buf->bytesused, 1, stdout); -+ -+ if (ret < 0) -+ fprintf(stderr, "write error: %s (%d)\n", strerror(errno), errno); -+ else if (ret != (int)buf->bytesused) -+ fprintf(stderr, "write error: only %d bytes written instead of %u\n", -+ ret, buf->bytesused); -+} -+ - static int video_do_capture(struct device *dev, unsigned int nframes, - unsigned int skip, unsigned int delay, const char *pattern, -- int do_requeue_last, enum buffer_fill_mode fill) -+ int do_requeue_last, enum buffer_fill_mode fill, int do_stdout) - { - struct v4l2_plane planes[VIDEO_MAX_PLANES]; - struct v4l2_buffer buf; -@@ -1529,7 +1543,7 @@ static int video_do_capture(struct device *dev, unsigned int nframes, - ret = ioctl(dev->fd, VIDIOC_DQBUF, &buf); - if (ret < 0) { - if (errno != EIO) { -- printf("Unable to dequeue buffer: %s (%d).\n", -+ fprintf(stderr, "Unable to dequeue buffer: %s (%d).\n", - strerror(errno), errno); - goto done; - } -@@ -1550,7 +1564,7 @@ static int video_do_capture(struct device *dev, unsigned int nframes, - - clock_gettime(CLOCK_MONOTONIC, &ts); - get_ts_flags(buf.flags, &ts_type, &ts_source); -- printf("%u (%u) [%c] %s %u %u B %ld.%06ld %ld.%06ld %.3f fps ts %s/%s\n", i, buf.index, -+ fprintf(stderr, "%u (%u) [%c] %s %u %u B %ld.%06ld %ld.%06ld %.3f fps ts %s/%s\n", i, buf.index, - (buf.flags & V4L2_BUF_FLAG_ERROR) ? 'E' : '-', - v4l2_field_name(buf.field), - buf.sequence, buf.bytesused, buf.timestamp.tv_sec, -@@ -1563,6 +1577,9 @@ static int video_do_capture(struct device *dev, unsigned int nframes, - if (video_is_capture(dev) && pattern && !skip) - video_save_image(dev, &buf, pattern, i); - -+ if (video_is_capture(dev) && do_stdout && !skip) -+ video_stdout_image(dev, &buf); -+ - if (skip) - --skip; - -@@ -1577,7 +1594,7 @@ static int video_do_capture(struct device *dev, unsigned int nframes, - - ret = video_queue_buffer(dev, buf.index, fill); - if (ret < 0) { -- printf("Unable to requeue buffer: %s (%d).\n", -+ fprintf(stderr, "Unable to requeue buffer: %s (%d).\n", - strerror(errno), errno); - goto done; - } -@@ -1587,7 +1604,7 @@ static int video_do_capture(struct device *dev, unsigned int nframes, - video_enable(dev, 0); - - if (nframes == 0) { -- printf("No frames captured.\n"); -+ fprintf(stderr, "No frames captured.\n"); - goto done; - } - -@@ -1604,7 +1621,7 @@ static int video_do_capture(struct device *dev, unsigned int nframes, - bps = size/(ts.tv_nsec/1000.0+1000000.0*ts.tv_sec)*1000000.0; - fps = i/(ts.tv_nsec/1000.0+1000000.0*ts.tv_sec)*1000000.0; - -- printf("Captured %u frames in %lu.%06lu seconds (%f fps, %f B/s).\n", -+ fprintf(stderr, "Captured %u frames in %lu.%06lu seconds (%f fps, %f B/s).\n", - i, ts.tv_sec, ts.tv_nsec/1000, fps, bps); - - done: -@@ -1616,42 +1633,42 @@ done: - - static void usage(const char *argv0) - { -- printf("Usage: %s [options] device\n", argv0); -- printf("Supported options:\n"); -- printf("-B, --buffer-type Buffer type (\"capture\", \"output\",\n"); -- printf(" \"capture-mplane\" or \"output-mplane\")\n"); -- printf("-c, --capture[=nframes] Capture frames\n"); -- printf("-C, --check-overrun Verify dequeued frames for buffer overrun\n"); -- printf("-d, --delay Delay (in ms) before requeuing buffers\n"); -- printf("-f, --format format Set the video format\n"); -- printf("-F, --file[=name] Read/write frames from/to disk\n"); -- printf("\tFor video capture devices, the first '#' character in the file name is\n"); -- printf("\texpanded to the frame sequence number. The default file name is\n"); -- printf("\t'frame-#.bin'.\n"); -- printf("-h, --help Show this help screen\n"); -- printf("-i, --input input Select the video input\n"); -- printf("-I, --fill-frames Fill frames with check pattern before queuing them\n"); -- printf("-l, --list-controls List available controls\n"); -- printf("-n, --nbufs n Set the number of video buffers\n"); -- printf("-p, --pause Pause before starting the video stream\n"); -- printf("-q, --quality n MJPEG quality (0-100)\n"); -- printf("-r, --get-control ctrl Get control 'ctrl'\n"); -- printf("-R, --realtime=[priority] Enable realtime RR scheduling\n"); -- printf("-s, --size WxH Set the frame size\n"); -- printf("-t, --time-per-frame num/denom Set the time per frame (eg. 1/25 = 25 fps)\n"); -- printf("-u, --userptr Use the user pointers streaming method\n"); -- printf("-w, --set-control 'ctrl value' Set control 'ctrl' to 'value'\n"); -- printf(" --enum-formats Enumerate formats\n"); -- printf(" --enum-inputs Enumerate inputs\n"); -- printf(" --fd Use a numeric file descriptor insted of a device\n"); -- printf(" --field Interlaced format field order\n"); -- printf(" --no-query Don't query capabilities on open\n"); -- printf(" --offset User pointer buffer offset from page start\n"); -- printf(" --requeue-last Requeue the last buffers before streamoff\n"); -- printf(" --timestamp-source Set timestamp source on output buffers [eof, soe]\n"); -- printf(" --skip n Skip the first n frames\n"); -- printf(" --sleep-forever Sleep forever after configuring the device\n"); -- printf(" --stride value Line stride in bytes\n"); -+ fprintf(stderr, "Usage: %s [options] device\n", argv0); -+ fprintf(stderr, "Supported options:\n"); -+ fprintf(stderr, "-B, --buffer-type Buffer type (\"capture\", \"output\",\n"); -+ fprintf(stderr, " \"capture-mplane\" or \"output-mplane\")\n"); -+ fprintf(stderr, "-c, --capture[=nframes] Capture frames\n"); -+ fprintf(stderr, "-C, --check-overrun Verify dequeued frames for buffer overrun\n"); -+ fprintf(stderr, "-d, --delay Delay (in ms) before requeuing buffers\n"); -+ fprintf(stderr, "-f, --format format Set the video format\n"); -+ fprintf(stderr, "-F, --file[=name] Read/write frames from/to disk\n"); -+ fprintf(stderr, "\tFor video capture devices, the first '#' character in the file name is\n"); -+ fprintf(stderr, "\texpanded to the frame sequence number. The default file name is\n"); -+ fprintf(stderr, "\t'frame-#.bin'.\n"); -+ fprintf(stderr, "-h, --help Show this help screen\n"); -+ fprintf(stderr, "-i, --input input Select the video input\n"); -+ fprintf(stderr, "-I, --fill-frames Fill frames with check pattern before queuing them\n"); -+ fprintf(stderr, "-l, --list-controls List available controls\n"); -+ fprintf(stderr, "-n, --nbufs n Set the number of video buffers\n"); -+ fprintf(stderr, "-p, --pause Pause before starting the video stream\n"); -+ fprintf(stderr, "-q, --quality n MJPEG quality (0-100)\n"); -+ fprintf(stderr, "-r, --get-control ctrl Get control 'ctrl'\n"); -+ fprintf(stderr, "-R, --realtime=[priority] Enable realtime RR scheduling\n"); -+ fprintf(stderr, "-s, --size WxH Set the frame size\n"); -+ fprintf(stderr, "-t, --time-per-frame num/denom Set the time per frame (eg. 1/25 = 25 fps)\n"); -+ fprintf(stderr, "-u, --userptr Use the user pointers streaming method\n"); -+ fprintf(stderr, "-w, --set-control 'ctrl value' Set control 'ctrl' to 'value'\n"); -+ fprintf(stderr, " --enum-formats Enumerate formats\n"); -+ fprintf(stderr, " --enum-inputs Enumerate inputs\n"); -+ fprintf(stderr, " --fd Use a numeric file descriptor insted of a device\n"); -+ fprintf(stderr, " --field Interlaced format field order\n"); -+ fprintf(stderr, " --no-query Don't query capabilities on open\n"); -+ fprintf(stderr, " --offset User pointer buffer offset from page start\n"); -+ fprintf(stderr, " --requeue-last Requeue the last buffers before streamoff\n"); -+ fprintf(stderr, " --timestamp-source Set timestamp source on output buffers [eof, soe]\n"); -+ fprintf(stderr, " --skip n Skip the first n frames\n"); -+ fprintf(stderr, " --sleep-forever Sleep forever after configuring the device\n"); -+ fprintf(stderr, " --stride value Line stride in bytes\n"); - } - - #define OPT_ENUM_FORMATS 256 -@@ -1665,6 +1682,7 @@ static void usage(const char *argv0) - #define OPT_FD 264 - #define OPT_TSTAMP_SRC 265 - #define OPT_FIELD 266 -+#define OPT_STDOUT 267 - - static struct option opts[] = { - {"buffer-type", 1, 0, 'B'}, -@@ -1677,6 +1695,7 @@ static struct option opts[] = { - {"field", 1, 0, OPT_FIELD}, - {"file", 2, 0, 'F'}, - {"fill-frames", 0, 0, 'I'}, -+ {"stdout", 0, 0, OPT_STDOUT}, - {"format", 1, 0, 'f'}, - {"help", 0, 0, 'h'}, - {"input", 1, 0, 'i'}, -@@ -1717,7 +1736,8 @@ int main(int argc, char *argv[]) - int do_list_controls = 0, do_get_control = 0, do_set_control = 0; - int do_sleep_forever = 0, do_requeue_last = 0; - int do_rt = 0; -- int no_query = 0; -+ int no_query = 0; -+ int do_stdout = 0; - char *endptr; - int c; - -@@ -1755,7 +1775,7 @@ int main(int argc, char *argv[]) - case 'B': - ret = v4l2_buf_type_from_string(optarg); - if (ret == -1) { -- printf("Bad buffer type \"%s\"\n", optarg); -+ fprintf(stderr, "Bad buffer type \"%s\"\n", optarg); - return 1; - } - video_set_buf_type(&dev, ret); -@@ -1775,7 +1795,7 @@ int main(int argc, char *argv[]) - do_set_format = 1; - info = v4l2_format_by_name(optarg); - if (info == NULL) { -- printf("Unsupported video format '%s'\n", optarg); -+ fprintf(stderr, "Unsupported video format '%s'\n", optarg); - return 1; - } - pixelformat = info->fourcc; -@@ -1812,7 +1832,7 @@ int main(int argc, char *argv[]) - case 'r': - ctrl_name = strtol(optarg, &endptr, 0); - if (*endptr != 0) { -- printf("Invalid control name '%s'\n", optarg); -+ fprintf(stderr, "Invalid control name '%s'\n", optarg); - return 1; - } - do_get_control = 1; -@@ -1826,12 +1846,12 @@ int main(int argc, char *argv[]) - do_set_format = 1; - width = strtol(optarg, &endptr, 10); - if (*endptr != 'x' || endptr == optarg) { -- printf("Invalid size '%s'\n", optarg); -+ fprintf(stderr, "Invalid size '%s'\n", optarg); - return 1; - } - height = strtol(endptr + 1, &endptr, 10); - if (*endptr != 0) { -- printf("Invalid size '%s'\n", optarg); -+ fprintf(stderr, "Invalid size '%s'\n", optarg); - return 1; - } - break; -@@ -1839,12 +1859,12 @@ int main(int argc, char *argv[]) - do_set_time_per_frame = 1; - time_per_frame.numerator = strtol(optarg, &endptr, 10); - if (*endptr != '/' || endptr == optarg) { -- printf("Invalid time per frame '%s'\n", optarg); -+ fprintf(stderr, "Invalid time per frame '%s'\n", optarg); - return 1; - } - time_per_frame.denominator = strtol(endptr + 1, &endptr, 10); - if (*endptr != 0) { -- printf("Invalid time per frame '%s'\n", optarg); -+ fprintf(stderr, "Invalid time per frame '%s'\n", optarg); - return 1; - } - break; -@@ -1854,12 +1874,12 @@ int main(int argc, char *argv[]) - case 'w': - ctrl_name = strtol(optarg, &endptr, 0); - if (*endptr != ' ' || endptr == optarg) { -- printf("Invalid control name '%s'\n", optarg); -+ fprintf(stderr, "Invalid control name '%s'\n", optarg); - return 1; - } - ctrl_value = strtol(endptr + 1, &endptr, 0); - if (*endptr != 0) { -- printf("Invalid control value '%s'\n", optarg); -+ fprintf(stderr, "Invalid control value '%s'\n", optarg); - return 1; - } - do_set_control = 1; -@@ -1873,16 +1893,16 @@ int main(int argc, char *argv[]) - case OPT_FD: - ret = atoi(optarg); - if (ret < 0) { -- printf("Bad file descriptor %d\n", ret); -+ fprintf(stderr, "Bad file descriptor %d\n", ret); - return 1; - } -- printf("Using file descriptor %d\n", ret); -+ fprintf(stderr, "Using file descriptor %d\n", ret); - video_set_fd(&dev, ret); - break; - case OPT_FIELD: - field = v4l2_field_from_string(optarg); - if (field == (enum v4l2_field)-1) { -- printf("Invalid field order '%s'\n", optarg); -+ fprintf(stderr, "Invalid field order '%s'\n", optarg); - return 1; - } - break; -@@ -1907,22 +1927,25 @@ int main(int argc, char *argv[]) - } else if (!strcmp(optarg, "soe")) { - dev.buffer_output_flags |= V4L2_BUF_FLAG_TSTAMP_SRC_SOE; - } else { -- printf("Invalid timestamp source %s\n", optarg); -+ fprintf(stderr, "Invalid timestamp source %s\n", optarg); - return 1; - } - break; - case OPT_USERPTR_OFFSET: - userptr_offset = atoi(optarg); - break; -+ case OPT_STDOUT: -+ do_stdout = 1; -+ break; - default: -- printf("Invalid option -%c\n", c); -- printf("Run %s -h for help.\n", argv[0]); -+ fprintf(stderr, "Invalid option -%c\n", c); -+ fprintf(stderr, "Run %s -h for help.\n", argv[0]); - return 1; - } - } - - if ((fill_mode & BUFFER_FILL_PADDING) && memtype != V4L2_MEMORY_USERPTR) { -- printf("Buffer overrun can only be checked in USERPTR mode.\n"); -+ fprintf(stderr, "Buffer overrun can only be checked in USERPTR mode.\n"); - return 1; - } - -@@ -1959,7 +1982,7 @@ int main(int argc, char *argv[]) - ret = get_control(&dev, ctrl_name, - get_control_type(&dev, ctrl_name), &val); - if (ret >= 0) -- printf("Control 0x%08x value %" PRId64 "\n", ctrl_name, val); -+ fprintf(stderr, "Control 0x%08x value %" PRId64 "\n", ctrl_name, val); - } - - if (do_set_control) -@@ -1970,7 +1993,7 @@ int main(int argc, char *argv[]) - video_list_controls(&dev); - - if (do_enum_formats) { -- printf("- Available formats:\n"); -+ fprintf(stderr, "- Available formats:\n"); - video_enum_formats(&dev, V4L2_BUF_TYPE_VIDEO_CAPTURE); - video_enum_formats(&dev, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE); - video_enum_formats(&dev, V4L2_BUF_TYPE_VIDEO_OUTPUT); -@@ -1979,14 +2002,14 @@ int main(int argc, char *argv[]) - } - - if (do_enum_inputs) { -- printf("- Available inputs:\n"); -+ fprintf(stderr, "- Available inputs:\n"); - video_enum_inputs(&dev); - } - - if (do_set_input) { - video_set_input(&dev, input); - ret = video_get_input(&dev); -- printf("Input %d selected\n", ret); -+ fprintf(stderr, "Input %d selected\n", ret); - } - - /* Set the video format. */ -@@ -2028,7 +2051,7 @@ int main(int argc, char *argv[]) - } - - if (do_pause) { -- printf("Press enter to start capture\n"); -+ fprintf(stderr, "Press enter to start capture\n"); - getchar(); - } - -@@ -2037,12 +2060,12 @@ int main(int argc, char *argv[]) - sched.sched_priority = rt_priority; - ret = sched_setscheduler(0, SCHED_RR, &sched); - if (ret < 0) -- printf("Failed to select RR scheduler: %s (%d)\n", -+ fprintf(stderr, "Failed to select RR scheduler: %s (%d)\n", - strerror(errno), errno); - } - - if (video_do_capture(&dev, nframes, skip, delay, filename, -- do_requeue_last, fill_mode) < 0) { -+ do_requeue_last, fill_mode, do_stdout) < 0) { - video_close(&dev); - return 1; - } --- -1.7.9.5 - diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb index a192d1a3bb..deffa4a146 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb @@ -3,8 +3,8 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" SRC_URI = "git://git.ideasonboard.org/yavta.git \ - file://0001-Add-stdout-mode-to-allow-streaming-over-the-network-.patch" -SRCREV = "7e9f28bedc1ed3205fb5164f686aea96f27a0de2" + " +SRCREV = "65f740aa1758531fd810339bc1b7d1d33666e28a" PV = "0.0" PR = "r2" -- cgit v1.2.3