Accepting request 229973 from X11:XOrg

update to latest stable (forwarded request 229838 from tobijk)

OBS-URL: https://build.opensuse.org/request/show/229973
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libdrm?expand=0&rev=94

U_freedreno_license_fix.patch

@@ -1,49 +0,0 @@
-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

libdrm-2.4.52.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fa693c2f1f61befcefbdcc396673e38481110bac9db610afa4b8afb2be0218c1
-size 551473

libdrm-2.4.53.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1b0c28fd2f2b92d2df0a73d1aed88f43cb0dee1267aea6bc52ccb5fca5757a08
+size 579171

libdrm.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Sat Apr 12 01:28:02 UTC 2014 - tobias.johannes.klausmann@mni.thm.de
+
+- Update to version 2.4.53:
+  + drm: Implement drmCheckModesettingSupported() for FreeBSD
+  + Enable libkms by default on DragonFly
+  + freedreno: do not leak drmVersion
+  + freedreno: fix license
+  + freedreno: some msm-ring reset/flush fixes
+  + freedreno: simplify device creation
+  + freedreno: fix null ptr in error path
+  + freedreno/kgsl: don't even bother trying CREATE_FD
+  + freedreno: zero out unused field
+  + modeprint: pretty print connector names
+  + radeon: sync with radeon_drm.h from kernel headers
+- Remove upstream patch: Patch3: U_freedreno_license_fix.patch
+
 -------------------------------------------------------------------
 Sun Feb 16 15:16:40 UTC 2014 - afaerber@suse.de
 

libdrm.spec

@@ -18,7 +18,7 @@
 
 Name:           libdrm
 Url:            http://dri.freedesktop.org/
-Version:        2.4.52
+Version:        2.4.53
 Release:        0
 Provides:       libdrm23 = %{version}
 Obsoletes:      libdrm23 < %{version}
@@ -34,12 +34,12 @@ Group:          System/Libraries
 
 #Git-Clone:	git://anongit.freedesktop.org/git/mesa/drm
 #Git-Web:	http://cgit.freedesktop.org/mesa/drm/
-Source:         http://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.bz2
+# Source URL:   http://dri.freedesktop.org/libdrm/
+Source:         %{name}-%{version}.tar.bz2
 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
@@ -165,7 +165,6 @@ Group:          System/Libraries
 %setup -q
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"