From b50ab95ec8af972c607c5f1cb270f2f8306f4d04 Mon Sep 17 00:00:00 2001 From: Packit Service Date: Dec 23 2020 06:10:41 +0000 Subject: Prepare for a new update Reverting patches so we can apply the latest update and changes can be seen in the spec file and sources. --- diff --git a/bin/commit_in_branch.py b/bin/commit_in_branch.py index 9f928cb..e4e2edb 100755 --- a/bin/commit_in_branch.py +++ b/bin/commit_in_branch.py @@ -1,4 +1,4 @@ -#! /usr/libexec/platform-python +#!/usr/bin/env python3 import argparse import subprocess diff --git a/bin/gen_release_notes.py b/bin/gen_release_notes.py index 8f8c844..8801611 100755 --- a/bin/gen_release_notes.py +++ b/bin/gen_release_notes.py @@ -1,4 +1,4 @@ -#! /usr/libexec/platform-python +#!/usr/bin/env python3 # 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 ef0e3f6..0a28dd7 100644 --- a/bin/install_megadrivers.py +++ b/bin/install_megadrivers.py @@ -1,4 +1,4 @@ -#! /usr/libexec/platform-python +#!/usr/bin/env python3 # encoding=utf-8 # Copyright 2017-2018 Intel Corporation diff --git a/bin/khronos-update.py b/bin/khronos-update.py index b08cb12..cc82a07 100755 --- a/bin/khronos-update.py +++ b/bin/khronos-update.py @@ -1,4 +1,4 @@ -#! /usr/libexec/platform-python +#!/usr/bin/env python3 import argparse import base64 diff --git a/bin/meson-cmd-extract.py b/bin/meson-cmd-extract.py index ac40a29..b630885 100755 --- a/bin/meson-cmd-extract.py +++ b/bin/meson-cmd-extract.py @@ -1,4 +1,4 @@ -#! /usr/libexec/platform-python +#!/usr/bin/env python3 # 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 fd0944f..e22aef5 100755 --- a/bin/meson-options.py +++ b/bin/meson-options.py @@ -1,4 +1,4 @@ -#! /usr/libexec/platform-python +#!/usr/bin/env python3 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 38ac7e6..a221e26 100644 --- a/bin/meson_get_version.py +++ b/bin/meson_get_version.py @@ -1,4 +1,4 @@ -#! /usr/libexec/platform-python +#!/usr/bin/env python # encoding=utf-8 # Copyright © 2017 Intel Corporation diff --git a/bin/perf-annotate-jit.py b/bin/perf-annotate-jit.py index 234f5d1..28bbc59 100755 --- a/bin/perf-annotate-jit.py +++ b/bin/perf-annotate-jit.py @@ -1,4 +1,4 @@ -#! /usr/libexec/platform-python +#!/usr/bin/env python # # Copyright 2012 VMware Inc # Copyright 2008-2009 Jose Fonseca diff --git a/bin/pick-ui.py b/bin/pick-ui.py index 22cfee4..3aea771 100755 --- a/bin/pick-ui.py +++ b/bin/pick-ui.py @@ -1,4 +1,4 @@ -#! /usr/libexec/platform-python +#!/usr/bin/env python3 # 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 9c764a6..359cbd9 100755 --- a/bin/post_version.py +++ b/bin/post_version.py @@ -1,4 +1,4 @@ -#! /usr/libexec/platform-python +#!/usr/bin/env python3 # 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 88d2d42..e56b49d 100644 --- a/bin/symbols-check.py +++ b/bin/symbols-check.py @@ -1,4 +1,4 @@ -#! /usr/libexec/platform-python +#!/usr/bin/env python import argparse import os diff --git a/docs/Mesa-MLAA-License-Clarification-Email.txt b/docs/Mesa-MLAA-License-Clarification-Email.txt deleted file mode 100644 index 30bdf2e..0000000 --- a/docs/Mesa-MLAA-License-Clarification-Email.txt +++ /dev/null @@ -1,117 +0,0 @@ - -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 0ce33f6..2063e9d 100644 --- a/src/egl/generate/gen_egl_dispatch.py +++ b/src/egl/generate/gen_egl_dispatch.py @@ -1,4 +1,4 @@ -#! /usr/libexec/platform-python +#!/usr/bin/env python # (C) Copyright 2016, NVIDIA CORPORATION. # All Rights Reserved. diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c index 2832402..45734f9 100644 --- a/src/gallium/frontends/lavapipe/lvp_device.c +++ b/src/gallium/frontends/lavapipe/lvp_device.c @@ -118,9 +118,6 @@ VkResult lvp_CreateInstance( client_version = VK_API_VERSION_1_0; } - if (!getenv("RH_SW_VULKAN")) - return VK_ERROR_INITIALIZATION_FAILED; - instance = vk_zalloc2(&default_alloc, pAllocator, sizeof(*instance), 8, VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); if (!instance) diff --git a/src/gallium/tools/trace/diff_state.py b/src/gallium/tools/trace/diff_state.py index 1822231..877dc38 100755 --- a/src/gallium/tools/trace/diff_state.py +++ b/src/gallium/tools/trace/diff_state.py @@ -1,4 +1,4 @@ -#! /usr/libexec/platform-python +#!/usr/bin/env python2 ########################################################################## # # Copyright 2011 Jose Fonseca diff --git a/src/gallium/tools/trace/dump.py b/src/gallium/tools/trace/dump.py index 02368e9..10211c8 100755 --- a/src/gallium/tools/trace/dump.py +++ b/src/gallium/tools/trace/dump.py @@ -1,4 +1,4 @@ -#! /usr/libexec/platform-python +#!/usr/bin/env python2 ########################################################################## # # Copyright 2008 VMware, Inc. diff --git a/src/gallium/tools/trace/dump_state.py b/src/gallium/tools/trace/dump_state.py index deacb5a..2622d13 100755 --- a/src/gallium/tools/trace/dump_state.py +++ b/src/gallium/tools/trace/dump_state.py @@ -1,4 +1,4 @@ -#! /usr/libexec/platform-python +#!/usr/bin/env python2 ########################################################################## # # Copyright 2008-2013, VMware, Inc. diff --git a/src/gallium/tools/trace/format.py b/src/gallium/tools/trace/format.py index 7d93e24..de6f402 100755 --- a/src/gallium/tools/trace/format.py +++ b/src/gallium/tools/trace/format.py @@ -1,4 +1,4 @@ -#! /usr/libexec/platform-python +#!/usr/bin/env python2 ########################################################################## # # Copyright 2008 VMware, Inc. diff --git a/src/gallium/tools/trace/model.py b/src/gallium/tools/trace/model.py index 43ca231..6a42184 100755 --- a/src/gallium/tools/trace/model.py +++ b/src/gallium/tools/trace/model.py @@ -1,4 +1,4 @@ -#! /usr/libexec/platform-python +#!/usr/bin/env python2 ########################################################################## # # Copyright 2008 VMware, Inc. diff --git a/src/gallium/tools/trace/parse.py b/src/gallium/tools/trace/parse.py index 5ec154a..004b585 100755 --- a/src/gallium/tools/trace/parse.py +++ b/src/gallium/tools/trace/parse.py @@ -1,4 +1,4 @@ -#! /usr/libexec/platform-python +#!/usr/bin/env python2 ########################################################################## # # Copyright 2008 VMware, Inc. diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c index f0e1b9f..569d273 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c @@ -530,8 +530,6 @@ static bool do_winsys_init(struct radeon_drm_winsys *ws) } } - ws->info.num_se = ws->info.max_se; - radeon_get_drm_value(ws->fd, RADEON_INFO_MAX_SH_PER_SE, NULL, &ws->info.max_sh_per_se); if (ws->gen == DRV_SI) {