New upstream version 22.0.3+dfsg1
This commit is contained in:
Sebastian Ramacher
parent
665f64a933
commit
cdc9a9fc87
334 changed files with 14525 additions and 2639 deletions
|
|
@ -44,6 +44,10 @@ FIND_PATH(LUAJIT_INCLUDE_DIR
|
|||
include/luajit-2.0
|
||||
luajit2.0
|
||||
include/luajit2.0
|
||||
luajit-2.1
|
||||
include/luajit-2.1
|
||||
luajit2.1
|
||||
include/luajit2.1
|
||||
)
|
||||
|
||||
find_library(LUAJIT_LIB
|
||||
|
|
|
|||
143
cmake/Modules/FindMbedTLS.cmake
Normal file
143
cmake/Modules/FindMbedTLS.cmake
Normal file
|
|
@ -0,0 +1,143 @@
|
|||
# Once done these will be defined:
|
||||
#
|
||||
# LIBMBEDTLS_FOUND
|
||||
# LIBMBEDTLS_INCLUDE_DIRS
|
||||
# LIBMBEDTLS_LIBRARIES
|
||||
#
|
||||
# For use in OBS:
|
||||
#
|
||||
# MBEDTLS_INCLUDE_DIR
|
||||
|
||||
find_package(PkgConfig QUIET)
|
||||
if (PKG_CONFIG_FOUND)
|
||||
pkg_check_modules(_MBEDTLS QUIET mbedtls)
|
||||
endif()
|
||||
|
||||
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||
set(_lib_suffix 64)
|
||||
else()
|
||||
set(_lib_suffix 32)
|
||||
endif()
|
||||
|
||||
# If we're on MacOS or Linux, please try to statically-link mbedtls.
|
||||
if(STATIC_MBEDTLS AND (APPLE OR UNIX))
|
||||
set(_MBEDTLS_LIBRARIES libmbedtls.a)
|
||||
set(_MBEDCRYPTO_LIBRARIES libmbedcrypto.a)
|
||||
set(_MBEDX509_LIBRARIES libmbedx509.a)
|
||||
endif()
|
||||
|
||||
find_path(MBEDTLS_INCLUDE_DIR
|
||||
NAMES mbedtls/ssl.h
|
||||
HINTS
|
||||
ENV mbedtlsPath${_lib_suffix}
|
||||
ENV mbedtlsPath
|
||||
ENV DepsPath${_lib_suffix}
|
||||
ENV DepsPath
|
||||
${mbedtlsPath${_lib_suffix}}
|
||||
${mbedtlsPath}
|
||||
${DepsPath${_lib_suffix}}
|
||||
${DepsPath}
|
||||
${_MBEDTLS_INCLUDE_DIRS}
|
||||
PATHS
|
||||
/usr/include /usr/local/include /opt/local/include /sw/include
|
||||
PATH_SUFFIXES
|
||||
include)
|
||||
|
||||
find_library(MBEDTLS_LIB
|
||||
NAMES ${_MBEDTLS_LIBRARIES} mbedtls libmbedtls
|
||||
HINTS
|
||||
ENV mbedtlsPath${_lib_suffix}
|
||||
ENV mbedtlsPath
|
||||
ENV DepsPath${_lib_suffix}
|
||||
ENV DepsPath
|
||||
${mbedtlsPath${_lib_suffix}}
|
||||
${mbedtlsPath}
|
||||
${DepsPath${_lib_suffix}}
|
||||
${DepsPath}
|
||||
${_MBEDTLS_LIBRARY_DIRS}
|
||||
PATHS
|
||||
/usr/lib /usr/local/lib /opt/local/lib /sw/lib
|
||||
PATH_SUFFIXES
|
||||
lib${_lib_suffix} lib
|
||||
libs${_lib_suffix} libs
|
||||
bin${_lib_suffix} bin
|
||||
../lib${_lib_suffix} ../lib
|
||||
../libs${_lib_suffix} ../libs
|
||||
../bin${_lib_suffix} ../bin)
|
||||
|
||||
find_library(MBEDCRYPTO_LIB
|
||||
NAMES ${_MBEDCRYPTO_LIBRARIES} mbedcrypto libmbedcrypto
|
||||
HINTS
|
||||
ENV mbedcryptoPath${_lib_suffix}
|
||||
ENV mbedcryptoPath
|
||||
ENV DepsPath${_lib_suffix}
|
||||
ENV DepsPath
|
||||
${mbedcryptoPath${_lib_suffix}}
|
||||
${mbedcryptoPath}
|
||||
${DepsPath${_lib_suffix}}
|
||||
${DepsPath}
|
||||
${_MBEDCRYPTO_LIBRARY_DIRS}
|
||||
PATHS
|
||||
/usr/lib /usr/local/lib /opt/local/lib /sw/lib
|
||||
PATH_SUFFIXES
|
||||
lib${_lib_suffix} lib
|
||||
libs${_lib_suffix} libs
|
||||
bin${_lib_suffix} bin
|
||||
../lib${_lib_suffix} ../lib
|
||||
../libs${_lib_suffix} ../libs
|
||||
../bin${_lib_suffix} ../bin)
|
||||
|
||||
find_library(MBEDX509_LIB
|
||||
NAMES ${_MBEDX509_LIBRARIES} mbedx509 libmbedx509
|
||||
HINTS
|
||||
ENV mbedx509Path${_lib_suffix}
|
||||
ENV mbedx509Path
|
||||
ENV DepsPath${_lib_suffix}
|
||||
ENV DepsPath
|
||||
${mbedx509Path${_lib_suffix}}
|
||||
${mbedx509Path}
|
||||
${DepsPath${_lib_suffix}}
|
||||
${DepsPath}
|
||||
${_MBEDX509_LIBRARY_DIRS}
|
||||
PATHS
|
||||
/usr/lib /usr/local/lib /opt/local/lib /sw/lib
|
||||
PATH_SUFFIXES
|
||||
lib${_lib_suffix} lib
|
||||
libs${_lib_suffix} libs
|
||||
bin${_lib_suffix} bin
|
||||
../lib${_lib_suffix} ../lib
|
||||
../libs${_lib_suffix} ../libs
|
||||
../bin${_lib_suffix} ../bin)
|
||||
|
||||
# Sometimes mbedtls is split between three libs, and sometimes it isn't.
|
||||
# If it isn't, let's check if the symbols we need are all in MBEDTLS_LIB.
|
||||
if(MBEDTLS_LIB AND NOT MBEDCRYPTO_LIB AND NOT MBEDX509_LIB)
|
||||
set(CMAKE_REQUIRED_LIBRARIES ${MBEDTLS_LIB})
|
||||
set(CMAKE_REQUIRED_INCLUDES ${MBEDTLS_INCLUDE_DIR})
|
||||
check_symbol_exists(mbedtls_x509_crt_init "mbedtls/x509_crt.h" MBEDTLS_INCLUDES_X509)
|
||||
check_symbol_exists(mbedtls_sha256_init "mbedtls/sha256.h" MBEDTLS_INCLUDES_CRYPTO)
|
||||
unset(CMAKE_REQUIRED_INCLUDES)
|
||||
unset(CMAKE_REQUIRED_LIBRARIES)
|
||||
endif()
|
||||
|
||||
# If we find all three libraries, then go ahead.
|
||||
if(MBEDTLS_LIB AND MBEDCRYPTO_LIB AND MBEDX509_LIB)
|
||||
set(LIBMBEDTLS_INCLUDE_DIRS ${MBEDTLS_INCLUDE_DIR})
|
||||
set(LIBMBEDTLS_LIBRARIES ${MBEDTLS_LIB} ${MBEDCRYPTO_LIB} ${MBEDX509_LIB})
|
||||
set(MBEDTLS_INCLUDE_DIRS ${LIBMBEDTLS_INCLUDE_DIRS})
|
||||
set(MBEDTLS_LIBRARIES ${LIBMBEDTLS_LIBRARIES})
|
||||
|
||||
# Otherwise, if we find MBEDTLS_LIB, and it has both CRYPTO and x509
|
||||
# within the single lib (i.e. a windows build environment), then also
|
||||
# feel free to go ahead.
|
||||
elseif(MBEDTLS_LIB AND MBEDTLS_INCLUDES_CRYPTO AND MBEDTLS_INCLUDES_X509)
|
||||
set(LIBMBEDTLS_INCLUDE_DIRS ${MBEDTLS_INCLUDE_DIR})
|
||||
set(LIBMBEDTLS_LIBRARIES ${MBEDTLS_LIB})
|
||||
set(MBEDTLS_INCLUDE_DIRS ${LIBMBEDTLS_INCLUDE_DIRS})
|
||||
set(MBEDTLS_LIBRARIES ${LIBMBEDTLS_LIBRARIES})
|
||||
endif()
|
||||
|
||||
# Now we've accounted for the 3-vs-1 library case:
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(Libmbedtls DEFAULT_MSG MBEDTLS_LIBRARIES MBEDTLS_INCLUDE_DIRS)
|
||||
mark_as_advanced(MBEDTLS_INCLUDE_DIR MBEDTLS_LIBRARIES MBEDTLS_INCLUDE_DIRS)
|
||||
|
|
@ -1,77 +0,0 @@
|
|||
# Once done these will be defined:
|
||||
#
|
||||
# SSL_FOUND
|
||||
# SSL_INCLUDE_DIRS
|
||||
# SSL_LIBRARIES
|
||||
#
|
||||
# For use in OBS:
|
||||
#
|
||||
# SSL_INCLUDE_DIR
|
||||
|
||||
find_package(PkgConfig QUIET)
|
||||
if (PKG_CONFIG_FOUND)
|
||||
pkg_check_modules(_CRYPTO QUIET libcrypto)
|
||||
pkg_check_modules(_SSL QUIET libssl)
|
||||
endif()
|
||||
|
||||
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||
set(_lib_suffix 64)
|
||||
else()
|
||||
set(_lib_suffix 32)
|
||||
endif()
|
||||
|
||||
set(_SSL_BASE_HINTS
|
||||
ENV sslPath${_lib_suffix}
|
||||
ENV sslPath
|
||||
ENV DepsPath${_lib_suffix}
|
||||
ENV DepsPath
|
||||
${sslPath${_lib_suffix}}
|
||||
${sslPath}
|
||||
${DepsPath${_lib_suffix}}
|
||||
${DepsPath})
|
||||
|
||||
set(_SSL_LIB_SUFFIXES
|
||||
lib${_lib_suffix} lib
|
||||
libs${_lib_suffix} libs
|
||||
bin${_lib_suffix} bin
|
||||
../lib${_lib_suffix} ../lib
|
||||
../libs${_lib_suffix} ../libs
|
||||
../bin${_lib_suffix} ../bin)
|
||||
|
||||
find_path(SSL_INCLUDE_DIR
|
||||
NAMES openssl/ssl.h
|
||||
HINTS
|
||||
${_SSL_BASE_HINTS}
|
||||
${_CRYPTO_INCLUDE_DIRS}
|
||||
${_SSL_INCLUDE_DIRS}
|
||||
PATHS
|
||||
/usr/include /usr/local/include /opt/local/include /sw/include
|
||||
PATH_SUFFIXES
|
||||
include)
|
||||
|
||||
find_library(_SSL_LIB
|
||||
NAMES ${_SSL_LIBRARIES} ssleay32 ssl
|
||||
HINTS
|
||||
${_SSL_BASE_HINTS}
|
||||
${_SSL_LIBRARY_DIRS}
|
||||
PATHS
|
||||
/usr/lib /usr/local/lib /opt/local/lib /sw/lib
|
||||
PATH_SUFFIXES ${_SSL_LIB_SUFFIXES})
|
||||
|
||||
find_library(_CRYPTO_LIB
|
||||
NAMES ${_CRYPTO_LIBRARIES} libeay32 crypto
|
||||
HINTS
|
||||
${_SSL_BASE_HINTS}
|
||||
${_CRYPTO_LIBRARY_DIRS}
|
||||
PATHS
|
||||
/usr/lib /usr/local/lib /opt/local/lib /sw/lib
|
||||
PATH_SUFFIXES ${_SSL_LIB_SUFFIXES})
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(ssl DEFAULT_MSG _SSL_LIB _CRYPTO_LIB SSL_INCLUDE_DIR)
|
||||
mark_as_advanced(SSL_INCLUDE_DIR _SSL_LIB _CRYPTO_LIB)
|
||||
|
||||
if(SSL_FOUND)
|
||||
set(SSL_INCLUDE_DIRS ${SSL_INCLUDE_DIR})
|
||||
set(SSL_LIBRARIES ${_SSL_LIB} ${_CRYPTO_LIB})
|
||||
endif()
|
||||
|
|
@ -21,6 +21,7 @@
|
|||
# XCB_GLX_FOUND XCB_GLX_INCLUDE_DIR XCB_GLX_LIBRARY
|
||||
# XCB_SHM_FOUND XCB_SHM_INCLUDE_DIR XCB_SHM_LIBRARY
|
||||
# XCB_XV_FOUND XCB_XV_INCLUDE_DIR XCB_XV_LIBRARY
|
||||
# XCB_XINPUT_FOUND XCB_XINPUT_INCLUDE_DIR XCB_XINPUT_LIBRARY
|
||||
# XCB_SYNC_FOUND XCB_SYNC_INCLUDE_DIR XCB_SYNC_LIBRARY
|
||||
# XCB_XTEST_FOUND XCB_XTEST_INCLUDE_DIR XCB_XTEST_LIBRARY
|
||||
# XCB_ICCCM_FOUND XCB_ICCCM_INCLUDE_DIR XCB_ICCCM_LIBRARY
|
||||
|
|
@ -54,6 +55,7 @@ set(knownComponents XCB
|
|||
XFIXES
|
||||
XTEST
|
||||
XV
|
||||
XINPUT
|
||||
XINERAMA)
|
||||
|
||||
unset(unknownComponents)
|
||||
|
|
@ -112,6 +114,8 @@ foreach(comp ${comps})
|
|||
list(APPEND pkgConfigModules "xcb-xtest")
|
||||
elseif("${comp}" STREQUAL "XV")
|
||||
list(APPEND pkgConfigModules "xcb-xv")
|
||||
elseif("${comp}" STREQUAL "XINPUT")
|
||||
list(APPEND pkgConfigModules "xcb-xinput")
|
||||
elseif("${comp}" STREQUAL "XINERAMA")
|
||||
list(APPEND pkgConfigModules "xcb-xinerama")
|
||||
endif()
|
||||
|
|
@ -190,6 +194,9 @@ macro(_XCB_HANDLE_COMPONENT _comp)
|
|||
elseif("${_comp}" STREQUAL "XV")
|
||||
set(_header "xcb/xv.h")
|
||||
set(_lib "xcb-xv")
|
||||
elseif("${_comp}" STREQUAL "XINPUT")
|
||||
set(_header "xcb/xinput.h")
|
||||
set(_lib "xcb-xinput")
|
||||
elseif("${_comp}" STREQUAL "XINERAMA")
|
||||
set(_header "xcb/xinerama.h")
|
||||
set(_lib "xcb-xinerama")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue