1 |
ssuominen 09/07/31 13:15:12 |
2 |
|
3 |
Modified: musepack-tools-444-gentoo.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-sound/musepack-tools/files/musepack-tools-444-gentoo.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/musepack-tools/files/musepack-tools-444-gentoo.patch?rev=1.2&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/musepack-tools/files/musepack-tools-444-gentoo.patch?rev=1.2&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/musepack-tools/files/musepack-tools-444-gentoo.patch?r1=1.1&r2=1.2 |
14 |
|
15 |
Index: musepack-tools-444-gentoo.patch |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/files/musepack-tools-444-gentoo.patch,v |
18 |
retrieving revision 1.1 |
19 |
retrieving revision 1.2 |
20 |
diff -u -r1.1 -r1.2 |
21 |
--- musepack-tools-444-gentoo.patch 25 Jul 2009 15:24:18 -0000 1.1 |
22 |
+++ musepack-tools-444-gentoo.patch 31 Jul 2009 13:15:12 -0000 1.2 |
23 |
@@ -1,14 +1,29 @@ |
24 |
diff -ruN musepack-tools-444.orig/CMakeLists.txt musepack-tools-444/CMakeLists.txt |
25 |
--- musepack-tools-444.orig/CMakeLists.txt 2009-07-25 16:49:11.000000000 +0300 |
26 |
-+++ musepack-tools-444/CMakeLists.txt 2009-07-25 18:04:19.000000000 +0300 |
27 |
-@@ -22,3 +22,4 @@ |
28 |
++++ musepack-tools-444/CMakeLists.txt 2009-07-31 16:11:09.000000000 +0300 |
29 |
+@@ -6,6 +6,8 @@ |
30 |
+ set(CMAKE_VERBOSE_MAKEFILE false) |
31 |
+ TEST_BIG_ENDIAN(MPC_ENDIANNESS) |
32 |
+ |
33 |
++option(SHARED "Use shared libmpcdec" OFF) |
34 |
++ |
35 |
+ add_definitions(-DFAST_MATH -DCVD_FASTLOG) |
36 |
+ |
37 |
+ if(NOT MSVC) |
38 |
+@@ -22,3 +24,5 @@ |
39 |
add_subdirectory(mpc2sv8) |
40 |
add_subdirectory(mpccut) |
41 |
add_subdirectory(mpcchap) |
42 |
+add_subdirectory(wavcmp) |
43 |
++add_subdirectory(include) |
44 |
+diff -ruN musepack-tools-444.orig/include/CMakeLists.txt musepack-tools-444/include/CMakeLists.txt |
45 |
+--- musepack-tools-444.orig/include/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200 |
46 |
++++ musepack-tools-444/include/CMakeLists.txt 2009-07-31 16:09:09.000000000 +0300 |
47 |
+@@ -0,0 +1 @@ |
48 |
++INSTALL(DIRECTORY mpc DESTINATION include) |
49 |
diff -ruN musepack-tools-444.orig/include/mpc/mpcmath.h musepack-tools-444/include/mpc/mpcmath.h |
50 |
--- musepack-tools-444.orig/include/mpc/mpcmath.h 2009-07-25 16:49:10.000000000 +0300 |
51 |
-+++ musepack-tools-444/include/mpc/mpcmath.h 2009-07-25 17:37:16.000000000 +0300 |
52 |
++++ musepack-tools-444/include/mpc/mpcmath.h 2009-07-31 15:33:45.000000000 +0300 |
53 |
@@ -16,6 +16,8 @@ |
54 |
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
55 |
*/ |
56 |
@@ -20,66 +35,87 @@ |
57 |
typedef union mpc_floatint |
58 |
diff -ruN musepack-tools-444.orig/libmpcdec/CMakeLists.txt musepack-tools-444/libmpcdec/CMakeLists.txt |
59 |
--- musepack-tools-444.orig/libmpcdec/CMakeLists.txt 2009-07-25 16:49:10.000000000 +0300 |
60 |
-+++ musepack-tools-444/libmpcdec/CMakeLists.txt 2009-07-25 17:58:04.000000000 +0300 |
61 |
-@@ -1,2 +1,15 @@ |
62 |
++++ musepack-tools-444/libmpcdec/CMakeLists.txt 2009-07-31 16:05:03.000000000 +0300 |
63 |
+@@ -1,2 +1,21 @@ |
64 |
include_directories(${libmpc_SOURCE_DIR}/include) |
65 |
+ |
66 |
add_library(mpcdec_static STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32) |
67 |
+set_target_properties(mpcdec_static PROPERTIES OUTPUT_NAME mpcdec CLEAN_DIRECT_OUTPUT 1) |
68 |
+if(NOT MSVC) |
69 |
-+target_link_libraries(mpcdec_static m) |
70 |
-+endif(NOT MSVC) |
71 |
-+ |
72 |
-+add_library(mpcdec_shared SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32) |
73 |
-+set_target_properties(mpcdec_shared PROPERTIES OUTPUT_NAME mpcdec CLEAN_DIRECT_OUTPUT 1 VERSION 6.1.0 SOVERSION 6) |
74 |
-+if(NOT MSVC) |
75 |
-+target_link_libraries(mpcdec_shared m) |
76 |
++ target_link_libraries(mpcdec_static m) |
77 |
+endif(NOT MSVC) |
78 |
+ |
79 |
-+install(TARGETS mpcdec_static mpcdec_shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}") |
80 |
++if(SHARED) |
81 |
++ add_library(mpcdec_shared SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32) |
82 |
++ set_target_properties(mpcdec_shared PROPERTIES OUTPUT_NAME mpcdec CLEAN_DIRECT_OUTPUT 1 VERSION 6.1.0 SOVERSION 6) |
83 |
++ if(NOT MSVC) |
84 |
++ target_link_libraries(mpcdec_shared m) |
85 |
++ endif(NOT MSVC) |
86 |
++endif(SHARED) |
87 |
++ |
88 |
++install(TARGETS mpcdec_static LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}") |
89 |
++ |
90 |
++if(SHARED) |
91 |
++ install(TARGETS mpcdec_shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}") |
92 |
++endif(SHARED) |
93 |
diff -ruN musepack-tools-444.orig/mpc2sv8/CMakeLists.txt musepack-tools-444/mpc2sv8/CMakeLists.txt |
94 |
--- musepack-tools-444.orig/mpc2sv8/CMakeLists.txt 2009-07-25 16:49:11.000000000 +0300 |
95 |
-+++ musepack-tools-444/mpc2sv8/CMakeLists.txt 2009-07-25 17:59:54.000000000 +0300 |
96 |
-@@ -12,7 +12,7 @@ |
97 |
++++ musepack-tools-444/mpc2sv8/CMakeLists.txt 2009-07-31 16:07:59.000000000 +0300 |
98 |
+@@ -12,7 +12,12 @@ |
99 |
|
100 |
add_executable(mpc2sv8 mpc2sv8.c) |
101 |
|
102 |
-target_link_libraries(mpc2sv8 mpcdec_static) |
103 |
-+target_link_libraries(mpc2sv8 mpcdec_shared) |
104 |
++if(SHARED) |
105 |
++ target_link_libraries(mpc2sv8 mpcdec_shared) |
106 |
++else(SHARED) |
107 |
++ target_link_libraries(mpc2sv8 mpcdec_static) |
108 |
++endif(SHARED) |
109 |
++ |
110 |
target_link_libraries(mpc2sv8 mpcenc_static) |
111 |
|
112 |
if(WIN32) |
113 |
-@@ -27,3 +27,4 @@ |
114 |
+@@ -27,3 +32,4 @@ |
115 |
target_link_libraries(mpc2sv8 ossaudio) |
116 |
endif(CMAKE_SYSTEM_NAME STREQUAL OpenBSD) |
117 |
|
118 |
+install(TARGETS mpc2sv8 RUNTIME DESTINATION bin) |
119 |
diff -ruN musepack-tools-444.orig/mpcchap/CMakeLists.txt musepack-tools-444/mpcchap/CMakeLists.txt |
120 |
--- musepack-tools-444.orig/mpcchap/CMakeLists.txt 2009-07-25 16:49:11.000000000 +0300 |
121 |
-+++ musepack-tools-444/mpcchap/CMakeLists.txt 2009-07-25 17:59:30.000000000 +0300 |
122 |
-@@ -14,7 +14,7 @@ |
123 |
++++ musepack-tools-444/mpcchap/CMakeLists.txt 2009-07-31 16:07:07.000000000 +0300 |
124 |
+@@ -14,7 +14,12 @@ |
125 |
|
126 |
add_executable(mpcchap mpcchap dictionary iniparser ${libmpc_SOURCE_DIR}/common/tags) |
127 |
|
128 |
-target_link_libraries(mpcchap mpcdec_static) |
129 |
-+target_link_libraries(mpcchap mpcdec_shared) |
130 |
++if(SHARED) |
131 |
++ target_link_libraries(mpcchap mpcdec_shared) |
132 |
++else(SHARED) |
133 |
++ target_link_libraries(mpcchap mpcdec_static) |
134 |
++endif(SHARED) |
135 |
++ |
136 |
target_link_libraries(mpcchap mpcenc_static) |
137 |
target_link_libraries(mpcchap ${CUEFILE_LIBRARY}) |
138 |
|
139 |
-@@ -22,3 +22,4 @@ |
140 |
+@@ -22,3 +27,4 @@ |
141 |
target_link_libraries(mpcchap m) |
142 |
endif(NOT MSVC) |
143 |
|
144 |
+install(TARGETS mpcchap RUNTIME DESTINATION bin) |
145 |
diff -ruN musepack-tools-444.orig/mpccut/CMakeLists.txt musepack-tools-444/mpccut/CMakeLists.txt |
146 |
--- musepack-tools-444.orig/mpccut/CMakeLists.txt 2009-07-25 16:49:10.000000000 +0300 |
147 |
-+++ musepack-tools-444/mpccut/CMakeLists.txt 2009-07-25 18:00:24.000000000 +0300 |
148 |
-@@ -12,10 +12,11 @@ |
149 |
++++ musepack-tools-444/mpccut/CMakeLists.txt 2009-07-31 16:03:42.000000000 +0300 |
150 |
+@@ -12,10 +12,16 @@ |
151 |
|
152 |
add_executable(mpccut mpccut) |
153 |
|
154 |
-target_link_libraries(mpccut mpcdec_static) |
155 |
-+target_link_libraries(mpccut mpcdec_shared) |
156 |
++if(SHARED) |
157 |
++ target_link_libraries(mpccut mpcdec_shared) |
158 |
++else(SHARED) |
159 |
++ target_link_libraries(mpccut mpcdec_static) |
160 |
++endif(SHARED) |
161 |
++ |
162 |
target_link_libraries(mpccut mpcenc_static) |
163 |
|
164 |
if(NOT MSVC) |
165 |
@@ -89,24 +125,34 @@ |
166 |
+install(TARGETS mpccut RUNTIME DESTINATION bin) |
167 |
diff -ruN musepack-tools-444.orig/mpcdec/CMakeLists.txt musepack-tools-444/mpcdec/CMakeLists.txt |
168 |
--- musepack-tools-444.orig/mpcdec/CMakeLists.txt 2009-07-25 16:49:10.000000000 +0300 |
169 |
-+++ musepack-tools-444/mpcdec/CMakeLists.txt 2009-07-25 18:00:49.000000000 +0300 |
170 |
-@@ -17,4 +17,6 @@ |
171 |
++++ musepack-tools-444/mpcdec/CMakeLists.txt 2009-07-31 16:06:43.000000000 +0300 |
172 |
+@@ -17,4 +17,11 @@ |
173 |
endif(NOT MSVC) |
174 |
|
175 |
target_link_libraries(mpcdec wavformat_static) |
176 |
-target_link_libraries(mpcdec mpcdec_static) |
177 |
-+target_link_libraries(mpcdec mpcdec_shared) |
178 |
++ |
179 |
++if(SHARED) |
180 |
++ target_link_libraries(mpcdec mpcdec_shared) |
181 |
++else(SHARED) |
182 |
++ target_link_libraries(mpcdec mpcdec_static) |
183 |
++endif(SHARED) |
184 |
+ |
185 |
+install(TARGETS mpcdec RUNTIME DESTINATION bin) |
186 |
diff -ruN musepack-tools-444.orig/mpcgain/CMakeLists.txt musepack-tools-444/mpcgain/CMakeLists.txt |
187 |
--- musepack-tools-444.orig/mpcgain/CMakeLists.txt 2009-07-25 16:49:11.000000000 +0300 |
188 |
-+++ musepack-tools-444/mpcgain/CMakeLists.txt 2009-07-25 18:05:03.000000000 +0300 |
189 |
-@@ -18,9 +18,10 @@ |
190 |
++++ musepack-tools-444/mpcgain/CMakeLists.txt 2009-07-31 16:06:17.000000000 +0300 |
191 |
+@@ -18,9 +18,15 @@ |
192 |
add_executable(mpcgain mpcgain.c) |
193 |
|
194 |
target_link_libraries(mpcgain ${REPLAY_GAIN_LIBRARY}) |
195 |
-target_link_libraries(mpcgain mpcdec_static) |
196 |
-+target_link_libraries(mpcgain mpcdec_shared) |
197 |
++ |
198 |
++if(SHARED) |
199 |
++ target_link_libraries(mpcgain mpcdec_shared) |
200 |
++else(SHARED) |
201 |
++ target_link_libraries(mpcgain mpcdec_static) |
202 |
++endif(SHARED) |
203 |
|
204 |
if(NOT MSVC) |
205 |
target_link_libraries(mpcgain m) |
206 |
@@ -115,7 +161,7 @@ |
207 |
+install(TARGETS mpcgain RUNTIME DESTINATION bin) |
208 |
diff -ruN musepack-tools-444.orig/wavcmp/CMakeLists.txt musepack-tools-444/wavcmp/CMakeLists.txt |
209 |
--- musepack-tools-444.orig/wavcmp/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200 |
210 |
-+++ musepack-tools-444/wavcmp/CMakeLists.txt 2009-07-25 18:20:36.000000000 +0300 |
211 |
++++ musepack-tools-444/wavcmp/CMakeLists.txt 2009-07-31 15:33:45.000000000 +0300 |
212 |
@@ -0,0 +1,8 @@ |
213 |
+include_directories(${libmpc_SOURCE_DIR}/libwavformat) |
214 |
+link_directories(${libmpc_BINARY_DIR}/libwavformat) |