Accepting request 1288239 from devel:libraries:c_c++

OBS-URL: https://build.opensuse.org/request/show/1288239
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/v4l-utils?expand=0&rev=46

use_system_v4l_for_qv4l.patch

@@ -1,24 +1,94 @@
-Index: v4l-utils-1.22.1/utils/qv4l2/Makefile.am
+Index: v4l-utils-1.28.1/meson.build
 ===================================================================
---- 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
--qv4l2_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la \
--  ../libv4l2util/libv4l2util.la ../libmedia_dev/libmedia_dev.la
-+qv4l2_LDADD = ../libmedia_dev/libmedia_dev.la
-+qv4l2_SOURCES +=- ../libv4l2util/frequencies.c
- qv4l2_CPPFLAGS = -I$(top_srcdir)/utils/common
+--- v4l-utils-1.28.1.orig/meson.build
++++ v4l-utils-1.28.1/meson.build
+@@ -386,13 +386,17 @@ man_pages = []
  
- if WITH_QTGL
-@@ -21,6 +21,8 @@ endif
- qv4l2_CPPFLAGS += $(ALSA_CFLAGS) -Wno-psabi
- qv4l2_LDFLAGS += $(ALSA_LIBS) -pthread
+ i18n_gettext_arguments = ['--directory=' + source_root,
+                           '--keyword=_', '--keyword=N_', '--keyword=P_:1,2']
++if get_option('qv4l2').disabled()
+ subdir('libdvbv5-po')
+ subdir('v4l-utils-po')
  
-+qv4l2_LDFLAGS += -lv4l2 -lv4lconvert
+ subdir('lib')
++else
++  ir_bpf_enabled = false
++endif
+ 
++subdir('utils')
+ if get_option('v4l-utils')
+-    subdir('utils')
+     subdir('contrib')
+ else
+     ir_bpf_enabled = false
+Index: v4l-utils-1.28.1/utils/qv4l2/meson.build
+===================================================================
+--- v4l-utils-1.28.1.orig/utils/qv4l2/meson.build
++++ v4l-utils-1.28.1/utils/qv4l2/meson.build
+@@ -23,14 +23,17 @@ qv4l2_sources = files(
+     'v4l2-tpg-core.c',
+     'vbi-tab.cpp',
+     'vbi-tab.h',
++    '../libv4l2util/frequencies.c',
+ )
+ 
++dep_libv4l2 = dependency('libv4l2')
++dep_libv4lconvert = dependency('libv4lconvert')
 +
- EXTRA_DIST = enterbutt.png exit.png fileopen.png qv4l2_24x24.png qv4l2_64x64.png qv4l2.png qv4l2.svg \
-   snapshot.png video-television.png fileclose.png qv4l2_16x16.png qv4l2_32x32.png qv4l2.desktop \
-   qv4l2.qrc saveraw.png qv4l2.pro qv4l2.1 fullscreenexit.png fullscreen.png start.png step.png
+ qv4l2_deps = [
+     dep_alsa,
+     dep_gl,
+     dep_libmedia_dev,
+     dep_libv4l2,
+-    dep_libv4l2util,
+     dep_libv4lconvert,
+     dep_qt,
+     dep_qt_opengl,
+Index: v4l-utils-1.28.1/utils/meson.build
+===================================================================
+--- v4l-utils-1.28.1.orig/utils/meson.build
++++ v4l-utils-1.28.1/utils/meson.build
+@@ -19,6 +19,7 @@ endforeach
+ # Libraries
+ subdir('libcecutil')
+ subdir('libmedia_dev')
++if get_option('qv4l2').disabled()
+ subdir('libv4l2util')
+ 
+ # Utils
+@@ -30,8 +31,10 @@ subdir('ir-ctl')
+ subdir('ivtv-ctl')
+ subdir('keytable')
+ subdir('media-ctl')
++endif
+ subdir('qv4l2')
+ subdir('qvidcap')
++if get_option('qv4l2').disabled()
+ subdir('rds-ctl')
+ subdir('v4l2-ctl')
+ subdir('v4l2-dbg')
+@@ -41,3 +44,4 @@ subdir('v4l2-tracer')
+ # Compliance tools
+ subdir('cec-compliance')
+ subdir('v4l2-compliance')
++endif
+Index: v4l-utils-1.28.1/utils/qvidcap/meson.build
+===================================================================
+--- v4l-utils-1.28.1.orig/utils/qvidcap/meson.build
++++ v4l-utils-1.28.1/utils/qvidcap/meson.build
+@@ -20,6 +20,7 @@ qvidcap_sources = files(
+     'v4l2-info.cpp',
+     'v4l2-tpg-colors.c',
+     'v4l2-tpg-core.c',
++    '../libv4l2util/frequencies.c',
+ )
+ 
+ qvidcap_deps = [
+@@ -27,7 +28,6 @@ qvidcap_deps = [
+     dep_gl,
+     dep_libmedia_dev,
+     dep_libv4l2,
+-    dep_libv4l2util,
+     dep_libv4lconvert,
+     dep_qt,
+     dep_qt_opengl,

v4l-utils-1.24.1.tar.bz2.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEBdAWnCbkFZNBgSnfGZpk+t+1AP8FAmP47hkACgkQGZpk+t+1
-AP8hhA/9Hkg3y58XRW4OqL1AsS156nBgYretYdESVTt0bCAuB/k6bdMCzk8cIdYG
-drXpbMqKSNoaZgKmHJ0+rpNySw2aJscdWPlROUNqpnCmCyFB1I5oKLZUNMzxbmlK
-M+MGtNiQrJmWZvwyIqfYQNGL1KncXA1oUaIQYFsWQvWbqY5GSDcSoPLhLLm1kS8E
-HgkqJISvP8n9VbtENnr8Fdtt3tHja/B4l67o7wvFCjsFWw7e7pzzMfuhoH16etga
-xArhCMy4vE6sdNGBjK7Jz6kdwCTNcyP/H/INxJ5c878OjBe8KZJiGYq4H4yCxCp4
-fHlRtcHTD7jBaYUgoS7GYQlguz3SBM8g1FIxyekueclCYgIcV8ojm7LnfE9WIYgN
-icK20RgX18IToB5ms3fph9TBCYdxkOmJ9Cn3hgM5p7Hsz6m9gGba7sYlHTn2TURD
-YO47MJ583lJ+lYRSb9fqhDUu4J2mmw04j0A7n67iolYyYD9CiXH5VQuizjufTMtx
-vVB8WgRvv5wuoGrwkBesT5xSf/lhOu1iEFaxs4MmqeCixWZUSq2/leW/Drp3oLWP
-BkUbzmeTQ437bVwudw+keL1I6PpBN+YIiguQe6p8QDfJYAZN3dDZ5LCUwxkc8FxH
-yg5ofWW9lWyVAM+xREsYUjVx78iDvtkzTTMnKvvmi/pN6apBVMM=
-=D6V8
------END PGP SIGNATURE-----

v4l-utils-1.28.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0fa075ce59b6618847af6ea191b6155565ccaa44de0504581ddfed795a328a82
+size 1246516

v4l-utils-1.28.1.tar.xz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEBdAWnCbkFZNBgSnfGZpk+t+1AP8FAmagA8MACgkQGZpk+t+1
+AP+SKQ//YgaIcJl/BQrUVZOpGyOB72A8JthY7X2CO0LqiMfg55MY5R4tPChoGo9M
+3jN1Q6NDMkku87ZXQSl3y08a1jTWw56+Smy7Ak8jCHHCu0vZNaikPiJdSeHNdjqX
+K2+OX+de7fkUnTpavg/V/3Ug64CWhrVU+J7YbltTzLtykIdpPSnlUQwoHXHppfWD
+ogEhF7zku73uZEYm8cHmxQ2y3coGgLT817ZSu3wCbow9WXih0nPd8LKbytP/BYdF
+BjYtUm/WFixQGG1y+ngn63y4UtqJBvwKshjDuhkJBM5N1iwBk8Gb10KpANf2rr+q
+v41fZPUTsALkl0e9XCDl1LzWXxCAN1JydW/xGTpc0uZ0ls6WZDL/mIcBescxFUK0
+eMagdjPpN9dPyu9onhrqsC7Aqebr7Z/hDJiVCgVrwoXkjc6dzOmqEcpaITxtKTXI
+3u9bmzz38bImooWslQ6AqV9+SFC6wV4F5gl5eBeQWwwGCkIylp6S7Fur37nsj/B+
+ZSlT8gtY3IYrFLUm6RPNjWAC0VSBFBsMlqfqHz+P68oVfR0TcY19MwUD6eEkJC8q
+XLDug3YNfwGe1X1lyPobsncVsljU2EWMtjUUu4lYsQmc1UlA3k/AIdgV1JbjEyc2
+adRn6kpaBA2wR2sOwIFmD44OQ7oVzxb8Ubv1rGeLBuK7sY097Xs=
+=m5u9
+-----END PGP SIGNATURE-----

v4l-utils.changes

@@ -1,3 +1,248 @@
+-------------------------------------------------------------------
+Tue Jun 10 08:41:45 UTC 2025 - Andreas Schwab <schwab@suse.de>
+
+- Filter out GLIBC_PRIVATE dependencies
+
+-------------------------------------------------------------------
+Sat Apr 12 22:31:55 UTC 2025 - Asterios Dramis <asterios.dramis@gmail.com>
+
+- Install gconv module file to /usr/lib64/gconv/gconv-modules.d/
+  (resolves also conflict with /usr/lib64/gconv/gconv-modules file
+  from glibc).
+
+-------------------------------------------------------------------
+Mon Mar 31 14:07:02 UTC 2025 - Antonio Larrosa <alarrosa@suse.com>
+
+- Update to 1.28.1
+  * qv4l2: always set m_haveFramebufferSRGB to false
+  * qv4l2: fix crash when disabling openGL
+  * qvidcap: fix core dump
+- Update to 1.28.0
+  * buildsystem: Start v4l-utils 1.27.0 development cycle
+  * cec-compliance: add --show-timestamp option
+  * cec-ctl: avoid confusing error message
+  * cec-ctl: exit after reporting all cec devices with --list-devices
+  * cec-ctl: fix random cec stress test: check if msg status is OK
+  * cec-follower: change type of struct Timer duration field to int
+  * cv4l-helpers.h: add missing helper functions
+  * Fixed qv4l2 crash with drivers that implement VIDIOC_ENUM_FRAMESIZES for outputs
+  * ir-ctl: add optional header to manchester encoding
+  * ir-ctl: clear errno before strtol
+  * ir-ctl: correct max_size for rc5 and rc5_sz
+  * ir-ctl: encode rc6 mode 0 can have 43 edges
+  * ir-ctl: fix encoding pulse_length bpf encoder
+  * ir-ctl: remove line length limits
+  * keytable: fix command line processing
+  * keytable: fix segfault when reading legacy keymaps
+  * keytable: fix stdout/stderr inconsistency
+  * keytable: meson not passing rc_keymaps system directory
+  * keytable: meson: Restrict the installation of 50-rc_keymap.conf
+  * keytable: remove line length limits
+  * libv4l2rds: fix TMC location parsing
+  * libv4l2subdev: Extend API with 'which' argument where missing
+  * media-ctl: Re-order setting format and routes
+  * media-info: add missing sys/stat.h include (for dev_t)
+  * meson: add optional Qt6 support
+  * meson: Allow documentation directory to be specified with -Ddocdir
+  * meson: Fix building with -Dv4l-utils=false
+  * meson: fix has_function fork detection (needs suitable include)
+  * meson: libv4lconvert helpers need fork support
+  * meson: v4l2grab needs libv4lconvert with fork support enabled
+  * meson.build: dep_systemd was not set in one case
+  * qv4l2: add support for /dev/v4l-touchX devices
+  * qv4l2: fix crash when used with metadata output devices
+  * qv4l2: support menu controls in updateCtrlRange()
+  * Revert "meson: v4l2grab needs libv4lconvert with fork support enabled"
+  * sync-with-kernel.sh: add v4l2-dv-timings.h
+  * sync-with-kernel.sh: create v4l2-tracer patches
+  * sync-with-kernel.sh: filter V4L2_META_FMT_GENERIC_ defines
+  * test-media: Add basic tests for visl
+  * utils: media-ctl: Prepare for TRY state support
+  * utils: media-ctl: Print the MUST_CONNECT pad flag
+  * utils: media-ctl: Support accessing the subdev TRY state
+  * utils: media-ctl: Support changed routing API
+  * utils/keytable: forgot to add mygica_utv3.toml
+  * v4l2-compliance: Add a test for REMOVE_BUFS ioctl
+  * v4l2-compliance: add new CREATE_BUFS tests
+  * v4l2-compliance: add support for V4L2_SUBDEV_CLIENT_CAP_INTERVAL_USES_WHICH
+  * v4l2-compliance: Add tests for V4L2_FMT_FLAG_META_LINE_BASED flag
+  * v4l2-compliance: clarify a create_bufs test
+  * v4l2-compliance: Constify pointers and references in formats tests
+  * v4l2-compliance: do not warn for unexpected vivid_ro_ctrl values
+  * v4l2-compliance: Fix building against libc++
+  * v4l2-compliance: Fix streams use in testSubDevEnumFrameSize()
+  * v4l2-compliance: Fix use of routing on 32-bit platforms
+  * v4l2-compliance: matchFormats(): add multiplane logging
+  * v4l2-compliance: Support the changed routing API
+  * v4l2-ctl: add support for V4L2_SUBDEV_CLIENT_CAP_INTERVAL_USES_WHICH
+  * v4l2-ctl: Add --try-routing option
+  * v4l2-ctl: --list-devices --verbose will list current input/output
+  * v4l2-ctl: replace --fix-edid-checksums by --keep-edid-checksums
+  * v4l2-ctl: report max_num_buffers
+  * v4l2-ctl/compliance: read and show the subdev client capabilities
+  * v4l2gl: Add missing dependency on argp
+  * v4l2-info: add support for V4L2_BUF_CAP_SUPPORTS_REMOVE_BUFS
+  * v4l2-info: support V4L2_FMT_FLAG_META_LINE_BASED
+  * v4l2-tracer: add auto-generated files to git repo
+  * v4l2-tracer: add re/tracing for AV1 controls
+  * v4l2-tracer: add re/tracing for MAX_NUM_BUFFERS
+  * v4l2-tracer: autogenerate files that can be added to git
+  * v4l2-tracer: ignore single line comments when parsing headers
+  * v4l2-tracer: look in more places for libv4l2tracer
+  * v4l2-tracer: Rewrite libv4l2tracer.so lookup
+  * v4l2-tracer: stop auto-generating files with meson
+  * v4l2-tracer: stop waiting to handle a signal
+  * v4l2-tracer: use stat to verify that retrace file exists
+  * v4l-helpers: support V4L2_SUBDEV_CLIENT_CAP_INTERVAL_USES_WHICH
+  * v4l-helpers: v4l_format_s_sizeimage: add support for other buftypes
+  * v4l-utils: clang-tidy: convert to for range loop
+  * v4l-utils: clang-tidy: use auto with iterators
+  * v4l-utils: (c)v4l-helpers.h: support more than 32 buffers
+  * v4l-utils: fix formats under alpha/ppc64/mips64
+  * v4l-utils: fix @PACKAGE_VERSION@ use
+  * v4l-utils: fix potential crashing with 32-bit musl
+  * v4l-utils: sync with latest kernel
+  * v4l-utils: sync-with-kernel
+  * v4l-utils: sync-with-kernel
+  * v4l-utils: sync-with-kernel
+  * v4l-utils: test-media: add dmesg -n info before modprobes
+  * v4l-utils: test-media: connect the hdmi input to the output
+  * v4l-utils: use 64-bit formats for time
+  * v4l-utils: use 64-bit off_t format
+  * v4l-utils: v4l-utils: sync with latest kernel headers
+  * v4l-utils: v4l-utils: sync with latest kernel headers
+  * v4l-utils/contrib/gconv: fix conversion errors on ARIB-STD-B24 strings
+  * v4l-utils/contrib/gconv: translation table fix for ARIB-STD-B24
+- Update to 1.26.0
+  * Add support for meson building
+  * build: conditionally retrieve Git repo information
+  * build: do not fall back to libbpf header lookup
+  * buildsystem: Start v4l-utils 1.25.0 development cycle
+  * cec-compliance: get_power_status(): check cec_msg_status_is_abort
+  * cec-compliance: get_power_status(): fix valid RX test
+  * cec-ctl: add hpd-may-be-low suboption for the CEC tests
+  * cec-ctl: add --test-random-power-states stress test
+  * cec-ctl: always log timestamp in show_msg if not-OK
+  * cec-ctl: rename power-cycle to standby-wakeup-cycle
+  * cec-ctl: store state changes in pin file
+  * cec-ctl.1.in: clarify that you configure *your* device
+  * cec-ctl.1.in: for hpd-may-be-low option: <0,1> -> <0/1>
+  * cec-follower: add --exclusive option
+  * cec/v4l2-compliance, cec-follower: use __FILE_NAME__ if available
+  * common/media-info: add MEDIA_ENT_F_PROC_VIDEO_ISP
+  * common/media-info: fail for unknown entity function values
+  * configure.ac: fix gconv directory search
+  * Copy Doxygen configuration file to doc/
+  * Drop autoconf/automake support
+  * gen_dvb_structs.pl: drop copy of dvb-frontend.h
+  * .gitignore: add back '*.pc' pattern
+  * ir-ctl: fix sharp encoding
+  * keytable: fix repeat formatting
+  * keytable: open lirc for read/write for attaching/detaching bpf programs
+  * libcecutil: fix performance inefficiencies
+  * libdvbv5: dvb-scan: fix DVB-S2 checks for DVB-S tuning
+  * lib/libdvbv5/dvb-file.c: check for valid entry pointer
+  * libv4l1/libv4l2/v4l2-tracer: use common meson c_args/cpp_args to disable transparent large file support
+  * manpages: fix groff warnings
+  * media-ctl: 1 -> 1ULL
+  * media-ctl: Add support for routes and streams
+  * media-ctl: Check for Streams API support
+  * meson: Add support for doxygen documentation
+  * meson: Fix install location of doxygen's man pages
+  * meson: Fix libbpf detection
+  * meson: make it backward-compatible with version 0.54
+  * meson: re-enable qv4l2 without Qt OpenGL support
+  * meson: Use -include to include config.h instead of -I.
+  * meson.build: backport it to version 0.56
+  * qv4l2: enable Qt6 compile with Qt OpenGL support
+  * qv4l2: fix qmake project file
+  * qv4l2: fix Qt6 compile (ambiguous overload for operator!=)
+  * qv4l2: fix Qt6 compile (missing QActionGroup header)
+  * qv4l2: fix Qt6 compile (no matching function for call to QString::split(QRegExp))
+  * qv4l2: fix Qt6 compile (QDesktopWidget: No such file or directory)
+  * qv4l2: fix Qt6 compile (QHBoxLayout/QVBoxLayout has no member setMargin)
+  * qv4l2: fix Qt6 warning (QMenu::addAction() is deprecated)
+  * qv4l2: fix Qt6 warnings (QKeyCombination operator+ is deprecated)
+  * qv4l2: fix SDR format error message
+  * qv4l2: remove leagcy alsa_stream.h include (ENABLE_ALSA protected)
+  * qv4l2: remove unused local variables 'QString what'
+  * qv4l2: update qmake project file for Qt6 (core5compat module)
+  * qvidcap: enable Qt6 compile with Qt OpenGL support
+  * qvidcap: fix qmake project file
+  * qvidcap: fix v4l2_convert_hook (add PRE_TARGETDEPS)
+  * README.md: drop qt5-default, add libsdl2-dev libbpf-dev llvm clang
+  * sync-with-kernel.sh: don't filter V4L2_PIX_FMT_HEVC_SLICE
+  * sync-with-kernel.sh: regenerate utils/keytable/rc_keymaps/meson.build
+  * test-media: cec-pwr enables cec variable as well
+  * test-media: log utils versions
+  * test-media: 'mc' argument didn't select vidtv
+  * test-media: use -m instead of -M for vicodec and vidtv
+  * Update old email address
+  * utils: libv4l2subdev: Set stream for g_selection
+  * utils/common: Set V4L2_SUBDEV_CLIENT_CAP_STREAMS for subdevs
+  * utils/libcecutil: drop spurious dep_libv4lconvert
+  * v4l2-compliance: Add gadget. as bus_info prefix
+  * v4l2-compliance: Add handling for QC08C and QC10C format
+  * v4l2-compliance: call select before dequeuing event
+  * v4l2-compliance: codecs: Add stateless (TRY_)DECODER_CMD tests
+  * v4l2-compliance: improve error message
+  * v4l2-compliance: pass media_fd when walking topology
+  * v4l2-compliance: support V4L2_PIX_FMT_AV1_FRAME
+  * v4l2-compliance: Test queue maximum buffers allocation
+  * v4l2-ctl: Add --get/--set-ctrl support for INTEGER and INTEGER64 arrays
+  * v4l2-ctl: add missing > in aspect option usage message
+  * v4l2-ctl: Add routing and streams support
+  * v4l2-ctl: add support for AV1 stateless control types
+  * v4l2-ctl: Check for Streams API support
+  * v4l2-ctl: fix alignment meta formats usage message
+  * v4l2-ctl: fix handling the premul-alpha sub-option
+  * v4l2-ctl: improve --silent support
+  * v4l2-ctl: improve --stream-sleep
+  * v4l2-ctl: improve --stream-sleep functionality
+  * v4l2-ctl: Improve sub-device options help text
+  * v4l2-ctl: reset fps counter when using --stream-sleep with streamoff/on
+  * v4l2-ctl: show field value in print_concise_buffer()
+  * v4l2-ctl: support random sleep times
+  * v4l2-ctl.1.in: add missing --help-meta
+  * v4l2-ctl/compliance: add include cstdint
+  * v4l2-ctl/compliance: Add routing and streams multiplexed streams
+  * v4l2-ctl/compliance: Add simple routing test
+  * v4l2-info.cpp: fix _SUPPORTS_MAX_NUM_BUFFERS description
+  * v4l2-info/v4l2-tracer: add macro to mark the trace
+  * v4l2-tracer: add event tracing/retracing
+  * v4l2-tracer: add G/S TUNER ioctls
+  * v4l2-tracer: add macros to print debug info
+  * v4l2-tracer: add quotes to -DLIBTRACER_PATH="@0@"
+  * v4l2-tracer: add VIDIOC_ENUM_FRAMEINTERVALS
+  * v4l2-tracer: add VIDIOC_ENUM_FRAMESIZES
+  * v4l2-tracer: auto generate flags for DECODER_CMD
+  * v4l2-tracer: create an option to trace userspace args
+  * v4l2-tracer: fix autogen script for AV1
+  * v4l2-tracer: Fix libv4l2tracer.so loader
+  * v4l2-tracer: fix trace path name creation
+  * v4l2-tracer: get decoded bytesused from DQBUF
+  * v4l2-tracer: print only if debugging option is set
+  * v4l2-tracer: remove buffers by type and index
+  * v4l2-tracer: remove compress_frame_count
+  * v4l2-tracer: replace buftype2s with val2s
+  * v4l2-tracer: stop retracing failed ioctls
+  * v4l2-tracer: stop stringifying v4l2_input "tuner"
+  * v4l2-tracer: stringify target in v4l2_selection
+  * v4l2-tracer: use __s64 instead of long
+  * v4l2-tracer: wrap open64/mmap64 functions only if linux && __GLIBC__
+  * v4l-utils: libdvbv5: fix doxygen warnings
+  * v4l-utils: sync with latest kernel headers
+  * v4l-utils: sync with latest kernel headers
+  * v4l-utils: sync with latest kernel headers
+  * v4l-utils: sync with latest kernel headers
+  * v4l-utils: sync with latest media staging tree
+  * v4l-utils: sync with upstream media staging kernel.
+  * v4l-utils.spec.in: update it to work with meson
+- Use Qt6 instead of Qt5 when building the qv4l2 flavor
+- Drop usage of deprecated %suse_update_desktop_file
+- Redo patch since v4l-utils now uses meson:
+  * use_system_v4l_for_qv4l.patch
+
 -------------------------------------------------------------------
 Wed Mar  1 21:30:29 UTC 2023 - Asterios Dramis <asterios.dramis@gmail.com>
 

v4l-utils.spec

@@ -1,7 +1,7 @@
 #
-# spec file
+# spec file for package v4l-utils
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,30 +19,47 @@
 %global flavor @BUILD_FLAVOR@%{nil}
 %if "%{flavor}" == "qv4l2"
 %global psuffix -%{flavor}
+
+%ifarch armv7l armv7hl aarch64
+# Qt6 doesn't have gl support in these archs
+%bcond_with qvidcap
+%else
+%if 0%{?suse_version} == 1500
+# Neither does Qt in SLE15
+%bcond_with qvidcap
+%else
+%bcond_without qvidcap
+%endif
+%endif
+
 %endif
 %define _udevdir %(pkg-config --variable udevdir udev)
 %define so_ver 0
 %define sname v4l-utils
 Name:           v4l-utils%{?psuffix}
-Version:        1.24.1
+Version:        1.28.1
 Release:        0
 Summary:        Utilities for video4linux
 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
+Source0:        https://linuxtv.org/downloads/v4l-utils/%{sname}-%{version}.tar.xz
+Source1:        https://linuxtv.org/downloads/v4l-utils/%{sname}-%{version}.tar.xz.asc
 Source2:        %{sname}.keyring
 Source100:      baselibs.conf
 Patch0:         use_system_v4l_for_qv4l.patch
 Patch1:         v4l-utils-32bitfix.patch
 BuildRequires:  alsa-devel
-BuildRequires:  autoconf
-BuildRequires:  automake
+%if 0%{?suse_version} == 1500
+BuildRequires:  gcc13-c++
+%else
 BuildRequires:  gcc-c++
+%endif
 BuildRequires:  libjpeg-devel
-BuildRequires:  libtool
+BuildRequires:  meson
 BuildRequires:  pkgconfig
+BuildRequires:  pkgconfig(json-c)
 BuildRequires:  pkgconfig(libudev)
+BuildRequires:  pkgconfig(systemd)
 BuildRequires:  pkgconfig(udev)
 Requires:       libv4l = %{version}
 %if "%{flavor}" == ""
@@ -50,16 +67,22 @@ BuildRequires:  doxygen
 BuildRequires:  kernel-headers
 %endif
 %if "%{flavor}" == "qv4l2"
-BuildRequires:  update-desktop-files
-BuildRequires:  pkgconfig(Qt5Core)
-BuildRequires:  pkgconfig(Qt5Gui)
-BuildRequires:  pkgconfig(Qt5OpenGL)
-BuildRequires:  pkgconfig(Qt5Widgets)
+BuildRequires:  pkgconfig(Qt6Core)
+BuildRequires:  pkgconfig(Qt6Core5Compat)
+BuildRequires:  pkgconfig(Qt6Gui)
+BuildRequires:  pkgconfig(Qt6OpenGL)
+BuildRequires:  pkgconfig(Qt6OpenGLWidgets)
+BuildRequires:  pkgconfig(Qt6Platform)
+BuildRequires:  pkgconfig(Qt6Widgets)
 BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(libv4l2)
 BuildRequires:  pkgconfig(libv4lconvert)
 %endif
 
+# The gconv modules need some private glibc interface
+%define __requires_exclude GLIBC_PRIVATE
+
 %description
 v4l-utils is a collection of various video4linux (V4L) utilities.
 
@@ -100,6 +123,15 @@ Requires:       libdvbv5-%{so_ver} = %{version}
 The libdvbv5-devel package contains libraries and header files for
 developing applications that use libdvbv5.
 
+%package -n libdvbv5-gconv
+Summary:        Gconv files with the charsets For Digital TV
+License:        GPL-2.0-only
+Requires:       libdvbv5-%{so_ver} = %{version}
+
+%description -n libdvbv5-gconv
+Some digital TV standards define their own charsets. Add library
+support for them: EN 300 468 and ARIB STD-B24
+
 %package -n libv4l
 Summary:        Collection of video4linux support libraries
 License:        GPL-2.0-only AND LGPL-2.1-or-later
@@ -179,38 +211,46 @@ qv4l2 is a test control and streaming test application for video4linux.
 %autosetup -p1 -n %{sname}-%{version}
 
 %build
-autoreconf -vfi
-%configure \
-  --disable-static \
-  --disable-silent-rules \
-%if "%{flavor}" == "qv4l2"
-  --disable-libdvbv5 \
-%else
-  --disable-qv4l2 \
+%if 0%{?suse_version} == 1500
+export CC=gcc-13
+export CXX=g++-13
 %endif
-  --with-udevdir=%{_udevdir}
 
+%meson \
+  -Dudevdir=%{_udevdir} \
+  -Ddoxygen-doc=disabled \
+  -Ddoxygen-man=false \
+  -Ddoxygen-html=false \
+  -Dbpf=disabled \
 %if "%{flavor}" == "qv4l2"
-export CXXFLAGS="-std=c++14 %{optflags}"
-%make_build -C utils/libmedia_dev
-%make_build -C utils/libv4l2util
-%make_build -C utils/qv4l2
+  -Dqv4l2=enabled \
+%if %{with qvidcap}
+  -Dqvidcap=enabled \
 %else
-%make_build
+  -Dqvidcap=disabled \
 %endif
+  -Dlibdvbv5=disabled \
+  -Dv4l-plugins=false \
+  -Dv4l-utils=false \
+  -Dv4l-wrappers=false \
+  -Dv4l2-compliance-libv4l=false \
+  -Dv4l2-ctl-libv4l=false \
+  -Dv4l2-ctl-stream-to=false \
+%else
+  -Dqv4l2=disabled \
+  -Dqvidcap=disabled \
+  -Dlibdvbv5=enabled \
+%endif
+  %{nil}
+%meson_build
 
 %install
-%if "%{flavor}" == "qv4l2"
-%make_install -C utils/qv4l2
-%suse_update_desktop_file -N "QV4l2" -G "V4L2 Test Utility" -r qv4l2 Qt AudioVideo Video TV
-
-%else
-%make_install
+%meson_install
+%if "%{flavor}" == ""
+install -dm 0755 %{buildroot}%{_libdir}/gconv/gconv-modules.d
+mv %{buildroot}%{_libdir}/gconv/gconv-modules %{buildroot}%{_libdir}/gconv/gconv-modules.d/libdvbv5.conf
 %find_lang "%{name}"
 %find_lang libdvbv5
-
-# Not needed (links to plugins in libv4l subdir)
-rm %{buildroot}%{_libdir}/{v4l1compat.so,v4l2convert.so}
 %endif
 
 find %{buildroot} -type f -name "*.la" -delete -print
@@ -218,6 +258,8 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %if "%{flavor}" == ""
 %post -n libdvbv5-%{so_ver} -p /sbin/ldconfig
 %postun -n libdvbv5-%{so_ver} -p /sbin/ldconfig
+%post -n libdvbv5-gconv -p %{_sbindir}/iconvconfig
+%postun -n libdvbv5-gconv -p %{_sbindir}/iconvconfig
 %post -n libv4l1-%{so_ver} -p /sbin/ldconfig
 %postun -n libv4l1-%{so_ver} -p /sbin/ldconfig
 %post -n libv4l2-%{so_ver} -p /sbin/ldconfig
@@ -262,8 +304,10 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %doc ChangeLog README.md TODO
 %{_bindir}/decode_tm6000
 %{_bindir}/v4l2-compliance
+%{_bindir}/v4l2-tracer
 %{_sbindir}/v4l2-dbg
 %{_mandir}/man1/v4l2-compliance.1%{?ext_man}
+%{_mandir}/man1/v4l2-tracer.1%{?ext_man}
 
 %files -n dvb-utils
 %license COPYING
@@ -283,6 +327,10 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_libdir}/libdvbv5.so
 %{_libdir}/pkgconfig/libdvbv5*.pc
 
+%files -n libdvbv5-gconv
+%{_libdir}/gconv/*.so
+%{_libdir}/gconv/gconv-modules.d/libdvbv5.conf
+
 %files -n libv4l
 %license COPYING.libv4l
 %doc ChangeLog README.md README.libv4l TODO
@@ -321,6 +369,13 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %dir %{_datadir}/icons/hicolor/scalable/apps
 %{_datadir}/icons/hicolor/*/apps/qv4l2.*
 %{_mandir}/man1/qv4l2.1%{?ext_man}
+%if %{with qvidcap}
+%{_bindir}/qvidcap
+%{_datadir}/applications/qvidcap.desktop
+%{_datadir}/icons/hicolor/*/apps/qvidcap.*
+%{_mandir}/man1/qvidcap.1%{?ext_man}
+%endif
+
 %endif
 
 %changelog