mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@db180c0
This commit is contained in:
TriForceX
@@ -0,0 +1,47 @@
|
||||
From 9bbf9f0d862b8d458e59690d36641618fb101b4e Mon Sep 17 00:00:00 2001
|
||||
From: Val Doroshchuk <valentyn.doroshchuk@qt.io>
|
||||
Date: Mon, 17 Jun 2019 15:20:22 +0200
|
||||
Subject: Fix compile issue when no opengl in QVideoSurfacePainter
|
||||
|
||||
error: invalid use of incomplete type 'class QGLContext'
|
||||
|
||||
Change-Id: I4bc9bd4231e663b187d3cef917b7a551ba614ba9
|
||||
Fixes: QTBUG-76405
|
||||
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
|
||||
|
||||
[Retrieved from:
|
||||
https://code.qt.io/cgit/qt/qtmultimedia.git/commit/?id=9bbf9f0d862b8d458e59690d36641618fb101b4e]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
src/multimediawidgets/qpaintervideosurface.cpp | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp
|
||||
index 440d5c858..6af0c7588 100644
|
||||
--- a/src/multimediawidgets/qpaintervideosurface.cpp
|
||||
+++ b/src/multimediawidgets/qpaintervideosurface.cpp
|
||||
@@ -57,10 +57,6 @@
|
||||
#ifndef GL_RGB8
|
||||
#define GL_RGB8 0x8051
|
||||
#endif
|
||||
-#endif
|
||||
-
|
||||
-#include <QtDebug>
|
||||
-QT_BEGIN_NAMESPACE
|
||||
|
||||
static void makeCurrent(QGLContext *context)
|
||||
{
|
||||
@@ -70,6 +66,10 @@ static void makeCurrent(QGLContext *context)
|
||||
if (handle && QOpenGLContext::currentContext() != handle)
|
||||
handle->makeCurrent(handle->surface());
|
||||
}
|
||||
+#endif
|
||||
+
|
||||
+#include <QtDebug>
|
||||
+QT_BEGIN_NAMESPACE
|
||||
|
||||
QVideoSurfacePainter::~QVideoSurfacePainter()
|
||||
{
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
||||
16
package/qt5/qt5multimedia/Config.in
Normal file
16
package/qt5/qt5multimedia/Config.in
Normal file
@@ -0,0 +1,16 @@
|
||||
config BR2_PACKAGE_QT5MULTIMEDIA
|
||||
bool "qt5multimedia"
|
||||
select BR2_PACKAGE_QT5BASE
|
||||
select BR2_PACKAGE_QT5BASE_GUI
|
||||
select BR2_PACKAGE_QT5BASE_NETWORK
|
||||
select BR2_PACKAGE_QT5BASE_OPENGL_LIB if BR2_PACKAGE_QT5BASE_OPENGL
|
||||
help
|
||||
Qt is a cross-platform application and UI framework for
|
||||
developers using C++.
|
||||
|
||||
The Qt Multimedia module provides a rich feature set that
|
||||
enables you to easily take advantage of a platform's
|
||||
multimedia capabilities such as media playback and the use
|
||||
of camera and radio devices.
|
||||
|
||||
http://doc.qt.io/qt-5/multimediaoverview.html
|
||||
17
package/qt5/qt5multimedia/qt5multimedia.hash
Normal file
17
package/qt5/qt5multimedia/qt5multimedia.hash
Normal file
@@ -0,0 +1,17 @@
|
||||
# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtmultimedia-opensource-src-5.6.3.tar.xz.mirrorlist
|
||||
sha256 ae36039ea8037742342f1615687e0ca2188f3ed0d700627a5e5be546c15e1b46 qtmultimedia-opensource-src-5.6.3.tar.xz
|
||||
|
||||
# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.4/submodules/qtmultimedia-everywhere-src-5.12.4.tar.xz.sha256
|
||||
sha256 7c0759ab6fca2480b10b71a35beeffe0b847adeff5af94eacd1a4531d033423d qtmultimedia-everywhere-src-5.12.4.tar.xz
|
||||
|
||||
# Hashes for license files:
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
|
||||
sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
|
||||
sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
|
||||
sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
|
||||
sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
|
||||
sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
|
||||
sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
|
||||
sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
|
||||
sha256 c1d75c15db4409bcbb182180d582f410a263dc9a631cd546b256e95f1da42165 examples/multimedia/spectrum/3rdparty/fftreal/license.txt
|
||||
90
package/qt5/qt5multimedia/qt5multimedia.mk
Normal file
90
package/qt5/qt5multimedia/qt5multimedia.mk
Normal file
@@ -0,0 +1,90 @@
|
||||
################################################################################
|
||||
#
|
||||
# qt5multimedia
|
||||
#
|
||||
################################################################################
|
||||
|
||||
QT5MULTIMEDIA_VERSION = $(QT5_VERSION)
|
||||
QT5MULTIMEDIA_SITE = $(QT5_SITE)
|
||||
QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5MULTIMEDIA_VERSION).tar.xz
|
||||
QT5MULTIMEDIA_DEPENDENCIES = qt5base
|
||||
QT5MULTIMEDIA_INSTALL_STAGING = YES
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
|
||||
QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
|
||||
QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
|
||||
else
|
||||
QT5MULTIMEDIA_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
|
||||
QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE),y)
|
||||
QT5MULTIMEDIA_DEPENDENCIES += gst-plugins-base
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y)
|
||||
QT5MULTIMEDIA_DEPENDENCIES += gst1-plugins-base
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
|
||||
QT5MULTIMEDIA_DEPENDENCIES += qt5declarative
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBGLIB2)$(BR2_PACKAGE_PULSEAUDIO),yy)
|
||||
QT5MULTIMEDIA_DEPENDENCIES += libglib2 pulseaudio
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
|
||||
QT5MULTIMEDIA_DEPENDENCIES += alsa-lib
|
||||
endif
|
||||
|
||||
define QT5MULTIMEDIA_CONFIGURE_CMDS
|
||||
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
|
||||
endef
|
||||
|
||||
define QT5MULTIMEDIA_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
|
||||
endef
|
||||
|
||||
define QT5MULTIMEDIA_INSTALL_STAGING_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),)
|
||||
# since Qt5.10.1 libqgsttools was renamed to libQtMultimediaGstTools
|
||||
# and is installed by the default target install step below
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST)x$(BR2_PACKAGE_GST1_PLUGINS_BASE),xy)
|
||||
define QT5MULTIMEDIA_INSTALL_TARGET_QGSTTOOLS_LIB
|
||||
cp -dpf $(STAGING_DIR)/usr/lib/libqgsttools*.so.* $(TARGET_DIR)/usr/lib
|
||||
endef
|
||||
endif
|
||||
|
||||
define QT5MULTIMEDIA_INSTALL_TARGET_LIBS
|
||||
cp -dpf $(STAGING_DIR)/usr/lib/libQt5Multimedia*.so.* $(TARGET_DIR)/usr/lib
|
||||
cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/* $(TARGET_DIR)/usr/lib/qt/plugins
|
||||
$(QT5MULTIMEDIA_INSTALL_TARGET_QGSTTOOLS_LIB)
|
||||
endef
|
||||
endif # !BR2_STATIC_LIBS
|
||||
|
||||
# this is only built with quick/opengl support enabled
|
||||
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5_GL_AVAILABLE),yy)
|
||||
define QT5MULTIMEDIA_INSTALL_TARGET_QMLS
|
||||
cp -dpfr $(STAGING_DIR)/usr/qml/QtMultimedia $(TARGET_DIR)/usr/qml/
|
||||
endef
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
|
||||
QT5MULTIMEDIA_LICENSE := $(QT5MULTIMEDIA_LICENSE), LGPL-2.1+ (examples/multimedia/spectrum/3rdparty/fftreal)
|
||||
QT5MULTIMEDIA_LICENSE_FILES += examples/multimedia/spectrum/3rdparty/fftreal/license.txt
|
||||
define QT5MULTIMEDIA_INSTALL_TARGET_EXAMPLES
|
||||
cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/multimedia* $(TARGET_DIR)/usr/lib/qt/examples/
|
||||
endef
|
||||
endif
|
||||
|
||||
define QT5MULTIMEDIA_INSTALL_TARGET_CMDS
|
||||
$(QT5MULTIMEDIA_INSTALL_TARGET_LIBS)
|
||||
$(QT5MULTIMEDIA_INSTALL_TARGET_QMLS)
|
||||
$(QT5MULTIMEDIA_INSTALL_TARGET_EXAMPLES)
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
Reference in New Issue
Block a user