diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2009-07-31 13:15:12 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-07-31 13:15:12 +0000 |
commit | f9082c014346a95f4ff5c3eef5bd150936b4f325 (patch) | |
tree | 4834febde12bce8ad8c314bb12652710a0caf3df /media-sound/musepack-tools | |
parent | Added gcc-4.4 compatibility patch (fixes bug #274039). (diff) | |
download | gentoo-2-f9082c014346a95f4ff5c3eef5bd150936b4f325.tar.gz gentoo-2-f9082c014346a95f4ff5c3eef5bd150936b4f325.tar.bz2 gentoo-2-f9082c014346a95f4ff5c3eef5bd150936b4f325.zip |
Update patch for upstream.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/musepack-tools')
-rw-r--r-- | media-sound/musepack-tools/ChangeLog | 6 | ||||
-rw-r--r-- | media-sound/musepack-tools/files/musepack-tools-444-gentoo.patch | 106 | ||||
-rw-r--r-- | media-sound/musepack-tools/musepack-tools-444.ebuild | 8 |
3 files changed, 86 insertions, 34 deletions
diff --git a/media-sound/musepack-tools/ChangeLog b/media-sound/musepack-tools/ChangeLog index e06eb9e8dafa..0a45708e3911 100644 --- a/media-sound/musepack-tools/ChangeLog +++ b/media-sound/musepack-tools/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/musepack-tools # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.41 2009/07/29 14:32:00 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.42 2009/07/31 13:15:11 ssuominen Exp $ + + 31 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> + musepack-tools-444.ebuild, files/musepack-tools-444-gentoo.patch: + Update patch for upstream. 29 Jul 2009; Jeroen Roovers <jer@gentoo.org> musepack-tools-444.ebuild: Marked ~hppa (bug #279069). diff --git a/media-sound/musepack-tools/files/musepack-tools-444-gentoo.patch b/media-sound/musepack-tools/files/musepack-tools-444-gentoo.patch index fed26426882f..6393afd61256 100644 --- a/media-sound/musepack-tools/files/musepack-tools-444-gentoo.patch +++ b/media-sound/musepack-tools/files/musepack-tools-444-gentoo.patch @@ -1,14 +1,29 @@ diff -ruN musepack-tools-444.orig/CMakeLists.txt musepack-tools-444/CMakeLists.txt --- musepack-tools-444.orig/CMakeLists.txt 2009-07-25 16:49:11.000000000 +0300 -+++ musepack-tools-444/CMakeLists.txt 2009-07-25 18:04:19.000000000 +0300 -@@ -22,3 +22,4 @@ ++++ musepack-tools-444/CMakeLists.txt 2009-07-31 16:11:09.000000000 +0300 +@@ -6,6 +6,8 @@ + set(CMAKE_VERBOSE_MAKEFILE false) + TEST_BIG_ENDIAN(MPC_ENDIANNESS) + ++option(SHARED "Use shared libmpcdec" OFF) ++ + add_definitions(-DFAST_MATH -DCVD_FASTLOG) + + if(NOT MSVC) +@@ -22,3 +24,5 @@ add_subdirectory(mpc2sv8) add_subdirectory(mpccut) add_subdirectory(mpcchap) +add_subdirectory(wavcmp) ++add_subdirectory(include) +diff -ruN musepack-tools-444.orig/include/CMakeLists.txt musepack-tools-444/include/CMakeLists.txt +--- musepack-tools-444.orig/include/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200 ++++ musepack-tools-444/include/CMakeLists.txt 2009-07-31 16:09:09.000000000 +0300 +@@ -0,0 +1 @@ ++INSTALL(DIRECTORY mpc DESTINATION include) diff -ruN musepack-tools-444.orig/include/mpc/mpcmath.h musepack-tools-444/include/mpc/mpcmath.h --- musepack-tools-444.orig/include/mpc/mpcmath.h 2009-07-25 16:49:10.000000000 +0300 -+++ musepack-tools-444/include/mpc/mpcmath.h 2009-07-25 17:37:16.000000000 +0300 ++++ musepack-tools-444/include/mpc/mpcmath.h 2009-07-31 15:33:45.000000000 +0300 @@ -16,6 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -20,66 +35,87 @@ diff -ruN musepack-tools-444.orig/include/mpc/mpcmath.h musepack-tools-444/inclu typedef union mpc_floatint diff -ruN musepack-tools-444.orig/libmpcdec/CMakeLists.txt musepack-tools-444/libmpcdec/CMakeLists.txt --- musepack-tools-444.orig/libmpcdec/CMakeLists.txt 2009-07-25 16:49:10.000000000 +0300 -+++ musepack-tools-444/libmpcdec/CMakeLists.txt 2009-07-25 17:58:04.000000000 +0300 -@@ -1,2 +1,15 @@ ++++ musepack-tools-444/libmpcdec/CMakeLists.txt 2009-07-31 16:05:03.000000000 +0300 +@@ -1,2 +1,21 @@ include_directories(${libmpc_SOURCE_DIR}/include) + add_library(mpcdec_static STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32) +set_target_properties(mpcdec_static PROPERTIES OUTPUT_NAME mpcdec CLEAN_DIRECT_OUTPUT 1) +if(NOT MSVC) -+target_link_libraries(mpcdec_static m) ++ target_link_libraries(mpcdec_static m) +endif(NOT MSVC) + -+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 6.1.0 SOVERSION 6) -+if(NOT MSVC) -+target_link_libraries(mpcdec_shared m) -+endif(NOT MSVC) ++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) ++ set_target_properties(mpcdec_shared PROPERTIES OUTPUT_NAME mpcdec CLEAN_DIRECT_OUTPUT 1 VERSION 6.1.0 SOVERSION 6) ++ if(NOT MSVC) ++ target_link_libraries(mpcdec_shared m) ++ endif(NOT MSVC) ++endif(SHARED) + -+install(TARGETS mpcdec_static mpcdec_shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}") ++install(TARGETS mpcdec_static LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}") ++ ++if(SHARED) ++ install(TARGETS mpcdec_shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}") ++endif(SHARED) diff -ruN musepack-tools-444.orig/mpc2sv8/CMakeLists.txt musepack-tools-444/mpc2sv8/CMakeLists.txt --- musepack-tools-444.orig/mpc2sv8/CMakeLists.txt 2009-07-25 16:49:11.000000000 +0300 -+++ musepack-tools-444/mpc2sv8/CMakeLists.txt 2009-07-25 17:59:54.000000000 +0300 -@@ -12,7 +12,7 @@ ++++ musepack-tools-444/mpc2sv8/CMakeLists.txt 2009-07-31 16:07:59.000000000 +0300 +@@ -12,7 +12,12 @@ add_executable(mpc2sv8 mpc2sv8.c) -target_link_libraries(mpc2sv8 mpcdec_static) -+target_link_libraries(mpc2sv8 mpcdec_shared) ++if(SHARED) ++ target_link_libraries(mpc2sv8 mpcdec_shared) ++else(SHARED) ++ target_link_libraries(mpc2sv8 mpcdec_static) ++endif(SHARED) ++ target_link_libraries(mpc2sv8 mpcenc_static) if(WIN32) -@@ -27,3 +27,4 @@ +@@ -27,3 +32,4 @@ target_link_libraries(mpc2sv8 ossaudio) endif(CMAKE_SYSTEM_NAME STREQUAL OpenBSD) +install(TARGETS mpc2sv8 RUNTIME DESTINATION bin) diff -ruN musepack-tools-444.orig/mpcchap/CMakeLists.txt musepack-tools-444/mpcchap/CMakeLists.txt --- musepack-tools-444.orig/mpcchap/CMakeLists.txt 2009-07-25 16:49:11.000000000 +0300 -+++ musepack-tools-444/mpcchap/CMakeLists.txt 2009-07-25 17:59:30.000000000 +0300 -@@ -14,7 +14,7 @@ ++++ musepack-tools-444/mpcchap/CMakeLists.txt 2009-07-31 16:07:07.000000000 +0300 +@@ -14,7 +14,12 @@ add_executable(mpcchap mpcchap dictionary iniparser ${libmpc_SOURCE_DIR}/common/tags) -target_link_libraries(mpcchap mpcdec_static) -+target_link_libraries(mpcchap mpcdec_shared) ++if(SHARED) ++ target_link_libraries(mpcchap mpcdec_shared) ++else(SHARED) ++ target_link_libraries(mpcchap mpcdec_static) ++endif(SHARED) ++ target_link_libraries(mpcchap mpcenc_static) target_link_libraries(mpcchap ${CUEFILE_LIBRARY}) -@@ -22,3 +22,4 @@ +@@ -22,3 +27,4 @@ target_link_libraries(mpcchap m) endif(NOT MSVC) +install(TARGETS mpcchap RUNTIME DESTINATION bin) diff -ruN musepack-tools-444.orig/mpccut/CMakeLists.txt musepack-tools-444/mpccut/CMakeLists.txt --- musepack-tools-444.orig/mpccut/CMakeLists.txt 2009-07-25 16:49:10.000000000 +0300 -+++ musepack-tools-444/mpccut/CMakeLists.txt 2009-07-25 18:00:24.000000000 +0300 -@@ -12,10 +12,11 @@ ++++ musepack-tools-444/mpccut/CMakeLists.txt 2009-07-31 16:03:42.000000000 +0300 +@@ -12,10 +12,16 @@ add_executable(mpccut mpccut) -target_link_libraries(mpccut mpcdec_static) -+target_link_libraries(mpccut mpcdec_shared) ++if(SHARED) ++ target_link_libraries(mpccut mpcdec_shared) ++else(SHARED) ++ target_link_libraries(mpccut mpcdec_static) ++endif(SHARED) ++ target_link_libraries(mpccut mpcenc_static) if(NOT MSVC) @@ -89,24 +125,34 @@ diff -ruN musepack-tools-444.orig/mpccut/CMakeLists.txt musepack-tools-444/mpccu +install(TARGETS mpccut RUNTIME DESTINATION bin) diff -ruN musepack-tools-444.orig/mpcdec/CMakeLists.txt musepack-tools-444/mpcdec/CMakeLists.txt --- musepack-tools-444.orig/mpcdec/CMakeLists.txt 2009-07-25 16:49:10.000000000 +0300 -+++ musepack-tools-444/mpcdec/CMakeLists.txt 2009-07-25 18:00:49.000000000 +0300 -@@ -17,4 +17,6 @@ ++++ musepack-tools-444/mpcdec/CMakeLists.txt 2009-07-31 16:06:43.000000000 +0300 +@@ -17,4 +17,11 @@ endif(NOT MSVC) target_link_libraries(mpcdec wavformat_static) -target_link_libraries(mpcdec mpcdec_static) -+target_link_libraries(mpcdec mpcdec_shared) ++ ++if(SHARED) ++ target_link_libraries(mpcdec mpcdec_shared) ++else(SHARED) ++ target_link_libraries(mpcdec mpcdec_static) ++endif(SHARED) + +install(TARGETS mpcdec RUNTIME DESTINATION bin) diff -ruN musepack-tools-444.orig/mpcgain/CMakeLists.txt musepack-tools-444/mpcgain/CMakeLists.txt --- musepack-tools-444.orig/mpcgain/CMakeLists.txt 2009-07-25 16:49:11.000000000 +0300 -+++ musepack-tools-444/mpcgain/CMakeLists.txt 2009-07-25 18:05:03.000000000 +0300 -@@ -18,9 +18,10 @@ ++++ musepack-tools-444/mpcgain/CMakeLists.txt 2009-07-31 16:06:17.000000000 +0300 +@@ -18,9 +18,15 @@ add_executable(mpcgain mpcgain.c) target_link_libraries(mpcgain ${REPLAY_GAIN_LIBRARY}) -target_link_libraries(mpcgain mpcdec_static) -+target_link_libraries(mpcgain mpcdec_shared) ++ ++if(SHARED) ++ target_link_libraries(mpcgain mpcdec_shared) ++else(SHARED) ++ target_link_libraries(mpcgain mpcdec_static) ++endif(SHARED) if(NOT MSVC) target_link_libraries(mpcgain m) @@ -115,7 +161,7 @@ diff -ruN musepack-tools-444.orig/mpcgain/CMakeLists.txt musepack-tools-444/mpcg +install(TARGETS mpcgain RUNTIME DESTINATION bin) diff -ruN musepack-tools-444.orig/wavcmp/CMakeLists.txt musepack-tools-444/wavcmp/CMakeLists.txt --- musepack-tools-444.orig/wavcmp/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200 -+++ musepack-tools-444/wavcmp/CMakeLists.txt 2009-07-25 18:20:36.000000000 +0300 ++++ musepack-tools-444/wavcmp/CMakeLists.txt 2009-07-31 15:33:45.000000000 +0300 @@ -0,0 +1,8 @@ +include_directories(${libmpc_SOURCE_DIR}/libwavformat) +link_directories(${libmpc_BINARY_DIR}/libwavformat) diff --git a/media-sound/musepack-tools/musepack-tools-444.ebuild b/media-sound/musepack-tools/musepack-tools-444.ebuild index 7d9f570f5482..e61436ba5802 100644 --- a/media-sound/musepack-tools/musepack-tools-444.ebuild +++ b/media-sound/musepack-tools/musepack-tools-444.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-444.ebuild,v 1.7 2009/07/29 14:32:00 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-444.ebuild,v 1.8 2009/07/31 13:15:11 ssuominen Exp $ inherit cmake-utils @@ -24,9 +24,11 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${P}-gentoo.patch" ) +pkg_setup() { + mycmakeargs="-DSHARED=ON" +} + src_install() { cmake-utils_src_install - insinto /usr/include/mpc - doins include/mpc/*.h || die "doins failed" dosym mpc /usr/include/mpcdec || die "dosym failed" } |