pool/libdrm
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 222553 from X11:XOrg

Browse Source 
With open questions on the theoretical-only exynos GPL-2.0+ situation remaining (SR#215419), let's meanwhile fix the freedreno GPL-2.0 part by backporting the relicensing to MIT (bnc#860595). (forwarded request 222489 from a_faerber)

OBS-URL: https://build.opensuse.org/request/show/222553
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libdrm?expand=0&rev=93
This commit is contained in:
Stephan Kulow 2014-02-19 10:36:15 +00:00 committed by Git OBS Bridge
commit 25042c9ed6
3 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
U_freedreno_license_fix.patch Normal file
View File

@ -0,0 +1,49 @@
From 128e74cf6492025e63e035566bd6e2203e8da5e1 Mon Sep 17 00:00:00 2001
From: Rob Clark <robclark@freedesktop.org>
Date: Fri, 31 Jan 2014 16:58:30 +0000
Subject: freedreno: fix license
The userspace headers were intended to be BSD license.
Signed-off-by: Rob Clark <robclark@freedesktop.org>
---
diff --git a/freedreno/msm/msm_drm.h b/freedreno/msm/msm_drm.h
index 090c724..b83c9a8 100644
--- a/freedreno/msm/msm_drm.h
+++ b/freedreno/msm/msm_drm.h
@@ -2,17 +2,24 @@
* Copyright (C) 2013 Red Hat
* Author: Rob Clark <robdclark@gmail.com>
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
*
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
*
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
*/
#ifndef __MSM_DRM_H__
--
cgit v0.9.0.2-2-gbebe

6
libdrm.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Feb 16 15:16:40 UTC 2014 - afaerber@suse.de
- U_freedreno_license_fix.patch: Backport relicensing of freedreno
DRM header from GPL-2.0 to MIT (bnc#860595).
-------------------------------------------------------------------
Tue Jan 21 11:14:46 UTC 2014 - sndirsch@suse.com

2
libdrm.spec
View File

@ -39,6 +39,7 @@ Source2: baselibs.conf
# PATCH-FIX-UPSTREAM libdrm-implicit-defs.diff fdo#48599 -- Fix compiler warnings in tests/radeon/radeon_ttm.c
Patch1: libdrm-implicit-defs.diff
Patch2: u_Fix-compilation-on-systems-that-don-t-provide-O_CLOE.patch
Patch3: U_freedreno_license_fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf >= 2.63
@ -164,6 +165,7 @@ Group: System/Libraries
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"