projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4bf4601
)
Try to prevent ffmpeg shared build for Linux as it fails to link statically to libsoxr.
author
Carl Hetherington
<cth@carlh.net>
Thu, 3 Sep 2015 23:08:44 +0000
(
00:08
+0100)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 3 Sep 2015 23:08:44 +0000
(
00:08
+0100)
cscript
patch
|
blob
|
history
diff --git
a/cscript
b/cscript
index 47956b6a120f40efd850557b8db544a926df91d0..3824603ec0826809a310ea55e11cc21d523673e4 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-238,7
+238,13
@@
def make_spec(filename, version, target):
print >>f,'/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :'
def dependencies(target):
- return (('ffmpeg-cdist', '2e977e1'),
+
+ if target.platform == 'linux':
+ ffmpeg_options = { 'shared': False }
+ else:
+ ffmpeg_options = {}
+
+ return (('ffmpeg-cdist', '2e977e1', ffmpeg_options),
('libdcp', 'v1.2.3'),
('libsub', 'v1.1.4'))