Thu Jun 3 19:23:39 2021 UTC ()
audio/musepack: fix build for missing libm


(thor)
diff -r1.5 -r1.6 pkgsrc/audio/musepack/distinfo
diff -r1.1 -r1.2 pkgsrc/audio/musepack/patches/patch-libmpcdec_CMakeLists.txt
cvs diff -r1.5 -r1.6 pkgsrc/audio/musepack/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/musepack/distinfo 2021/05/14 03:14:19 1.5
+++ pkgsrc/audio/musepack/distinfo 2021/06/03 19:23:39 1.6
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.5 2021/05/14 03:14:19 mcf Exp $ 1$NetBSD: distinfo,v 1.6 2021/06/03 19:23:39 thor Exp $
2 2
3SHA1 (musepack_src_r475.tar.gz) = bdd4042773eb5c885df70d7a19914fa6e2306391 3SHA1 (musepack_src_r475.tar.gz) = bdd4042773eb5c885df70d7a19914fa6e2306391
4RMD160 (musepack_src_r475.tar.gz) = 622d04eeb309beacd2b6bb650178dcdc42773db2 4RMD160 (musepack_src_r475.tar.gz) = 622d04eeb309beacd2b6bb650178dcdc42773db2
5SHA512 (musepack_src_r475.tar.gz) = 23aa16152b27ba99ff7f4672b8f91562ee9ad829bbe1ee066693eabf69844ee9f8e4b3eebf1bac78e6994119fbb53b034479a1b996576aeecbfba7d797f130b0 5SHA512 (musepack_src_r475.tar.gz) = 23aa16152b27ba99ff7f4672b8f91562ee9ad829bbe1ee066693eabf69844ee9f8e4b3eebf1bac78e6994119fbb53b034479a1b996576aeecbfba7d797f130b0
6Size (musepack_src_r475.tar.gz) = 188737 bytes 6Size (musepack_src_r475.tar.gz) = 188737 bytes
7SHA1 (patch-CMakeLists.txt) = c4a9dd61c1f8691d8321e6ee5f6939cd44eb7a15 7SHA1 (patch-CMakeLists.txt) = c4a9dd61c1f8691d8321e6ee5f6939cd44eb7a15
8SHA1 (patch-libmpcdec_CMakeLists.txt) = 4e202b96ca3a7012cbdf4e0bcb11ed12b7932746 8SHA1 (patch-libmpcdec_CMakeLists.txt) = d5db7fac0d99f2bae6edd98e0e4498b6acf676db
9SHA1 (patch-mpcenc_keyboard.c) = 42e038f003c64369e245e3688f6f0783bd2d443a 9SHA1 (patch-mpcenc_keyboard.c) = 42e038f003c64369e245e3688f6f0783bd2d443a
10SHA1 (patch-mpcenc_mpcenc.h) = 507b4aa9e7a99a93d42efaf97e03855ed6970a13 10SHA1 (patch-mpcenc_mpcenc.h) = 507b4aa9e7a99a93d42efaf97e03855ed6970a13
cvs diff -r1.1 -r1.2 pkgsrc/audio/musepack/patches/patch-libmpcdec_CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/audio/musepack/patches/patch-libmpcdec_CMakeLists.txt 2019/07/11 10:11:26 1.1
+++ pkgsrc/audio/musepack/patches/patch-libmpcdec_CMakeLists.txt 2021/06/03 19:23:39 1.2
@@ -1,14 +1,19 @@ @@ -1,14 +1,19 @@
1$NetBSD: patch-libmpcdec_CMakeLists.txt,v 1.1 2019/07/11 10:11:26 nia Exp $ 1$NetBSD: patch-libmpcdec_CMakeLists.txt,v 1.2 2021/06/03 19:23:39 thor Exp $
2 2
3Let CMake manage the RPATH by adding an INSTALL statement. 3Let CMake manage the RPATH by adding an INSTALL statement.
 4Also link to libm to get some pow()er.
4 5
5--- libmpcdec/CMakeLists.txt.orig 2010-08-21 15:55:01.000000000 +0000 6--- libmpcdec/CMakeLists.txt.orig 2010-08-21 15:55:01.000000000 +0000
6+++ libmpcdec/CMakeLists.txt 7+++ libmpcdec/CMakeLists.txt
7@@ -1,6 +1,7 @@ 8@@ -1,7 +1,10 @@
8 include_directories(${libmpc_SOURCE_DIR}/include) 9 include_directories(${libmpc_SOURCE_DIR}/include)
9 if(SHARED) 10 if(SHARED)
10 add_library(mpcdec SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32) 11 add_library(mpcdec SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
11+ install(TARGETS mpcdec LIBRARY DESTINATION lib) 12+ install(TARGETS mpcdec LIBRARY DESTINATION lib)
12 else(SHARED) 13 else(SHARED)
13 add_library(mpcdec_static STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32) 14 add_library(mpcdec_static STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
14 endif(SHARED) 15 endif(SHARED)
 16-
 17+if(NOT MSVC)
 18+ target_link_libraries(mpcdec m)
 19+endif(NOT MSVC)