X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=b1397d6e87e4f40d2a70286e9cce68a65291ac68;hb=0c47b6b09d0aa0ad5495d8e9c57bfc47e905fc30;hp=0bfde74bed5d9d80d417d4efd931feebec232462;hpb=b3ab2230281429ab8c0fcfd75c5b421ec958bcac;p=dcpomatic.git

diff --git a/cscript b/cscript
index 0bfde74be..b1397d6e8 100644
--- a/cscript
+++ b/cscript
@@ -8,7 +8,6 @@ deb_build_depends = {'debhelper': '8.0.0',
                      'pkg-config': '0.26',
                      'libssh-dev': '0.5.2',
                      'libsndfile1-dev': '1.0.25',
-                     'libmagick++-dev': '8:6.6.9.7',
                      'libgtk2.0-dev': '2.24.10'}
 
 deb_depends = dict()
@@ -156,8 +155,9 @@ def make_control(debian_version, bits, filename, debug):
         print >>f,''
 
 def dependencies(target):
-    return (('ffmpeg-cdist', '7e95caa'),
-            ('libdcp', '7f029e7'))
+    return (('ffmpeg-cdist', '1093c6f'),
+            ('libdcp', '1.0'),
+            ('libsub', None))
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.directory
@@ -172,7 +172,7 @@ def build(target, options):
             if target.version == '6.5':
                 cmd += ' --target-centos-6 --disable-tests'
             elif target.version == '7':
-                cmd += ' --target-centos-7'
+                cmd += ' --target-centos-7 --disable-tests'
 
     target.command(cmd)
     target.command('./waf')
@@ -208,7 +208,7 @@ def package_debian(target, cpu, version):
     target.set('CDIST_PKG_CONFIG_PATH', target.get('PKG_CONFIG_PATH'))
     if target.version == 'unstable':
         target.set('CDIST_EXTRA_CONFIGURE', '--debian-unstable')
-    target.command('dpkg-buildpackage')
+    target.command('dpkg-buildpackage -uc -us')
     
     debs = []
     for p in glob.glob('../*.deb'):
@@ -217,29 +217,26 @@ def package_debian(target, cpu, version):
     return debs
 
 def package_centos(target, cpu, version):
-    os.makedirs('build/rpmbuild/BUILD')
-    os.makedirs('build/rpmbuild/RPMS')
-    os.makedirs('build/rpmbuild/SOURCES')
-    os.makedirs('build/rpmbuild/SPECS')
-    os.makedirs('build/rpmbuild/SRPMS')
-
-    f = open('build/rpmmacros', 'w')
-    print >>f,os.path.expanduser("%_topdir ~/build/rpmbuild")
-    f.close()
+    topdir = os.path.realpath('build/rpmbuild')
+    os.makedirs('%s/BUILD' % topdir)
+    os.makedirs('%s/RPMS' % topdir)
+    os.makedirs('%s/SOURCES' % topdir)
+    os.makedirs('%s/SPECS' % topdir)
+    os.makedirs('%s/SRPMS' % topdir)
 
     target.command('./waf dist')
     shutil.copyfile(
         "%s/src/dcpomatic/dcpomatic-%s.tar.bz2" % (target.directory, version),
-        "build/rpmbuild/SOURCES/dcpomatic-%s.tar.bz2" % version
+        "%s/SOURCES/dcpomatic-%s.tar.bz2" % (topdir, version)
         )
 
-    target.command('rpmbuild --rcfile build/rpmmacros -bb build/platform/linux/dcpomatic.spec')
+    target.command('rpmbuild --define \'_topdir %s\' -bb build/platform/linux/dcpomatic2.spec' % topdir)
     rpms = []
 
     if cpu == "amd64":
         cpu = "x86_64"
 
-    for p in glob.glob('build/rpmbuild/RPMS/%s/*.rpm' % cpu):
+    for p in glob.glob('%s/RPMS/%s/*.rpm' % (topdir, cpu)):
         rpms.append(os.path.abspath(p))
 
     return rpms