Add some more cmake stuff

Author: 48ca

CMakeLists.txt

@@ -3,7 +3,11 @@ project(ttydisp)
 
 set (CMAKE_CXX_STANDARD 17)
 
-include("./cmake/FindFFmpeg.cmake")
+include("./cmake/ffmpeg-config.cmake")
+include("./cmake/libvdpau-config.cmake")
+find_package(X11)
+find_package(Threads)
+find_package(ZLIB)
 
 if(MSVC)
 	# Visual Studio -- /W4
@@ -20,5 +24,9 @@ endif()
 add_executable(ttydisp ttydisp.cpp)
 target_include_directories( ttydisp PRIVATE ${LIBAVFORMAT_INCLUDE_DIR} ${LIBAVCODEC_INCLUDE_DIR} ${LIBAVUTIL_INCLUDE_DIR} ${LIBSWSCALE_INCLUDE_DIR})
 target_link_libraries(ttydisp ${LIBAVFORMAT_LIBRARY} ${LIBAVCODEC_LIBRARY} ${LIBAVUTIL_LIBRARY} ${LIBSWSCALE_LIBRARY} )
+target_link_libraries(ttydisp ${LIBVDPAU_LIBRARY})
+target_link_libraries(ttydisp ${X11_LIBRARIES})
+target_link_libraries(ttydisp ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(ttydisp ${ZLIB_LIBRARIES})
 
 install(TARGETS ttydisp DESTINATION bin)

cmake/FindFFmpeg.cmake renamed to cmake/ffmpeg-config.cmake

@@ -0,0 +1,59 @@
+# Custom libvdpau cmake file
+
+find_package( PkgConfig )
+if( PKG_CONFIG_FOUND )
+    pkg_search_module( PC_LIBVDPAU vdpau )
+endif( PKG_CONFIG_FOUND )
+
+find_path( LIBVDPAU_INCLUDE_DIR vdpau/vdpau.h
+    HINTS
+        # Hints provided by pkg-config
+        ${PC_LIBVDPAU_INCLUDEDIR}
+        ${PC_LIBVDPAU_INCLUDEDIR}/*
+        ${PC_LIBVDPAU_INCLUDE_DIRS}
+    PATHS
+        # Standard include directories
+        /usr/include/
+        ~/usr/include/
+        /opt/local/include/
+        /usr/local/include/
+        /opt/kde4/include/
+        ${KDE4_INCLUDE_DIR}/
+        # Search all subdirs of the above
+        /usr/include/*
+        ~/usr/include/*
+        /opt/local/include/*
+        /usr/local/include/*
+        /opt/kde4/include/*
+        ${KDE4_INCLUDE_DIR}/*
+    PATH_SUFFIXES
+        # Subdirectory hints
+        libvdpau
+        vdpau
+)
+
+find_library( LIBVDPAU_LIBRARY vdpau
+    HINTS
+        # Hints provided by pkg-config
+        ${PC_LIBVDPAU_LIBDIR}
+        ${PC_LIBVDPAU_LIBRARY_DIRS}
+    PATHS
+        ~/usr/lib/
+        /opt/local/lib/
+        /usr/lib/
+        /usr/lib64/
+        /usr/local/lib/
+        /opt/kde4/lib/
+        ${KDE4_LIB_DIR}
+)
+
+include( FindPackageHandleStandardArgs )
+find_package_handle_standard_args( vdpau DEFAULT_MSG
+    LIBVDPAU_INCLUDE_DIR
+    LIBVDPAU_LIBRARY
+)
+if( LIBVDPAU_FOUND )
+    message( STATUS "\tvdpau: ${LIBVDPAU_INCLUDE_DIR}, ${LIBVDPAU_LIBRARY}" )
+endif( LIBVDPAU_FOUND )
+
+mark_as_advanced( LIBVDPAU_LIBRARY )

cmake/libvdpau-config.cmake

@@ -8,6 +8,10 @@
 #include <chrono>
 #include <csignal>
 
+#ifndef AV_ERROR_MAX_STRING_SIZE
+#define AV_ERROR_MAX_STRING_SIZE 64
+#endif
+
 using clk = std::chrono::steady_clock;
 
 extern "C"