X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=1e18684d9e0d94d434ae556a6a72ec3945469de9;hb=e2a17243c3a7047bb02ef2c7dddc5c71efc8181e;hp=93847e27479539edd7f3489ca068d28089e15093;hpb=9ba4863a67b31ae8bdb407f16e9695f5f414d5f5;p=dcpomatic.git diff --git a/cscript b/cscript index 93847e274..1e18684d9 100644 --- a/cscript +++ b/cscript @@ -44,7 +44,9 @@ deb_depends['12.04'] = {'libc6': '2.15', 'libxmlsec1-openssl': '1.2.14-1.2build1', 'libboost-date-time1.48.0': '1.48.0-3', 'libcurl3': '7.22.0-3ubuntu4', - 'libzip2': '0.10-1ubuntu1'} + 'libzip2': '0.10-1ubuntu1', + 'libsamplerate0': '0.1.8-4', + 'libicu48': '4.8.1.1-3'} deb_depends['14.04'] = {'libc6': '2.19-0ubuntu6', 'libssh-4': '0.6.1-0ubuntu3', @@ -59,7 +61,9 @@ deb_depends['14.04'] = {'libc6': '2.19-0ubuntu6', 'libxmlsec1-openssl': '1.2.18-2ubuntu1', 'libboost-date-time1.54.0': '1.54.0-4ubuntu3', 'libcurl3': '7.35.0-1ubuntu2', - 'libzip2': '0.10.1-1.2'} + 'libzip2': '0.10.1-1.2', + 'libsamplerate0': '0.1.8-7', + 'libicu52': '52.1-3'} deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4', 'libssh-4': '0.6.3-3ubuntu3', @@ -74,7 +78,10 @@ deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4', 'libxmlsec1-openssl': '1.2.20-2ubuntu2', 'libboost-date-time1.55.0': '1.55.0+dfsg-3ubuntu2', 'libcurl3': '7.38.0-3ubuntu2', - 'libzip2': '0.11.2-1.2'} + 'libzip2': '0.11.2-1.2', + 'libwxgtk3.0-0': '3.0.2-1', + 'libsamplerate0': '0.1.8-8', + 'libicu52': '52.1-8'} deb_depends['7'] = {'libc6': '2.13', 'libssh-4': '0.5.4', @@ -89,7 +96,11 @@ deb_depends['7'] = {'libc6': '2.13', 'libboost-date-time1.49.0': '1.49.0', 'libxmlsec1-openssl': '1.2.18', 'libcurl3': '7.26.0', - 'libzip2': '0.10.1'} + 'libzip2': '0.10.1', + 'libcairomm-1.0-1': '1.10.0-1', + 'libpangomm-1.4-1': '2.28.4-1', + 'libsamplerate0': '0.1.8-5', + 'libicu48': '4.8.1.1-12+deb7u3'} deb_depends['8'] = {'libc6': '2.19-18', 'libssh-4': '0.6.3-4', @@ -107,7 +118,9 @@ deb_depends['8'] = {'libc6': '2.19-18', 'libzip2': '0.11.2', 'libwxgtk3.0-0': '3.0.2', 'libxcb-xfixes0': '1.10', - 'libxcb-shape0': '1.10'} + 'libxcb-shape0': '1.10', + 'libsamplerate0': '0.1.8-8', + 'libicu52': '52.1-8+deb8u2'} deb_depends['unstable'] = {'libc6': '2.13', 'libssh-4': '0.5.4', @@ -122,8 +135,9 @@ deb_depends['unstable'] = {'libc6': '2.13', 'libboost-date-time1.55.0': '1.55.0', 'libxmlsec1-openssl': '1.2.18', 'libcurl3': '7.26.0', - 'libzip2': '0.10.1'} - + 'libzip2': '0.10.1', + 'libsamplerate0': '0.1.8-8', + 'libicu52': '52.1-9'} def packages(name, packages, f): s = '%s: ' % name @@ -198,9 +212,10 @@ def make_spec(filename, version, target): print >>f,'%{_datadir}/applications/dcpomatic2_server.desktop' print >>f,'%{_datadir}/dcpomatic2/taskbar_icon.png' print >>f,'%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf' + print >>f,'%{_datadir}/dcpomatic2/splash.png' for r in ['128x128', '22x22', '32x32', '48x48', '64x64']: print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2.png' % r - for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL']: + for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK']: print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2-wx.mo' % l print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l @@ -230,9 +245,15 @@ 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', '0492ad2'), - ('libdcp', '1.0'), - ('libsub', '1.0')) + + if target.platform == 'linux': + ffmpeg_options = { 'shared': False } + else: + ffmpeg_options = {} + + return (('ffmpeg-cdist', 'd0986a9', ffmpeg_options), + ('libdcp', '6a9f369'), + ('libsub', '04d92c2')) def configure_options(target): opt = '' @@ -247,7 +268,9 @@ def configure_options(target): if target.version == '6.5': opt += ' --static-boost --static-xmlpp' elif target.version == '7': - opt += ' --workaround-gssapi' + opt += ' --workaround-gssapi --static-xmlpp' + if target.distro == 'debian' and target.version == 'unstable': + target.append_with_space('CXXFLAGS', '-std=c++11') return opt @@ -261,6 +284,7 @@ def build(target, options): def package_windows(target): shutil.copyfile('build/platform/windows/installer.%s.nsi' % target.bits, 'build/platform/windows/installer2.%s.nsi' % target.bits) target.command('sed -i "s~%%resources%%~%s/platform/windows~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) + target.command('sed -i "s~%%graphics%%~%s/graphics~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) target.command('sed -i "s~%%static_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.windows_prefix, target.bits)) target.command('sed -i "s~%%cdist_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.directory, target.bits)) target.command('sed -i "s~%%mingw%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.mingw_path, target.bits)) @@ -302,7 +326,7 @@ def package_debian(target, cpu, version): return debs -def package_centos(target, cpu, version): +def package_rpm(target, cpu, version): topdir = os.path.realpath('build/rpmbuild') os.makedirs('%s/BUILD' % topdir) os.makedirs('%s/RPMS' % topdir) @@ -312,7 +336,7 @@ def package_centos(target, cpu, version): target.command('./waf dist') shutil.copyfile( - "%s/src/dcpomatic2/dcpomatic-%s.tar.bz2" % (target.directory, version), + "%s/src/dcpomatic/dcpomatic-%s.tar.bz2" % (target.directory, version), "%s/SOURCES/dcpomatic-%s.tar.bz2" % (topdir, version) ) @@ -322,8 +346,12 @@ def package_centos(target, cpu, version): if cpu == "amd64": cpu = "x86_64" + else: + cpu = "i686" + print 'Looking in %s/RPMS/%s/*.rpm' % (topdir, cpu) for p in glob.glob('%s/RPMS/%s/*.rpm' % (topdir, cpu)): + print 'found %s' % p rpms.append(os.path.abspath(p)) return rpms @@ -339,8 +367,8 @@ def package(target, version): if target.distro == 'debian' or target.distro == 'ubuntu': return package_debian(target, cpu, version) - elif target.distro == 'centos': - return package_centos(target, cpu, version) + elif target.distro == 'centos' or target.distro == 'fedora': + return package_rpm(target, cpu, version) elif target.platform == 'osx': target.command('bash platform/osx/make_dmg.sh %s' % target.directory) return os.path.abspath(glob.glob('build/platform/osx/DCP-o-matic*.dmg')[0])