mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-26 14:23:09 +00:00
Remove leftover gstreamer bits
We don't use gstreamer for torch access any more and it's unclear whether a future solution will. Remove some leftover bits
This commit is contained in:
Nicolas Fella
Bhushan Shah
parent
791c76f327
commit
b19543b56a
5 changed files with 2 additions and 139 deletions
|
|
@ -9,7 +9,7 @@ set(CMAKE_CXX_STANDARD 17)
|
|||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
|
||||
find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
|
||||
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
|
||||
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
|
||||
|
||||
include(KDEInstallDirs)
|
||||
include(KDECMakeSettings)
|
||||
|
|
@ -38,11 +38,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
|
|||
Wayland
|
||||
)
|
||||
|
||||
# torch
|
||||
find_package(GStreamer 1.1.90 REQUIRED)
|
||||
find_package(GLIB2 REQUIRED)
|
||||
find_package(GObject REQUIRED)
|
||||
|
||||
include(CheckIncludeFiles)
|
||||
|
||||
plasma_install_package(look-and-feel org.kde.plasma.phone look-and-feel)
|
||||
|
|
|
|||
|
|
@ -1,52 +0,0 @@
|
|||
# - Try to find GObject
|
||||
# Once done this will define
|
||||
#
|
||||
# GOBJECT_FOUND - system has GObject
|
||||
# GOBJECT_INCLUDE_DIR - the GObject include directory
|
||||
# GOBJECT_LIBRARIES - the libraries needed to use GObject
|
||||
# GOBJECT_DEFINITIONS - Compiler switches required for using GObject
|
||||
|
||||
# Copyright (c) 2011, Raphael Kubo da Costa <kubito@gmail.com>
|
||||
# Copyright (c) 2006, Tim Beaulen <tbscope@gmail.com>
|
||||
#
|
||||
# Redistribution and use is allowed according to the terms of the BSD license.
|
||||
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
||||
|
||||
FIND_PACKAGE(PkgConfig)
|
||||
PKG_CHECK_MODULES(PC_GOBJECT gobject-2.0)
|
||||
SET(GOBJECT_DEFINITIONS ${PC_GOBJECT_CFLAGS_OTHER})
|
||||
|
||||
FIND_PATH(GOBJECT_INCLUDE_DIR gobject.h
|
||||
HINTS
|
||||
${PC_GOBJECT_INCLUDEDIR}
|
||||
${PC_GOBJECT_INCLUDE_DIRS}
|
||||
PATH_SUFFIXES glib-2.0/gobject/
|
||||
)
|
||||
|
||||
FIND_LIBRARY(_GObjectLibs NAMES gobject-2.0
|
||||
HINTS
|
||||
${PC_GOBJECT_LIBDIR}
|
||||
${PC_GOBJECT_LIBRARY_DIRS}
|
||||
)
|
||||
FIND_LIBRARY(_GModuleLibs NAMES gmodule-2.0
|
||||
HINTS
|
||||
${PC_GOBJECT_LIBDIR}
|
||||
${PC_GOBJECT_LIBRARY_DIRS}
|
||||
)
|
||||
FIND_LIBRARY(_GThreadLibs NAMES gthread-2.0
|
||||
HINTS
|
||||
${PC_GOBJECT_LIBDIR}
|
||||
${PC_GOBJECT_LIBRARY_DIRS}
|
||||
)
|
||||
FIND_LIBRARY(_GLibs NAMES glib-2.0
|
||||
HINTS
|
||||
${PC_GOBJECT_LIBDIR}
|
||||
${PC_GOBJECT_LIBRARY_DIRS}
|
||||
)
|
||||
|
||||
SET( GOBJECT_LIBRARIES ${_GObjectLibs} ${_GModuleLibs} ${_GThreadLibs} ${_GLibs} )
|
||||
|
||||
INCLUDE(FindPackageHandleStandardArgs)
|
||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GOBJECT DEFAULT_MSG GOBJECT_LIBRARIES GOBJECT_INCLUDE_DIR)
|
||||
|
||||
MARK_AS_ADVANCED(GOBJECT_INCLUDE_DIR _GObjectLibs _GModuleLibs _GThreadLibs _GLibs)
|
||||
|
|
@ -1,72 +0,0 @@
|
|||
# - Try to find GStreamer
|
||||
# Once done this will define
|
||||
#
|
||||
# GSTREAMER_FOUND - system has GStreamer
|
||||
# GSTREAMER_INCLUDE_DIR - the GStreamer include directory
|
||||
# GSTREAMER_LIBRARY - the main GStreamer library
|
||||
# GSTREAMER_PLUGIN_DIR - the GStreamer plugin directory
|
||||
#
|
||||
# And for all the plugin libraries specified in the COMPONENTS
|
||||
# of find_package, this module will define:
|
||||
#
|
||||
# GSTREAMER_<plugin_lib>_LIBRARY_FOUND - system has <plugin_lib>
|
||||
# GSTREAMER_<plugin_lib>_LIBRARY - the <plugin_lib> library
|
||||
# GSTREAMER_<plugin_lib>_INCLUDE_DIR - the <plugin_lib> include directory
|
||||
#
|
||||
# Copyright(c) 2010, Collabora Ltd.
|
||||
# @author George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
|
||||
#
|
||||
# Redistribution and use is allowed according to the terms of the BSD license.
|
||||
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
||||
|
||||
# TODO: Other versions --> GSTREAMER_X_Y_FOUND(Example: GSTREAMER_0_8_FOUND and GSTREAMER_0_10_FOUND etc)
|
||||
|
||||
if(GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY)
|
||||
# in cache already
|
||||
set(GStreamer_FIND_QUIETLY TRUE)
|
||||
else()
|
||||
set(GStreamer_FIND_QUIETLY FALSE)
|
||||
endif()
|
||||
|
||||
set(GSTREAMER_API_VERSION 1.0)
|
||||
if(NOT WIN32)
|
||||
FIND_PACKAGE(PkgConfig REQUIRED)
|
||||
# use pkg-config to get the directories and then use these values
|
||||
# in the FIND_PATH() and FIND_LIBRARY() calls
|
||||
# don't make this check required - otherwise you can't use macro_optional_find_package on this one
|
||||
PKG_CHECK_MODULES(PKG_GSTREAMER gstreamer-${GSTREAMER_API_VERSION})
|
||||
set(GSTREAMER_VERSION ${PKG_GSTREAMER_VERSION})
|
||||
set(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS})
|
||||
endif()
|
||||
|
||||
message(STATUS "Found GStreamer package: ${PKG_GSTREAMER_VERSION}")
|
||||
|
||||
set(GSTREAMER_INCLUDE_DIR ${PKG_GSTREAMER_INCLUDE_DIRS})
|
||||
|
||||
find_library(GSTREAMER_LIBRARIES NAMES gstreamer-${GSTREAMER_API_VERSION}
|
||||
PATHS
|
||||
${PKG_GSTREAMER_LIBRARY_DIRS}
|
||||
)
|
||||
|
||||
find_library(GSTREAMER_BASE_LIBRARY NAMES gstbase-${GSTREAMER_API_VERSION}
|
||||
PATHS
|
||||
${PKG_GSTREAMER_LIBRARY_DIRS}
|
||||
)
|
||||
|
||||
find_library(GSTREAMER_VIDEO_LIBRARY NAMES gstvideo-${GSTREAMER_API_VERSION}
|
||||
PATHS
|
||||
${PKG_GSTREAMER_LIBRARY_DIRS}
|
||||
)
|
||||
|
||||
if(NOT GSTREAMER_INCLUDE_DIR)
|
||||
message(STATUS "GStreamer: WARNING: include dir not found")
|
||||
endif()
|
||||
|
||||
if(NOT GSTREAMER_LIBRARIES)
|
||||
message(STATUS "GStreamer: WARNING: library not found")
|
||||
endif()
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(GStreamer DEFAULT_MSG GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIR GSTREAMER_BASE_LIBRARY)
|
||||
|
||||
mark_as_advanced(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY)
|
||||
|
|
@ -14,10 +14,7 @@ target_link_libraries(plasma_applet_phonepanel
|
|||
Qt5::Gui
|
||||
Qt5::DBus
|
||||
KF5::Plasma
|
||||
KF5::I18n
|
||||
${GSTREAMER_LIBRARIES} GLIB2::GLIB2 ${GOBJECT_LIBRARIES})
|
||||
|
||||
target_include_directories(plasma_applet_phonepanel PRIVATE "${GSTREAMER_INCLUDE_DIR}")
|
||||
KF5::I18n)
|
||||
|
||||
install(TARGETS plasma_applet_phonepanel DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/applets)
|
||||
#install(FILES plasma-phonepanel-default.desktop DESTINATION ${SERVICES_INSTALL_DIR})
|
||||
|
|
|
|||
|
|
@ -24,8 +24,6 @@
|
|||
|
||||
#include <Plasma/Containment>
|
||||
|
||||
#include <gst/gst.h>
|
||||
|
||||
#include "kscreeninterface.h"
|
||||
#include "screenshotinterface.h"
|
||||
|
||||
|
|
@ -50,9 +48,6 @@ signals:
|
|||
void autoRotateChanged(bool value);
|
||||
|
||||
private:
|
||||
GstElement* m_pipeline;
|
||||
GstElement* m_sink;
|
||||
GstElement* m_source;
|
||||
bool m_running = false;
|
||||
|
||||
org::kde::KScreen *m_kscreenInterface;
|
||||
|
|
|
|||
Loading…
Reference in a new issue