diff --git a/bin/commit_in_branch.py b/bin/commit_in_branch.py index e4e2edb..9f928cb 100755 --- a/bin/commit_in_branch.py +++ b/bin/commit_in_branch.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#! /usr/libexec/platform-python import argparse import subprocess diff --git a/bin/gen_release_notes.py b/bin/gen_release_notes.py index 8801611..8f8c844 100755 --- a/bin/gen_release_notes.py +++ b/bin/gen_release_notes.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#! /usr/libexec/platform-python # Copyright © 2019-2020 Intel Corporation # Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/bin/install_megadrivers.py b/bin/install_megadrivers.py index 0a28dd7..ef0e3f6 100644 --- a/bin/install_megadrivers.py +++ b/bin/install_megadrivers.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#! /usr/libexec/platform-python # encoding=utf-8 # Copyright 2017-2018 Intel Corporation diff --git a/bin/khronos-update.py b/bin/khronos-update.py index cc82a07..b08cb12 100755 --- a/bin/khronos-update.py +++ b/bin/khronos-update.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#! /usr/libexec/platform-python import argparse import base64 diff --git a/bin/meson-cmd-extract.py b/bin/meson-cmd-extract.py index b630885..ac40a29 100755 --- a/bin/meson-cmd-extract.py +++ b/bin/meson-cmd-extract.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#! /usr/libexec/platform-python # Copyright © 2019 Intel Corporation # Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/bin/meson-options.py b/bin/meson-options.py index e22aef5..fd0944f 100755 --- a/bin/meson-options.py +++ b/bin/meson-options.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#! /usr/libexec/platform-python from os import get_terminal_size from textwrap import wrap diff --git a/bin/meson_get_version.py b/bin/meson_get_version.py index a221e26..38ac7e6 100644 --- a/bin/meson_get_version.py +++ b/bin/meson_get_version.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/libexec/platform-python # encoding=utf-8 # Copyright © 2017 Intel Corporation diff --git a/bin/perf-annotate-jit.py b/bin/perf-annotate-jit.py index 28bbc59..234f5d1 100755 --- a/bin/perf-annotate-jit.py +++ b/bin/perf-annotate-jit.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/libexec/platform-python # # Copyright 2012 VMware Inc # Copyright 2008-2009 Jose Fonseca diff --git a/bin/pick-ui.py b/bin/pick-ui.py index 3aea771..22cfee4 100755 --- a/bin/pick-ui.py +++ b/bin/pick-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#! /usr/libexec/platform-python # Copyright © 2019-2020 Intel Corporation # Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/bin/post_version.py b/bin/post_version.py index 359cbd9..9c764a6 100755 --- a/bin/post_version.py +++ b/bin/post_version.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#! /usr/libexec/platform-python # Copyright © 2019-2020 Intel Corporation # Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/bin/symbols-check.py b/bin/symbols-check.py index e56b49d..88d2d42 100644 --- a/bin/symbols-check.py +++ b/bin/symbols-check.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/libexec/platform-python import argparse import os diff --git a/docs/Mesa-MLAA-License-Clarification-Email.txt b/docs/Mesa-MLAA-License-Clarification-Email.txt new file mode 100644 index 0000000..30bdf2e --- /dev/null +++ b/docs/Mesa-MLAA-License-Clarification-Email.txt @@ -0,0 +1,117 @@ + +Subject: RE: Question about Mesa MLAA license +From: Jorge Jimenez +Date: 01/08/2013 12:50 PM +To: Tom Callaway +CC: "jorge@iryoku.com" + +Yes to both questions. + +Thanks, +Jorge + +From: Tom Callaway +Sent: January 8, 2013 6:49 PM +To: Jorge Jimenez +CC: jorge@iryoku.com +Subject: Re: Question about Mesa MLAA license + +On 01/08/2013 12:39 PM, Jorge Jimenez wrote: +> Hi Tom, +> +> What we meant with that is that we made an exception for clause 2. +> Instead of clause 2, in the case of the Mesa project, you have to name +> the technique Jimenez's MLAA in the config options of Mesa. We did that +> just to allow them to solve license issues. This exception should be for +> the Mesa project, and any project using Mesa, like Fedora. +> +> We want to widespread usage of our MLAA, so we want to avoid any kind of +> license complications. Hope current one is good for Fedora, if not +> please tell, and we'll see what we can do! + +Okay, a few more questions: + +* If Fedora decides to simply reproduce the quoted statement: +"Uses Jimenez's MLAA. Copyright (C) 2010 by Jorge Jimenez, Belen Masia, +Jose I. Echevarria, Fernando Navarro and Diego Gutierrez." + +Specifically, if this is done as part of documentation included with +Mesa, is that sufficient to meet clause 2 even if the Mesa config option +is not set as described in your exception? + +* Currently, the Mesa config option for MLAA says: "Morphological +anti-aliasing based on Jimenez\' MLAA. 0 to disable, 8 for default +quality". Is this in compliance with your exception? + +Thanks again, + +~tom + +== +Fedora Project + +Subject: RE: Question about Mesa MLAA license +From: Jorge Jimenez +Date: 01/08/2013 12:39 PM +To: "jorge@iryoku.com" , Tom Callaway + +Hi Tom, + +What we meant with that is that we made an exception for clause 2. +Instead of clause 2, in the case of the Mesa project, you have to name +the technique Jimenez's MLAA in the config options of Mesa. We did that +just to allow them to solve license issues. This exception should be for +the Mesa project, and any project using Mesa, like Fedora. + +We want to widespread usage of our MLAA, so we want to avoid any kind of +license complications. Hope current one is good for Fedora, if not +please tell, and we'll see what we can do! + +Cheers, +Jorge + +From: Tom Callaway +Sent: January 8, 2013 6:30 PM +To: jorge@iryoku.com +Subject: Question about Mesa MLAA license + +Jorge, + +Thanks for all of your fantastic graphics work! I have been auditing +Fedora (a popular distribution of Linux) for license compliance and I +came across your MLAA code in Mesa. + +The license says: + + * 2. Redistributions in binary form must reproduce the following +statement: + * + * "Uses Jimenez's MLAA. Copyright (C) 2010 by Jorge Jimenez, Belen Masia, + * Jose I. Echevarria, Fernando Navarro and Diego Gutierrez." + * + * Only for use in the Mesa project, this point 2 is filled by naming the + * technique Jimenez's MLAA in the Mesa config options. + +That wording is unclear. When you say "Only for use in the Mesa +project...", it seems like you could either be saying: + +- This code may only be used as part of Mesa. + +OR + +- In Mesa, you can comply with clause 2 by simply selecting "Jimenez's +MLAA" in the Mesa config options. + +***** + +If the first item is true, then we may have to remove the MLAA code from +Fedora's copy of Mesa. However, looking at the license on your SMAA +code, I do not believe it to be the case. Please let me know either way! + +Thanks in advance, + +Tom Callaway +Fedora Legal + +== +Fedora Project diff --git a/src/egl/generate/gen_egl_dispatch.py b/src/egl/generate/gen_egl_dispatch.py index 2063e9d..0ce33f6 100644 --- a/src/egl/generate/gen_egl_dispatch.py +++ b/src/egl/generate/gen_egl_dispatch.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/libexec/platform-python # (C) Copyright 2016, NVIDIA CORPORATION. # All Rights Reserved. diff --git a/src/gallium/tools/trace/diff_state.py b/src/gallium/tools/trace/diff_state.py index 877dc38..1822231 100755 --- a/src/gallium/tools/trace/diff_state.py +++ b/src/gallium/tools/trace/diff_state.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#! /usr/libexec/platform-python ########################################################################## # # Copyright 2011 Jose Fonseca diff --git a/src/gallium/tools/trace/dump.py b/src/gallium/tools/trace/dump.py index 10211c8..02368e9 100755 --- a/src/gallium/tools/trace/dump.py +++ b/src/gallium/tools/trace/dump.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#! /usr/libexec/platform-python ########################################################################## # # Copyright 2008 VMware, Inc. diff --git a/src/gallium/tools/trace/dump_state.py b/src/gallium/tools/trace/dump_state.py index 2622d13..deacb5a 100755 --- a/src/gallium/tools/trace/dump_state.py +++ b/src/gallium/tools/trace/dump_state.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#! /usr/libexec/platform-python ########################################################################## # # Copyright 2008-2013, VMware, Inc. diff --git a/src/gallium/tools/trace/format.py b/src/gallium/tools/trace/format.py index de6f402..7d93e24 100755 --- a/src/gallium/tools/trace/format.py +++ b/src/gallium/tools/trace/format.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#! /usr/libexec/platform-python ########################################################################## # # Copyright 2008 VMware, Inc. diff --git a/src/gallium/tools/trace/model.py b/src/gallium/tools/trace/model.py index 6a42184..43ca231 100755 --- a/src/gallium/tools/trace/model.py +++ b/src/gallium/tools/trace/model.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#! /usr/libexec/platform-python ########################################################################## # # Copyright 2008 VMware, Inc. diff --git a/src/gallium/tools/trace/parse.py b/src/gallium/tools/trace/parse.py index 004b585..5ec154a 100755 --- a/src/gallium/tools/trace/parse.py +++ b/src/gallium/tools/trace/parse.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#! /usr/libexec/platform-python ########################################################################## # # Copyright 2008 VMware, Inc.