c_cpp/v4l-utils
SHA256
8
0
Fork 0
forked from pool/v4l-utils
Code Pull Requests Activity

Accepting request 799704 from home:StefanBruens:branches:devel:libraries:c_c++

Browse Source 
- Update to 1.18.1:
  Fix GCC 10 / -fno-common
- Drop upstream gcc10.patch
- Avoid symbol name clash causing qv4l2 crash - v4l2_open is defined
  by the public libv4l2 and private libv4l2utils
  * Update use_system_v4l_for_qv4l.patch

OBS-URL: https://build.opensuse.org/request/show/799704
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/v4l-utils?expand=0&rev=69
This commit is contained in:
Marcus Meissner
2020-05-03 06:12:30 +00:00
committed by Git OBS Bridge
parent 046146c424
commit ecff9fc13d
8 changed files with 37 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
use_system_v4l_for_qv4l.patch
View File

@@ -2,13 +2,14 @@ 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,7 @@ qv4l2_SOURCES = qv4l2.cpp general-tab.cpp ctrl-tab.cpp vbi-tab.cpp capture-win.c
@@ -6,8 +6,8 @@ qv4l2_SOURCES = qv4l2.cpp general-tab.cpp ctrl-tab.cpp vbi-tab.cpp capture-win.c
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 = ../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
if WITH_QTGL