diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-09-09 09:52:41 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-09-09 09:52:41 +0100 |
| commit | c0503d4121ffead6a3adb745b167191cd006b4a3 (patch) | |
| tree | de58d2e51c09f84913b6695fd923102162bdb1b6 | |
| parent | f26af8112b03b5233eb5239defd11a7428b705ad (diff) | |
| parent | 5f6ee203ec06970bac3ecd89e5b0780ed9b04f77 (diff) | |
Merge.
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | platform/osx/make_dmg.sh | 2 | ||||
| -rw-r--r-- | wscript | 2 |
4 files changed, 19 insertions, 4 deletions
@@ -3,6 +3,19 @@ * Use SRC_LINEAR when resampling for audio analysis to speed things up (#685). +2015-09-09 Carl Hetherington <cth@carlh.net> + + * Version 2.1.58 released. + +2015-09-09 Carl Hetherington <cth@carlh.net> + + * Actually fix missing libsamplerate + dylib for OS X. + +2015-09-08 Carl Hetherington <cth@carlh.net> + + * Version 2.1.57 released. + 2015-09-08 c.hetherington <cth@carlh.net> * Missing libsamplerate dylib for OS X. diff --git a/debian/changelog b/debian/changelog index 99106de60..da3e732f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (2.1.56-1) UNRELEASED; urgency=low +dcpomatic (2.1.58-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -287,8 +287,10 @@ dcpomatic (2.1.56-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. + * New upstream release. - -- Carl Hetherington <carl@d1stkfactory> Sun, 06 Sep 2015 12:58:09 +0100 + -- Carl Hetherington <carl@d1stkfactory> Wed, 09 Sep 2015 00:16:38 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 6791282ff..cbc703c36 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -112,7 +112,7 @@ universal_copy_lib $ENV libpango "$WORK/$libs" universal_copy_lib $ENV libcairo "$WORK/$libs" universal_copy_lib $ENV libpixman "$WORK/$libs" universal_copy_lib $ENV libharfbuzz "$WORK/$libs" -universal_copy_lib $ENV libswresample "$WORK/$libs" +universal_copy_lib $ENV libsamplerate "$WORK/$libs" relink=`echo $relink | sed -e "s/\+//g"` @@ -26,7 +26,7 @@ import distutils.spawn from waflib import Logs APPNAME = 'dcpomatic' -VERSION = '2.1.56devel' +VERSION = '2.1.58devel' def options(opt): opt.load('compiler_cxx') |