File mediastreamer2-fix-xv.patch of Package mediastreamer2

Overview Repositories Revisions Requests Users Attributes Meta

File mediastreamer2-fix-xv.patch of Package mediastreamer2 (Revision 166bbdfa91a6696f206ad7dcb36eac7e)

Currently displaying revision 166bbdfa91a6696f206ad7dcb36eac7e , Show latest

--- a/cmake/FindXext.cmake
+++ b/cmake/FindXext.cmake
@@ -0,0 +1,48 @@
+############################################################################
+# FindXext.txt
+# Copyright (C) 2014  Belledonne Communications, Grenoble France
+#
+############################################################################
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+############################################################################
+#
+# - Find the Xext include file and library
+#
+#  XEXT_FOUND - system has Xext
+#  XEXT_INCLUDE_DIRS - the Xext include directory
+#  XEXT_LIBRARIES - The libraries needed to use Xext
+
+find_path(XEXT_INCLUDE_DIRS
+	NAMES X11/extensions/Xext.h
+	PATH_SUFFIXES include
+)
+if(XEXT_INCLUDE_DIRS)
+	set(HAVE_X11_EXTENSIONS_XEXT_H 1)
+endif()
+
+find_library(XEXT_LIBRARIES
+	NAMES Xext
+	PATH_SUFFIXES lib
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(XEXT
+	DEFAULT_MSG
+	XEXT_INCLUDE_DIRS XEXT_LIBRARIES HAVE_X11_EXTENSIONS_XEXT_H
+)
+
+mark_as_advanced(XEXT_INCLUDE_DIRS XEXT_LIBRARIES HAVE_X11_EXTENSIONS_XEXT_H)
--- a/cmake/FindXv.cmake
+++ b/cmake/FindXv.cmake
@@ -30,6 +30,7 @@ include(CheckIncludeFile)
 include(CheckSymbolExists)
 
 find_package(X11 REQUIRED)
+find_package(Xext REQUIRED)
 
 set(_XV_ROOT_PATHS
 	${CMAKE_INSTALL_PREFIX}
@@ -55,7 +56,7 @@ if(XV_H_INCLUDE_DIR AND XVLIB_H_INCLUDE_
 	set(XV_INCLUDE_DIRS ${XV_H_INCLUDE_DIR} ${XVLIB_H_INCLUDE_DIR})
 endif()
 
-set(XV_INCLUDE_DIRS ${XV_INCLUDE_DIRS} ${X11_INCLUDE_DIRS})
+set(XV_INCLUDE_DIRS ${XV_INCLUDE_DIRS} ${XEXT_INCLUDE_DIRS} ${X11_INCLUDE_DIRS})
 list(REMOVE_DUPLICATES XV_INCLUDE_DIRS)
 
 find_library(XV_LIBRARIES
@@ -72,7 +73,7 @@ if(XV_LIBRARIES)
 	cmake_pop_check_state()
 endif()
 
-set(XV_LIBRARIES ${XV_LIBRARIES} ${X11_LIBRARIES})
+set(XV_LIBRARIES ${XV_LIBRARIES} ${XEXT_LIBRARIES} ${X11_LIBRARIES})
 list(REMOVE_DUPLICATES XV_LIBRARIES)
 
 include(FindPackageHandleStandardArgs)

Places

File mediastreamer2-fix-xv.patch of Package mediastreamer2 (Revision 166bbdfa91a6696f206ad7dcb36eac7e)

Places