From 0d412e1897aa1d379aabaf4f14f997c0b80db653 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 20 Jun 2014 11:12:54 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 167921fbe..6bd0eac22 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.69.29devel' +VERSION = '1.69.30' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 04200d657331f2693141105ebfbe0daa9711b0df Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 20 Jun 2014 11:12:54 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 6bd0eac22..bf861df83 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.69.30' +VERSION = '1.69.30devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 6ddc0b04df78dd5d26210b626f2df04f7920ba50 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 21 Jun 2014 00:43:44 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index b088c7b4c..624923c55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-21 Carl Hetherington + + * Version 1.69.31 released. + 2014-06-20 Carl Hetherington * Version 1.69.30 released. diff --git a/debian/changelog b/debian/changelog index 5bdbcbb00..ce33f5681 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.69.30-1) UNRELEASED; urgency=low +dcpomatic (1.69.31-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -154,8 +154,9 @@ dcpomatic (1.69.30-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Fri, 20 Jun 2014 11:12:54 +0100 + -- Carl Hetherington Sat, 21 Jun 2014 00:43:44 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index bf861df83..9bf53858d 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.69.30devel' +VERSION = '1.69.31' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From f4f82f2812cab585867c71a7de8069112a673ee0 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 21 Jun 2014 00:43:45 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 9bf53858d..8babe333a 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.69.31' +VERSION = '1.69.31devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 8a06ce0402779cd89e27386567438c3ed0100e80 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 21 Jun 2014 14:59:59 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 624923c55..fc70460d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-21 Carl Hetherington + + * Version 1.69.32 released. + 2014-06-21 Carl Hetherington * Version 1.69.31 released. diff --git a/debian/changelog b/debian/changelog index ce33f5681..fdf912c83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.69.31-1) UNRELEASED; urgency=low +dcpomatic (1.69.32-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -155,8 +155,9 @@ dcpomatic (1.69.31-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Sat, 21 Jun 2014 00:43:44 +0100 + -- Carl Hetherington Sat, 21 Jun 2014 14:59:59 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 8babe333a..f59af5858 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.69.31devel' +VERSION = '1.69.32' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 83d36de0b2fb5b348919c8bcba1e4e7267fb5b63 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 21 Jun 2014 14:59:59 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index f59af5858..78bcf6776 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.69.32' +VERSION = '1.69.32devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From a7665d9eb579a59110b58d55e331146215ea982b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 21 Jun 2014 19:09:15 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index fc70460d2..3cc95f69a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-21 Carl Hetherington + + * Version 1.69.33 released. + 2014-06-21 Carl Hetherington * Version 1.69.32 released. diff --git a/debian/changelog b/debian/changelog index fdf912c83..3a10749c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.69.32-1) UNRELEASED; urgency=low +dcpomatic (1.69.33-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -156,8 +156,9 @@ dcpomatic (1.69.32-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Sat, 21 Jun 2014 14:59:59 +0100 + -- Carl Hetherington Sat, 21 Jun 2014 19:09:14 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 78bcf6776..476aaf763 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.69.32devel' +VERSION = '1.69.33' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From b5523c032fb79bd808d43afd289b23ef643e68f0 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 21 Jun 2014 19:09:15 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 476aaf763..43f15c4b8 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.69.33' +VERSION = '1.69.33devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 5ae11069596fb01d3a1fd01ffd0db8d100dee7f4 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 21 Jun 2014 21:56:44 +0100 Subject: Fix Linux static build. --- wscript | 3 +++ 1 file changed, 3 insertions(+) (limited to 'wscript') diff --git a/wscript b/wscript index 78bcf6776..0f780b082 100644 --- a/wscript +++ b/wscript @@ -33,6 +33,8 @@ def static_ffmpeg(conf): conf.env.STLIB_SWSCALE = ['swscale'] conf.check_cfg(package='libswresample', args='--cflags', uselib_store='SWRESAMPLE', mandatory=True) conf.env.STLIB_SWRESAMPLE = ['swresample'] + conf.check_cfg(package='libpostproc', args='--cflags', uselib_store='POSTPROC', mandatory=True) + conf.env.STLIB_POSTPROC = ['postproc'] def dynamic_ffmpeg(conf): conf.check_cfg(package='libavformat', args='--cflags --libs', uselib_store='AVFORMAT', mandatory=True) @@ -41,6 +43,7 @@ def dynamic_ffmpeg(conf): conf.check_cfg(package='libavutil', args='--cflags --libs', uselib_store='AVUTIL', mandatory=True) conf.check_cfg(package='libswscale', args='--cflags --libs', uselib_store='SWSCALE', mandatory=True) conf.check_cfg(package='libswresample', args='--cflags --libs', uselib_store='SWRESAMPLE', mandatory=True) + conf.check_cfg(package='libpostproc', args='--cflags --libs', uselib_store='POSTPROC', mandatory=True) def static_openjpeg(conf): conf.check_cfg(package='libopenjpeg', args='--cflags', atleast_version='1.5.0', uselib_store='OPENJPEG', mandatory=True) -- cgit v1.2.3 From 7cf18dbd1bd05cbf0f4e9bce82c5605b67e683d6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 21 Jun 2014 22:26:16 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 3cc95f69a..1c8fc930b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-21 Carl Hetherington + + * Version 1.69.34 released. + 2014-06-21 Carl Hetherington * Version 1.69.33 released. diff --git a/debian/changelog b/debian/changelog index 3a10749c2..34067724a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.69.33-1) UNRELEASED; urgency=low +dcpomatic (1.69.34-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -157,8 +157,9 @@ dcpomatic (1.69.33-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Sat, 21 Jun 2014 19:09:14 +0100 + -- Carl Hetherington Sat, 21 Jun 2014 22:26:15 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index d35d03758..b513225fa 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.69.33devel' +VERSION = '1.69.34' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 65be0fdb86f0c63e0ae2377b9fec4dd08433ece2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 21 Jun 2014 22:26:16 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index b513225fa..2704ec2e3 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.69.34' +VERSION = '1.69.34devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3