openeuler-ci-bot
Gitee
commit
89306b8081
@ -1,27 +0,0 @@
|
||||
From b33c8b56abcc4837f96f7f106b108681858482e0 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
|
||||
Date: Tue, 24 Apr 2018 09:46:41 +0200
|
||||
Subject: [PATCH] gallium: Disable rgb10 configs by default
|
||||
|
||||
Applications tend to not handle rgb10 configs very well, so lets
|
||||
disable it for now.
|
||||
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1560481
|
||||
---
|
||||
src/gallium/auxiliary/pipe-loader/driinfo_gallium.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h b/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h
|
||||
index 21dc599dc2..23f9194149 100644
|
||||
--- a/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h
|
||||
+++ b/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h
|
||||
@@ -33,5 +33,5 @@ DRI_CONF_SECTION_END
|
||||
DRI_CONF_SECTION_MISCELLANEOUS
|
||||
DRI_CONF_ALWAYS_HAVE_DEPTH_BUFFER("false")
|
||||
DRI_CONF_GLSL_ZERO_INIT("false")
|
||||
- DRI_CONF_ALLOW_RGB10_CONFIGS("true")
|
||||
+ DRI_CONF_ALLOW_RGB10_CONFIGS("false")
|
||||
DRI_CONF_SECTION_END
|
||||
--
|
||||
2.17.0
|
||||
|
||||
@ -1,117 +0,0 @@
|
||||
|
||||
Subject: RE: Question about Mesa MLAA license
|
||||
From: Jorge Jimenez <iryoku@gmail.com>
|
||||
Date: 01/08/2013 12:50 PM
|
||||
To: Tom Callaway <tcallawa@redhat.com>
|
||||
CC: "jorge@iryoku.com" <jorge@iryoku.com>
|
||||
|
||||
Yes to both questions.
|
||||
|
||||
Thanks,
|
||||
Jorge
|
||||
|
||||
From: Tom Callaway <tcallawa@redhat.com>
|
||||
Sent: January 8, 2013 6:49 PM
|
||||
To: Jorge Jimenez <iryoku@gmail.com>
|
||||
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 <iryoku@gmail.com>
|
||||
Date: 01/08/2013 12:39 PM
|
||||
To: "jorge@iryoku.com" <jorge@iryoku.com>, Tom Callaway <tcallawa@redhat.com>
|
||||
|
||||
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 <tcallawa@redhat.com>
|
||||
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
|
||||
Binary file not shown.
21
mesa.spec
21
mesa.spec
@ -24,25 +24,16 @@
|
||||
Name: mesa
|
||||
Summary: Mesa graphics libraries
|
||||
Version: 18.2.2
|
||||
Release: 4
|
||||
Release: 5
|
||||
License: MIT
|
||||
URL: https://www.mesa3d.org
|
||||
Source0: %{name}-%{version}.tar.xz
|
||||
Source1: vl_decoder.c
|
||||
Source2: vl_mpeg12_decoder.c
|
||||
Source0: https://mesa.freedesktop.org/archive/%{name}-%{version}.tar.xz
|
||||
Source3: Makefile
|
||||
# src/gallium/auxiliary/postprocess/pp_mlaa* have an ... interestingly worded license.
|
||||
# Source4 contains email correspondence clarifying the license terms.
|
||||
Source4: Mesa-MLAA-License-Clarification-Email.txt
|
||||
|
||||
Patch1: 0001-llvm-SONAME-without-version.patch
|
||||
Patch3: 0003-evergreen-big-endian.patch
|
||||
Patch4: 0004-bigendian-assert.patch
|
||||
|
||||
# Disable rgb10 configs by default:
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1560481
|
||||
Patch7: 0001-gallium-Disable-rgb10-configs-by-default.patch
|
||||
|
||||
BuildRequires: gcc gcc-c++ automake autoconf libtool kernel-headers libdrm-devel libXxf86vm-devel expat-devel
|
||||
BuildRequires: xorg-x11-proto-devel imake libselinux-devel libXrandr-devel libXext-devel libXfixes-devel libXdamage-devel
|
||||
BuildRequires: libXi-devel libXmu-devel libxshmfence-devel elfutils python3 python2 gettext llvm-devel clang-devel
|
||||
@ -236,14 +227,8 @@ Headers for development with the Vulkan API.
|
||||
%prep
|
||||
%autosetup -n %{name}-%{version} -p1
|
||||
|
||||
cmp %{SOURCE1} src/gallium/auxiliary/vl/vl_decoder.c
|
||||
cmp %{SOURCE2} src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
|
||||
cp %{SOURCE4} docs/
|
||||
|
||||
%build
|
||||
cmp %{SOURCE1} src/gallium/auxiliary/vl/vl_decoder.c
|
||||
cmp %{SOURCE2} src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
|
||||
|
||||
autoreconf -ivf
|
||||
|
||||
%ifarch %{ix86}
|
||||
@ -312,7 +297,7 @@ popd
|
||||
|
||||
%files filesystem
|
||||
%defattr(-,root,root)
|
||||
%doc docs/Mesa-MLAA-License-Clarification-Email.txt docs/libGL.txt
|
||||
%doc docs/libGL.txt
|
||||
%license docs/license.html
|
||||
%dir %{_libdir}/dri
|
||||
%dir %{_libdir}/vdpau
|
||||
|
||||
20
vl_decoder.c
20
vl_decoder.c
@ -1,20 +0,0 @@
|
||||
#include "vl_decoder.h"
|
||||
bool
|
||||
vl_profile_supported(struct pipe_screen *screen, enum pipe_video_profile profile,
|
||||
enum pipe_video_entrypoint entrypoint)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
int
|
||||
vl_level_supported(struct pipe_screen *screen, enum pipe_video_profile profile)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct pipe_video_codec *
|
||||
vl_create_decoder(struct pipe_context *pipe,
|
||||
const struct pipe_video_codec *templat)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
@ -1,7 +0,0 @@
|
||||
#include "vl_mpeg12_decoder.h"
|
||||
struct pipe_video_codec *
|
||||
vl_create_mpeg12_decoder(struct pipe_context *context,
|
||||
const struct pipe_video_codec *templat)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user