diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-07-31 13:32:13 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-07-31 13:32:13 +0000 |
| commit | b3169ee9766c238f716acdb1647d205cb5315ca0 (patch) | |
| tree | 139235b55936cf77c9a087bb8e2b497370e94782 /media-libs/libreplaygain | |
| parent | I knew this will backfire me. Forgot to remove .svn directories from snapshot... (diff) | |
| download | gentoo-2-b3169ee9766c238f716acdb1647d205cb5315ca0.tar.gz gentoo-2-b3169ee9766c238f716acdb1647d205cb5315ca0.tar.bz2 gentoo-2-b3169ee9766c238f716acdb1647d205cb5315ca0.zip | |
Update patch for upstream.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/libreplaygain')
| -rw-r--r-- | media-libs/libreplaygain/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libreplaygain/files/libreplaygain-444-multilib.patch | 45 | ||||
| -rw-r--r-- | media-libs/libreplaygain/libreplaygain-444.ebuild | 10 |
3 files changed, 51 insertions, 10 deletions
diff --git a/media-libs/libreplaygain/ChangeLog b/media-libs/libreplaygain/ChangeLog index abcc466a3275..5435a382860b 100644 --- a/media-libs/libreplaygain/ChangeLog +++ b/media-libs/libreplaygain/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libreplaygain # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libreplaygain/ChangeLog,v 1.4 2009/07/29 14:29:26 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libreplaygain/ChangeLog,v 1.5 2009/07/31 13:32:13 ssuominen Exp $ + + 31 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> + libreplaygain-444.ebuild, files/libreplaygain-444-multilib.patch: + Update patch for upstream. 29 Jul 2009; Jeroen Roovers <jer@gentoo.org> libreplaygain-444.ebuild: Marked ~hppa (bug #279069). diff --git a/media-libs/libreplaygain/files/libreplaygain-444-multilib.patch b/media-libs/libreplaygain/files/libreplaygain-444-multilib.patch index d1cceb05e9bc..16bc0ea5aa8f 100644 --- a/media-libs/libreplaygain/files/libreplaygain-444-multilib.patch +++ b/media-libs/libreplaygain/files/libreplaygain-444-multilib.patch @@ -1,9 +1,42 @@ -diff -ur libreplaygain-444.orig/src/CMakeLists.txt libreplaygain-444/src/CMakeLists.txt +diff -ruN libreplaygain-444.orig/CMakeLists.txt libreplaygain-444/CMakeLists.txt +--- libreplaygain-444.orig/CMakeLists.txt 2009-07-25 14:49:52.000000000 +0300 ++++ libreplaygain-444/CMakeLists.txt 2009-07-31 16:29:50.000000000 +0300 +@@ -4,8 +4,11 @@ +
+ set(CMAKE_VERBOSE_MAKEFILE false)
+
++option(SHARED "Use shared libreplaygain" OFF)
++
+ if(NOT MSVC)
+ set(CMAKE_C_FLAGS "-O3 -fomit-frame-pointer -pipe")
+ endif(NOT MSVC)
+
+-add_subdirectory(src) +\ No newline at end of file ++add_subdirectory(src)
++add_subdirectory(include)
+diff -ruN libreplaygain-444.orig/include/CMakeLists.txt libreplaygain-444/include/CMakeLists.txt +--- libreplaygain-444.orig/include/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200 ++++ libreplaygain-444/include/CMakeLists.txt 2009-07-31 16:28:59.000000000 +0300 +@@ -0,0 +1 @@ ++INSTALL(DIRECTORY replaygain DESTINATION include) +diff -ruN libreplaygain-444.orig/src/CMakeLists.txt libreplaygain-444/src/CMakeLists.txt --- libreplaygain-444.orig/src/CMakeLists.txt 2009-07-25 14:49:52.000000000 +0300 -+++ libreplaygain-444/src/CMakeLists.txt 2009-07-25 15:00:48.000000000 +0300 -@@ -6,4 +6,4 @@ - add_library(replaygain-shared SHARED gain_analysis) - set_target_properties(replaygain-shared PROPERTIES OUTPUT_NAME replaygain CLEAN_DIRECT_OUTPUT 1 VERSION 1.0.0 SOVERSION 1) ++++ libreplaygain-444/src/CMakeLists.txt 2009-07-31 16:31:36.000000000 +0300 +@@ -3,7 +3,13 @@ + add_library(replaygain-static STATIC gain_analysis) + set_target_properties(replaygain-static PROPERTIES OUTPUT_NAME replaygain CLEAN_DIRECT_OUTPUT 1) + +-add_library(replaygain-shared SHARED gain_analysis) +-set_target_properties(replaygain-shared PROPERTIES OUTPUT_NAME replaygain CLEAN_DIRECT_OUTPUT 1 VERSION 1.0.0 SOVERSION 1) ++if(SHARED) ++ add_library(replaygain-shared SHARED gain_analysis) ++ set_target_properties(replaygain-shared PROPERTIES OUTPUT_NAME replaygain CLEAN_DIRECT_OUTPUT 1 VERSION 1.0.0 SOVERSION 1) ++endif(SHARED) -install(TARGETS replaygain-static replaygain-shared LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) -+install(TARGETS replaygain-static replaygain-shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}") ++install(TARGETS replaygain-static LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}") ++ ++if(SHARED) ++ install(TARGETS replaygain-shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}") ++endif(SHARED) diff --git a/media-libs/libreplaygain/libreplaygain-444.ebuild b/media-libs/libreplaygain/libreplaygain-444.ebuild index 699fe6598daa..35d5696e9800 100644 --- a/media-libs/libreplaygain/libreplaygain-444.ebuild +++ b/media-libs/libreplaygain/libreplaygain-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-libs/libreplaygain/libreplaygain-444.ebuild,v 1.8 2009/07/29 14:29:26 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libreplaygain/libreplaygain-444.ebuild,v 1.9 2009/07/31 13:32:13 ssuominen Exp $ inherit cmake-utils @@ -18,8 +18,12 @@ IUSE="" PATCHES=( "${FILESDIR}/${P}-multilib.patch" ) +pkg_setup() { + mycmakeargs="-DSHARED=ON" +} + src_install() { cmake-utils_src_install - insinto /usr/include/replaygain - doins -r include/replaygain/*.h || die "doins failed" + # Forgot to remove .svn directories from snapshot. + rm -rf "${D}"/usr/include/replaygain/.svn || die "rm -rf failed" } |