X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=ce24e866684620109f1b3e1e047762c9b8f8ae20;hb=7392cb8383c9b857edad5f99eaf917ed70da237d;hp=da1378cc46b80877d5c0bb3f75f31fc692dbfca4;hpb=d1e17b2719ed8930caecb0c80e51e0c2fd813b7c;p=dcpomatic.git

diff --git a/wscript b/wscript
index da1378cc4..ce24e8666 100644
--- a/wscript
+++ b/wscript
@@ -39,7 +39,7 @@ libdcp_version = '1.8.5'
 libsub_version = '1.6.5'
 
 this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0]
-last_version = subprocess.Popen(shlex.split('git describe --tags --abbrev=0'), stdout=subprocess.PIPE).communicate()[0]
+last_version = subprocess.Popen(shlex.split('git describe --tags --match v* --abbrev=0'), stdout=subprocess.PIPE).communicate()[0]
 
 # Python 2/3 compatibility; I don't really understand what's going on here
 if not isinstance(this_version, str):
@@ -343,6 +343,18 @@ def configure(conf):
     # libpng
     conf.check_cfg(package='libpng', args='--cflags --libs', uselib_store='PNG', mandatory=True)
 
+    # libjpeg
+    conf.check_cxx(fragment="""
+                            #include <cstddef>
+                            #include <cstdio>
+                            #include <jpeglib.h>
+                            int main() { struct jpeg_compress_struct compress; jpeg_create_compress (&compress); return 0; }
+                            """,
+                   msg='Checking for libjpeg',
+                   libpath='/usr/local/lib',
+                   lib=['jpeg'],
+                   uselib_store='JPEG')
+
     # lwext4
     if conf.options.enable_disk:
         conf.check_cxx(fragment="""
@@ -664,10 +676,8 @@ def create_version_cc(version, cxx_flags):
 def post(ctx):
     if ctx.cmd == 'install' and ctx.env.TARGET_LINUX:
         ctx.exec_command('/sbin/ldconfig')
-        # setuid root executable
-        exe = os.path.join(ctx.env['INSTALL_PREFIX'], 'bin/%s/dcpomatic2_disk_writer')
-        if os.path.exists(exe):
-            os.chmod(exe, 0o4755)
+        if ctx.env.ENABLE_DISK:
+            ctx.exec_command('setcap "cap_dac_override+ep cap_sys_admin+ep" %s/bin/dcpomatic2_disk_writer' % ctx.options.prefix)
 
 def pot(bld):
     bld.recurse('src')