From 702cd3b5c90ac3c9904f50198786ccb45dda84bcf9b415937ceb15451a3f0f94 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 14 Mar 2014 15:45:18 +0000 Subject: [PATCH 1/3] Accepting request 225976 from home:Guillaume_G:branches:X11:XOrg Add subpackage for Exynos (ARM) OBS-URL: https://build.opensuse.org/request/show/225976 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libdrm?expand=0&rev=166 --- libdrm.changes | 5 +++++ libdrm.spec | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/libdrm.changes b/libdrm.changes index 3171749..126ef8f 100644 --- a/libdrm.changes +++ b/libdrm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 12 16:22:55 UTC 2014 - guillaume@opensuse.org + +- Add subpackage for Exynos (ARM) + ------------------------------------------------------------------- Sun Feb 16 15:16:40 UTC 2014 - afaerber@suse.de diff --git a/libdrm.spec b/libdrm.spec index 3f2416b..5a353f6 100644 --- a/libdrm.spec +++ b/libdrm.spec @@ -73,6 +73,7 @@ Requires: libdrm2 = %version Requires: libdrm_nouveau2 = %version Requires: libdrm_radeon1 = %version %ifarch %arm +Requires: libdrm_exynos1 = %version Requires: libdrm_freedreno1 = %version Requires: libdrm_omap1 = %version %endif @@ -159,6 +160,13 @@ Group: System/Libraries %description -n libdrm_freedreno1 (Upstream has not provided a description) + +%package -n libdrm_exynos1 +Summary: Userspace interface to kernel DRM services for exynos chips +Group: System/Libraries + +%description -n libdrm_exynos1 +(Upstream has not provided a description) %endif %prep @@ -174,6 +182,7 @@ autoreconf -fi %ifarch %arm --enable-omap-experimental-api \ --enable-freedreno-experimental-api \ + --enable-exynos-experimental-api \ %endif --enable-udev @@ -223,6 +232,10 @@ rm -f "%buildroot/%_libdir"/*.la %post -n libdrm_freedreno1 -p /sbin/ldconfig %postun -n libdrm_freedreno1 -p /sbin/ldconfig + +%post -n libdrm_exynos1 -p /sbin/ldconfig + +%postun -n libdrm_exynos1 -p /sbin/ldconfig %endif %files tools @@ -238,6 +251,7 @@ rm -f "%buildroot/%_libdir"/*.la %ifarch %arm %_includedir/omap %_includedir/freedreno +%_includedir/exynos %endif %_includedir/xf86drm.h %_includedir/xf86drmMode.h @@ -282,6 +296,10 @@ rm -f "%buildroot/%_libdir"/*.la %files -n libdrm_freedreno1 %defattr(-,root,root) %_libdir/libdrm_freedreno.so.1* + +%files -n libdrm_exynos1 +%defattr(-,root,root) +%_libdir/libdrm_exynos.so.1* %endif %changelog From 2626fa8c2a0467dba1b4680f2cbabc0d687e5e5469cf8a38cb4f32454b6f6b69 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 14 Mar 2014 15:51:19 +0000 Subject: [PATCH 2/3] back to previous version ... OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libdrm?expand=0&rev=167 --- libdrm.changes | 5 ----- libdrm.spec | 18 ------------------ 2 files changed, 23 deletions(-) diff --git a/libdrm.changes b/libdrm.changes index 126ef8f..3171749 100644 --- a/libdrm.changes +++ b/libdrm.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Wed Mar 12 16:22:55 UTC 2014 - guillaume@opensuse.org - -- Add subpackage for Exynos (ARM) - ------------------------------------------------------------------- Sun Feb 16 15:16:40 UTC 2014 - afaerber@suse.de diff --git a/libdrm.spec b/libdrm.spec index 5a353f6..3f2416b 100644 --- a/libdrm.spec +++ b/libdrm.spec @@ -73,7 +73,6 @@ Requires: libdrm2 = %version Requires: libdrm_nouveau2 = %version Requires: libdrm_radeon1 = %version %ifarch %arm -Requires: libdrm_exynos1 = %version Requires: libdrm_freedreno1 = %version Requires: libdrm_omap1 = %version %endif @@ -160,13 +159,6 @@ Group: System/Libraries %description -n libdrm_freedreno1 (Upstream has not provided a description) - -%package -n libdrm_exynos1 -Summary: Userspace interface to kernel DRM services for exynos chips -Group: System/Libraries - -%description -n libdrm_exynos1 -(Upstream has not provided a description) %endif %prep @@ -182,7 +174,6 @@ autoreconf -fi %ifarch %arm --enable-omap-experimental-api \ --enable-freedreno-experimental-api \ - --enable-exynos-experimental-api \ %endif --enable-udev @@ -232,10 +223,6 @@ rm -f "%buildroot/%_libdir"/*.la %post -n libdrm_freedreno1 -p /sbin/ldconfig %postun -n libdrm_freedreno1 -p /sbin/ldconfig - -%post -n libdrm_exynos1 -p /sbin/ldconfig - -%postun -n libdrm_exynos1 -p /sbin/ldconfig %endif %files tools @@ -251,7 +238,6 @@ rm -f "%buildroot/%_libdir"/*.la %ifarch %arm %_includedir/omap %_includedir/freedreno -%_includedir/exynos %endif %_includedir/xf86drm.h %_includedir/xf86drmMode.h @@ -296,10 +282,6 @@ rm -f "%buildroot/%_libdir"/*.la %files -n libdrm_freedreno1 %defattr(-,root,root) %_libdir/libdrm_freedreno.so.1* - -%files -n libdrm_exynos1 -%defattr(-,root,root) -%_libdir/libdrm_exynos.so.1* %endif %changelog From c6483d915ae573c1645cbddb3ee8c4391958c0ee564164b401b5994301754620 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 14 Apr 2014 09:43:34 +0000 Subject: [PATCH 3/3] Accepting request 229838 from home:tobijk:X11:XOrg update to latest stable OBS-URL: https://build.opensuse.org/request/show/229838 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libdrm?expand=0&rev=168 --- U_freedreno_license_fix.patch | 49 ----------------------------------- libdrm-2.4.52.tar.bz2 | 3 --- libdrm-2.4.53.tar.bz2 | 3 +++ libdrm.changes | 17 ++++++++++++ libdrm.spec | 7 +++-- 5 files changed, 23 insertions(+), 56 deletions(-) delete mode 100644 U_freedreno_license_fix.patch delete mode 100644 libdrm-2.4.52.tar.bz2 create mode 100644 libdrm-2.4.53.tar.bz2 diff --git a/U_freedreno_license_fix.patch b/U_freedreno_license_fix.patch deleted file mode 100644 index 06220e9..0000000 --- a/U_freedreno_license_fix.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 128e74cf6492025e63e035566bd6e2203e8da5e1 Mon Sep 17 00:00:00 2001 -From: Rob Clark -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 ---- -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 - * -- * 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 . -+ * 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 diff --git a/libdrm-2.4.52.tar.bz2 b/libdrm-2.4.52.tar.bz2 deleted file mode 100644 index e99dd6b..0000000 --- a/libdrm-2.4.52.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fa693c2f1f61befcefbdcc396673e38481110bac9db610afa4b8afb2be0218c1 -size 551473 diff --git a/libdrm-2.4.53.tar.bz2 b/libdrm-2.4.53.tar.bz2 new file mode 100644 index 0000000..c34ceab --- /dev/null +++ b/libdrm-2.4.53.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b0c28fd2f2b92d2df0a73d1aed88f43cb0dee1267aea6bc52ccb5fca5757a08 +size 579171 diff --git a/libdrm.changes b/libdrm.changes index 3171749..524c9cc 100644 --- a/libdrm.changes +++ b/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 diff --git a/libdrm.spec b/libdrm.spec index 3f2416b..7749fde 100644 --- a/libdrm.spec +++ b/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"