add gstwayland

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 149444c..9fd7d1f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,21 +22,12 @@ set(CMAKE_CXX_FLAGS "-Wall -fpermissive")
 find_package(PkgConfig)
 find_package (Threads)
 pkg_check_modules(WAYLAND_CLIENT wayland-client REQUIRED)
-pkg_check_modules(WAYLAND_CURSOR wayland-cursor REQUIRED)
-pkg_check_modules(WALTHAM waltham REQUIRED)
-pkg_check_modules(GLESv2 glesv2 REQUIRED)
-pkg_check_modules(WAYLAND_EGL wayland-egl REQUIRED)
 pkg_check_modules(ILMCONTROL REQUIRED ilmControl)
 pkg_check_modules(ILMINPUT REQUIRED ilmInput)
-
-pkg_search_module(EGL egl required)
 pkg_search_module(GSTREAMER gstreamer-1.0 required)
-pkg_search_module(GSTREAMERAPP gstreamer-app-1.0 required)
-pkg_search_module(DRM libdrm required)
 pkg_search_module(WEBSOCKET libwebsockets required)
 
 find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner)
-find_library(GST_ALLOCATOR NAMES gstallocators-1.0 PATHs /usr/lib64)
 find_library(GST_VIDEO NAMES gstvideo-1.0 PATHs /usr/lib64)
 find_library(GST_WAYLAND NAMES gstwayland-1.0 PATHs /usr/lib64)
 
@@ -57,45 +48,24 @@ add_custom_command(
 )
 
 include_directories(
-    ${WAYLAND_CLIENT_INCLUDE_DIR}
-    ${WAYLAND_CURSOR_INCLUDE_DIR}
-    ${WALTHAM_INCLUDE_DIRS}
-    ${DRM_INCLUDE_DIRS}
+    "${CMAKE_SYSROOT}/usr/include"
     ${GSTREAMER_LIBRARY_DIRS}
     ${GSTREAMER_INCLUDE_DIRS}
-    ${GSTREAMERAPP_INCLUDE_DIRS}
-    ${EGL_INCLUDE_DIRS}
-    ${WAYLAND_EGL_INCLUDE_DIR}
-    ${GLESv2_INCLUDE_DIRS}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/include/
-    ${CMAKE_SOURCE_DIR}/waltham-renderer
     "${ILMCONTROL_INCLUDE_DIRS}"
     "${ILMINPUT_INCLUDE_DIRS}"
 )
 
 link_directories(
     ${WAYLAND_CLIENT_LIBRARY_DIRS}
-    ${WAYLAND_CURSOR_LIBRARY_DIRS}
-    ${WALTHAM_LIBRARY_DIRS}
-    ${EGL_LIBRARY_DIRS}
-    ${WAYLAND_EGL_LIBRAY_DIRS}
-    ${GLESv2_LIBRARY_DIRS}
     ${GSTREAMER_LIBRARY_DIRS}
-    ${GSTREAMERAPP_LIBRARY_DIRS}
 )
 
 SET(LIBS
     ${CMAKE_THREAD_LIBS_INIT}
     ${WAYLAND_CLIENT_LIBRARIES}
-    ${WAYLAND_CURSOR_LIBRARIES}
-    ${WALTHAM_LIBRARIES}
-    ${EGL_LIBRARIES}
-    ${WAYLAND_EGL_LIBRARIES}
-    ${GLESv2_LIBRARIES}
     ${GSTREAMER_LIBRARIES}
-    ${GSTREAMERAPP_LIBRARIES}
-    ${GST_ALLOCATOR}
     ${GST_VIDEO}
     ${GST_WAYLAND}
     libwindowmanager.so
@@ -116,9 +86,6 @@ SET(SRC_FILES
 #add executable file
 add_executable(${PROJECT_NAME} ${SRC_FILES})
 
-#add link library
-add_definitions(${EGL_CFLAGS})
-
 target_link_libraries(${PROJECT_NAME} ${LIBS})
 
 add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD

diff --git a/src/gst-wayland-demo.cpp b/src/gst-wayland-demo.cpp
index 06bf1e5..7315a84 100644 (file)
--- a/src/gst-wayland-demo.cpp
+++ b/src/gst-wayland-demo.cpp
@@ -18,7 +18,6 @@
  */
 
 #include <gst/gst.h>
-
 #include <gst/video/video.h>
 #include <gst/video/videooverlay.h>