This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:
Subject: qv4l: Drop support for Qt4 Author: Gregor Jasny <gja...@googlemail.com> Date: Thu Oct 18 21:00:34 2018 +0200 INSTALL | 2 +- README | 4 +--- configure.ac | 25 ++----------------------- v4l-utils.spec.in | 2 +- 4 files changed, 5 insertions(+), 28 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=8d2093a8a4bc43622cd68aeb85fb2b817de55993 diff --git a/INSTALL b/INSTALL index 8c98a768baa7..d55f56cd9f7a 100644 --- a/INSTALL +++ b/INSTALL @@ -2,7 +2,7 @@ Requirements: ------------- * make and a C and C++ compiler * optionally libjpeg v6 or later -* optionally Qt4 for building qv4l2 +* optionally Qt5 for building qv4l2 Building: --------- diff --git a/README b/README index 91fa7dff796d..e344dee1abfd 100644 --- a/README +++ b/README @@ -31,7 +31,7 @@ On Debian and derivated distributions, you need to install the following packages with apt-get or aptitude: debhelper dh-autoreconf autotools-dev autoconf-archive doxygen graphviz libasound2-dev - libtool libjpeg-dev libqt4-dev libqt4-opengl-dev libudev-dev libx11-dev + libtool libjpeg-dev qtbase5-dev libqt5opengl5-dev libudev-dev libx11-dev pkg-config udev make gcc git @@ -46,8 +46,6 @@ you'll need also: alsa-lib-devel doxygen libjpeg-turbo-devel qt5-qtbase-devel libudev-devel mesa-libGLU-devel -(Or qt-devel instead of qt5-qtbase-devel for qt4) - After downloading and installing the needed packages, you should run: diff --git a/configure.ac b/configure.ac index 90ef10aa4252..53161c391742 100644 --- a/configure.ac +++ b/configure.ac @@ -253,30 +253,9 @@ if test "x$qt_pkgconfig" = "xtrue"; then QT_VERSION="v5" fi AC_MSG_WARN(Qt5 OpenGL is not available) - fi -else - PKG_CHECK_MODULES(QT, [QtCore >= 4.0 QtGui >= 4.0], [qt_pkgconfig=true], [qt_pkgconfig=false]) - if test "x$qt_pkgconfig" = "xtrue"; then - MOC=`$PKG_CONFIG --variable=moc_location QtCore` - UIC=`$PKG_CONFIG --variable=uic_location QtCore` - RCC=`$PKG_CONFIG --variable=rcc_location QtCore` - if test -z "$RCC"; then - RCC="rcc" - fi - AC_SUBST(MOC) - AC_SUBST(UIC) - AC_SUBST(RCC) - PKG_CHECK_MODULES(QTGL, [QtOpenGL >= 4.8 gl], [qt_pkgconfig_gl=true], [qt_pkgconfig_gl=false]) - if test "x$qt_pkgconfig_gl" = "xtrue"; then - AC_DEFINE([HAVE_QTGL], [1], [qt has opengl support]) - QT_VERSION="v4 with QtGL" - else - QT_VERSION="v4" - AC_MSG_WARN(Qt4 OpenGL is not available) - fi - else - AC_MSG_WARN(Qt4 or higher is not available) fi +else + AC_MSG_WARN(Qt5 or higher is not available) fi diff --git a/v4l-utils.spec.in b/v4l-utils.spec.in index 51765eaf2c45..67bdca57ae92 100644 --- a/v4l-utils.spec.in +++ b/v4l-utils.spec.in @@ -12,7 +12,7 @@ Source2: qv4l2.svg Source3: qvidcap.desktop Source4: qvidcap.svg BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: qt4-devel libsysfs-devel kernel-headers desktop-file-utils elfutils-libelf-devel clang +BuildRequires: qt5-qtbase-devel libsysfs-devel kernel-headers desktop-file-utils elfutils-libelf-devel clang # For /etc/udev/rules.d ownership Requires: udev Requires: libv4l = %{version}-%{release} _______________________________________________ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
