Date: Sat, 6 Jul 2019 12:27:31 +0000 (UTC) From: Dima Panov <fluffy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r505985 - in head/audio/amarok: . files Message-ID: <201907061227.x66CRVEW013845@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fluffy Date: Sat Jul 6 12:27:30 2019 New Revision: 505985 URL: https://svnweb.freebsd.org/changeset/ports/505985 Log: - Update AmaroK to 2.9.70 snapshot - Teach mysql library plugins to use SSL/Crypto libs directly - Allow to find and use mysql embedded library from MariaDB/PerconaDB Added: head/audio/amarok/files/patch-CMakeLists.txt (contents, props changed) head/audio/amarok/files/patch-src_core-impl_storage_sql_mysqlestorage_CMakeLists.txt (contents, props changed) head/audio/amarok/files/patch-src_core-impl_storage_sql_mysqlserverstorage_CMakeLists.txt (contents, props changed) Modified: head/audio/amarok/Makefile head/audio/amarok/distinfo head/audio/amarok/files/patch-cmake_modules_FindMySQL.cmake Modified: head/audio/amarok/Makefile ============================================================================== --- head/audio/amarok/Makefile Sat Jul 6 12:26:23 2019 (r505984) +++ head/audio/amarok/Makefile Sat Jul 6 12:27:30 2019 (r505985) @@ -2,9 +2,9 @@ PORTNAME= amarok DISTVERSIONPREFIX= v -DISTVERSION= 2.9.0-277 -DISTVERSIONSUFFIX= -gd50ecc430c -PORTREVISION= 4 +DISTVERSION= 2.9.70 +PKGVERSIONSUFFIX= -g${GH_TAGNAME} +PORTREVISION= 0 CATEGORIES= audio kde MAINTAINER= kde@FreeBSD.org @@ -30,7 +30,7 @@ USE_QT= core concurrent declarative dbus gui location webkit widgets xml \ buildtools_build qmake_build -USE_KDE= archive auth attica bookmarks codecs config configwidgets \ +USE_KDE= archive auth attica bookmarks codecs config configwidgets \ completion coreaddons crash dbusaddons dnssd globalaccel \ guiaddons i18n iconthemes itemviews jobwidgets kdeclarative \ kcmutils kio kirigami2 newstuff notifications notifyconfig \ @@ -42,6 +42,7 @@ USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= kde +GH_TAGNAME= 0aa6ae0c77 SHEBANG_FILES= src/kconf_update/amarok-2.4.1-tokens_syntax_update.pl CMAKE_ARGS= -DOPENSSL_ROOT_DIR=${OPENSSLBASE} @@ -67,6 +68,7 @@ IPOD_CMAKE_BOOL= WITH_IPOD MP3TUNES_DESC= MP3tunes support MP3TUNES_LIB_DEPENDS= libloudmouth-1.so:net-im/loudmouth \ libcurl.so:ftp/curl +MP3TUNES_LIB_DEPENDS_OFF= libgcrypt.so:security/libgcrypt MP3TUNES_USE= GNOME=glib20,libxml2 MP3TUNES_USES= gnome ssl Modified: head/audio/amarok/distinfo ============================================================================== --- head/audio/amarok/distinfo Sat Jul 6 12:26:23 2019 (r505984) +++ head/audio/amarok/distinfo Sat Jul 6 12:27:30 2019 (r505985) @@ -1,3 +1,3 @@ -TIMESTAMP = 1545825317 -SHA256 (kde-amarok-v2.9.0-277-gd50ecc430c_GH0.tar.gz) = e1dc7d1fe11f88a4b71e69ebeb94b62c63db6f1f5ac52ddeed89d92343108e9f -SIZE (kde-amarok-v2.9.0-277-gd50ecc430c_GH0.tar.gz) = 21062595 +TIMESTAMP = 1558016091 +SHA256 (kde-amarok-v2.9.70-0aa6ae0c77_GH0.tar.gz) = 2c236fb6853d697f3cb80bfc8289c2bdfa39098b662938143bc6b287f4c7cb84 +SIZE (kde-amarok-v2.9.70-0aa6ae0c77_GH0.tar.gz) = 21070462 Added: head/audio/amarok/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/amarok/files/patch-CMakeLists.txt Sat Jul 6 12:27:30 2019 (r505985) @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2019-04-30 03:42:56 UTC ++++ CMakeLists.txt +@@ -207,6 +207,8 @@ if( WITH_PLAYER ) + # zlib is required for mysql embedded + find_package(ZLIB REQUIRED) + set_package_properties( ZLIB PROPERTIES DESCRIPTION "zlib" TYPE REQUIRED ) ++ # SSL is required for mysql embedded ++ find_package(OpenSSL REQUIRED) + + # We tell users that we need 1.0.3, but we really check just >= 1.0.0. This is because + # upstream forgot to update version in lastfm/global.h, so it looks like 1.0.2. :-( Modified: head/audio/amarok/files/patch-cmake_modules_FindMySQL.cmake ============================================================================== --- head/audio/amarok/files/patch-cmake_modules_FindMySQL.cmake Sat Jul 6 12:26:23 2019 (r505984) +++ head/audio/amarok/files/patch-cmake_modules_FindMySQL.cmake Sat Jul 6 12:27:30 2019 (r505985) @@ -1,6 +1,6 @@ ---- cmake/modules/FindMySQL.cmake.orig 2019-06-14 07:24:31 UTC +--- cmake/modules/FindMySQL.cmake.orig 2019-04-30 03:42:56 UTC +++ cmake/modules/FindMySQL.cmake -@@ -31,21 +31,7 @@ if(MYSQLCONFIG_EXECUTABLE) +@@ -31,18 +31,20 @@ if(MYSQLCONFIG_EXECUTABLE) OUTPUT_STRIP_TRAILING_WHITESPACE ) @@ -11,15 +11,41 @@ - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - -- if(NOT MC_MYSQL_EMBEDDED_LIBRARIES) -- # At least on OpenSUSE --libmysql-libs doesn't exist, so we just use -- # MYSQL_LIBRARIES for that. We'll see if that's enough when testing -- # below. + if(NOT MC_MYSQL_EMBEDDED_LIBRARIES) + # At least on OpenSUSE --libmysql-libs doesn't exist, so we just use + # MYSQL_LIBRARIES for that. We'll see if that's enough when testing + # below. - set(MYSQL_EMBEDDED_LIBRARIES ${MYSQL_LIBRARIES}) -- else() -- set(MYSQL_EMBEDDED_LIBRARIES ${MC_MYSQL_EMBEDDED_LIBRARIES}) -- endif() -+ set(MYSQL_EMBEDDED_LIBRARIES "-L/usr/local/lib/mysql" -lmysqld -llz4) - endif() - ++ # mysql-config removed --libmysql-libs, but amarok need libmysqld other ++ # than libmysqlclient to run mysql embedded server. ++ find_library(MYSQL_EMBEDDED_LIBRARIES NAMES mysqld libmysqld ++ PATHS ++ $ENV{MYSQL_DIR}/libmysql_r/.libs ++ $ENV{MYSQL_DIR}/lib ++ $ENV{MYSQL_DIR}/lib/mysql ++ PATH_SUFFIXES ++ mysql ++ ) + else() + set(MYSQL_EMBEDDED_LIBRARIES ${MC_MYSQL_EMBEDDED_LIBRARIES}) + endif() +@@ -51,7 +53,7 @@ endif() # Try searching manually via find_path/find_library, possibly with hints + # from pkg-config + find_package(PkgConfig) +-pkg_check_modules(PC_MYSQL QUIET mysql mariadb) ++pkg_check_modules(PC_MYSQL QUIET mysql mariadb perconaserverclient) + + find_path(MYSQL_INCLUDE_DIR mysql.h + PATHS +@@ -101,6 +103,10 @@ if(MYSQL_EMBEDDED_LIBRARIES) + # string(STRIP ${_mysql_libs} _mysql_libs) + # set(MYSQL_EMBEDDED_LIBRARIES ${_mysql_libs}) + #endif() ++ ++ string(CONCAT MC_MYSQL_LIBRARIES ${MYSQL_LIBRARIES} " -llz4") ++ string(STRIP ${MC_MYSQL_LIBRARIES} MC_MYSQL_LIBRARIES) ++ set(MYSQL_LIBRARIES ${MC_MYSQL_LIBRARIES}) + cmake_push_check_state() + set(CMAKE_REQUIRED_INCLUDES ${MYSQL_INCLUDE_DIR}) + set(CMAKE_REQUIRED_LIBRARIES ${MYSQL_EMBEDDED_LIBRARIES}) Added: head/audio/amarok/files/patch-src_core-impl_storage_sql_mysqlestorage_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/amarok/files/patch-src_core-impl_storage_sql_mysqlestorage_CMakeLists.txt Sat Jul 6 12:27:30 2019 (r505985) @@ -0,0 +1,11 @@ +--- src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt.orig 2019-04-30 03:42:56 UTC ++++ src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt +@@ -25,6 +25,8 @@ target_link_libraries(amarok_storage-mysqlestorage + ${MYSQL_EMBEDDED_LIBRARIES} + ${CMAKE_DL_LIBS} + ${ZLIB_LIBRARIES} ++ ${OPENSSL_SSL_LIBRARY} ++ ${OPENSSL_CRYPTO_LIBRARY} + ) + + if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "FreeBSD") Added: head/audio/amarok/files/patch-src_core-impl_storage_sql_mysqlserverstorage_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/amarok/files/patch-src_core-impl_storage_sql_mysqlserverstorage_CMakeLists.txt Sat Jul 6 12:27:30 2019 (r505985) @@ -0,0 +1,11 @@ +--- src/core-impl/storage/sql/mysqlserverstorage/CMakeLists.txt.orig 2019-04-30 03:42:56 UTC ++++ src/core-impl/storage/sql/mysqlserverstorage/CMakeLists.txt +@@ -25,6 +25,8 @@ target_link_libraries(amarok_storage-mysqlserverstorag + ${MYSQL_LIBRARIES} + ${CMAKE_DL_LIBS} + ${ZLIB_LIBRARIES} ++ ${OPENSSL_SSL_LIBRARY} ++ ${OPENSSL_CRYPTO_LIBRARY} + ) + + if(NOT WIN32 AND NOT APPLE)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907061227.x66CRVEW013845>