diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-03-14 00:47:04 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-03-14 00:47:04 +0000 |
commit | 633a3741c9483bd63e8c29b276d2af636ec8b390 (patch) | |
tree | b8aa248d6496c9fe7799f1ad6a89a310cc317735 /media-sound/musepack-tools/files/musepack-tools-495-fixup-link-depends.patch | |
parent | f30563609870941d7e5078dc39cfa30a0e696058 (diff) |
gentoo auto-resync : 14:03:2024 - 00:47:04
Diffstat (limited to 'media-sound/musepack-tools/files/musepack-tools-495-fixup-link-depends.patch')
-rw-r--r-- | media-sound/musepack-tools/files/musepack-tools-495-fixup-link-depends.patch | 95 |
1 files changed, 95 insertions, 0 deletions
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 + |