Re: [Mesa-dev] [PATCH v2 5/5] scons: Check for mako 0.8.0

2018-08-16 Thread Eric Engestrom
On Wednesday, 2018-08-15 09:18:08 -0700, Dylan Baker wrote:
> v2: - Use distutils to do the version checking
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107565

Acked-by: Eric Engestrom 

> ---
>  scons/gallium.py | 13 +
>  1 file changed, 13 insertions(+)
> 
> diff --git a/scons/gallium.py b/scons/gallium.py
> index 659da72c1c3..aa7201a9715 100755
> --- a/scons/gallium.py
> +++ b/scons/gallium.py
> @@ -29,6 +29,7 @@ Frontend-tool for Gallium3D architecture.
>  # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
>  #
>  
> +from __future__ import print_function
>  
>  import distutils.version
>  import os
> @@ -677,6 +678,18 @@ def generate(env):
>  env.PkgCheckModules('XF86VIDMODE', ['xxf86vm'])
>  env.PkgCheckModules('DRM', ['libdrm >= 2.4.75'])
>  
> +if not os.path.exists("src/util/format_srgb.c"):
> +print("Checking for Python Mako module (>= 0.8.0)... ", end='')
> +try:
> +import mako
> +except ImportError:
> +print("no")
> +exit(1)
> +if distutils.version.StrictVersion(mako.__version__) < 
> distutils.version.StrictVersion('0.8.0'):
> +print("no")
> +exit(1)
> +print("yes")
> +
>  if env['x11']:
>  env.Append(CPPPATH = env['X11_CPPPATH'])
>  
> -- 
> 2.18.0
> 
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH v2 5/5] scons: Check for mako 0.8.0

2018-08-15 Thread Jose Fonseca

On 15/08/18 17:18, Dylan Baker wrote:

v2: - Use distutils to do the version checking

Bugzilla: 
https://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbugs.freedesktop.org%2Fshow_bug.cgi%3Fid%3D107565data=02%7C01%7Cjfonseca%40vmware.com%7C49a58211ac9747678b9608d602cad13d%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C1%7C0%7C636699467450929937sdata=iPzSf8AUDqDbXxxrjmkwenq%2F4805Abd4axrr5cV%2Bkdg%3Dreserved=0
---
  scons/gallium.py | 13 +
  1 file changed, 13 insertions(+)

diff --git a/scons/gallium.py b/scons/gallium.py
index 659da72c1c3..aa7201a9715 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -29,6 +29,7 @@ Frontend-tool for Gallium3D architecture.
  # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  #
  
+from __future__ import print_function
  
  import distutils.version

  import os
@@ -677,6 +678,18 @@ def generate(env):
  env.PkgCheckModules('XF86VIDMODE', ['xxf86vm'])
  env.PkgCheckModules('DRM', ['libdrm >= 2.4.75'])
  
+if not os.path.exists("src/util/format_srgb.c"):

+print("Checking for Python Mako module (>= 0.8.0)... ", end='')
+try:
+import mako
+except ImportError:
+print("no")
+exit(1)
+if distutils.version.StrictVersion(mako.__version__) < 
distutils.version.StrictVersion('0.8.0'):
+print("no")
+exit(1)
+print("yes")
+
  if env['x11']:
  env.Append(CPPPATH = env['X11_CPPPATH'])
  



Series looks good to me.

Reviewed-by: Jose Fonseca 

Jose
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


[Mesa-dev] [PATCH v2 5/5] scons: Check for mako 0.8.0

2018-08-15 Thread Dylan Baker
v2: - Use distutils to do the version checking

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107565
---
 scons/gallium.py | 13 +
 1 file changed, 13 insertions(+)

diff --git a/scons/gallium.py b/scons/gallium.py
index 659da72c1c3..aa7201a9715 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -29,6 +29,7 @@ Frontend-tool for Gallium3D architecture.
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
+from __future__ import print_function
 
 import distutils.version
 import os
@@ -677,6 +678,18 @@ def generate(env):
 env.PkgCheckModules('XF86VIDMODE', ['xxf86vm'])
 env.PkgCheckModules('DRM', ['libdrm >= 2.4.75'])
 
+if not os.path.exists("src/util/format_srgb.c"):
+print("Checking for Python Mako module (>= 0.8.0)... ", end='')
+try:
+import mako
+except ImportError:
+print("no")
+exit(1)
+if distutils.version.StrictVersion(mako.__version__) < 
distutils.version.StrictVersion('0.8.0'):
+print("no")
+exit(1)
+print("yes")
+
 if env['x11']:
 env.Append(CPPPATH = env['X11_CPPPATH'])
 
-- 
2.18.0

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev