diff options
| author | Adriaan de Groot <adridg@FreeBSD.org> | 2021-02-13 23:49:48 +0000 |
|---|---|---|
| committer | Adriaan de Groot <adridg@FreeBSD.org> | 2021-02-13 23:49:48 +0000 |
| commit | fd25963a14dddb9247e955ca90ad0bb860891184 (patch) | |
| tree | 3fd594ce6ffaa61c23cf4ac872e860d5631d173a /audio/amarok/files/patch-cmake_modules_FindMySQLe.cmake | |
| parent | devel/cereal: Update 1.3.0 -> 1.3.0-10 (diff) | |
Update audio/amarok to recent upstream
This fixes the previous botched update. Existing patches
have been merged or made obsolete, while we still need to
massage CMakeLists and CMake modules to find things onFreeBSD.
While here, drop redundant USES=ssl (it is in the main USES
clause already) and add missing USE_KDE=wallet.
Notes
Notes:
svn path=/head/; revision=565187
Diffstat (limited to 'audio/amarok/files/patch-cmake_modules_FindMySQLe.cmake')
| -rw-r--r-- | audio/amarok/files/patch-cmake_modules_FindMySQLe.cmake | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/audio/amarok/files/patch-cmake_modules_FindMySQLe.cmake b/audio/amarok/files/patch-cmake_modules_FindMySQLe.cmake new file mode 100644 index 000000000000..2fbb5a572f20 --- /dev/null +++ b/audio/amarok/files/patch-cmake_modules_FindMySQLe.cmake @@ -0,0 +1,39 @@ +--- cmake/modules/FindMySQLe.cmake.orig 2021-02-13 22:45:16 UTC ++++ cmake/modules/FindMySQLe.cmake +@@ -51,6 +51,7 @@ + if(NOT MYSQLE_LIBRARIES) + # mysql-config removed --libmysql-libs, but amarok needs libmysqld other + # than libmysqlclient to run mysql embedded server. ++ message(STATUS "Looking for mysqld libmysqld..") + find_library(MYSQLE_LIBRARIES NAMES mysqld libmysqld + PATHS + $ENV{MYSQL_DIR}/libmysql_r/.libs +@@ -61,10 +62,14 @@ + PATH_SUFFIXES + mysql + ) ++ message(STATUS ".. found ${MYSQLE_LIBRARIES}") ++else() ++ message(STATUS "Embedded MySQL libs already set ${MYSQLE_LIBRARIES}") + endif() + + if(PC_MYSQL_VERSION) + set(MySQLe_VERSION_STRING ${PC_MYSQL_VERSION}) ++ message(STATUS ".. version ${MySQLe_VERSION_STRING}") + endif() + + if(MYSQLE_LIBRARIES) +@@ -75,6 +80,13 @@ + # string(STRIP ${_mysql_libs} _mysql_libs) + # set(MYSQLE_LIBRARIES ${_mysql_libs}) + #endif() ++ find_library(_lz4_libraries NAMES lz4 liblz4 PATHS $ENV{MYSQL_DIR}/lib ${PC_MYSQL_LIBDIR} ${PC_MYSQL_LIBRARY_DIRS}) ++ if (_lz4_libraries) ++ message(STATUS ".. adding ${_lz4_libraries}") ++ list(APPEND MYSQLE_LIBRARIES ${_lz4_libraries}) ++ endif() ++ message(STATUS ".. compile-checking ${MYSQLE_LIBRARIES}") ++ unset(HAVE_MYSQL_OPT_EMBEDDED_CONNECTION) + cmake_push_check_state() + set(CMAKE_REQUIRED_INCLUDES ${MYSQL_INCLUDE_DIR}) + set(CMAKE_REQUIRED_LIBRARIES ${MYSQLE_LIBRARIES}) |