diff options
Diffstat (limited to 'media-sound/musepack-tools')
5 files changed, 185 insertions, 3 deletions
diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest index 8e93f03f219f..1348915c04b4 100644 --- a/media-sound/musepack-tools/Manifest +++ b/media-sound/musepack-tools/Manifest @@ -1,6 +1,10 @@ AUX musepack-tools-465-fno-common.patch 659 BLAKE2B 603213fe4c979b4a79b9a2103117eb63e3b90933119cbefef32c18c3523d24c6f0eca8beea685d1ef6effb3bec82e53004bdaeed2062a2a14f4a1e7bb398fd97 SHA512 239b353380d534f09fb381520eb29b919cb3f69ac51be8a813e67338de928c91c99c249b6a5b27f297cd0a741b7c10e7c61171b4bd42b5016402b52efa00cca0 AUX musepack-tools-465-gentoo.patch 2982 BLAKE2B 0783de2ac04e77d8ff337e3ed52b09174e6268aaa9a1c2709b65343753880437b42af8fd17fbf1361811bdeb5caed625f78fa8440c7ccbddbdf80b827da3374e SHA512 5eee2985b4a3201e6d93d24e7cd9244d7e7f64208ae80656cdd6932d3adee2403e14e17ede45a83071a5c5bf21aa938e4786267a2c4b3118053c900aa18b2105 AUX musepack-tools-465-musl.patch 435 BLAKE2B 71eb34c0525d72048962e2dba1a24e6ff34b93e5e88554d7050dde195f98f57f3a0a7286e3dadf257b1a861af6ca73c7ffa8fa6789d32dca250e78f40798de55 SHA512 f18421dd7fcef088365abef24ad7d3877c04dd40e38b551ca5d8a3a1828d1644935924cb8c012ae484cbd72666b88468b6bf803a982154afe6a5ac9b29b6bfd6 +AUX musepack-tools-495-fixup-link-depends.patch 3083 BLAKE2B 8876c1500f17effef4efb9f2e22eecc3f8934239dc89262ebcee2a5187c93cebd6868703cd82a2ba888f71b17c6941c4bb65a5d18da549e110d1ea6c6b08a3de SHA512 c598252279b51e2ee04a4975a6dea8406f29c53ac980ccfd1838f1bd67cc96d55dee5b0527436aa2ebb7e331ad9a19de734f128538274eb8406e48b0346121bb +AUX musepack-tools-495-respect-cflags.patch 644 BLAKE2B b49a7309329719b56a2522afbbd57a18e3d02585787b73dc82721e9c63cb04c964fd41142bcfc1d12a79e23875bfa897c184749942a2cfe6a15f6d2e12c4a38b SHA512 d0faf6490039612339f06f47ec76dfcab7065aee86b8e189ed446314a3699c94aacfda97e35922d3df916d87e99e078ac381e6064cfcd3217b40fbe8d74d54fb DIST musepack-tools-465.tar.bz2 167612 BLAKE2B 0748cbfaecec396a4bf054aac5a451f16386becae75cdbb63821c28f7b7d378723df180d909eb3b9e0c7eafa79996dbe7aaab251721fd139b81755e7f59249f1 SHA512 ce933376bc127f6f4acc8500e50b6318a6bc5bf8443547fc0e25b4e8e5881fd7a73aff155560ffbc5161b5d7d03522c73bfbc31e14e1531fe511036a0f657d54 -EBUILD musepack-tools-465-r2.ebuild 800 BLAKE2B d18dcdee702031801dc48c443138bdefec1fcdd43e195d491805a4fbbf3639412c786933d54f1af9b61a17d2302016e5198692e294e0da2c813966dad8df2658 SHA512 47eef0bd1a0dc1f98a89cba59cd8b99b20bca40b08c3416109028e336633e55e0525b31b6eb5031f1062909045ad89caea9a9d194d3969b1fb577b523b3ad180 +DIST musepack-tools-495.tar.xz 148968 BLAKE2B dcc5ae24454a7da03b9ff9094c9680126abd57d700a55b7bfa77693a83a02d831a75cb494795991aabd519e830af4e1450950e4da3bb41a779ad0ad407ef083b SHA512 d518cf88fc7aff8b09566fe201af4f6bcd704a6f6e10a7c0118be910de5faf69ba3fac0c44d6ec8eb9048136bf241133707033046967dd7e999752bfe886ef35 +EBUILD musepack-tools-465-r2.ebuild 966 BLAKE2B b95a600a04183a689c71e428f522e6b0cd9d1225c9242e6d2f234839e62d9a9c3fa22d96ec20c66b1a5315fe6a3e992583a1f24dc260430efe4d9fedc310b835 SHA512 a9e4f433305de95a16a562c634e77ae02cf1da8ee0231c64ef159c03c7731a7d694a68309c6e3d546503b455faffac4d4d38be264a31e1da1fa6d323bca975ce +EBUILD musepack-tools-495.ebuild 1080 BLAKE2B d8fd0b0def2796595fd016053710bdd8ab55901e587c0cd9710bc233590e8d38762d027e746c66beff80c5e301289620d749064984e3da2c6a6286edc2508848 SHA512 0fd3f8a3b764a14c82618ade6bc72713df4cb2f6b6865f7fe834bff08c126b2eac5362a36845501df95c687361617db7fd942a43a1a7f6d28d321ef657a2a726 MISC metadata.xml 260 BLAKE2B 9945ac40ee60ce67adf51840c3cc2d6d2743dffe4fd2ec965d300c709323f80eb5d35eaeb804414eebb2da1e954ee688067c05093b26499678de524b414ac4ec SHA512 e5b6a2a44cd2a4ea4fb1267eb8f635c079c022853443ad180ca12f2df84492f3ba34db45e4ff5e7e09262a74745f5c0aa04ebccd6f998cf19a6ea2ccd0627701 diff --git a/media-sound/musepack-tools/files/musepack-tools-495-fixup-link-depends.patch b/media-sound/musepack-tools/files/musepack-tools-495-fixup-link-depends.patch new file mode 100644 index 000000000000..b62800c594a3 --- /dev/null +++ b/media-sound/musepack-tools/files/musepack-tools-495-fixup-link-depends.patch @@ -0,0 +1,95 @@ +From a71b6e2f189e90b272094b8b9cd88752ff96e785 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Wed, 13 Mar 2024 00:34:22 -0400 +Subject: [PATCH] Fix regression causing executables to not depend on libmpcdec + +In revision r491 a "Gentoo patch" was merged, entitled + +"Fixup installation of shared mpcdec library." + +It inherently clashed with revision r467, which *also* renamed the +target in question. +--- + mpc2sv8/CMakeLists.txt | 2 +- + mpcchap/CMakeLists.txt | 2 +- + mpccut/CMakeLists.txt | 2 +- + mpcdec/CMakeLists.txt | 2 +- + mpcgain/CMakeLists.txt | 4 ++-- + 5 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/mpc2sv8/CMakeLists.txt b/mpc2sv8/CMakeLists.txt +index eea0df0..a4fe93e 100644 +--- a/mpc2sv8/CMakeLists.txt ++++ b/mpc2sv8/CMakeLists.txt +@@ -13,7 +13,7 @@ endif(MSVC) + add_executable(mpc2sv8 mpc2sv8.c) + + if(SHARED) +- target_link_libraries(mpc2sv8 mpcdec) ++ target_link_libraries(mpc2sv8 mpcdec_shared) + else(SHARED) + target_link_libraries(mpc2sv8 mpcdec_static) + endif(SHARED) +diff --git a/mpcchap/CMakeLists.txt b/mpcchap/CMakeLists.txt +index 743d5b6..50c4ded 100644 +--- a/mpcchap/CMakeLists.txt ++++ b/mpcchap/CMakeLists.txt +@@ -15,7 +15,7 @@ link_directories(${libmpc_BINARY_DIR}/libmpcenc) + add_executable(mpcchap mpcchap.c dictionary.c iniparser.c ${libmpc_SOURCE_DIR}/common/tags.c) + + if(SHARED) +- target_link_libraries(mpcchap mpcdec) ++ target_link_libraries(mpcchap mpcdec_shared) + else(SHARED) + target_link_libraries(mpcchap mpcdec_static) + endif(SHARED) +diff --git a/mpccut/CMakeLists.txt b/mpccut/CMakeLists.txt +index 7d15ce2..2fbfb7a 100644 +--- a/mpccut/CMakeLists.txt ++++ b/mpccut/CMakeLists.txt +@@ -13,7 +13,7 @@ endif(MSVC) + add_executable(mpccut mpccut.c) + + if(SHARED) +- target_link_libraries(mpccut mpcdec) ++ target_link_libraries(mpccut mpcdec_shared) + else(SHARED) + target_link_libraries(mpccut mpcdec_static) + endif(SHARED) +diff --git a/mpcdec/CMakeLists.txt b/mpcdec/CMakeLists.txt +index c95f521..a4ca38f 100644 +--- a/mpcdec/CMakeLists.txt ++++ b/mpcdec/CMakeLists.txt +@@ -15,7 +15,7 @@ add_executable(mpcdec_cmd mpcdec.c) + target_link_libraries(mpcdec_cmd wavformat_static) + + if(SHARED) +- target_link_libraries(mpcdec_cmd mpcdec) ++ target_link_libraries(mpcdec_cmd mpcdec_shared) + else(SHARED) + target_link_libraries(mpcdec_cmd mpcdec_static) + endif(SHARED) +diff --git a/mpcgain/CMakeLists.txt b/mpcgain/CMakeLists.txt +index 5445faf..474f3b3 100644 +--- a/mpcgain/CMakeLists.txt ++++ b/mpcgain/CMakeLists.txt +@@ -13,14 +13,14 @@ FIND_LIBRARY(REPLAY_GAIN_LIBRARY NAMES replaygain replaygain_static PATHS + include_directories(${libmpc_SOURCE_DIR}/include) + include_directories(${REPLAY_GAIN_INCLUDE_DIR}) + +-link_directories(${libmpc_BINARY_DIR}/libmpcdec) ++link_directories(${libmpc_BINARY_DIR}/libmpcdec_shared) + + add_executable(mpcgain mpcgain.c) + + target_link_libraries(mpcgain ${REPLAY_GAIN_LIBRARY}) + + if(SHARED) +- target_link_libraries(mpcgain mpcdec) ++ target_link_libraries(mpcgain mpcdec_shared) + else(SHARED) + target_link_libraries(mpcgain mpcdec_static) + endif(SHARED) +-- +2.43.2 + diff --git a/media-sound/musepack-tools/files/musepack-tools-495-respect-cflags.patch b/media-sound/musepack-tools/files/musepack-tools-495-respect-cflags.patch new file mode 100644 index 000000000000..5ed2797ab3bc --- /dev/null +++ b/media-sound/musepack-tools/files/musepack-tools-495-respect-cflags.patch @@ -0,0 +1,27 @@ +From 95ba4fd6c2f2f5bd770d1a100afd65e5c95fa1d0 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Wed, 13 Mar 2024 00:00:45 -0400 +Subject: [PATCH] Respect environment CFLAGS + +--- + CMakeLists.txt | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4d9b78f..3b09d4c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,10 +20,6 @@ endif() + + add_definitions(-DFAST_MATH -DCVD_FASTLOG) + +-if(NOT MSVC) +- set(CMAKE_C_FLAGS "-O3 -Wall -fomit-frame-pointer -pipe") +-endif(NOT MSVC) +- + add_subdirectory(libmpcdec) + add_subdirectory(libmpcpsy) + add_subdirectory(libmpcenc) +-- +2.43.2 + diff --git a/media-sound/musepack-tools/musepack-tools-465-r2.ebuild b/media-sound/musepack-tools/musepack-tools-465-r2.ebuild index 503162e92f33..96d1eb23372f 100644 --- a/media-sound/musepack-tools/musepack-tools-465-r2.ebuild +++ b/media-sound/musepack-tools/musepack-tools-465-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake +inherit cmake flag-o-matic # svn export http://svn.musepack.net/libmpc/trunk musepack-tools-${PV} # tar -cjf musepack-tools-${PV}.tar.bz2 musepack-tools-${PV} @@ -31,3 +31,13 @@ PATCHES=( "${FILESDIR}"/${P}-fno-common.patch "${FILESDIR}"/${P}-musl.patch ) + +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/860882 + # + # Software is dead since 2016. + filter-lto + + cmake_src_configure +} diff --git a/media-sound/musepack-tools/musepack-tools-495.ebuild b/media-sound/musepack-tools/musepack-tools-495.ebuild new file mode 100644 index 000000000000..4107037ae078 --- /dev/null +++ b/media-sound/musepack-tools/musepack-tools-495.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +# svn export http://svn.musepack.net/libmpc/trunk musepack-tools-${PV} +# tar -cjf musepack-tools-${PV}.tar.bz2 musepack-tools-${PV} + +DESCRIPTION="Musepack SV8 libraries and utilities" +HOMEPAGE="https://www.musepack.net" +SRC_URI="mirror://gentoo/${P}.tar.xz" + +LICENSE="BSD LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + +DEPEND=" + >=media-libs/libcuefile-477 + >=media-libs/libreplaygain-477 +" +RDEPEND=" + ${DEPEND} + !media-libs/libmpcdec + !media-libs/libmpcdecsv7 +" + +PATCHES=( + "${FILESDIR}"/${P}-respect-cflags.patch + "${FILESDIR}"/${P}-fixup-link-depends.patch +) + +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/860882 + # + # Software is dead since 2016. + filter-lto + + # Symbols are decorated with MPC_API but visibility isn't wired up to the + # build system(s) + append-flags -fvisibility=hidden + + cmake_src_configure +} |