From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- media-sound/flacon/Manifest | 8 +- .../flacon/files/flacon-5.5.1-ninja-warning.patch | 63 +++++++++++++++ .../files/flacon-5.5.1-no-man-compress.patch | 23 ++++++ media-sound/flacon/flacon-4.1.0.ebuild | 3 +- media-sound/flacon/flacon-5.5.1.ebuild | 89 ++++++++++++++++++++++ media-sound/flacon/metadata.xml | 3 +- 6 files changed, 184 insertions(+), 5 deletions(-) create mode 100644 media-sound/flacon/files/flacon-5.5.1-ninja-warning.patch create mode 100644 media-sound/flacon/files/flacon-5.5.1-no-man-compress.patch create mode 100644 media-sound/flacon/flacon-5.5.1.ebuild (limited to 'media-sound/flacon') diff --git a/media-sound/flacon/Manifest b/media-sound/flacon/Manifest index 891640d69164..f7f5e97eb402 100644 --- a/media-sound/flacon/Manifest +++ b/media-sound/flacon/Manifest @@ -1,3 +1,7 @@ +AUX flacon-5.5.1-ninja-warning.patch 2227 BLAKE2B 07957a0d79d3c6d8c228ba00f1232c5e2071f6868097ff891ee00473ade0f01f32ec8a9ea8fdf55ea7681d82e9c023382dcf978d828a7a0c0a2b05053b36d070 SHA512 77755301347b562f1f0003d13cd933f98e3bd9041ec9e1f8c6d4daf6e4185197cbec7f7c9ee584ef3948594c98eba13ddc509350f3329c5753430d12090b1d31 +AUX flacon-5.5.1-no-man-compress.patch 1089 BLAKE2B e4757b39f3ccbfb60e0298ed091718c809fa224d53d4cc0e15ae1f65e11d8698a5434bd3099bae3932b4931a7624ce9c00334e8503c2131a0d61d075642dc730 SHA512 a975329808a5642d4684d03c9261073633f394d789ac5b28dd30e0028a7ee8503a447644d5911a1bcd24c89fbab6279e3228dc21462f277aec9ef040b784703f DIST flacon-4.1.0.tar.gz 1579869 BLAKE2B 6e0bf31f0eb47bf594d74e0f058f333daa9ee84f9313e75e059f1568386c20f79482926f6f786d332ecfbb72c3991e346a7b98ab8f27a2a4b4ce5c195c23d6bb SHA512 4e786571ba3e157aad2dc27523f8b9de259b44b84c7b054124a610199ef19855832000e4499d18bd6f725f2133bbbbf8d0d75f1cafbdce918605c3b407f6b0ef -EBUILD flacon-4.1.0.ebuild 2487 BLAKE2B 6d785d27fd85a20e1fce1c825af29c94c10f38b47fb2e005c5d56f6bf0d3514b894d1668e120281b45ef432112f1d02a70a885b2400696cf2ee98379e12298ea SHA512 8625a895f8cadce399892eb931ae3b851d4496a26f2faec61f6e480eb8f1415035140854d0de9adab753a685eb601453c82b95493d7b7f256e3e52daff7bb9bc -MISC metadata.xml 306 BLAKE2B 2ac342c7a4c650d7a02d359e8e30daf71d3a8001b1a104bd51dbece75211a74a6aa459edb914ee843d5d37c81f187ec7a1c43cee796b835941b8c3a30965089c SHA512 ebd3af9217f23911f93ef04d7176dd1524e31ac5e2842a51e1efa3e025c9d864cc71070adea0287ea1b465dd15cf17ba47e3bcfc1b96b5c9ceb5962b177f7e5a +DIST flacon-5.5.1.tar.gz 2336502 BLAKE2B 524fe5fa28126f56452515ca1ce1572343dad8b06c28fc8e3a22a11e9ad8f3a51a25b3c19ddd29a7e3c658f1d7fb3316a2554a12a4ba3dd22370fc1394d38022 SHA512 36900b011135b61cf3cc1f05d94f852fc7e127972f3fed09e0fb7e66fec944ed1c3bfc61307494aff87c2fe24e16479605043a79e0634bc23940d01fc337c6c1 +EBUILD flacon-4.1.0.ebuild 2511 BLAKE2B 92ca36c74b7f0ce0db0c6bb8fdb4f6dfd04335e13e5fa7d7b952d1c89e8b8313744eb20b62c6c4043183c36936ad855ada0b7f9062667e53834ae744a20a22a6 SHA512 5de628e97ae4f9d2e7a7f746d9835e96c1451bb3eb5a3bfb93f0628d2ae7e7013152163f74caa09c38a8c49036bef4cca4b9b2c19fb083f021e90fe677d53002 +EBUILD flacon-5.5.1.ebuild 2064 BLAKE2B 35467ab737b7db36875d3b7c9c244da2ec9f187f96dd45b658096b5ce534ab3c86023c760d8f36b09f2c145e673962340532e507e23256ed23d33966b551c57e SHA512 ff565ccca8a127ac4b7fca1785b47e562c3cd10409d45d73b63e1496d3fcc60c8dca0e3cf2bb380d2ed4deb0ea7afa80dc052fa8388633151993c35bc31026e5 +MISC metadata.xml 245 BLAKE2B d65195b37ab70bec146facd788d5a6239a7795c578130cb5703bf89e7a92da8acf8f4840e7f867d61359b57f0b002396a9e959cb9d2bbee2654003bc8ee061ff SHA512 be2b5dde02a39ab7345c9918796ce93c2356899fed6beb96b43f93b81eeb96a74020d2e606a5a33f95dfafa1bdef23620ab3214c2744c5e418beb7e8df1e9ae1 diff --git a/media-sound/flacon/files/flacon-5.5.1-ninja-warning.patch b/media-sound/flacon/files/flacon-5.5.1-ninja-warning.patch new file mode 100644 index 000000000000..358e0464c80c --- /dev/null +++ b/media-sound/flacon/files/flacon-5.5.1-ninja-warning.patch @@ -0,0 +1,63 @@ +From bc6346175db9f89777141b6d17b52143b3caafeb Mon Sep 17 00:00:00 2001 +From: Alexander Sokolov +Date: Mon, 21 Oct 2019 22:08:18 +0300 +Subject: [PATCH] Fixed issue #104. Correct CMake policy CMP0058 warnings. + +--- + CMakeLists.txt | 10 +++++++++- + translations/translatorsinfo.cmake | 10 ++-------- + 2 files changed, 11 insertions(+), 9 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1fbbca2..95f25cd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -244,7 +244,15 @@ include(FindPkgConfig) + pkg_search_module(UCHARDET REQUIRED uchardet) + + include(translations/translatorsinfo.cmake) +-create_translatorsinfo_qrc(TRANSLATORS_INFO_QRC translations) ++add_custom_target("translators") ++add_custom_command( ++ TARGET "translators" ++ PRE_BUILD ++ BYPRODUCTS ${TRANSLATORS_INFO_FILE} ++ COMMAND create_translatorsinfo_qrc(TRANSLATORS_INFO_QRC translations) ++) ++ ++ + set(LIBRARIES ${LIBRARIES} ${UCHARDET_LIBRARIES}) + include_directories(${UCHARDET_INCLUDE_DIRS}) + link_directories(${UCHARDET_LIBRARY_DIRS}) +diff --git a/translations/translatorsinfo.cmake b/translations/translatorsinfo.cmake +index b439a05..650174b 100644 +--- a/translations/translatorsinfo.cmake ++++ b/translations/translatorsinfo.cmake +@@ -23,13 +23,11 @@ + # + # END_COMMON_COPYRIGHT_HEADER + ++set(TRANSLATORS_INFO_FILE ${CMAKE_CURRENT_BINARY_DIR}/translators.info) + + FUNCTION(create_translatorsinfo_qrc _qrcFile _DIR) + get_filename_component(srcDir ${_DIR}/ ABSOLUTE) + +- +- set(TRANSLATORS_INFO_FILE ${CMAKE_CURRENT_BINARY_DIR}/translators.info) +- + file(GLOB IN_FILES ${srcDir}/translators_*.info) + file(WRITE ${TRANSLATORS_INFO_FILE} "") + +@@ -42,11 +40,7 @@ FUNCTION(create_translatorsinfo_qrc _qrcFile _DIR) + + configure_file(${srcDir}/translatorsinfo.qrc.in ${CMAKE_CURRENT_BINARY_DIR}/translatorsinfo.qrc) + +- if(USE_QT4) +- qt4_add_resources(__qrcFile ${CMAKE_CURRENT_BINARY_DIR}/translatorsinfo.qrc) +- else() +- qt5_add_resources(__qrcFile ${CMAKE_CURRENT_BINARY_DIR}/translatorsinfo.qrc) +- endif() ++ qt5_add_resources(__qrcFile ${CMAKE_CURRENT_BINARY_DIR}/translatorsinfo.qrc) + + set(${_qrcFile} ${__qrcFile} PARENT_SCOPE) + ENDFUNCTION() diff --git a/media-sound/flacon/files/flacon-5.5.1-no-man-compress.patch b/media-sound/flacon/files/flacon-5.5.1-no-man-compress.patch new file mode 100644 index 000000000000..191d863fb310 --- /dev/null +++ b/media-sound/flacon/files/flacon-5.5.1-no-man-compress.patch @@ -0,0 +1,23 @@ +--- a/CMakeLists.txt 2019-12-07 15:55:24.155414989 +0100 ++++ b/CMakeLists.txt 2019-12-07 15:56:38.266998439 +0100 +@@ -341,11 +341,6 @@ + @ONLY + ) + +-add_custom_command(TARGET ${PROJECT_NAME} +- COMMAND gzip -c -n ${CMAKE_CURRENT_BINARY_DIR}/flacon.1 > ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz +-) +- +- + if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "Flacon") + install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION Flacon.app/Contents/MacOS) +@@ -357,7 +352,7 @@ + else() + install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) + install(FILES ${QM_FILES} DESTINATION ${TRANSLATIONS_DIR}) +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz DESTINATION share/man/man1) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1 DESTINATION share/man/man1) + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.desktop DESTINATION "share/applications") + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/com.github.Flacon.metadata.xml DESTINATION "share/metainfo") diff --git a/media-sound/flacon/flacon-4.1.0.ebuild b/media-sound/flacon/flacon-4.1.0.ebuild index 446aeca8ef6e..82b17e271799 100644 --- a/media-sound/flacon/flacon-4.1.0.ebuild +++ b/media-sound/flacon/flacon-4.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,6 +18,7 @@ LICENSE="LGPL-2.1+" SLOT="0" KEYWORDS="amd64 x86" IUSE="test" +RESTRICT="!test? ( test )" RDEPEND=" app-i18n/uchardet diff --git a/media-sound/flacon/flacon-5.5.1.ebuild b/media-sound/flacon/flacon-5.5.1.ebuild new file mode 100644 index 000000000000..e6310352d358 --- /dev/null +++ b/media-sound/flacon/flacon-5.5.1.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Tests require lots of disk space +CHECKREQS_DISK_BUILD=10G +inherit check-reqs cmake-utils eutils virtualx xdg-utils + +DESCRIPTION="Extracts audio tracks from an audio CD image to separate tracks" +HOMEPAGE="https://flacon.github.io/" +SRC_URI="https://github.com/flacon/flacon/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +BDEPEND=" + virtual/pkgconfig + dev-qt/linguist-tools:5 +" +RDEPEND=" + app-i18n/uchardet + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 +" +DEPEND="${RDEPEND} + dev-qt/qtconcurrent:5 + test? ( + dev-qt/qttest:5 + media-libs/flac + media-sound/mac + media-sound/shntool + media-sound/ttaenc + media-sound/wavpack + ) +" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}/${P}-no-man-compress.patch" + "${FILESDIR}/${P}-ninja-warning.patch" # git master +) + +pkg_pretend() { + use test && check-reqs_pkg_pretend +} + +pkg_setup() { + use test && check-reqs_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTS="$(usex test)" + ) + cmake-utils_src_configure +} + +src_test() { + virtx "${BUILD_DIR}/tests/${PN}_test" +} + +pkg_postinst() { + elog "${PN} optionally supports formats listed below." + elog "(List will be empty if all extra packages are installed.)" + elog "Please install the required packages and restart ${PN}." + optfeature 'FLAC input and output support' media-libs/flac + optfeature 'WavPack input and output support' media-sound/wavpack + optfeature 'APE input support' media-sound/mac + optfeature 'TTA input support' media-sound/ttaenc + optfeature 'AAC output support' media-libs/faac + optfeature 'MP3 output support' media-sound/lame + optfeature 'Vorbis output support' media-sound/vorbis-tools + optfeature 'MP3 Replay Gain support' media-sound/mp3gain + optfeature 'Vorbis Replay Gain support' media-sound/vorbisgain + + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update +} diff --git a/media-sound/flacon/metadata.xml b/media-sound/flacon/metadata.xml index 1b0223c33976..ef795ca97504 100644 --- a/media-sound/flacon/metadata.xml +++ b/media-sound/flacon/metadata.xml @@ -1,9 +1,8 @@ - + - https://flacon.github.io/changelog/ flacon/flacon -- cgit v1.2.3