$ git show --format=fuller --patch-with-stat --summary a9e075bc11268c571df406f5c34f7039c7879e15
commit a9e075bc11268c571df406f5c34f7039c7879e15
Author: Bernhard Rosenkränzer <bero@lindev.ch>
AuthorDate: Sun Sep 13 18:41:19 2020 +0200
Commit: Bernhard Rosenkränzer <bero@lindev.ch>
CommitDate: Sun Sep 13 18:41:19 2020 +0200
Fix building qvidcap if Qt is built with OpenGL ES
---
v4l-utils-1.20.0-qt-gles.patch | 60 ++++++++++++++++++++++++++++++++++++++++++
v4l-utils.spec | 5 +++-
2 files changed, 64 insertions(+), 1 deletion(-)
create mode 100644 v4l-utils-1.20.0-qt-gles.patch
diff --git a/v4l-utils-1.20.0-qt-gles.patch b/v4l-utils-1.20.0-qt-gles.patch
new file mode 100644
index 0000000..e83ccac
--- /dev/null
+++ b/v4l-utils-1.20.0-qt-gles.patch
@@ -0,0 +1,60 @@
+diff -up v4l-utils-1.20.0/utils/qvidcap/paint.cpp.omv~ v4l-utils-1.20.0/utils/qvidcap/paint.cpp
+--- v4l-utils-1.20.0/utils/qvidcap/paint.cpp.omv~ 2020-09-13 18:21:12.993667857 +0200
++++ v4l-utils-1.20.0/utils/qvidcap/paint.cpp 2020-09-13 18:31:04.021442468 +0200
+@@ -24,6 +24,10 @@
+
+ #include "v4l2-info.h"
+
++#ifdef HAVE_QTGLES
++#include <GL/gl.h>
++#endif
++
+ void CaptureWin::initializeGL()
+ {
+ initializeOpenGLFunctions();
+diff -up v4l-utils-1.20.0/configure.ac.omv~ v4l-utils-1.20.0/configure.ac
+--- v4l-utils-1.20.0/configure.ac.omv~ 2020-09-13 18:32:46.372727599 +0200
++++ v4l-utils-1.20.0/configure.ac 2020-09-13 18:32:30.869531424 +0200
+@@ -272,12 +272,16 @@ if test "x$qt_pkgconfig" = "xtrue"; then
+ QT_VERSION="v5 with QtGL"
+ fi
+ else
++ QTGL_CFLAGS="$QT5GL_CFLAGS -fPIC"
++ QTGL_LIBS="$QT5GL_LIBS"
++ AC_SUBST(QTGL_CFLAGS)
++ AC_SUBST(QTGL_LIBS)
++ AC_DEFINE([HAVE_QTGLES], [1], [qt has opengl ES support])
+ if test "x$qt54_pkgconfig" = "xtrue"; then
+- QT_VERSION="v5.4"
++ QT_VERSION="v5.4 with QtGLES"
+ else
+- QT_VERSION="v5"
++ QT_VERSION="v5 with QtGLES"
+ fi
+- AC_MSG_WARN(Qt5 Desktop OpenGL is not available)
+ fi
+ else
+ AC_MSG_WARN(Qt5 or higher is not available)
+@@ -538,7 +542,7 @@ AM_CONDITIONAL([WITH_DVBV5_REMOTE], [tes
+ AM_CONDITIONAL([WITH_DYN_LIBV4L], [test x$enable_dyn_libv4l != xno])
+ AM_CONDITIONAL([WITH_V4LUTILS], [test x$enable_v4l_utils != xno -a x$linux_os = xyes])
+ AM_CONDITIONAL([WITH_QV4L2], [test x${qt_pkgconfig} = xtrue -a x$enable_qv4l2 != xno])
+-AM_CONDITIONAL([WITH_QVIDCAP], [test x${qt_desktop_opengl} = xyes -a x$enable_qvidcap != xno])
++AM_CONDITIONAL([WITH_QVIDCAP], [test x${qt_pkgconfig} = xtrue -a x$enable_qvidcap != xno])
+ AM_CONDITIONAL([WITH_V4L_PLUGINS], [test x$enable_dyn_libv4l != xno -a x$enable_shared != xno])
+ AM_CONDITIONAL([WITH_V4L_WRAPPERS], [test x$enable_dyn_libv4l != xno -a x$enable_shared != xno])
+ AM_CONDITIONAL([WITH_QTGL], [test x${qt_desktop_opengl} = xyes])
+diff -up v4l-utils-1.20.0/configure.ac.omv~ v4l-utils-1.20.0/configure.ac
+diff -up v4l-utils-1.20.0/utils/Makefile.am.omv~ v4l-utils-1.20.0/utils/Makefile.am
+diff -up v4l-utils-1.20.0/utils/qvidcap/Makefile.am.omv~ v4l-utils-1.20.0/utils/qvidcap/Makefile.am
+--- v4l-utils-1.20.0/utils/qvidcap/Makefile.am.omv~ 2020-09-13 18:38:24.869113238 +0200
++++ v4l-utils-1.20.0/utils/qvidcap/Makefile.am 2020-09-13 18:38:42.822350138 +0200
+@@ -6,7 +6,7 @@ qvidcap_SOURCES = qvidcap.cpp qvidcap.h
+ nodist_qvidcap_SOURCES = qrc_qvidcap.cpp moc_capture.cpp v4l2-convert.h
+ qvidcap_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la ../libv4l2util/libv4l2util.la \
+ ../libmedia_dev/libmedia_dev.la
+-qvidcap_CPPFLAGS = -I\$(top_srcdir)/utils/common
++qvidcap_CPPFLAGS = -I$(top_srcdir)/utils/common
+
+ qvidcap_CPPFLAGS += $(QTGL_CFLAGS)
+ qvidcap_LDFLAGS = $(QTGL_LIBS)
diff --git a/v4l-utils.spec b/v4l-utils.spec
index 552ea09..e8bf55e 100644
--- a/v4l-utils.spec
+++ b/v4l-utils.spec
@@ -17,7 +17,7 @@
Name: v4l-utils
Version: 1.20.0
-Release: 1
+Release: 2
Summary: Linux V4L2 and DVB API utilities
License: LGPLv2+
Group: System/Libraries
@@ -26,6 +26,7 @@ Source0: http://linuxtv.org/downloads/v4l-utils/%{name}-%{version}.tar.bz2
Source100: %{name}.rpmlintrc
Patch0: v4l-utils-1.12.3-pthread.patch
Patch1: v4l-utils-1.8.0-use-system-jpeg.patch
+Patch2: v4l-utils-1.20.0-qt-gles.patch
BuildRequires: pkgconfig(libjpeg)
BuildRequires: sysfsutils-devel
BuildRequires: pkgconfig(libelf)
@@ -315,6 +316,8 @@ pixelformats to v4l2 applications.
%prep
%autosetup -p1
+autoheader
+autoconf
export CONFIGURE_TOP="$(pwd)"
%if %{with compat32}
mkdir build32