CVS commit: pkgsrc/audio/musepack

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Jul 11 10:11:26 UTC 2019

Modified Files:
        pkgsrc/audio/musepack: Makefile distinfo
Added Files:
        pkgsrc/audio/musepack/patches: patch-libmpcdec_CMakeLists.txt

Log Message:
musepack: Let CMake manage the RPATH by adding an INSTALL statement in the
CMakeLists.txt of the library.

from Clement Bouvier
PR pkg/54367


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/musepack/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/musepack/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/musepack/patches/patch-libmpcdec_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/musepack/Makefile
diff -u pkgsrc/audio/musepack/Makefile:1.2 pkgsrc/audio/musepack/Makefile:1.3
--- pkgsrc/audio/musepack/Makefile:1.2  Fri Oct 10 11:19:29 2014
+++ pkgsrc/audio/musepack/Makefile      Thu Jul 11 10:11:26 2019
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2014/10/10 11:19:29 adam Exp $
+# $NetBSD: Makefile,v 1.3 2019/07/11 10:11:26 nia Exp $
 
 DISTNAME=      musepack_src_r475
 PKGNAME=       musepack-0rc475
+PKGREVISION=   1
 CATEGORIES=    audio
 MASTER_SITES=  http://files.musepack.net/source/
 
@@ -12,11 +13,8 @@ LICENSE=     modified-bsd
 
 USE_CMAKE=             yes
 
-INSTALLATION_DIRS=     lib
-
 post-install:
        rm -rf ${DESTDIR}${PREFIX}/include/mpc/.svn/
-       ${INSTALL_LIB} ${WRKSRC}/libmpcdec/libmpcdec.* ${DESTDIR}${PREFIX}/lib
 
 .include "../../audio/libcuefile/buildlink3.mk"
 .include "../../audio/libreplaygain/buildlink3.mk"

Index: pkgsrc/audio/musepack/distinfo
diff -u pkgsrc/audio/musepack/distinfo:1.3 pkgsrc/audio/musepack/distinfo:1.4
--- pkgsrc/audio/musepack/distinfo:1.3  Mon Dec 18 13:01:17 2017
+++ pkgsrc/audio/musepack/distinfo      Thu Jul 11 10:11:26 2019
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.3 2017/12/18 13:01:17 jperkin Exp $
+$NetBSD: distinfo,v 1.4 2019/07/11 10:11:26 nia Exp $
 
 SHA1 (musepack_src_r475.tar.gz) = bdd4042773eb5c885df70d7a19914fa6e2306391
 RMD160 (musepack_src_r475.tar.gz) = 622d04eeb309beacd2b6bb650178dcdc42773db2
 SHA512 (musepack_src_r475.tar.gz) = 23aa16152b27ba99ff7f4672b8f91562ee9ad829bbe1ee066693eabf69844ee9f8e4b3eebf1bac78e6994119fbb53b034479a1b996576aeecbfba7d797f130b0
 Size (musepack_src_r475.tar.gz) = 188737 bytes
 SHA1 (patch-CMakeLists.txt) = c4a9dd61c1f8691d8321e6ee5f6939cd44eb7a15
+SHA1 (patch-libmpcdec_CMakeLists.txt) = 4e202b96ca3a7012cbdf4e0bcb11ed12b7932746
 SHA1 (patch-mpcenc_keyboard.c) = 42e038f003c64369e245e3688f6f0783bd2d443a

Added files:

Index: pkgsrc/audio/musepack/patches/patch-libmpcdec_CMakeLists.txt
diff -u /dev/null pkgsrc/audio/musepack/patches/patch-libmpcdec_CMakeLists.txt:1.1
--- /dev/null   Thu Jul 11 10:11:27 2019
+++ pkgsrc/audio/musepack/patches/patch-libmpcdec_CMakeLists.txt        Thu Jul 11 10:11:26 2019
@@ -0,0 +1,14 @@
+$NetBSD: patch-libmpcdec_CMakeLists.txt,v 1.1 2019/07/11 10:11:26 nia Exp $
+
+Let CMake manage the RPATH by adding an INSTALL statement.
+
+--- libmpcdec/CMakeLists.txt.orig      2010-08-21 15:55:01.000000000 +0000
++++ libmpcdec/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ include_directories(${libmpc_SOURCE_DIR}/include)
+ if(SHARED)
+   add_library(mpcdec SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
++  install(TARGETS mpcdec LIBRARY DESTINATION lib)
+ 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)