Accepting request 242398 from home:tobijk:X11:XOrg

OBS-URL: https://build.opensuse.org/request/show/242398
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libdrm?expand=0&rev=177

libdrm-2.4.54.tar.bz2

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

libdrm-2.4.55.tar.bz2

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

libdrm-implicit-defs.diff

@@ -1,29 +0,0 @@
-From: Jan Engelhardt <jengelh@medozas.de>
-Date: 2012-02-11 18:30:33.770195708 +0100
-
-Resolve compiler warnings about use of implicit declared-functions.
-
-radeon_ttm.c: In function 'radeon_open_fd':
-radeon_ttm.c:58:5: warning: implicit declaration of function 'drmOpen' [-Wimplicit-function-declaration]
-radeon_ttm.c: In function 'main':
-radeon_ttm.c:73:5: warning: implicit declaration of function 'close' [-Wimplicit-function-declaration]
-radeon_ttm.c: At top level:
-
----
- tests/radeon/radeon_ttm.c |    2 ++
- 1 file changed, 2 insertions(+)
-
-Index: libdrm-2.4.31/tests/radeon/radeon_ttm.c
-===================================================================
---- libdrm-2.4.31.orig/tests/radeon/radeon_ttm.c
-+++ libdrm-2.4.31/tests/radeon/radeon_ttm.c
-@@ -25,7 +25,9 @@
-  */
- #include <stdio.h>
- #include <stdlib.h>
-+#include <unistd.h>
- #include "rbo.h"
-+#include "xf86drm.h"
- 
- /* allocate as many single page bo to try to starve the kernel
-  * memory zone (below highmem)

libdrm.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Fri Jul 25 15:08:00 UTC 2014 - tobias.johannes.klausmann@mni.thm.de
+
+- Update to version 2.4.55:
+  + exynos: do not build fimg2d_test when building without libkms support.
+  + radeon: Add missing header includes.
+  + exynos: fix scaling factor computation in g2d_copy_with_scale
+  + exynos: fix G2D_DOUBLE_TO_FIXED for non-integer input
+  + exynos: fix coordinate computation in g2d_copy
+  + intel: Add new userptr ioctl
+  + intel: Sync typo fix from the kernel sources.
+  + intel: Sync the command parser version parameter from kernel
+  + freedreno: add chip-id property
+  + freedreno: sync kernel header
+  + drm: Add universal plane capability bit and plane type enums
+  + exynos: prime: use drmPrime*() helpers
+  + exynos_fimg2d_test: fix drmModeRmFB
+  + eyxnos: install exynos tests if HAVE_INSTALL_TESTS
+- Drop upstreamed patches:
+  + libdrm-implicit-defs.diff (Patch1)
+
 -------------------------------------------------------------------
 Sun May 25 15:00:04 UTC 2014 - afaerber@suse.de
 

libdrm.spec

@@ -18,7 +18,7 @@
 
 Name:           libdrm
 Url:            http://dri.freedesktop.org/
-Version:        2.4.54
+Version:        2.4.55
 Release:        0
 Provides:       libdrm23 = %{version}
 Obsoletes:      libdrm23 < %{version}
@@ -38,7 +38,6 @@ Group:          System/Libraries
 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_No-longer-hardcode-path-for-drm.h-include-in-qxl_drm.patch
 
@@ -164,7 +163,6 @@ Group:          System/Libraries
 
 %prep
 %setup -q
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1