Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/libreplaygain/files: libreplaygain-444-multilib.patch
Date: Fri, 31 Jul 2009 13:32:16
Message-Id: E1MWsDV-0005Yw-No@stork.gentoo.org
1 ssuominen 09/07/31 13:32:13
2
3 Modified: libreplaygain-444-multilib.patch
4 Log:
5 Update patch for upstream.
6 (Portage version: 2.2_rc33/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.2 media-libs/libreplaygain/files/libreplaygain-444-multilib.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libreplaygain/files/libreplaygain-444-multilib.patch?rev=1.2&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libreplaygain/files/libreplaygain-444-multilib.patch?rev=1.2&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libreplaygain/files/libreplaygain-444-multilib.patch?r1=1.1&r2=1.2
14
15 Index: libreplaygain-444-multilib.patch
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/media-libs/libreplaygain/files/libreplaygain-444-multilib.patch,v
18 retrieving revision 1.1
19 retrieving revision 1.2
20 diff -u -r1.1 -r1.2
21 --- libreplaygain-444-multilib.patch 25 Jul 2009 12:03:57 -0000 1.1
22 +++ libreplaygain-444-multilib.patch 31 Jul 2009 13:32:13 -0000 1.2
23 @@ -1,9 +1,42 @@
24 -diff -ur libreplaygain-444.orig/src/CMakeLists.txt libreplaygain-444/src/CMakeLists.txt
25 +diff -ruN libreplaygain-444.orig/CMakeLists.txt libreplaygain-444/CMakeLists.txt
26 +--- libreplaygain-444.orig/CMakeLists.txt 2009-07-25 14:49:52.000000000 +0300
27 ++++ libreplaygain-444/CMakeLists.txt 2009-07-31 16:29:50.000000000 +0300
28 +@@ -4,8 +4,11 @@
29 +
30 + set(CMAKE_VERBOSE_MAKEFILE false)
31 +
32 ++option(SHARED "Use shared libreplaygain" OFF)
33 ++
34 + if(NOT MSVC)
35 + set(CMAKE_C_FLAGS "-O3 -fomit-frame-pointer -pipe")
36 + endif(NOT MSVC)
37 +
38 +-add_subdirectory(src)
39 +\ No newline at end of file
40 ++add_subdirectory(src)
41 ++add_subdirectory(include)
42 +diff -ruN libreplaygain-444.orig/include/CMakeLists.txt libreplaygain-444/include/CMakeLists.txt
43 +--- libreplaygain-444.orig/include/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200
44 ++++ libreplaygain-444/include/CMakeLists.txt 2009-07-31 16:28:59.000000000 +0300
45 +@@ -0,0 +1 @@
46 ++INSTALL(DIRECTORY replaygain DESTINATION include)
47 +diff -ruN libreplaygain-444.orig/src/CMakeLists.txt libreplaygain-444/src/CMakeLists.txt
48 --- libreplaygain-444.orig/src/CMakeLists.txt 2009-07-25 14:49:52.000000000 +0300
49 -+++ libreplaygain-444/src/CMakeLists.txt 2009-07-25 15:00:48.000000000 +0300
50 -@@ -6,4 +6,4 @@
51 - add_library(replaygain-shared SHARED gain_analysis)
52 - set_target_properties(replaygain-shared PROPERTIES OUTPUT_NAME replaygain CLEAN_DIRECT_OUTPUT 1 VERSION 1.0.0 SOVERSION 1)
53 ++++ libreplaygain-444/src/CMakeLists.txt 2009-07-31 16:31:36.000000000 +0300
54 +@@ -3,7 +3,13 @@
55 + add_library(replaygain-static STATIC gain_analysis)
56 + set_target_properties(replaygain-static PROPERTIES OUTPUT_NAME replaygain CLEAN_DIRECT_OUTPUT 1)
57 +
58 +-add_library(replaygain-shared SHARED gain_analysis)
59 +-set_target_properties(replaygain-shared PROPERTIES OUTPUT_NAME replaygain CLEAN_DIRECT_OUTPUT 1 VERSION 1.0.0 SOVERSION 1)
60 ++if(SHARED)
61 ++ add_library(replaygain-shared SHARED gain_analysis)
62 ++ set_target_properties(replaygain-shared PROPERTIES OUTPUT_NAME replaygain CLEAN_DIRECT_OUTPUT 1 VERSION 1.0.0 SOVERSION 1)
63 ++endif(SHARED)
64
65 -install(TARGETS replaygain-static replaygain-shared LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
66 -+install(TARGETS replaygain-static replaygain-shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
67 ++install(TARGETS replaygain-static LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
68 ++
69 ++if(SHARED)
70 ++ install(TARGETS replaygain-shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
71 ++endif(SHARED)