summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-12-11 23:15:18 +0000
committerCarl Hetherington <cth@carlh.net>2012-12-11 23:15:18 +0000
commit4f8f6baed5ca7c154f694e0d861f5988b6d0da73 (patch)
tree569ced216f1139ae3997e4f626f200e19cfb9f50
parent5b94b810863d860ac11738ad827dedb5ff2e8607 (diff)
Tweak .deb deps, hopefully to work on 32/64 ubuntu.
-rw-r--r--ChangeLog4
-rw-r--r--wscript2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 213b7e372..db6adc28f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2012-12-11 Carl Hetherington <cth@carlh.net>
+ * More .deb dep tweaks.
+
+2012-12-11 Carl Hetherington <cth@carlh.net>
+
* Version 0.60 released.
2012-12-11 Carl Hetherington <cth@carlh.net>
diff --git a/wscript b/wscript
index 07b57839f..7f6765889 100644
--- a/wscript
+++ b/wscript
@@ -67,7 +67,7 @@ def configure(conf):
# I think anyone else who builds would do so dynamically.
conf.env.HAVE_DCP = 1
conf.env.STLIB_DCP = ['dcp', 'asdcp-libdcp', 'kumu-libdcp']
- conf.env.LIB_DCP = ['glibmm-2.4', 'xml++-2.6', 'ssl3', 'gnutls-openssl', 'crypto', 'bz2']
+ conf.env.LIB_DCP = ['glibmm-2.4', 'xml++-2.6', 'ssl', 'crypto', 'bz2']
conf.env.HAVE_AVFORMAT = 1
conf.env.STLIB_AVFORMAT = ['avformat']
conf.env.HAVE_AVFILTER = 1