From 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 14 Dec 2020 13:26:14 +0000 Subject: gentoo resync : 14.12.2020 --- media-libs/liblastfm/Manifest | 6 +- .../liblastfm-1.1.0_pre20150206-qt-5.11b3.patch | 302 --------------------- .../liblastfm-1.1.0_pre20190625-missing-dep.patch | 28 ++ .../liblastfm/liblastfm-1.1.0_pre20150206.ebuild | 51 ---- .../liblastfm/liblastfm-1.1.0_pre20190625.ebuild | 48 ++++ 5 files changed, 79 insertions(+), 356 deletions(-) delete mode 100644 media-libs/liblastfm/files/liblastfm-1.1.0_pre20150206-qt-5.11b3.patch create mode 100644 media-libs/liblastfm/files/liblastfm-1.1.0_pre20190625-missing-dep.patch delete mode 100644 media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild create mode 100644 media-libs/liblastfm/liblastfm-1.1.0_pre20190625.ebuild (limited to 'media-libs/liblastfm') diff --git a/media-libs/liblastfm/Manifest b/media-libs/liblastfm/Manifest index 5747836032a2..b00efbf2db6a 100644 --- a/media-libs/liblastfm/Manifest +++ b/media-libs/liblastfm/Manifest @@ -1,4 +1,4 @@ -AUX liblastfm-1.1.0_pre20150206-qt-5.11b3.patch 9192 BLAKE2B 0c4e96448692869202514ad54e0c1b371e839c9f9c4ea6ff9b085fc28f29d9f65912cd501d0c83b442242e292f868eb1d79eea6e36d20ef967cab9fb681b6b2b SHA512 f88acaed5b7a53e7e4ab47100a769a88c9579f373b7d6d305b8fd9ccd3cc749a5d5ec544e0d8f30734d940016bb8ce23e49ffc4347afd87601ad013a7111bacb -DIST liblastfm-1.1.0_pre20150206.tar.gz 119380 BLAKE2B ec532b7577e60c02f9e8202b06e4e496b052801d60a27795d58204c6fbec62eea24512979ea9e42f643e7cfc01794982e07b808f6411b884893e13c29d9e17b0 SHA512 984d4b6b36a12e019e486425d243fc5be24fc3968b30f7ec746204c976b9c526477d56793205c9a6eed79bff1b33a2b1c7063d1d08fd376c4b89346337d8b166 -EBUILD liblastfm-1.1.0_pre20150206.ebuild 1080 BLAKE2B 317ad17291bc477d59d761cd15fa3facd3389777d966b42b76b408726527094e0b65cb11c0d74194795f0fb92e78a320c2ad1904270f711f6800c9a40319dc5a SHA512 f7a09d4190eb8efa296b18f27a715bb64713de375ede6b1c70745df4bab90a77709c5a2dc34bb204bd46ad0dc17d3dbba39f6c4ad218fa10f7812729e8e14d41 +AUX liblastfm-1.1.0_pre20190625-missing-dep.patch 766 BLAKE2B 87172764568e132717a88d42ce66f2c33453a2c506a1fcfa4200172d8ad88f353fa2d625397c38589fb6ee83674b4b45d64c78532e3513a3c738fd7dc7c89cf5 SHA512 d983704f7c4e10135b8399e0786f9f69974f44e0a3b5035d2b482cd2154ebfa066d4b2c874fd65c6a25b91a218518498f36aea54928603467a95c95bc5fc10c9 +DIST liblastfm-1.1.0_pre20190625.tar.gz 119348 BLAKE2B d4755d6dfe6dc8bb4c21e1f4ed94fd96165313111a553271e518ad57f08aab45980239a51416d6e99d87a86f7859c7ea04ba81fb06f6dfa61b2aa7f554935589 SHA512 ee36cc31e1f7b345e2de29ff4151acb7bbe30960bbf2528bf8eb5214a47272955efe3bd1c6e20af8dd22a4fbc510de34befdcd6c728683ae300bd45e578e5ebb +EBUILD liblastfm-1.1.0_pre20190625.ebuild 1069 BLAKE2B 7e676bf61ed54474a790055acd1cb4f5e263fca9229ac653be61304fdafdfc88441d5077f150a5ae03881b138da8d729175bd3cdb8c90a5c41c8cdfbc4dcee2b SHA512 08465b758fe6a98cb909fee8d60588e28c8118596314557f961721a53b71d12e048579b0d9f12fd7333e7f6e2e3775c9d4a0459360787b97243c1a10d8dbb4bc MISC metadata.xml 416 BLAKE2B 8f559223d9c09d5bcb551e582240252467d3846806e2d1ca1c2fe243286cd88b7f5760ec8313f15924b4041f55937c08795df1d4485e96c6523721c910b33efd SHA512 61b4387e1a4d837b28f13a7c705f1ab043fefb1ef80dda47399d52cb1a14ba79127f323967eb2e993fd6118375f134d9894fea9e132cc147c883758d1d5222a6 diff --git a/media-libs/liblastfm/files/liblastfm-1.1.0_pre20150206-qt-5.11b3.patch b/media-libs/liblastfm/files/liblastfm-1.1.0_pre20150206-qt-5.11b3.patch deleted file mode 100644 index fc0e9b8938dd..000000000000 --- a/media-libs/liblastfm/files/liblastfm-1.1.0_pre20150206-qt-5.11b3.patch +++ /dev/null @@ -1,302 +0,0 @@ -From 62a08d490a1e75e3ef5d08f3fb37e65c1563e706 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 1 Apr 2018 11:51:42 +0200 -Subject: [PATCH 1/4] Make Qt5 build default and simplify logic, add missing - deps - ---- - CMakeLists.txt | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index be88967..e628611 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -27,19 +27,19 @@ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Module - # setup qt stuff - set(CMAKE_AUTOMOC ON) - --option(BUILD_WITH_QT4 "Build liblastfm with Qt4 no matter if Qt5 was found" OFF) -+option(BUILD_WITH_QT4 "Build liblastfm with Qt4" OFF) - --if( NOT BUILD_WITH_QT4 ) -- # try Qt5 first, and prefer that if found -- find_package(Qt5Core QUIET) --endif() -+if(NOT BUILD_WITH_QT4) -+ find_package(Qt5 REQUIRED COMPONENTS Core Network Xml CONFIG) -+ -+ if(BUILD_FINGERPRINT) -+ find_package(Qt5Sql REQUIRED CONFIG) -+ endif() - --if(Qt5Core_DIR) - set(LASTFM_LIB_VERSION_SUFFIX 5) -- message(STATUS "Found Qt5! Please keep in mind, this is highly experimental and not our main development target..") - include_directories(${Qt5Core_INCLUDE_DIRS}) - if(UNIX AND NOT APPLE) -- find_package(Qt5DBus REQUIRED) -+ find_package(Qt5DBus REQUIRED CONFIG) - endif() - - # macro(qt_wrap_ui) --- -2.17.0 - - -From ff32d56e5e1bd8b1f86a8e9840c778249ff19118 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 1 Apr 2018 11:56:48 +0200 -Subject: [PATCH 2/4] Make use of FeatureSummary - ---- - CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e628611..dcdfd91 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -20,6 +20,7 @@ option(BUILD_TESTS "Build liblastfm tests" ON) - - # installation dirs - include(GNUInstallDirs) -+include(FeatureSummary) - - #cmake module path - set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules") -@@ -97,3 +98,5 @@ if(BUILD_TESTS) - enable_testing() - add_subdirectory(tests) - endif() -+ -+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) --- -2.17.0 - - -From 5762278b29c1ab6559dcca7a1e8fbad1d75134da Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 1 Apr 2018 12:06:48 +0200 -Subject: [PATCH 3/4] Cleanup include dirs - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dcdfd91..52589b5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -38,10 +38,10 @@ if(NOT BUILD_WITH_QT4) - endif() - - set(LASTFM_LIB_VERSION_SUFFIX 5) -- include_directories(${Qt5Core_INCLUDE_DIRS}) - if(UNIX AND NOT APPLE) - find_package(Qt5DBus REQUIRED CONFIG) - endif() -+ include_directories(Qt5::Core Qt5::Network Qt5::Xml) - - # macro(qt_wrap_ui) - # qt5_wrap_ui(${ARGN}) --- -2.17.0 - - -From aeb0cbc56376021444a56a984613faacefedfea9 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 15 Apr 2018 21:31:14 +0200 -Subject: [PATCH 4/4] Fix build with Qt 5.11_beta3 (drop qt5_use_modules) - ---- - CMakeLists.txt | 3 -- - src/CMakeLists.txt | 63 +++++++++++++++++++--------------- - src/fingerprint/CMakeLists.txt | 20 ++++++----- - tests/lastfm_add_test.cmake | 16 +++++---- - 4 files changed, 55 insertions(+), 47 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 52589b5..c8bc89d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -57,9 +57,6 @@ if(NOT BUILD_WITH_QT4) - # endmacro() - else() - find_package(Qt4 COMPONENTS QtCore QtNetwork QtXml REQUIRED) -- -- macro(qt5_use_modules) -- endmacro() - endif() - - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 0f872fb..22ce506 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -3,16 +3,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/global.h.in ${CMAKE_CURRENT_BINARY_DI - - add_definitions(${QT_DEFINITIONS}) - include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}) --set(liblastfm_LIBRARIES -- ${QT_QTCORE_LIBRARY} -- ${QT_QTNETWORK_LIBRARY} -- ${QT_QTXML_LIBRARY} --) -- --list(APPEND liblastfm_QT5_MODULES -- Xml -- Network --) - - set(liblastfm_SOURCES - ws.cpp -@@ -49,15 +39,11 @@ if(WIN32) - if(NOT MINGW) - add_definitions("-D_ATL_DLL -D_CRT_SECURE_NO_WARNINGS") - -- list(APPEND liblastfm_SOURCES -+ set(liblastfm_SOURCES ${liblastfm_SOURCES} - win/WNetworkConnectionMonitor_win.cpp - win/WmiSink.cpp - win/NdisEvents.cpp - ) -- list(APPEND liblastfm_LIBRARIES -- winhttp -- wbemuuid -- ) - endif() - endif() - -@@ -67,30 +53,51 @@ if(APPLE) - #set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5) - #set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX${CMAKE_OSX_DEPLOYMENT_TARGET}.sdk") - -- list(APPEND liblastfm_SOURCES -+ set(liblastfm_SOURCES ${liblastfm_SOURCES} - mac/MNetworkConnectionMonitor_mac.cpp - ) -- -- find_library(SYSTEMCONFIGURATION_LIBRARY SystemConfiguration) -- find_library(COREFOUNDATION_LIBRARY CoreFoundation) -- list(APPEND liblastfm_LIBRARIES -- ${COREFOUNDATION_LIBRARY} -- ${SYSTEMCONFIGURATION_LIBRARY} -- ) - endif() - - if(UNIX AND NOT APPLE) -- list(APPEND liblastfm_SOURCES -+ set(liblastfm_SOURCES ${liblastfm_SOURCES} - linux/LNetworkConnectionMonitor_linux.cpp - ) -- list(APPEND liblastfm_LIBRARIES ${QT_QTDBUS_LIBRARY}) -- list(APPEND liblastfm_QT5_MODULES DBus) - endif() - - add_library(${LASTFM_LIB_TARGET_NAME} SHARED ${liblastfm_SOURCES}) --qt5_use_modules(${LASTFM_LIB_TARGET_NAME} ${liblastfm_QT5_MODULES}) - --target_link_libraries(${LASTFM_LIB_TARGET_NAME} ${liblastfm_LIBRARIES}) -+if(Qt5Core_DIR) -+ target_link_libraries(${LASTFM_LIB_TARGET_NAME} Qt5::Network Qt5::Xml) -+ if(UNIX AND NOT APPLE) -+ target_link_libraries(${LASTFM_LIB_TARGET_NAME} Qt5::DBus) -+ endif() -+else() -+ target_link_libraries(${LASTFM_LIB_TARGET_NAME} -+ ${QT_QTCORE_LIBRARY} -+ ${QT_QTNETWORK_LIBRARY} -+ ${QT_QTXML_LIBRARY} -+ ) -+ if(UNIX AND NOT APPLE) -+ target_link_libraries(${LASTFM_LIB_TARGET_NAME} ${QT_QTDBUS_LIBRARY}) -+ endif() -+endif() -+ -+if(WIN32 AND NOT MINGW) -+ target_link_libraries(${LASTFM_LIB_TARGET_NAME} -+ winhttp -+ wbemuuid -+ ) -+endif() -+ -+if(APPLE) -+ find_library(SYSTEMCONFIGURATION_LIBRARY SystemConfiguration) -+ find_library(COREFOUNDATION_LIBRARY CoreFoundation) -+ target_link_libraries(${LASTFM_LIB_TARGET_NAME} -+ ${COREFOUNDATION_LIBRARY} -+ ${SYSTEMCONFIGURATION_LIBRARY} -+ ) -+endif() -+ - set_target_properties(${LASTFM_LIB_TARGET_NAME} PROPERTIES - VERSION ${LASTFM_VERSION_STRING} - SOVERSION ${LASTFM_SOVERSION} -diff --git a/src/fingerprint/CMakeLists.txt b/src/fingerprint/CMakeLists.txt -index 126f8d9..4a74e0d 100644 ---- a/src/fingerprint/CMakeLists.txt -+++ b/src/fingerprint/CMakeLists.txt -@@ -26,21 +26,23 @@ set(lastfm_fingerprint_HEADERS - - add_library(${FINGERPRINT_LIB_TARGET_NAME} SHARED ${lastfm_fingerprint_SOURCES}) - --target_link_libraries(${FINGERPRINT_LIB_TARGET_NAME} -- ${LASTFM_LIB_TARGET_NAME} -- ${QT_QTSQL_LIBRARY} -- ${QT_QTCORE_LIBRARY} -- ${LIBSAMPLERATE_LIBRARY} -- ${LIBFFTW3_LIBRARY} --) -- - set_target_properties(${FINGERPRINT_LIB_TARGET_NAME} PROPERTIES - COMPILE_DEFINITIONS LASTFM_FINGERPRINT_LIB - VERSION ${LASTFM_VERSION_STRING} - SOVERSION ${LASTFM_SOVERSION} - ) - --qt5_use_modules(${FINGERPRINT_LIB_TARGET_NAME} Network Sql Xml) -+target_link_libraries(${FINGERPRINT_LIB_TARGET_NAME} -+ ${LASTFM_LIB_TARGET_NAME} -+ ${LIBSAMPLERATE_LIBRARY} -+ ${LIBFFTW3_LIBRARY} -+) -+ -+if(Qt5Core_DIR) -+ target_link_libraries(${FINGERPRINT_LIB_TARGET_NAME} Qt5::Network Qt5::Sql Qt5::Xml) -+else() -+ target_link_libraries(${FINGERPRINT_LIB_TARGET_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTSQL_LIBRARY}) -+endif() - - install(TARGETS ${FINGERPRINT_LIB_TARGET_NAME} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -diff --git a/tests/lastfm_add_test.cmake b/tests/lastfm_add_test.cmake -index a4a1686..2f0664d 100644 ---- a/tests/lastfm_add_test.cmake -+++ b/tests/lastfm_add_test.cmake -@@ -6,13 +6,15 @@ macro(lastfm_add_test test_class) - configure_file(Test${LASTFM_TEST_CLASS}.h Test${LASTFM_TEST_CLASS}.h) - add_executable(${LASTFM_TEST_CLASS}Test Test${LASTFM_TEST_CLASS}.cpp) - -- qt5_use_modules(${LASTFM_TEST_CLASS}Test Core Test Xml Network) -- -- target_link_libraries(${LASTFM_TEST_CLASS}Test -- ${LASTFM_LIB_TARGET_NAME} -- ${QT_QTTEST_LIBRARY} -- ${QT_QTCORE_LIBRARY} -- ) -+ if(Qt5Core_DIR) -+ target_link_libraries(${LASTFM_TEST_CLASS}Test Qt5::Core Qt5::Test Qt5::Xml Qt5::Network -+ ${LASTFM_LIB_TARGET_NAME} -+ ) -+ else() -+ target_link_libraries(${LASTFM_TEST_CLASS}Test ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} -+ ${LASTFM_LIB_TARGET_NAME} -+ ) -+ endif() - - add_test(NAME ${LASTFM_TEST_CLASS}Test COMMAND ${LASTFM_TEST_CLASS}Test) - endmacro() --- -2.17.0 - diff --git a/media-libs/liblastfm/files/liblastfm-1.1.0_pre20190625-missing-dep.patch b/media-libs/liblastfm/files/liblastfm-1.1.0_pre20190625-missing-dep.patch new file mode 100644 index 000000000000..e36a01c15838 --- /dev/null +++ b/media-libs/liblastfm/files/liblastfm-1.1.0_pre20190625-missing-dep.patch @@ -0,0 +1,28 @@ +From 9264fbecf8c7e910fa038ab372376ecc9b8c403c Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sat, 12 Dec 2020 17:09:58 +0100 +Subject: [PATCH] Add missing -DBUILD_TESTS dependency Qt5Test + +Signed-off-by: Andreas Sturmlechner +--- + CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d4fd670..bb5a895 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -37,6 +37,10 @@ if(NOT BUILD_WITH_QT4) + find_package(Qt5Sql REQUIRED CONFIG) + endif() + ++ if(BUILD_TESTS) ++ find_package(Qt5Test CONFIG REQUIRED) ++ endif() ++ + set(LASTFM_LIB_VERSION_SUFFIX 5) + if(UNIX AND NOT APPLE) + find_package(Qt5DBus REQUIRED CONFIG) +-- +2.29.2 + diff --git a/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild b/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild deleted file mode 100644 index c539e6a7b1fa..000000000000 --- a/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -COMMIT=44331654256df83bc1d3cbb271a8ce3d4c464686 -inherit cmake - -DESCRIPTION="Collection of libraries to integrate Last.fm services" -HOMEPAGE="https://github.com/lastfm/liblastfm" -SRC_URI="https://github.com/lastfm/liblastfm/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" -SLOT="0/0" -IUSE="fingerprint test" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtxml:5 - fingerprint? ( - dev-qt/qtsql:5 - media-libs/libsamplerate - sci-libs/fftw:3.0 - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - test? ( dev-qt/qttest:5 ) -" - -# 1 of 2 (UrlBuilderTest) is failing, last checked version 1.0.9 -RESTRICT="test" - -S="${WORKDIR}/${PN}-${COMMIT}" - -PATCHES=( "${FILESDIR}/${P}-qt-5.11b3.patch" ) - -src_configure() { - # demos not working - local mycmakeargs=( - -DBUILD_DEMOS=OFF - -DBUILD_WITH_QT4=OFF - -DBUILD_FINGERPRINT=$(usex fingerprint) - -DBUILD_TESTS=$(usex test) - ) - - cmake_src_configure -} diff --git a/media-libs/liblastfm/liblastfm-1.1.0_pre20190625.ebuild b/media-libs/liblastfm/liblastfm-1.1.0_pre20190625.ebuild new file mode 100644 index 000000000000..e7a0b783f0a5 --- /dev/null +++ b/media-libs/liblastfm/liblastfm-1.1.0_pre20190625.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +COMMIT=f867df52757c569d97d9755c911ac9dec146f365 +inherit cmake + +DESCRIPTION="Collection of libraries to integrate Last.fm services" +HOMEPAGE="https://github.com/lastfm/liblastfm" +SRC_URI="https://github.com/lastfm/liblastfm/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${COMMIT}" + +LICENSE="GPL-3" +KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" +SLOT="0/0" +IUSE="fingerprint test" + +# 1 of 2 (UrlBuilderTest) is failing, last checked version 1.0.9 +RESTRICT="test" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtxml:5 + fingerprint? ( + dev-qt/qtsql:5 + media-libs/libsamplerate + sci-libs/fftw:3.0 + ) +" +DEPEND="${RDEPEND} + test? ( dev-qt/qttest:5 ) +" + +PATCHES=( "${FILESDIR}/${P}-missing-dep.patch" ) + +src_configure() { + # demos not working + local mycmakeargs=( + -DBUILD_DEMOS=OFF + -DBUILD_WITH_QT4=OFF + -DBUILD_FINGERPRINT=$(usex fingerprint) + -DBUILD_TESTS=$(usex test) + ) + cmake_src_configure +} -- cgit v1.2.3