From 4187bba080530c5ca1c7dae9c233e88f3fc8f535 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 6 Jul 2024 08:06:16 +0100 Subject: gentoo auto-resync : 06:07:2024 - 08:06:15 --- media-sound/musepack-tools/Manifest | 7 ++--- .../musepack-tools-495-fixup-link-depends.patch | 18 ------------- .../musepack-tools-495-incompatible-pointers.patch | 30 ++++++++++++++++++++++ .../files/musepack-tools-495-respect-cflags.patch | 6 ----- .../musepack-tools/musepack-tools-495.ebuild | 3 +-- 5 files changed, 35 insertions(+), 29 deletions(-) create mode 100644 media-sound/musepack-tools/files/musepack-tools-495-incompatible-pointers.patch (limited to 'media-sound/musepack-tools') diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest index 95b747d939f5..adddd2fc820e 100644 --- a/media-sound/musepack-tools/Manifest +++ b/media-sound/musepack-tools/Manifest @@ -1,5 +1,6 @@ -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 +AUX musepack-tools-495-fixup-link-depends.patch 2420 BLAKE2B 62cf10c26ca4a71edc204eb99952697ef7b54fc5c953f3e01fcb53d9f2c385e4cb3e3bc6c6437303e1f0454d95d4e7669af5c143a1069ec566fea7581769d782 SHA512 d0e1a4c557965d066687df779f297d8cf8d997cacf10e86b3d9a15f3952bdae74041ae085c05ddcbb9ab025aaf5f5b596812690c90efbf3b4d1367eb732e53a1 +AUX musepack-tools-495-incompatible-pointers.patch 1985 BLAKE2B 72c0ed7dd049ada3169c59be3904cbb0c3a4d8ce68fa4f875a5951e8639a0d39c04b17eca3425da5a149d627f0a248aee9bb4dfae60ff4e98381b6a4c483f294 SHA512 760d834182e06d891813772c55b286e24e1288900b6532becd205cee14496a8c954e56c7c98574feeb2b6e30f26546b390f479c73bd93cda6ecb427f0df46e79 +AUX musepack-tools-495-respect-cflags.patch 507 BLAKE2B 99157c28f86a1fc7778cb57f5541e5959971ccefd5f9686b8ea9ca4b330bab566f5e04113d3f8cb7622552b5b83bca2d50748cfc30b1b98638316327b7bfce10 SHA512 2dab19e882392dbcd3d437c62d953c3fa0515823b71260b7b4601953afe2cf55479c5d1eb8cc76ad5bf0c04974abadafa5f61b348873576a5d3e6043a8c9a51d DIST musepack-tools-495.tar.xz 148820 BLAKE2B 19e104339fddee49f7082095767228f9ad297e442532c6170c48f7d7ded9df3ce7e2f2afc446055cae4140e7fa0ec52bf5b72d216c2bf932cebf74847fe939e0 SHA512 11e7590280216e4d8706d659be9f9faa25deeb5b1831e03edf7c4615fff06c1c817bc20fb5d6c3f7efd7ccadbb22b32d37ea8070aeb8c126f18e4d67e81c7e1c -EBUILD musepack-tools-495.ebuild 1115 BLAKE2B b541a4fe5c2a5e1d896007f288a31e561df9f632b3298269af54c45cf97e6e2ad8e8d9f66fc61fe5fb9f4c2194855c8535f40376e739accb4b68da99050649de SHA512 91909c1bfb9408ee331bdd4d58f92fd9a8bafbf3b1b3c2dd0c8ee4825fdb57a2f707910c78aed3799d399048d93df5d161afcda65407470304be6de556259eb6 +EBUILD musepack-tools-495.ebuild 1114 BLAKE2B 8fcf17aaf41a5fc59bc8fd5464632ee54b334ce415a0ae5e96ece52d71218e721832279fec8bc29af939b4566091c16d8f6545632edd6a2035e21aa18ee613e7 SHA512 b10da4c682412e3580a3eee56f65f01abf8f213c2d12f5bdacf3e43aa0d7fca796b11af359decd00337f7a92774e4e121b8b8e41d869b39ad5a7a657623ee32f 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 index b62800c594a3..7dfb38cd73bd 100644 --- 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 @@ -9,16 +9,6 @@ In revision r491 a "Gentoo patch" was merged, entitled 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) @@ -30,8 +20,6 @@ index eea0df0..a4fe93e 100644 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) @@ -43,8 +31,6 @@ index 743d5b6..50c4ded 100644 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) @@ -56,8 +42,6 @@ index 7d15ce2..2fbfb7a 100644 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) @@ -69,8 +53,6 @@ index c95f521..a4ca38f 100644 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 diff --git a/media-sound/musepack-tools/files/musepack-tools-495-incompatible-pointers.patch b/media-sound/musepack-tools/files/musepack-tools-495-incompatible-pointers.patch new file mode 100644 index 000000000000..d23b002839f6 --- /dev/null +++ b/media-sound/musepack-tools/files/musepack-tools-495-incompatible-pointers.patch @@ -0,0 +1,30 @@ +--- musepack-tools-495/libmpcpsy/ans.c ++++ musepack-tools-495-fixed/libmpcpsy/ans.c +@@ -287,12 +287,12 @@ + // for L or M, respectively + memset ( m->FIR_L, 0, sizeof m->FIR_L ); // reset FIR + memset ( m->NS_Order_L, 0, sizeof m->NS_Order_L ); // reset Flags +- FindOptimalANS ( MaxBand, MSflag, ANSspec_L, ANSspec_M, m->NS_Order_L, m->SNR_comp_L, m->FIR_L, smr.L, smr.M, m->SCF_Index_L, Transient ); ++ FindOptimalANS ( MaxBand, MSflag, ANSspec_L, ANSspec_M, m->NS_Order_L, m->SNR_comp_L, m->FIR_L, smr.L, smr.M, (const void*)m->SCF_Index_L, Transient ); + + // for R or S, respectively + memset ( m->FIR_R, 0, sizeof m->FIR_R ); // reset FIR + memset ( m->NS_Order_R, 0, sizeof m->NS_Order_R ); // reset Flags +- FindOptimalANS ( MaxBand, MSflag, ANSspec_R, ANSspec_S, m->NS_Order_R, m->SNR_comp_R, m->FIR_R, smr.R, smr.S, m->SCF_Index_R, Transient ); ++ FindOptimalANS ( MaxBand, MSflag, ANSspec_R, ANSspec_S, m->NS_Order_R, m->SNR_comp_R, m->FIR_R, smr.R, smr.S, (const void*)m->SCF_Index_R, Transient ); + + return; + } +--- musepack-tools-495/mpcenc/mpcenc.h ++++ musepack-tools-495-fixed/mpcenc/mpcenc.h +@@ -241,8 +241,8 @@ + + float ISNR_Schaetzer ( const float* samples, const float comp, const int res); + float ISNR_Schaetzer_Trans ( const float* samples, const float comp, const int res); +-void QuantizeSubband ( unsigned int* qu_output, const float* input, const int res, float* errors, const int maxNsOrder ); +-void QuantizeSubbandWithNoiseShaping ( unsigned int* qu_output, const float* input, const int res, float* errors, const float* FIR ); ++void QuantizeSubband ( mpc_int16_t* qu_output, const float* input, const int res, float* errors, const int maxNsOrder ); ++void QuantizeSubbandWithNoiseShaping ( mpc_int16_t* qu_output, const float* input, const int res, float* errors, const float* FIR ); + + void NoiseInjectionComp ( void ); + 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 index 5ed2797ab3bc..1da02c8fec8b 100644 --- a/media-sound/musepack-tools/files/musepack-tools-495-respect-cflags.patch +++ b/media-sound/musepack-tools/files/musepack-tools-495-respect-cflags.patch @@ -3,12 +3,6 @@ From: Eli Schwartz 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() diff --git a/media-sound/musepack-tools/musepack-tools-495.ebuild b/media-sound/musepack-tools/musepack-tools-495.ebuild index 0c09918a1fbe..1ca0323298d3 100644 --- a/media-sound/musepack-tools/musepack-tools-495.ebuild +++ b/media-sound/musepack-tools/musepack-tools-495.ebuild @@ -22,13 +22,12 @@ DEPEND=" " RDEPEND=" ${DEPEND} - !media-libs/libmpcdec - !media-libs/libmpcdecsv7 " PATCHES=( "${FILESDIR}"/${P}-respect-cflags.patch "${FILESDIR}"/${P}-fixup-link-depends.patch + "${FILESDIR}"/${P}-incompatible-pointers.patch ) src_configure() { -- cgit v1.2.3