Merge branch 'python-gen-dispatch'

configure.ac

@@ -41,7 +41,7 @@ m4_ifndef([XORG_MACROS_VERSION],
 XORG_MACROS_VERSION(1.8)
 XORG_DEFAULT_OPTIONS
 
-AC_CHECK_PROGS([PYTHON], [python2 python])
+AC_CHECK_PROGS([PYTHON], [python3 python2 python])
 
 # Initialize libtool
 AC_DISABLE_STATIC

include/epoxy/meson.build

@@ -6,6 +6,7 @@ gl_generated = custom_target('gl_generated.h',
                                'gl_generated.h',
                              ],
                              command: [
+                               python,
                                gen_dispatch_py,
                                '--header',
                                '--no-source',
@@ -25,6 +26,7 @@ if build_egl
                                   'egl_generated.h',
                                 ],
                                 command: [
+                                  python,
                                   gen_dispatch_py,
                                   '--header',
                                   '--no-source',
@@ -44,6 +46,7 @@ if build_glx
                                   'glx_generated.h',
                                 ],
                                 command: [
+                                  python,
                                   gen_dispatch_py,
                                   '--header',
                                   '--no-source',
@@ -63,6 +66,7 @@ if build_wgl
                                   'wgl_generated.h',
                                 ],
                                 command: [
+                                  python,
                                   gen_dispatch_py,
                                   '--header',
                                   '--no-source',

meson.build

@@ -202,8 +202,18 @@ configure_file(input: 'epoxy.pc.in',
                install: true,
                install_dir: join_paths(epoxy_libdir, 'pkgconfig'))
 
+# Python
+# XXX: Depend on 0.37.1 for:
+# python = import('python3').find_python()
+python = find_program('python3', required: false)
+if not python.found()
+  python = find_program('python', required: true)
+endif
+
 # Generates the dispatch tables
-gen_dispatch_py = find_program('src/gen_dispatch.py')
+# XXX: Depend on 0.38.1 for:
+# gen_dispatch_py = files('src/gen_dispatch.py')
+gen_dispatch_py = join_paths(meson.source_root(), 'src/gen_dispatch.py')
 
 gl_registry = files('registry/gl.xml')
 egl_registry = files('registry/egl.xml')

src/gen_dispatch.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Copyright © 2013 Intel Corporation

src/meson.build

@@ -12,6 +12,7 @@ gl_generated = custom_target('gl_generated_dispatch.c',
                                'gl_generated_dispatch.c',
                              ],
                              command: [
+                               python,
                                gen_dispatch_py,
                                '--source',
                                '--no-header',
@@ -29,6 +30,7 @@ if build_egl
                                   'egl_generated_dispatch.c',
                                 ],
                                 command: [
+                                  python,
                                   gen_dispatch_py,
                                   '--source',
                                   '--no-header',
@@ -46,6 +48,7 @@ if build_glx
                                   'glx_generated_dispatch.c',
                                 ],
                                 command: [
+                                  python,
                                   gen_dispatch_py,
                                   '--source',
                                   '--no-header',
@@ -63,6 +66,7 @@ if build_wgl
                                   'wgl_generated_dispatch.c',
                                 ],
                                 command: [
+                                  python,
                                   gen_dispatch_py,
                                   '--source',
                                   '--no-header',