commit: 04e2521613b8d34dd31345592980a86f9332afda Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Mon Apr 15 08:13:11 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Mon Apr 15 08:13:11 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04e25216
media-sound/musepack-tools: dropped obsolete 465-r2 Bug: https://bugs.gentoo.org/929984 Closes: https://bugs.gentoo.org/919211 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> media-sound/musepack-tools/Manifest | 1 - .../files/musepack-tools-465-fno-common.patch | 16 ---- .../files/musepack-tools-465-gentoo.patch | 91 ---------------------- .../files/musepack-tools-465-musl.patch | 24 ------ .../musepack-tools/musepack-tools-465-r2.ebuild | 43 ---------- 5 files changed, 175 deletions(-) diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest index ca6d4dade8dd..f497d8d80b05 100644 --- a/media-sound/musepack-tools/Manifest +++ b/media-sound/musepack-tools/Manifest @@ -1,2 +1 @@ -DIST musepack-tools-465.tar.bz2 167612 BLAKE2B 0748cbfaecec396a4bf054aac5a451f16386becae75cdbb63821c28f7b7d378723df180d909eb3b9e0c7eafa79996dbe7aaab251721fd139b81755e7f59249f1 SHA512 ce933376bc127f6f4acc8500e50b6318a6bc5bf8443547fc0e25b4e8e5881fd7a73aff155560ffbc5161b5d7d03522c73bfbc31e14e1531fe511036a0f657d54 DIST musepack-tools-495.tar.xz 148820 BLAKE2B 19e104339fddee49f7082095767228f9ad297e442532c6170c48f7d7ded9df3ce7e2f2afc446055cae4140e7fa0ec52bf5b72d216c2bf932cebf74847fe939e0 SHA512 11e7590280216e4d8706d659be9f9faa25deeb5b1831e03edf7c4615fff06c1c817bc20fb5d6c3f7efd7ccadbb22b32d37ea8070aeb8c126f18e4d67e81c7e1c diff --git a/media-sound/musepack-tools/files/musepack-tools-465-fno-common.patch b/media-sound/musepack-tools/files/musepack-tools-465-fno-common.patch deleted file mode 100644 index 0fb9f5e5eb55..000000000000 --- a/media-sound/musepack-tools/files/musepack-tools-465-fno-common.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://bugs.gentoo.org/706992 ---- a/libmpcdec/requant.h -+++ b/libmpcdec/requant.h -@@ -47,9 +47,9 @@ - - - /* C O N S T A N T S */ --const mpc_uint8_t Res_bit [18]; ///< Bits per sample for chosen quantizer --const MPC_SAMPLE_FORMAT __Cc [1 + 18]; ///< Requantization coefficients --const mpc_int16_t __Dc [1 + 18]; ///< Requantization offset -+extern const mpc_uint8_t Res_bit [18]; ///< Bits per sample for chosen quantizer -+extern const MPC_SAMPLE_FORMAT __Cc [1 + 18]; ///< Requantization coefficients -+extern const mpc_int16_t __Dc [1 + 18]; ///< Requantization offset - - #define Cc (__Cc + 1) - #define Dc (__Dc + 1) diff --git a/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch b/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch deleted file mode 100644 index 5c80531d96f4..000000000000 --- a/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch +++ /dev/null @@ -1,91 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -15,10 +15,6 @@ - - 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) ---- a/libmpcdec/CMakeLists.txt -+++ b/libmpcdec/CMakeLists.txt -@@ -1,7 +1,15 @@ - include_directories(${libmpc_SOURCE_DIR}/include) --if(SHARED) -- add_library(mpcdec_shared SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32) --else(SHARED) -- add_library(mpcdec_static STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32) --endif(SHARED) - -+add_library(mpcdec_shared SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32) -+set_target_properties(mpcdec_shared PROPERTIES OUTPUT_NAME mpcdec CLEAN_DIRECT_OUTPUT 1 VERSION 7.0.1 SOVERSION 7) -+if(NOT MSVC) -+ target_link_libraries(mpcdec_shared m) -+endif(NOT MSVC) -+ -+add_library(mpcdec_shared STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32) -+ -+if(NOT MSVC) -+ target_link_libraries(mpcdec_shared m) -+endif(NOT MSVC) -+ -+install(TARGETS mpcdec_shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}") ---- a/mpc2sv8/CMakeLists.txt -+++ b/mpc2sv8/CMakeLists.txt -@@ -15,7 +15,7 @@ - if(SHARED) - target_link_libraries(mpc2sv8 mpcdec_shared) - else(SHARED) -- target_link_libraries(mpc2sv8 mpcdec_static) -+ target_link_libraries(mpc2sv8 mpcdec_shared) - endif(SHARED) - - target_link_libraries(mpc2sv8 mpcenc_static) ---- a/mpcchap/CMakeLists.txt -+++ b/mpcchap/CMakeLists.txt -@@ -17,7 +17,7 @@ - if(SHARED) - target_link_libraries(mpcchap mpcdec_shared) - else(SHARED) -- target_link_libraries(mpcchap mpcdec_static) -+ target_link_libraries(mpcchap mpcdec_shared) - endif(SHARED) - - target_link_libraries(mpcchap mpcenc_static) ---- a/mpccut/CMakeLists.txt -+++ b/mpccut/CMakeLists.txt -@@ -15,7 +15,7 @@ - if(SHARED) - target_link_libraries(mpccut mpcdec_shared) - else(SHARED) -- target_link_libraries(mpccut mpcdec_static) -+ target_link_libraries(mpccut mpcdec_shared) - endif(SHARED) - - target_link_libraries(mpccut mpcenc_static) ---- a/mpcdec/CMakeLists.txt -+++ b/mpcdec/CMakeLists.txt -@@ -21,7 +21,7 @@ - if(SHARED) - target_link_libraries(mpcdec mpcdec_shared) - else(SHARED) -- target_link_libraries(mpcdec mpcdec_static) -+ target_link_libraries(mpcdec mpcdec_shared) - endif(SHARED) - - install(TARGETS mpcdec RUNTIME DESTINATION bin) ---- a/mpcgain/CMakeLists.txt -+++ b/mpcgain/CMakeLists.txt -@@ -22,7 +22,7 @@ - if(SHARED) - target_link_libraries(mpcgain mpcdec_shared) - else(SHARED) -- target_link_libraries(mpcgain mpcdec_static) -+ target_link_libraries(mpcgain mpcdec_shared) - endif(SHARED) - - if(NOT MSVC) diff --git a/media-sound/musepack-tools/files/musepack-tools-465-musl.patch b/media-sound/musepack-tools/files/musepack-tools-465-musl.patch deleted file mode 100644 index f7fb0f771082..000000000000 --- a/media-sound/musepack-tools/files/musepack-tools-465-musl.patch +++ /dev/null @@ -1,24 +0,0 @@ -Bug: https://bugs.gentoo.org/712978 - ---- a/mpcenc/keyboard.c -+++ b/mpcenc/keyboard.c -@@ -84,6 +84,8 @@ - # define echo_on() (void)0 - # endif - -+# include <sys/select.h> -+ - int - WaitKey ( void ) - { ---- a/mpcenc/mpcenc.h -+++ b/mpcenc/mpcenc.h -@@ -50,7 +50,7 @@ - # include <unistd.h> - #endif - --#if defined __linux__ -+#if defined __GLIBC__ - # include <fpu_control.h> - #elif defined __FreeBSD__ - # include <machine/floatingpoint.h> diff --git a/media-sound/musepack-tools/musepack-tools-465-r2.ebuild b/media-sound/musepack-tools/musepack-tools-465-r2.ebuild deleted file mode 100644 index 96d1eb23372f..000000000000 --- a/media-sound/musepack-tools/musepack-tools-465-r2.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# 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.bz2" - -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-${PV} - >=media-libs/libreplaygain-${PV} -" -RDEPEND=" - ${DEPEND} - !media-libs/libmpcdec - !media-libs/libmpcdecsv7 -" - -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch - "${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 -}
