forked from pool/v4l-utils
Accepting request 1280955 from home:alarrosa:branches:devel:libraries:c_c++
- Update to 1.30.1 * licenses: update copyright files to remove fsf address * v4l2-compliance: run testBlockingWait when streaming - Update to 1.30.0 * media-ctl: libv4l2subdev: Add Y16 format * v4l2-ctl: process events before queues in stateful_m2m() * v4l2-compliance: Add test for V4L2_FMTDESC_FLAG_ENUM_ALL flag * v4l2-ctl-vidcap: Add options to enumerate all pixel formats * edid-decode: support parsing EDID-Like Data * buildsystem: Start v4l-utils 1.29.0 development cycle * qvidcap: fix core dump * qv4l2: fix crash when disabling openGL * qv4l2: always set m_haveFramebufferSRGB to false * v4l-utils: sync with latest kernel * cec-ctl: add support for CEC_MSG_FL_REPLY_VENDOR_ID * cec-compliance: add tests for CEC_MSG_FL_REPLY_VENDOR_ID * contrib/test/test-media: re-add cec-compliance -A tests * v4l-utils: sync with latest kernel * v4l2-compliance: testRequests(): drop V4L2_BUF_FLAG_QUEUED check * contrib/test/test-media: set log level to info at end * v4l2-compliance: only do request-queued checks while streaming is off * v4l2-compliance: always test blocking wait * v4l-utils: sync with latest kernel * utils/common: add V4L2_CAP_EDID support * v4l2-compliance: add support for V4L2_CAP_EDID * test-media: move visl out of the vivid test sequence * contrib/test/test-media: test unbind in DQBUF * v4l2-ctl/compliance: add -32-time64 variants OBS-URL: https://build.opensuse.org/request/show/1280955 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/v4l-utils?expand=0&rev=86
This commit is contained in:
94
use_system_v4l_for_qv4l.patch
Normal file
94
use_system_v4l_for_qv4l.patch
Normal file
@@ -0,0 +1,94 @@
|
||||
Index: v4l-utils-1.28.1/meson.build
|
||||
===================================================================
|
||||
--- v4l-utils-1.28.1.orig/meson.build
|
||||
+++ v4l-utils-1.28.1/meson.build
|
||||
@@ -386,13 +386,17 @@ man_pages = []
|
||||
|
||||
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')
|
||||
|
||||
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')
|
||||
+
|
||||
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,
|
Reference in New Issue
Block a user