From d0eebec0dba4dcf677fdf69c122a76065e9d411f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 22 Nov 2013 19:24:24 +0000 Subject: Missing OS X library. --- platform/osx/make_dmg.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 5554249f2..ccff4d567 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -84,6 +84,7 @@ universal_copy $ENV lib/libxmlsec1*.dylib $WORK/$libs universal_copy $ENV lib/libzip*.dylib $WORK/$libs universal_copy $ENV lib/libquickmail*.dylib $WORK/$libs universal_copy $ENV lib/libcurl*.dylib $WORK/$libs +universal_copy $ENV lib/libffi*.dylib $WORK/$libs for obj in $WORK/$macos/dcpomatic $WORK/$macos/ffprobe $WORK/$libs/*.dylib; do deps=`otool -L $obj | awk '{print $1}' | egrep "(/Users/carl|libboost|libssh|libltdl)"` -- cgit v1.2.3 From 406b1a88f7a7cb5e5ff5fc7589d6c1a9d110320f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 22 Nov 2013 22:12:06 +0000 Subject: Try to fix Windows installer. --- platform/windows/installer.nsi.32.in | 1 + platform/windows/installer.nsi.64.in | 1 + 2 files changed, 2 insertions(+) diff --git a/platform/windows/installer.nsi.32.in b/platform/windows/installer.nsi.32.in index 4e1f7e94f..325db0128 100644 --- a/platform/windows/installer.nsi.32.in +++ b/platform/windows/installer.nsi.32.in @@ -53,6 +53,7 @@ File "%static_deps%/bin/libjpeg-8.dll" File "%static_deps%/bin/wxbase294u_gcc_custom.dll" File "%static_deps%/bin/wxmsw294u_core_gcc_custom.dll" File "%static_deps%/bin/wxmsw294u_adv_gcc_custom.dll" +File "%static_deps%/bin/wxmsw294u_richtext_gcc_custom.dll" File "%static_deps%/bin/libcairo-2.dll" File "%static_deps%/bin/libfreetype-6.dll" File "%static_deps%/bin/libgthread-2.0-0.dll" diff --git a/platform/windows/installer.nsi.64.in b/platform/windows/installer.nsi.64.in index cc83f38ee..d7f5ab7bd 100644 --- a/platform/windows/installer.nsi.64.in +++ b/platform/windows/installer.nsi.64.in @@ -63,6 +63,7 @@ File "%static_deps%/bin/libjpeg-8.dll" File "%static_deps%/bin/wxbase294u_gcc_custom.dll" File "%static_deps%/bin/wxmsw294u_core_gcc_custom.dll" File "%static_deps%/bin/wxmsw294u_adv_gcc_custom.dll" +File "%static_deps%/bin/wxmsw294u_richtext_gcc_custom.dll" File "%static_deps%/bin/libcairo-2.dll" File "%static_deps%/bin/libfreetype-6.dll" File "%static_deps%/bin/libgthread-2.0-0.dll" -- cgit v1.2.3 From 623f359f0bd54f3fafedad1775d7b57ead33335e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 22 Nov 2013 22:40:52 +0000 Subject: Another missing Windows DLL. --- platform/windows/installer.nsi.32.in | 1 + platform/windows/installer.nsi.64.in | 1 + 2 files changed, 2 insertions(+) diff --git a/platform/windows/installer.nsi.32.in b/platform/windows/installer.nsi.32.in index 325db0128..f3446f4e3 100644 --- a/platform/windows/installer.nsi.32.in +++ b/platform/windows/installer.nsi.32.in @@ -54,6 +54,7 @@ File "%static_deps%/bin/wxbase294u_gcc_custom.dll" File "%static_deps%/bin/wxmsw294u_core_gcc_custom.dll" File "%static_deps%/bin/wxmsw294u_adv_gcc_custom.dll" File "%static_deps%/bin/wxmsw294u_richtext_gcc_custom.dll" +File "%static_deps%/bin/wxbase294u_xml_gcc_custom.dll" File "%static_deps%/bin/libcairo-2.dll" File "%static_deps%/bin/libfreetype-6.dll" File "%static_deps%/bin/libgthread-2.0-0.dll" diff --git a/platform/windows/installer.nsi.64.in b/platform/windows/installer.nsi.64.in index d7f5ab7bd..3ed2a6539 100644 --- a/platform/windows/installer.nsi.64.in +++ b/platform/windows/installer.nsi.64.in @@ -64,6 +64,7 @@ File "%static_deps%/bin/wxbase294u_gcc_custom.dll" File "%static_deps%/bin/wxmsw294u_core_gcc_custom.dll" File "%static_deps%/bin/wxmsw294u_adv_gcc_custom.dll" File "%static_deps%/bin/wxmsw294u_richtext_gcc_custom.dll" +File "%static_deps%/bin/wxbase294u_xml_gcc_custom.dll" File "%static_deps%/bin/libcairo-2.dll" File "%static_deps%/bin/libfreetype-6.dll" File "%static_deps%/bin/libgthread-2.0-0.dll" -- cgit v1.2.3 From 797ab6a4e1ac1a5c00f4d7297aaa31dfc8b7c611 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 22 Nov 2013 22:43:52 +0000 Subject: Another missing DLL. --- platform/windows/installer.nsi.32.in | 1 + platform/windows/installer.nsi.64.in | 1 + 2 files changed, 2 insertions(+) diff --git a/platform/windows/installer.nsi.32.in b/platform/windows/installer.nsi.32.in index f3446f4e3..9b719f825 100644 --- a/platform/windows/installer.nsi.32.in +++ b/platform/windows/installer.nsi.32.in @@ -54,6 +54,7 @@ File "%static_deps%/bin/wxbase294u_gcc_custom.dll" File "%static_deps%/bin/wxmsw294u_core_gcc_custom.dll" File "%static_deps%/bin/wxmsw294u_adv_gcc_custom.dll" File "%static_deps%/bin/wxmsw294u_richtext_gcc_custom.dll" +File "%static_deps%/bin/wxmsw294u_html_gcc_custom.dll" File "%static_deps%/bin/wxbase294u_xml_gcc_custom.dll" File "%static_deps%/bin/libcairo-2.dll" File "%static_deps%/bin/libfreetype-6.dll" diff --git a/platform/windows/installer.nsi.64.in b/platform/windows/installer.nsi.64.in index 3ed2a6539..c53c2cacc 100644 --- a/platform/windows/installer.nsi.64.in +++ b/platform/windows/installer.nsi.64.in @@ -64,6 +64,7 @@ File "%static_deps%/bin/wxbase294u_gcc_custom.dll" File "%static_deps%/bin/wxmsw294u_core_gcc_custom.dll" File "%static_deps%/bin/wxmsw294u_adv_gcc_custom.dll" File "%static_deps%/bin/wxmsw294u_richtext_gcc_custom.dll" +File "%static_deps%/bin/wxmsw294u_html_gcc_custom.dll" File "%static_deps%/bin/wxbase294u_xml_gcc_custom.dll" File "%static_deps%/bin/libcairo-2.dll" File "%static_deps%/bin/libfreetype-6.dll" -- cgit v1.2.3 From d70b48d21072b38d56a941b33bfa212fe331a2fd Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 22 Nov 2013 22:55:49 +0000 Subject: ChangeLog. --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7445df54c..7836f3714 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-11-22 Carl Hetherington + + * Fix both OS X and Windows installers. + 2013-11-21 Carl Hetherington * Version 1.33 released. -- cgit v1.2.3 From 87ea3bb2699a09fe6f6dd97578f750b918a51acf Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 22 Nov 2013 23:07:31 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7836f3714..6b9a3e435 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-11-22 Carl Hetherington + + * Version 1.34 released. + 2013-11-22 Carl Hetherington * Fix both OS X and Windows installers. diff --git a/debian/changelog b/debian/changelog index 3d37ca5ed..fd971efe3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.33-1) UNRELEASED; urgency=low +dcpomatic (1.34-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -37,8 +37,9 @@ dcpomatic (1.33-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Thu, 21 Nov 2013 18:56:59 +0000 + -- Carl Hetherington Fri, 22 Nov 2013 23:07:30 +0000 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index ec9eb5914..689297991 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.34pre' +VERSION = '1.34' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From ad0ddd25c94730bed174756a21c83a348c45687e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 22 Nov 2013 23:07:31 +0000 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 689297991..9d2450d34 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.34' +VERSION = '1.35pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3