From 3599e770ce9f25769be38c65ae2b5df7c3efa5d0dc8ced7c0ac37e300b89a53b Mon Sep 17 00:00:00 2001 From: Asterios Dramis Date: Thu, 9 Dec 2021 20:36:58 +0000 Subject: [PATCH 1/2] Accepting request 935854 from home:dirkmueller:Factory - update to 1.22.1 * add missing include for uClibc-ng * buildsystem: Start v4l-utils 1.21.0 development cycle * Build with libbpf, remove local sources * cec: add active sensing test for Audio Rate Control messages * cec: add Deck Control wake-up handling tests * cec: add invalid operand test for Audio Rate Control messages * cec: add One Touch Record Standby tests * cec: add tests for Deck Control message * cec: add tests for Deck Play message * cec: add tests for Give Deck Status message * cec-compliance: add Audio System mask to Set Audio Rate * cec-compliance: add cec-test-tuner-record-timer.cpp * cec-compliance: add 'reason' sanity check. * cec-compliance: Add version command * cec-compliance: clarify a power transition test * cec-compliance: clarify a warning * cec-compliance: don't skip tests if phys addr is invalid * cec-compliance: fix broken timer tests * cec-compliance: fix confusing 'Transient state' message * cec-compliance: fix 'unresponsive' detection * cec-compliance/follower: fix type comparison warnings * cec-compliance: hardcode audio_out_delay to 1 if not set * cec-compliance: improve confusing message * cec-compliance: improve current latency checks * cec-compliance: improve error message * cec-compliance: improve testLostMsgs test * cec-compliance: improve warning about late reply * cec-compliance: move audio helper functions to cec-test-audio.cpp * cec-compliance: move CDC helper functions to cec-test.cpp OBS-URL: https://build.opensuse.org/request/show/935854 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/v4l-utils?expand=0&rev=79 --- sysmacros.patch | 34 ---- use_system_v4l_for_qv4l.patch | 14 +- v4l-utils-1.20.0.tar.bz2 | 3 - v4l-utils-1.20.0.tar.bz2.asc | 16 -- v4l-utils-1.22.1.tar.bz2 | 3 + v4l-utils-1.22.1.tar.bz2.asc | 16 ++ v4l-utils-32bitfix.patch | 10 +- v4l-utils.changes | 287 ++++++++++++++++++++++++++++++++++ v4l-utils.spec | 28 ++-- 9 files changed, 328 insertions(+), 83 deletions(-) delete mode 100644 sysmacros.patch delete mode 100644 v4l-utils-1.20.0.tar.bz2 delete mode 100644 v4l-utils-1.20.0.tar.bz2.asc create mode 100644 v4l-utils-1.22.1.tar.bz2 create mode 100644 v4l-utils-1.22.1.tar.bz2.asc diff --git a/sysmacros.patch b/sysmacros.patch deleted file mode 100644 index 5a4602d..0000000 --- a/sysmacros.patch +++ /dev/null @@ -1,34 +0,0 @@ -Index: v4l-utils-1.18.0/lib/libv4lconvert/control/libv4lcontrol.c -=================================================================== ---- v4l-utils-1.18.0.orig/lib/libv4lconvert/control/libv4lcontrol.c -+++ v4l-utils-1.18.0/lib/libv4lconvert/control/libv4lcontrol.c -@@ -19,6 +19,7 @@ - # Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA - */ - -+#include "config.h" - #include - #ifndef __OpenBSD__ - #include -Index: v4l-utils-1.18.0/utils/v4l2-ctl/v4l2-ctl.cpp -=================================================================== ---- v4l-utils-1.18.0.orig/utils/v4l2-ctl/v4l2-ctl.cpp -+++ v4l-utils-1.18.0/utils/v4l2-ctl/v4l2-ctl.cpp -@@ -20,6 +20,7 @@ - Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA - */ - -+#include "config.h" - #include - #include - #include -@@ -27,6 +28,9 @@ - #include - #include - #include -+#if defined(MAJOR_IN_SYSMACROS) -+#include -+#endif - #include - #include - #include diff --git a/use_system_v4l_for_qv4l.patch b/use_system_v4l_for_qv4l.patch index c65b772..4011f79 100644 --- a/use_system_v4l_for_qv4l.patch +++ b/use_system_v4l_for_qv4l.patch @@ -1,8 +1,8 @@ -diff --git a/utils/qv4l2/Makefile.am b/utils/qv4l2/Makefile.am -index ccd1a2a..6978cf3 100644 ---- a/utils/qv4l2/Makefile.am -+++ b/utils/qv4l2/Makefile.am -@@ -6,8 +6,8 @@ qv4l2_SOURCES = qv4l2.cpp general-tab.cpp ctrl-tab.cpp vbi-tab.cpp capture-win.c +Index: v4l-utils-1.22.1/utils/qv4l2/Makefile.am +=================================================================== +--- v4l-utils-1.22.1.orig/utils/qv4l2/Makefile.am ++++ v4l-utils-1.22.1/utils/qv4l2/Makefile.am +@@ -6,8 +6,8 @@ qv4l2_SOURCES = qv4l2.cpp general-tab.cp raw2sliced.cpp qv4l2.h capture-win.h general-tab.h vbi-tab.h raw2sliced.h \ v4l2-tpg-core.c v4l2-tpg-colors.c nodist_qv4l2_SOURCES = moc_qv4l2.cpp moc_general-tab.cpp moc_capture-win.cpp moc_vbi-tab.cpp qrc_qv4l2.cpp @@ -13,8 +13,8 @@ index ccd1a2a..6978cf3 100644 qv4l2_CPPFLAGS = -I$(top_srcdir)/utils/common if WITH_QTGL -@@ -21,6 +20,8 @@ endif - qv4l2_CPPFLAGS += $(ALSA_CFLAGS) +@@ -21,6 +21,8 @@ endif + qv4l2_CPPFLAGS += $(ALSA_CFLAGS) -Wno-psabi qv4l2_LDFLAGS += $(ALSA_LIBS) -pthread +qv4l2_LDFLAGS += -lv4l2 -lv4lconvert diff --git a/v4l-utils-1.20.0.tar.bz2 b/v4l-utils-1.20.0.tar.bz2 deleted file mode 100644 index 6f9582d..0000000 --- a/v4l-utils-1.20.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:956118713f7ccb405c55c7088a6a2490c32d54300dd9a30d8d5008c28d3726f7 -size 2030419 diff --git a/v4l-utils-1.20.0.tar.bz2.asc b/v4l-utils-1.20.0.tar.bz2.asc deleted file mode 100644 index a29686a..0000000 --- a/v4l-utils-1.20.0.tar.bz2.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEBdAWnCbkFZNBgSnfGZpk+t+1AP8FAl7GZKEACgkQGZpk+t+1 -AP8eCRAAjS6qUaVOG2fhLu8wvfcqOvLXzDQxO6Foq6ccCawIeKiuvskwwU6ZPYpz -Ohlet4DOcLJXrDsVQHnR9cWrsAmSpIgnf1rjH6Inuqfw8b6lq0ZNl2ns7JMlLdbD -y6AsolFr5vCu43eM4Uba+VFQOsyqMJthoTgm00uT9B4mTYtJCg79j51wJAmsSrTq -ayRoNj1rPSOTN9mUeYNvfDTk8yIPpB6DRe0kGcnUQddXb4zYH8F94aw2+gOA2/1q -WPoV/B4fn5d1PRDcO1pmHbasA1YN9bOyIVaER1iEA/y8VGOdwzzH0kQouIqemxmQ -zdb2trMlY2bGwBTbMgmtR7Q77bGteUbQA4JrdmwlXqSepXGzoaIoRg6zYuiiwF3V -/IORmC2ybs4Uu0ap1Pskn3xjG3zTFe3dzWb44Ey4pSAH7sIAXNiVilKxdztniUdp -wD71nb54YuWluqP7e5zEAvZC306UuKF4gAi99TZspCafoqR7pIT4Bw1cjo6XhBJR -XS3atXqVy/JZU1AbEA+6oSYo4vdICTSwRRc+AmTuxi+0jxdgVwlsuAT1G9LT2mPJ -QQVi+WBVUMtYvXZ9f4ZWyqVmchpk5RcTdZULWmPRIzhwVoC5jGyc5rdkaKMBlkm8 -8xWXgcfqt2prUy9kgFWYlmNJY4Mip+0PjQnMqY4Y7V+rale40Dk= -=naRm ------END PGP SIGNATURE----- diff --git a/v4l-utils-1.22.1.tar.bz2 b/v4l-utils-1.22.1.tar.bz2 new file mode 100644 index 0000000..af1bef2 --- /dev/null +++ b/v4l-utils-1.22.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65c6fbe830a44ca105c443b027182c1b2c9053a91d1e72ad849dfab388b94e31 +size 2086238 diff --git a/v4l-utils-1.22.1.tar.bz2.asc b/v4l-utils-1.22.1.tar.bz2.asc new file mode 100644 index 0000000..8826cba --- /dev/null +++ b/v4l-utils-1.22.1.tar.bz2.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEBdAWnCbkFZNBgSnfGZpk+t+1AP8FAmF0Ju4ACgkQGZpk+t+1 +AP960hAAjHCy6+EpsBnfp8AW6QWFMAp3VwYh6cIL2dZBZRMezOv3O0uS4n4AKLu9 +1PMbye7BsElEHlZZu+Qp7QVWCVaMLjvpsm7DML13+zD6dE2dXrmHCpkEIKJDmbJy +YQe5Nvva10/e+ySQFuha0gvEqcC2sWDze+Qaa97vramNBcNOLLfriwCN91kLD4K+ +reOlGobyCywj5kAeYdx3Z7k13gW6pWtrc9jeJe7nEn4W+j5Figlg4B1VAH50FJ/h +/yBzrz+PiSsWbXoYRYZZf1kM6tj+KN29MlHJO0j8Pughb02HY1xDqH7cRw2X+BMc +fQMZ2fChyplVQMKmjDK/8ika946DzDvODiMtk4MARTOl89RNKvrmccDeQReyisPw +qUn+uJ+vHPvPphmyxpIILtCOHGVE3tOC11/PMOXoUbDuJH7HM2oAJCkUR2qX4iTE +L/bugC9CwRdDqtkwt2v5uYN8R/SQB1NsAN8UJX5ZypH/vdRuXg36k23g/gatlphU +Ylp+DB5BvrFV/z+n3dHcLzHZQXCt79ZqXDMlSHFs1/m83D4a1y9e/37giJXDMbxz +/hvRl1Bqt5S+HFoht68qsa+qdsTsiOJSKzN7tiguzCyh3U40hZDGbSWr9w0TDS3s +w/4Wmk4siDNC1qz91VN+DWlwTBAygek4UerO/B2tn7YlfI0HQvc= +=wh1p +-----END PGP SIGNATURE----- diff --git a/v4l-utils-32bitfix.patch b/v4l-utils-32bitfix.patch index 37e0435..1b679ad 100644 --- a/v4l-utils-32bitfix.patch +++ b/v4l-utils-32bitfix.patch @@ -1,8 +1,8 @@ -Index: b/lib/libdvbv5/dvb-file.c +Index: v4l-utils-1.22.1/lib/libdvbv5/dvb-file.c =================================================================== ---- a/lib/libdvbv5/dvb-file.c -+++ b/lib/libdvbv5/dvb-file.c -@@ -589,7 +589,8 @@ static int fill_entry(struct dvb_entry * +--- v4l-utils-1.22.1.orig/lib/libdvbv5/dvb-file.c ++++ v4l-utils-1.22.1/lib/libdvbv5/dvb-file.c +@@ -594,7 +594,8 @@ static int fill_entry(struct dvb_entry * n_prop = entry->n_props; entry->props[n_prop].cmd = i; if (!attr_name || !*attr_name) @@ -12,7 +12,7 @@ Index: b/lib/libdvbv5/dvb-file.c else { for (j = 0; attr_name[j]; j++) if (!strcasecmp(value, attr_name[j])) -@@ -708,7 +709,8 @@ static int fill_entry(struct dvb_entry * +@@ -713,7 +714,8 @@ static int fill_entry(struct dvb_entry * /* FIXME: this works only for integer values */ n_prop = entry->n_props; entry->props[n_prop].cmd = cmd; diff --git a/v4l-utils.changes b/v4l-utils.changes index c7049d6..971c2e9 100644 --- a/v4l-utils.changes +++ b/v4l-utils.changes @@ -1,3 +1,290 @@ +------------------------------------------------------------------- +Sun Dec 5 19:57:19 UTC 2021 - Dirk Müller + +- update to 1.22.1 + * add missing include for uClibc-ng + * buildsystem: Start v4l-utils 1.21.0 development cycle + * Build with libbpf, remove local sources + * cec: add active sensing test for Audio Rate Control messages + * cec: add Deck Control wake-up handling tests + * cec: add invalid operand test for Audio Rate Control messages + * cec: add One Touch Record Standby tests + * cec: add tests for Deck Control message + * cec: add tests for Deck Play message + * cec: add tests for Give Deck Status message + * cec-compliance: add Audio System mask to Set Audio Rate + * cec-compliance: add cec-test-tuner-record-timer.cpp + * cec-compliance: add 'reason' sanity check. + * cec-compliance: Add version command + * cec-compliance: clarify a power transition test + * cec-compliance: clarify a warning + * cec-compliance: don't skip tests if phys addr is invalid + * cec-compliance: fix broken timer tests + * cec-compliance: fix confusing 'Transient state' message + * cec-compliance: fix 'unresponsive' detection + * cec-compliance/follower: fix type comparison warnings + * cec-compliance: hardcode audio_out_delay to 1 if not set + * cec-compliance: improve confusing message + * cec-compliance: improve current latency checks + * cec-compliance: improve error message + * cec-compliance: improve testLostMsgs test + * cec-compliance: improve warning about late reply + * cec-compliance: move audio helper functions to cec-test-audio.cpp + * cec-compliance: move CDC helper functions to cec-test.cpp + * cec-compliance: options -n and -N were swapped in --help + * cec-compliance: remove Deck Status test + * cec-compliance: remove One Touch Record Status test + * cec-compliance: skip warning if audio_out_delay is 1 + * cec-compliance: the SHA needs to be shown in different ways + * cec-compliance: use send_timer_error for one more test + * cec-compliance: use the actual audio_out_delay value + * cec-compliance: wait up to 10s for Inactive Source reply + * cec-ctl.1.in: fix awkward language + * cec-ctl: Add version command + * cec-ctl/cec-compliance: add pulse8-cec kernel version check + * cec-ctl: detect if Standby etc. messages are Nacked + * cec-ctl: don't spam log with PA changes unless paused + * cec-ctl: free signal time -> signal free time + * cec-ctl: improve --list-devices + * cec-ctl: improve 'Sleep' message in stress test + * cec-ctl: improve the --phys-addr-from-edid-poll option + * cec-ctl: log signal free time when (show && !verbose) + * cec-ctl: min/max-sleep arguments should be double, not unsigned + * cec-ctl: really wait for 2 seconds when the HPD is low + * cec-ctl: report low drive without --verbose + * cec-ctl: showTopology(): fix level wraparound bug + * cec: expand One Touch Record tests + * cec: expand Timer Programming tests + * cec-follower: add --standby and --toggle-power-status + * cec-follower: Add version command + * cec-follower: CEC_MSG_STANDBY can just call enter_standby() + * cec-follower: detect the cessation of Audio Rate Control messages + * cec-follower: drop physical address check + * cec-follower: emulate features for CEC versions < CEC 2.0 + * cec-follower: emulate programmed timer recordings + * cec-follower: fix incorrect fallthrough + * cec-follower: fix logging the SHA + * cec-follower: increase precision of Audio Rate Control active sensing + * cec-follower: refactoring: split up overly long functions + * cec-follower: use log_addr_type to get local device type + * cec: improve vendor ID logging + * cec: remove redundant struct cec_msg initializations + * cec-tuner: std::array conversions + * cec utils and v4l2-compliance: improve version info + * clang-tidy: add a bunch of const + * clang-tidy: use auto + * clang-tidy: use nullptr + * clang-tidy: use using instead of typedef + * clean up includes and convert C includes to C++ + * common/media-info.cpp: 'Flags' was not aligned + * configure.ac: Add --without-libudev option to avoid automagic dep + * configure.ac: autodetect availability of systemd + * configure.ac: drop printf for GIT_COMMIT_DATE + * configure.ac: Export git commit count + * configure.ac: Fix building without libudev + * configure.ac: improve gettext compatibility support + * configure.ac: Resolve GIT_* even if repository is a submodule + * configure.ac: revert AM_GNU_GETTEXT_VERSION change + * contrib/test/test-media: add -setup option + * convert files to reference + * convert to range based loops + * cppcheck: turn several references to const + * cppcheck: use const references + * cv4l-helpers.h: fix the cv4l_buffer assignment operator + * dvb-dev-remote: check if setsockopt() fails + * dvb-fe-tool: better check the event type + * dvb-file: fix one-line output with default values + * dvb-file: reimplement get_pmt_descriptors() + * dvbv5-daemon: don't dereference a null pointer + * dvbv5-daemon: do some cleanups at the daemon + * dvbv5-zap: add a check for dvb_fe_retrieve_status() errors + * dvbv5-zap: add a warning when not recording PMT data + * dvbv5-zap: allow recording also the SDT table + * dvbv5-zap: don't use start time initialized + * dvbv5-zap: fix a cut-and paste error + * dvbv5-zap: remove an unused logic + * dvb-zap: copy_to_file doesn't return any value + * fix mismatching declaration + * Fix print formatting warning for clang. + * ir-ctl: include timeout in raw IR and parse timeout in pulse-space file + * ir-ctl: increase the size of the buffer used to read raw files + * ir-ctl: print correct transmitter count + * ir-ctl: Revert "ir-ctl: print correct transmitter count" + * keytable: Add source information in generated keymaps + * keytable: ensure BPF IR decoders use correct section name + * keytable: Fix missing inclusion of argp.h + * keytable: fix typo + * keytable: restrict installation of 50-rc_keymap.conf + * libcecutil/cec-info.cpp: rename Reserved to Backup + * libcecutil: make license consistent + * libdvb: fix ATSC service location parser + * libdvbv5: add a warning if a descriptor's init doesn't went fine + * libdvbv5: add support for the registration descriptor + * libdvbv5: avoid a potential access out of an array + * libdvbv5: desc_ca: cleanup the routine + * libdvbv5: desc_language: check if the size is correct + * libdvbv5: desc_network_name: simplify the init code + * libdvbv5: detect SMTPE 302m audio format + * libdvbv5: don't leak memory at dvb-dev-remote + * libdvbv5: dvb-dev-local: better handle realloc() + * libdvbv5: dvb-dev-local: fix error handling for device addition + * libdvbv5: dvb-dev-remote: better handle cmd size + * libdvbv5: dvb-dev-remote: don't leak resources at send_buf() + * libdvbv5: fix a typo + * libdvbv5: fix init of the ATSC service location + * libdvbv5: fix the quality detection logic + * libdvbv5: hide my_strlcpy symbol + * libdvbv5: hide stack_dump symbols and provide soname compatibility + * libdvbv5: initialize v3 params + * libdvbv5: use an array for the fourcc type + * libdvbv5: validate cable descriptor's size + * libv4l2: add newer caps to v4l2_driver.c + * Makefile.am: turn the build less verbose by default + * mass constexpr conversions + * mc_nextgen_test: Link against argp library + * media-ctl: add v4l2-ycbcr-enc field in help description + * media-ctl: Add version command + * media-ctl: fix compiler warnings + * media-ctl: fix ycbcr property in help description + * media-info: MEDIA_ENT_F_IO_DTV doesn't need an interface + * Move sync-with-kernel into dedicated shell script ./sync-with-kernel.sh + * qv4l2: add -Wno-psabi to avoid ABI warning on ARM + * qv4l2: Also fall back to old method for querying resolution + * qv4l2: fallback if window()->windowHandle() == NULL + * qv4l2: fix CaptureWin::setWindowSize() if there are multiple screens + * qv4l2: fix more 'deprecated Qt functions' warnings + * qv4l2: fix use of deprecated byteCount method + * qv4l2: QGuiApplication::screenAt() appeared in Qt 5.10 + * qvidcap: fix GL_UNPACK_ROW_LENGTH for Bayer > 8 bits + * qvidcap: set GL_UNPACK_ROW_LENGTH for Bayer formats + * remove pointless constructor + * remove unused ARRAY_SIZE + * Rudimentary support for mi_media_detect_type on FreeBSD. + * sync with latest media kernel + * test-media: add 'date' at beginning and end, show versions + * test-media: add -E and -W options + * test-media: add support for vidtv + * test-media: add 'tee /dev/kmsg' + * test-media: add vidtv to the mc target + * test-media: also keep vivid cec devices open + * test-media: configure vimc scaler correctly + * test-media: drop vidtv from mc, but warn if MC is disabled for DVB + * test-media: drop vidtv from the 'mc' target + * test-media: enable cache_hints for the first vivid instance + * test-media: improve vidtv tests + * test-media: mc should include vidtv + * test-media: missed one scaler config line + * test-media: show version info earlier and show cmd args + * use auto + * use emplace_back + * use explicit for single argument constructors + * Use standard integer types + * use using instead of typedef + * utils/cec: fix inconsistent Vendor ID reporting + * utils/libcecutil/cec-log.cpp: report 6 digits of Vendor ID + * utils: replace push_back with emplace_back + * utils: v4l2-ctl: support V4L2_CAP_IO_MC in v4l2-ctl '--list-formats-*' commands + * v4l2/cec-compliance: use new GIT_SHA variable + * v4l2: common: add the flags V4L2_FMT_FLAG_CSC* to the list that maps flags to str + * v4l2-compliance-32: use v4l2_compliance_CPPFLAGS + * v4l2-compliance: add 0 check for v4l2_event reserved field + * v4l2-compliance: Add libcamera to businfo prefixes + * v4l2-compliance: add missing V4L2_PIX_FMT_H264_SLICE + * v4l2-compliance: add new test for 32/64 bit time handling + * v4l2-compliance: add support for VIDIOC_SUBDEV_QUERYCAP + * v4l2-compliance: Add version command + * v4l2-compliance: check correct buffer length after CREATE_BUFS + * v4l2-compliance: check entity function for codecs + * v4l2-compliance: Convert testBlockingDQBuf to pthreads + * v4l2-compliance: disable cache flag test for kernels < 5.9 + * v4l2-compliance: don't warn about seq counter for metadata + * v4l2-compliance: drop kernel_version + * v4l2-compliance: fix bad indentation + * v4l2-compliance: fix cache hint regressions + * v4l2-compliance: fix colorspace checks for JPEG codecs + * v4l2-compliance: fix g++-7 compile error + * v4l2-compliance: fix stateful encoder tests + * v4l2-compliance: fix two S_EDID tests + * v4l2-compliance: improve comment for CROPCAP/G_SELECTION fail + * v4l2-compliance: improve compound control checks + * v4l2-compliance: improve fmtdesc.description check + * v4l2-compliance: improve frequency range checks + * v4l2-compliance: improve request tests + * v4l2-compliance: improve VIDIOC_TRY_DE/ENCODER_CMD tests + * v4l2-compliance: improve VIDIOC_(TRY_)EN/DECODER_CMD tests + * v4l2-compliance: move all vivid controls to v4l2-compliance.h + * v4l2-compliance: relax testBasicSelection check. + * v4l2-compliance: remove spurious \n in message + * v4l2-compliance: rename stvec to vec_remote_subtests + * v4l2-compliance: skip sequence tests for vivid + * v4l2-compliance: some fails were ignored + * v4l2-compliance: test for vb2/m2m poll kernel bug + * v4l2-compliance: test polling and disconnecting + * v4l2-compliance: use fail_on_test_val for better fail reports + * v4l2-compliance: V4L2_PIX_FMT_VP8_FRAME is for stateless decoder + * v4l2-ctl-32: use v4l2_ctl_CPPFLAGS, fix wrong check + * v4l2-ctl: add missing const, use {} instead of memset + * v4l2-ctl: add new control types + * v4l2-ctl: add '--set-edid type=list' support + * v4l2-ctl: add --show-edid, add new test EDIDs + * v4l2-ctl: add support for VIDIOC_SUBDEV_QUERYCAP + * v4l2-ctl: Add version command + * v4l2-ctl: break on VIDIOC_DQEVENT error + * v4l2-ctl: clean up control value printing + * v4l2-ctl: don't squash setting multiple identical controls. + * v4l2-ctl: fix broken fd.qbuf error check + * v4l2-ctl: fix bugs found in streaming_set_cap2out + * v4l2-ctl: fix hdmi and hdmi-4k-170mhz EDIDs + * v4l2-ctl: fix incorrect check for last_ts + * v4l2-ctl: fix INTEGER64 support, add common_print_control() + * v4l2-ctl: Fix test_ioctl cmd type + * v4l2-ctl: improve --help-edid + * v4l2-ctl: print delta to current clock in verbose mode + * v4l2-ctl: print specific error upon failure + * v4l2-ctl: recognize compound h264 and fwht control types + * v4l2-ctl: remove unused struct flag_def + * v4l2-ctl: rename vivid_uvc_meta_buf to uvc_meta_buf + * v4l2-ctl: set total number of native DTDs to 1 + * v4l2-ctl: subdev: Add support for the CSC API in the subdevices + * v4l2-ctl: subdev: Add the flags to the list of supported mbus formats + * v4l2-ctl: update EDIDs + * v4l2-ctl: update test EDIDs + * v4l2-ctl: vidcap: Add support for the CSC API + * v4l2-dbg: fix control flow problem + * v4l2grab: add command line args for other capture methods + * v4l2grab: add querycap basic support + * v4l2grab: add read and userptr capture methods + * v4l2grab: fix block mode handling + * v4l2grab: prepare it for adding support for other methods + * v4l2grab: remove an unused var + * v4l2grab: some code reorg + * v4l2-info: add v4l2_info_subdev_capability + * v4l2-info.cpp: add new flag V4L2_FMT_FLAG_ENC_CAP_FRAME_INTERVAL + * v4l2-subdev.h: replace BIT(0) by 0x00000001 + * v4l2-tpg.patch: add clamp_t define + * v4l2-tpg.patch: rename min/max defines to tpg_min/max + * v4l2-utils: test cache_hints for MMAP queues + * v4l2-utils: turn fb_formats to constexpr array + * v4l-compliance: re-introduce NON_COHERENT and cache hints tests + * v4l-compliance: remove NON_CONSISTENT hint test + * v4l-helpers: don't mix enum type with int + * v4l-utils: add missing fallthrough + * v4l-utils: add missing static + * v4l-utils: convert board_list to vector + * v4l-utils: FreeBSD already defines packed + * v4l-utils: libdvbv5: fix broken my_strlcpy calls + * v4l-utils: patch v4l2-controls.h + * v4l-utils: switch remote_subtest arrays to vector + * v4l-utils: sync with latest media kernel + * v4l-utils: sync with latest media staging tree + * v4l-utils: sync with latest media_tree master repo + * v4l-utils: sync with media_tree master + * v4l-utils: sync with media_tree/master + * v4l-utils: sync with upstream media_tree master + * v4l-utils: update v4l2-tpg.patch + * v4l-utils: use V4L2_TYPE_IS_CAPTURE +- remove sysmacros.patch: obsolete + ------------------------------------------------------------------- Sun Feb 21 22:22:50 UTC 2021 - Asterios Dramis diff --git a/v4l-utils.spec b/v4l-utils.spec index 457bc96..566ec31 100644 --- a/v4l-utils.spec +++ b/v4l-utils.spec @@ -1,5 +1,5 @@ # -# spec file for package v4l +# spec file # # Copyright (c) 2021 SUSE LLC # @@ -24,16 +24,15 @@ %define so_ver 0 %define sname v4l-utils Name: v4l-utils%{?psuffix} -Version: 1.20.0 +Version: 1.22.1 Release: 0 Summary: Utilities for video4linux -License: LGPL-2.1-or-later AND GPL-2.0-or-later AND GPL-2.0-only +License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later URL: https://linuxtv.org/downloads/v4l-utils/ Source0: https://linuxtv.org/downloads/v4l-utils/%{sname}-%{version}.tar.bz2 Source1: https://linuxtv.org/downloads/v4l-utils/%{sname}-%{version}.tar.bz2.asc Source2: %{sname}.keyring Source100: baselibs.conf -Patch0: sysmacros.patch Patch1: use_system_v4l_for_qv4l.patch Patch2: v4l-utils-32bitfix.patch BuildRequires: alsa-devel @@ -68,7 +67,7 @@ v4l-utils is a collection of various video4linux (V4L) utilities. %package devel-tools Summary: Utilities for v4l2 / DVB driver development and debugging -License: GPL-2.0-or-later AND GPL-2.0-only +License: GPL-2.0-only AND GPL-2.0-or-later Requires: libv4l = %{version} %description devel-tools @@ -103,7 +102,7 @@ developing applications that use libdvbv5. %package -n libv4l Summary: Collection of video4linux support libraries -License: LGPL-2.1-or-later AND GPL-2.0-only +License: GPL-2.0-only AND LGPL-2.1-or-later %description -n libv4l libv4l is a collection of libraries which adds a thin abstraction layer on @@ -174,20 +173,16 @@ License: GPL-2.0-or-later Requires: libv4l = %{version} Requires(post): hicolor-icon-theme Requires(post): update-desktop-files -Requires(postun): hicolor-icon-theme -Requires(postun): update-desktop-files +Requires(postun):hicolor-icon-theme +Requires(postun):update-desktop-files %description -n qv4l2 qv4l2 is a test control and streaming test application for video4linux. %prep -%setup -q -n %{sname}-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 -n %{sname}-%{version} %build -export CXXFLAGS="-std=c++14 %{optflags}" autoreconf -vfi %configure \ --disable-static \ @@ -216,6 +211,7 @@ export CXXFLAGS="-std=c++14 %{optflags}" %else %make_install %find_lang "%{name}" +%find_lang libdvbv5 # Not needed (links to plugins in libv4l subdir) rm %{buildroot}%{_libdir}/{v4l1compat.so,v4l2convert.so} @@ -243,10 +239,6 @@ find %{buildroot} -type f -name "*.la" -delete -print %dir %{_sysconfdir}/rc_keymaps/ %config(noreplace) %{_sysconfdir}/rc_maps.cfg %{_udevdir}/rc_keymaps -%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150200 && 0%{?is_opensuse} -%dir %{_unitdir}/systemd-udevd.service.d -%{_unitdir}/systemd-udevd.service.d/50-rc_keymap.conf -%endif %{_udevrulesdir}/70-infrared.rules %{_bindir}/cx18-ctl %{_bindir}/cec-compliance @@ -285,7 +277,7 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_mandir}/man1/dvb-*1%{?ext_man} %{_mandir}/man1/dvbv5-*1%{?ext_man} -%files -n libdvbv5-%{so_ver} +%files -n libdvbv5-%{so_ver} -f libdvbv5.lang %{_libdir}/libdvbv5.so.%{so_ver}* %files -n libdvbv5-devel From 5e8fb6f107ac398753afa90930e5444459ffdd24940134c8631efe14b54ac616 Mon Sep 17 00:00:00 2001 From: Asterios Dramis Date: Thu, 9 Dec 2021 22:36:31 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/v4l-utils?expand=0&rev=80 --- v4l-utils.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/v4l-utils.spec b/v4l-utils.spec index 566ec31..eaedeab 100644 --- a/v4l-utils.spec +++ b/v4l-utils.spec @@ -1,5 +1,5 @@ # -# spec file +# spec file for package v4l-utils # # Copyright (c) 2021 SUSE LLC # @@ -33,8 +33,8 @@ Source0: https://linuxtv.org/downloads/v4l-utils/%{sname}-%{version}.tar. Source1: https://linuxtv.org/downloads/v4l-utils/%{sname}-%{version}.tar.bz2.asc Source2: %{sname}.keyring Source100: baselibs.conf -Patch1: use_system_v4l_for_qv4l.patch -Patch2: v4l-utils-32bitfix.patch +Patch0: use_system_v4l_for_qv4l.patch +Patch1: v4l-utils-32bitfix.patch BuildRequires: alsa-devel BuildRequires: autoconf BuildRequires: automake @@ -173,8 +173,8 @@ License: GPL-2.0-or-later Requires: libv4l = %{version} Requires(post): hicolor-icon-theme Requires(post): update-desktop-files -Requires(postun):hicolor-icon-theme -Requires(postun):update-desktop-files +Requires(postun): hicolor-icon-theme +Requires(postun): update-desktop-files %description -n qv4l2 qv4l2 is a test control and streaming test application for video4linux. @@ -188,7 +188,7 @@ autoreconf -vfi --disable-static \ --disable-silent-rules \ %if "%{flavor}" == "qv4l2" - --disable-libdvb5 \ + --disable-libdvbv5 \ %else --disable-qv4l2 \ %endif