qt-gstreamer: remove - it belongs to meta-qt5-extra
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
@@ -1,44 +0,0 @@
|
||||
From e2ca8094aa8d0eac1c3a98df66fe94ce0c754088 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Santamar=C3=ADa?= <panfaust@gmail.com>
|
||||
Date: Fri, 2 Oct 2015 15:00:29 +0300
|
||||
Subject: [PATCH 6/6] Fix compilation with GStreamer >= 1.5.1
|
||||
|
||||
apply gstreamer pkg-config definitions To ensure gstreamer builds correctly,
|
||||
pick up its cflags in FindGstreamer and apply them to the build as definitions
|
||||
|
||||
https://lists.ubuntu.com/archives/kubuntu-devel/2015-August/009819.html
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=751382
|
||||
---
|
||||
CMakeLists.txt | 1 +
|
||||
cmake/modules/FindGStreamer.cmake | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 4d3e7dd..5744015 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -106,6 +106,7 @@ find_package(GObject)
|
||||
macro_log_feature(GOBJECT_FOUND "GObject" "Required to build QtGLib" "http://www.gtk.org/" TRUE)
|
||||
|
||||
set(CMAKE_REQUIRED_INCLUDES ${QTGSTREAMER_INCLUDES})
|
||||
+add_definitions(${GSTREAMER_DEFINITIONS})
|
||||
include(CheckCXXSourceCompiles)
|
||||
check_cxx_source_compiles("
|
||||
#include <QtCore/QtGlobal>
|
||||
diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake
|
||||
index dab91ac..fe6cde1 100644
|
||||
--- a/cmake/modules/FindGStreamer.cmake
|
||||
+++ b/cmake/modules/FindGStreamer.cmake
|
||||
@@ -36,6 +36,7 @@ if (PKG_CONFIG_FOUND)
|
||||
exec_program(${PKG_CONFIG_EXECUTABLE}
|
||||
ARGS --variable pluginsdir gstreamer-${GSTREAMER_ABI_VERSION}
|
||||
OUTPUT_VARIABLE PKG_GSTREAMER_PLUGIN_DIR)
|
||||
+ set(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS})
|
||||
endif()
|
||||
|
||||
find_library(GSTREAMER_LIBRARY
|
||||
--
|
||||
2.5.0
|
||||
|
||||
|
||||
@@ -1,81 +0,0 @@
|
||||
From aaff08c014d25266ce141fe378757ccb6fa18494 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sun, 3 Jun 2018 23:25:29 +0200
|
||||
Subject: [PATCH] FindQt4or5.cmake: Optionally create qt5_use_modules to fix
|
||||
build with Qt 5.11
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
cmake/modules/FindQt4or5.cmake | 51 ++++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 51 insertions(+)
|
||||
|
||||
diff --git a/cmake/modules/FindQt4or5.cmake b/cmake/modules/FindQt4or5.cmake
|
||||
index 855a48e..46976f7 100644
|
||||
--- a/cmake/modules/FindQt4or5.cmake
|
||||
+++ b/cmake/modules/FindQt4or5.cmake
|
||||
@@ -17,6 +17,57 @@
|
||||
|
||||
set(QT_VERSION "4" CACHE STRING "Qt version used for the build")
|
||||
|
||||
+if (NOT COMMAND qt5_use_modules)
|
||||
+ macro(qt5_use_modules _target _link_type)
|
||||
+ if(NOT CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.11)
|
||||
+ if(CMAKE_WARN_DEPRECATED)
|
||||
+ set(messageType WARNING)
|
||||
+ endif()
|
||||
+ if(CMAKE_ERROR_DEPRECATED)
|
||||
+ set(messageType FATAL_ERROR)
|
||||
+ endif()
|
||||
+ if(messageType)
|
||||
+ message(${messageType} "The qt5_use_modules macro is obsolete. Use target_link_libraries with IMPORTED targets instead.")
|
||||
+ endif()
|
||||
+ endif()
|
||||
+
|
||||
+ if (NOT TARGET ${_target})
|
||||
+ message(FATAL_ERROR "The first argument to qt5_use_modules must be an existing target.")
|
||||
+ endif()
|
||||
+ if ("${_link_type}" STREQUAL "LINK_PUBLIC" OR "${_link_type}" STREQUAL "LINK_PRIVATE" )
|
||||
+ set(_qt5_modules ${ARGN})
|
||||
+ set(_qt5_link_type ${_link_type})
|
||||
+ else()
|
||||
+ set(_qt5_modules ${_link_type} ${ARGN})
|
||||
+ endif()
|
||||
+
|
||||
+ if ("${_qt5_modules}" STREQUAL "")
|
||||
+ message(FATAL_ERROR "qt5_use_modules requires at least one Qt module to use.")
|
||||
+ endif()
|
||||
+
|
||||
+ foreach(_module ${_qt5_modules})
|
||||
+ if (NOT Qt5${_module}_FOUND)
|
||||
+ find_package(Qt5${_module} PATHS "${_Qt5_COMPONENT_PATH}" NO_DEFAULT_PATH)
|
||||
+ if (NOT Qt5${_module}_FOUND)
|
||||
+ message(FATAL_ERROR "Can not use \"${_module}\" module which has not yet been found.")
|
||||
+ endif()
|
||||
+ endif()
|
||||
+ target_link_libraries(${_target} ${_qt5_link_type} ${Qt5${_module}_LIBRARIES})
|
||||
+ set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES ${Qt5${_module}_INCLUDE_DIRS})
|
||||
+ set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS ${Qt5${_module}_COMPILE_DEFINITIONS})
|
||||
+ set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS_RELEASE QT_NO_DEBUG)
|
||||
+ set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS_RELWITHDEBINFO QT_NO_DEBUG)
|
||||
+ set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS_MINSIZEREL QT_NO_DEBUG)
|
||||
+ if (Qt5_POSITION_INDEPENDENT_CODE
|
||||
+ AND (CMAKE_VERSION VERSION_LESS 2.8.12
|
||||
+ AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
|
||||
+ OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)))
|
||||
+ set_property(TARGET ${_target} PROPERTY POSITION_INDEPENDENT_CODE ${Qt5_POSITION_INDEPENDENT_CODE})
|
||||
+ endif()
|
||||
+ endforeach()
|
||||
+ endmacro()
|
||||
+endif()
|
||||
+
|
||||
macro(_qt4or5_component_name_to_qt_component qt_component component)
|
||||
if (${component} STREQUAL "Widgets" AND ${QT_VERSION} STREQUAL "4")
|
||||
set(${qt_component} "Gui")
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
From 4fa9e08ddca36fc3cebd35b6f0ea2fc344b85e13 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sun, 28 Oct 2018 21:49:42 +0100
|
||||
Subject: [PATCH] Make QML installation path configurable
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
CMakeLists.txt | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 837c6bb..cc9be3c 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -15,6 +15,7 @@ option(QTGSTREAMER_EXAMPLES "Build QtGStreamer's examples" ON)
|
||||
option(QTGSTREAMER_CODEGEN "Build and use QtGStreamer's codegen" OFF)
|
||||
option(USE_GST_PLUGIN_DIR "Install gstreamer plugins at the system location" ON)
|
||||
option(USE_QT_PLUGIN_DIR "Install qt plugins at the system location" ON)
|
||||
+set(QMLDIR "/usr/lib/qml" CACHE STRING "QMLpath")
|
||||
|
||||
include(GNUInstallDirs)
|
||||
include(MacroLogFeature)
|
||||
@@ -165,7 +166,7 @@ endif()
|
||||
|
||||
if (USE_QT_PLUGIN_DIR)
|
||||
set(QTGSTREAMER_QTQUICK1_INSTALL_DIR ${QT_IMPORTS_DIR})
|
||||
- set(QTGSTREAMER_QTQUICK2_INSTALL_DIR ${QT_QML_DIR})
|
||||
+ set(QTGSTREAMER_QTQUICK2_INSTALL_DIR ${QMLDIR})
|
||||
else()
|
||||
if (USE_QT5)
|
||||
set(QTGSTREAMER_QTQUICK1_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/qt5/imports)
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
SUMMARY = "QtGStreamer is a set of libraries providing C++ bindings for GStreamer"
|
||||
|
||||
LICENSE = "LGPLv2.1"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
|
||||
|
||||
inherit cmake_qt5
|
||||
|
||||
DEPENDS += " \
|
||||
glib-2.0-native \
|
||||
boost \
|
||||
qtbase \
|
||||
qtquickcontrols2 \
|
||||
qtdeclarative \
|
||||
gstreamer1.0 \
|
||||
gstreamer1.0-plugins-base \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.xz \
|
||||
file://0001-Fix-compilation-with-GStreamer-1-5-1.patch \
|
||||
file://0002-FindQt4or5.cmake-Optionally-create-qt5_use_modules-t.patch \
|
||||
file://0003-Make-QML-installation-path-configurable.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "fd794045a828c184acc1794b08a463fd"
|
||||
SRC_URI[sha256sum] = "9f3b492b74cad9be918e4c4db96df48dab9c012f2ae5667f438b64a4d92e8fd4"
|
||||
|
||||
EXTRA_OECMAKE += " \
|
||||
-DQT_VERSION=5 \
|
||||
-DQMLDIR=${OE_QMAKE_PATH_QML} \
|
||||
"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${libdir}/gstreamer-1.0 \
|
||||
${OE_QMAKE_PATH_QML} \
|
||||
${OE_QMAKE_PATH_IMPORTS} \
|
||||
"
|
||||
|
||||
FILES_${PN}-dev += " \
|
||||
${libdir}/cmake \
|
||||
"
|
||||
@@ -92,7 +92,6 @@ RDEPENDS_${PN} += " \
|
||||
projectm \
|
||||
qmidiarp \
|
||||
qmmp \
|
||||
qt-gstreamer \
|
||||
\
|
||||
\
|
||||
drumkv1 drumkv1-presets \
|
||||
|
||||
Reference in New Issue
Block a user