Another try at fixing Arch build.
authorCarl Hetherington <cth@carlh.net>
Fri, 5 Feb 2016 18:46:09 +0000 (18:46 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 5 Feb 2016 18:46:09 +0000 (18:46 +0000)
wscript

diff --git a/wscript b/wscript
index 0364976ffd330395e1fb0717212deabba0f7c20e..e9d70575f92d24720802b0e11d3611088b91228a 100644 (file)
--- a/wscript
+++ b/wscript
@@ -271,17 +271,17 @@ def configure(conf):
     if conf.options.static_ffmpeg:
         names = ['avformat', 'avfilter', 'avcodec', 'avutil', 'swscale', 'postproc']
         for name in names:
-            static = subprocess.Popen(shlex.split('pkg-config --static --libs lib%s' % name), stdout=subprocess.PIPE).communicate()[0]
+            static = subprocess.Popen(shlex.split('pkg-config --static --libs lib%s' % name), stdout=subprocess.PIPE).communicate()[0].decode('utf-8')
             libs = []
             stlibs = []
             include = []
             libpath = []
             for s in static.split():
-                if s.startswith(b'-L'):
+                if s.startswith('-L'):
                     libpath.append(s[2:])
-                elif s.startswith(b'-I'):
+                elif s.startswith('-I'):
                     include.append(s[2:])
-                elif s.startswith(b'-l'):
+                elif s.startswith('-l'):
                     if s[2:] not in names:
                         libs.append(s[2:])
                     else: