diff options
author | Tim Harder <radhermit@gentoo.org> | 2013-06-01 23:49:12 +0000 |
---|---|---|
committer | Tim Harder <radhermit@gentoo.org> | 2013-06-01 23:49:12 +0000 |
commit | ca765dde0baf1b51225460a02be5dfa0fb46a449 (patch) | |
tree | 08185799a27884855cdcc042f1e0ab9163f0ca72 /media-sound | |
parent | Fix build with USE=-python and empty PYTHON_TARGETS; force non-empty PYTHON_T... (diff) | |
download | gentoo-2-ca765dde0baf1b51225460a02be5dfa0fb46a449.tar.gz gentoo-2-ca765dde0baf1b51225460a02be5dfa0fb46a449.tar.bz2 gentoo-2-ca765dde0baf1b51225460a02be5dfa0fb46a449.zip |
Remove old.
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'media-sound')
-rw-r--r-- | media-sound/musepack-tools/ChangeLog | 6 | ||||
-rw-r--r-- | media-sound/musepack-tools/files/musepack-tools-444-gentoo.patch | 173 | ||||
-rw-r--r-- | media-sound/musepack-tools/musepack-tools-444-r1.ebuild | 35 |
3 files changed, 5 insertions, 209 deletions
diff --git a/media-sound/musepack-tools/ChangeLog b/media-sound/musepack-tools/ChangeLog index 05e3d34daa48..c67aa7ba5c27 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-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.66 2013/06/01 14:27:00 creffett Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.67 2013/06/01 23:49:12 radhermit Exp $ + + 01 Jun 2013; Tim Harder <radhermit@gentoo.org> -musepack-tools-444-r1.ebuild, + -files/musepack-tools-444-gentoo.patch: + Remove old. 01 Jun 2013; Chris Reffett <creffett@gentoo.org> musepack-tools-444-r1.ebuild: EAPI bump wrt bug 460572 diff --git a/media-sound/musepack-tools/files/musepack-tools-444-gentoo.patch b/media-sound/musepack-tools/files/musepack-tools-444-gentoo.patch deleted file mode 100644 index 6393afd61256..000000000000 --- a/media-sound/musepack-tools/files/musepack-tools-444-gentoo.patch +++ /dev/null @@ -1,173 +0,0 @@ -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-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-31 15:33:45.000000000 +0300 -@@ -16,6 +16,8 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -+#include <math.h> -+ - #include <mpc/mpc_types.h> - - 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-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) -+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 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-31 16:07:59.000000000 +0300 -@@ -12,7 +12,12 @@ - - add_executable(mpc2sv8 mpc2sv8.c) - --target_link_libraries(mpc2sv8 mpcdec_static) -+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 +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-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) -+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 +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-31 16:03:42.000000000 +0300 -@@ -12,10 +12,16 @@ - - add_executable(mpccut mpccut) - --target_link_libraries(mpccut mpcdec_static) -+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) - target_link_libraries(mpccut m) - endif(NOT MSVC) - -+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-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) -+ -+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-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) -+ -+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) - endif(NOT MSVC) - -+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-31 15:33:45.000000000 +0300 -@@ -0,0 +1,8 @@ -+include_directories(${libmpc_SOURCE_DIR}/libwavformat) -+link_directories(${libmpc_BINARY_DIR}/libwavformat) -+ -+add_executable(wavcmp wavcmp) -+ -+target_link_libraries(wavcmp wavformat_static) -+ -+install(TARGETS wavcmp RUNTIME DESTINATION bin) diff --git a/media-sound/musepack-tools/musepack-tools-444-r1.ebuild b/media-sound/musepack-tools/musepack-tools-444-r1.ebuild deleted file mode 100644 index 3d39f6594978..000000000000 --- a/media-sound/musepack-tools/musepack-tools-444-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2013 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-r1.ebuild,v 1.2 2013/06/01 14:27:00 creffett Exp $ -EAPI=5 - -inherit cmake-utils - -# svn co 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="http://www.musepack.net" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="BSD LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 hppa ppc ppc64 x86 ~x86-fbsd" -IUSE="" - -DEPEND=">=media-libs/libcuefile-${PV} - >=media-libs/libreplaygain-${PV} - !media-libs/libmpcdec - !media-libs/libmpcdecsv7" - -PATCHES=( "${FILESDIR}/${P}-gentoo.patch" ) - -pkg_setup() { - mycmakeargs="-DSHARED=ON" -} - -src_install() { - cmake-utils_src_install - # Forgot to remove .svn directories from snapshot. - rm -rf "${D}"/usr/include/mpc/.svn || die "rm -rf failed" -} |