airlied pushed to libdrm (f20). "Merge remote-tracking branch 'origin/master' into f20"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sun Apr 5 00:56:59 UTC 2015
>From e79e433a2b27a2f1cb865c35bd7821eca39c39fa Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Tue, 18 Nov 2014 11:49:10 -0500
Subject: BR: valgrind-devel so we get ioctl annotations
diff --git a/libdrm.spec b/libdrm.spec
index 8932036..9a01001 100644
--- a/libdrm.spec
+++ b/libdrm.spec
@@ -3,7 +3,7 @@
Summary: Direct Rendering Manager runtime library
Name: libdrm
Version: 2.4.58
-Release: 1%{?dist}
+Release: 2%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://dri.sourceforge.net
@@ -27,6 +27,7 @@ BuildRequires: libudev-devel
BuildRequires: libatomic_ops-devel
BuildRequires: libpciaccess-devel
BuildRequires: libxslt docbook-style-xsl
+BuildRequires: valgrind-devel
Source2: 91-drm-modeset.rules
@@ -213,6 +214,9 @@ done
%{_mandir}/man7/drm*.7*
%changelog
+* Tue Nov 18 2014 Adam Jackson <ajax at redhat.com> 2.4.58-2
+- BR: valgrind-devel so we get ioctl annotations
+
* Thu Oct 02 2014 Adam Jackson <ajax at redhat.com> 2.4.58-1
- libdrm 2.4.58
--
cgit v0.10.2
>From 826ccbe797f95697209ed29c1127747901f4bbd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Wed, 19 Nov 2014 09:50:31 +0100
Subject: - valgrind available only on selected arches
diff --git a/libdrm.spec b/libdrm.spec
index 9a01001..6d3313a 100644
--- a/libdrm.spec
+++ b/libdrm.spec
@@ -3,7 +3,7 @@
Summary: Direct Rendering Manager runtime library
Name: libdrm
Version: 2.4.58
-Release: 2%{?dist}
+Release: 3%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://dri.sourceforge.net
@@ -27,7 +27,9 @@ BuildRequires: libudev-devel
BuildRequires: libatomic_ops-devel
BuildRequires: libpciaccess-devel
BuildRequires: libxslt docbook-style-xsl
+%ifarch %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64
BuildRequires: valgrind-devel
+%endif
Source2: 91-drm-modeset.rules
@@ -214,6 +216,9 @@ done
%{_mandir}/man7/drm*.7*
%changelog
+* Wed Nov 19 2014 Dan Horák <dan[at]danny.cz> 2.4.58-3
+- valgrind available only on selected arches
+
* Tue Nov 18 2014 Adam Jackson <ajax at redhat.com> 2.4.58-2
- BR: valgrind-devel so we get ioctl annotations
--
cgit v0.10.2
>From d7dc5ff4cfc6fb141129eac89c5eb54a17d62927 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Thu, 22 Jan 2015 11:54:02 +1000
Subject: libdrm 2.4.59
diff --git a/.gitignore b/.gitignore
index e52e733..014655b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@ libdrm-20100612.tar.bz2
/libdrm-2.4.54.tar.bz2
/libdrm-2.4.56.tar.bz2
/libdrm-2.4.58.tar.bz2
+/libdrm-2.4.59.tar.bz2
diff --git a/libdrm.spec b/libdrm.spec
index 6d3313a..51deac1 100644
--- a/libdrm.spec
+++ b/libdrm.spec
@@ -2,8 +2,8 @@
Summary: Direct Rendering Manager runtime library
Name: libdrm
-Version: 2.4.58
-Release: 3%{?dist}
+Version: 2.4.59
+Release: 1%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://dri.sourceforge.net
@@ -73,9 +73,6 @@ autoreconf -v --install || exit 1
--enable-exynos-experimental-api \
--enable-omap-experimental-api \
%endif
-%ifarch %{arm} aarch64
- --enable-freedreno-experimental-api \
-%endif
--enable-udev
make %{?_smp_mflags}
pushd tests
@@ -216,6 +213,9 @@ done
%{_mandir}/man7/drm*.7*
%changelog
+* Thu Jan 22 2015 Dave Airlie <airlied at redhat.com> 2.4.59-1
+- libdrm 2.4.59
+
* Wed Nov 19 2014 Dan Horák <dan[at]danny.cz> 2.4.58-3
- valgrind available only on selected arches
diff --git a/sources b/sources
index d9b9061..f929462 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
24213913333d72b36c16463ed92e522a libdrm-2.4.58.tar.bz2
+d32a1d37c2546ee11fc5924abeedb23e libdrm-2.4.59.tar.bz2
--
cgit v0.10.2
>From 9f9d6b753c82a28122a32826cc293a1390ee97db Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at gmail.com>
Date: Thu, 22 Jan 2015 03:43:24 +0000
Subject: Enable tegra
diff --git a/libdrm.spec b/libdrm.spec
index 51deac1..70b5d32 100644
--- a/libdrm.spec
+++ b/libdrm.spec
@@ -3,7 +3,7 @@
Summary: Direct Rendering Manager runtime library
Name: libdrm
Version: 2.4.59
-Release: 1%{?dist}
+Release: 2%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://dri.sourceforge.net
@@ -72,6 +72,7 @@ autoreconf -v --install || exit 1
%ifarch %{arm}
--enable-exynos-experimental-api \
--enable-omap-experimental-api \
+ --enable-tegra-experimental-api \
%endif
--enable-udev
make %{?_smp_mflags}
@@ -115,6 +116,8 @@ done
%{_libdir}/libdrm_exynos.so.1.0.0
%{_libdir}/libdrm_omap.so.1
%{_libdir}/libdrm_omap.so.1.0.0
+%{_libdir}/libdrm_tegra.so.0
+%{_libdir}/libdrm_tegra.so.0.0.0
%endif
%ifarch %{arm} aarch64
%{_libdir}/libdrm_freedreno.so.1
@@ -164,6 +167,7 @@ done
%ifarch %{arm}
%{_includedir}/libdrm/exynos_drmif.h
%{_includedir}/libdrm/omap_drmif.h
+%{_includedir}/libdrm/tegra.h
%{_includedir}/exynos/
%{_includedir}/omap/
%endif
@@ -188,6 +192,7 @@ done
%ifarch %{arm}
%{_libdir}/libdrm_exynos.so
%{_libdir}/libdrm_omap.so
+%{_libdir}/libdrm_tegra.so
%endif
%ifarch %{arm} aarch64
%{_libdir}/libdrm_freedreno.so
@@ -202,6 +207,7 @@ done
%ifarch %{arm}
%{_libdir}/pkgconfig/libdrm_exynos.pc
%{_libdir}/pkgconfig/libdrm_omap.pc
+%{_libdir}/pkgconfig/libdrm_tegra.pc
%endif
%ifarch %{arm} aarch64
%{_libdir}/pkgconfig/libdrm_freedreno.pc
@@ -213,6 +219,9 @@ done
%{_mandir}/man7/drm*.7*
%changelog
+* Thu Jan 22 2015 Peter Robinson <pbrobinson at fedoraproject.org> 2.4.59-2
+- Enable tegra
+
* Thu Jan 22 2015 Dave Airlie <airlied at redhat.com> 2.4.59-1
- libdrm 2.4.59
--
cgit v0.10.2
>From 4d0f69e9a6fe6cec1db588410dc1524c97ffa8a7 Mon Sep 17 00:00:00 2001
From: Rob Clark <robdclark at gmail.com>
Date: Fri, 23 Jan 2015 11:48:26 -0500
Subject: Add test apps to drm-utils package
diff --git a/libdrm.spec b/libdrm.spec
index 70b5d32..58b19dc 100644
--- a/libdrm.spec
+++ b/libdrm.spec
@@ -3,7 +3,7 @@
Summary: Direct Rendering Manager runtime library
Name: libdrm
Version: 2.4.59
-Release: 2%{?dist}
+Release: 3%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://dri.sourceforge.net
@@ -74,6 +74,7 @@ autoreconf -v --install || exit 1
--enable-omap-experimental-api \
--enable-tegra-experimental-api \
%endif
+ --enable-install-test-programs \
--enable-udev
make %{?_smp_mflags}
pushd tests
@@ -148,6 +149,10 @@ done
%{_bindir}/openclose
%{_bindir}/setversion
%{_bindir}/updatedraw
+%{_bindir}/modetest
+%{_bindir}/modeprint
+%{_bindir}/vbltest
+%{_bindir}/kmstest
%files devel
%defattr(-,root,root,-)
@@ -219,6 +224,9 @@ done
%{_mandir}/man7/drm*.7*
%changelog
+* Fri Jan 23 2015 Rob Clark <rclark at redhat.com> 2.4.59-3
+- Add test apps to drm-utils package
+
* Thu Jan 22 2015 Peter Robinson <pbrobinson at fedoraproject.org> 2.4.59-2
- Enable tegra
--
cgit v0.10.2
>From 3883f01882a2fce8cae26dc42fd3ad798d2fd699 Mon Sep 17 00:00:00 2001
From: Rob Clark <robdclark at gmail.com>
Date: Fri, 23 Jan 2015 13:47:33 -0500
Subject: Don't install exynos tests
diff --git a/libdrm.spec b/libdrm.spec
index 58b19dc..743bcdb 100644
--- a/libdrm.spec
+++ b/libdrm.spec
@@ -3,7 +3,7 @@
Summary: Direct Rendering Manager runtime library
Name: libdrm
Version: 2.4.59
-Release: 3%{?dist}
+Release: 4%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://dri.sourceforge.net
@@ -153,6 +153,7 @@ done
%{_bindir}/modeprint
%{_bindir}/vbltest
%{_bindir}/kmstest
+%exclude %{_bindir}/exynos*
%files devel
%defattr(-,root,root,-)
@@ -224,6 +225,9 @@ done
%{_mandir}/man7/drm*.7*
%changelog
+* Fri Jan 23 2015 Rob Clark <rclark at redhat.com> 2.4.59-4
+- No we don't actually want to install the exynos tests
+
* Fri Jan 23 2015 Rob Clark <rclark at redhat.com> 2.4.59-3
- Add test apps to drm-utils package
--
cgit v0.10.2
>From 4ed3c43ddf02b3ee73f8bd0c07213c0249a7d743 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Mon, 23 Mar 2015 09:09:52 +1000
Subject: libdrm 2.4.60
diff --git a/.gitignore b/.gitignore
index 014655b..edfec8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ libdrm-20100612.tar.bz2
/libdrm-2.4.56.tar.bz2
/libdrm-2.4.58.tar.bz2
/libdrm-2.4.59.tar.bz2
+/libdrm-2.4.60.tar.bz2
diff --git a/libdrm-2.4.0-no-bc.patch b/libdrm-2.4.0-no-bc.patch
index ad14e21..e3624a6 100644
--- a/libdrm-2.4.0-no-bc.patch
+++ b/libdrm-2.4.0-no-bc.patch
@@ -1,10 +1,10 @@
-diff -up libdrm-20080814/xf86drm.c.no-bc libdrm-20080814/xf86drm.c
---- libdrm-20080814/xf86drm.c.no-bc 2008-08-14 15:43:09.000000000 +1000
-+++ libdrm-20080814/xf86drm.c 2008-08-14 15:45:09.000000000 +1000
-@@ -396,11 +396,6 @@ int drmAvailable(void)
+diff -up libdrm-2.4.60/xf86drm.c.no-bc libdrm-2.4.60/xf86drm.c
+--- libdrm-2.4.60/xf86drm.c.no-bc 2015-03-23 09:04:17.272458959 +1000
++++ libdrm-2.4.60/xf86drm.c 2015-03-23 09:07:36.856720490 +1000
+@@ -482,11 +482,6 @@ int drmAvailable(void)
int fd;
- if ((fd = drmOpenMinor(0, 1, DRM_NODE_RENDER)) < 0) {
+ if ((fd = drmOpenMinor(0, 1, DRM_NODE_PRIMARY)) < 0) {
-#ifdef __linux__
- /* Try proc for backward Linux compatibility */
- if (!access("/proc/dri/0", R_OK))
@@ -13,7 +13,7 @@ diff -up libdrm-20080814/xf86drm.c.no-bc libdrm-20080814/xf86drm.c
return 0;
}
-@@ -519,38 +514,6 @@ static int drmOpenByName(const char *nam
+@@ -659,38 +654,6 @@ static int drmOpenByName(const char *nam
}
}
@@ -38,9 +38,9 @@ diff -up libdrm-20080814/xf86drm.c.no-bc libdrm-20080814/xf86drm.c
- for (devstring = ++pt; *pt && *pt != ' '; ++pt)
- ;
- if (*pt) { /* Found busid */
-- return drmOpenByBusid(++pt);
+- return drmOpenByBusid(++pt, type);
- } else { /* No busid */
-- return drmOpenDevice(strtol(devstring, NULL, 0),i, DRM_NODE_RENDER);
+- return drmOpenDevice(strtol(devstring, NULL, 0),i, type);
- }
- }
- }
diff --git a/libdrm.spec b/libdrm.spec
index 743bcdb..ff19f79 100644
--- a/libdrm.spec
+++ b/libdrm.spec
@@ -2,8 +2,8 @@
Summary: Direct Rendering Manager runtime library
Name: libdrm
-Version: 2.4.59
-Release: 4%{?dist}
+Version: 2.4.60
+Release: 1%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://dri.sourceforge.net
@@ -225,6 +225,9 @@ done
%{_mandir}/man7/drm*.7*
%changelog
+* Mon Mar 23 2015 Dave Airlie <airlied at redhat.com> 2.4.60-1
+- libdrm 2.4.60
+
* Fri Jan 23 2015 Rob Clark <rclark at redhat.com> 2.4.59-4
- No we don't actually want to install the exynos tests
diff --git a/sources b/sources
index f929462..6da46a0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-24213913333d72b36c16463ed92e522a libdrm-2.4.58.tar.bz2
-d32a1d37c2546ee11fc5924abeedb23e libdrm-2.4.59.tar.bz2
+13e35a7a1cf38b4c9c0fa0f8c9be6b93 libdrm-2.4.60.tar.bz2
--
cgit v0.10.2
>From efe98d71ee49dbd25c23335221c08b5bbc0dae5d Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Mon, 23 Mar 2015 09:21:14 +1000
Subject: drop tests that are no longer shipped
diff --git a/libdrm.spec b/libdrm.spec
index ff19f79..6fbd833 100644
--- a/libdrm.spec
+++ b/libdrm.spec
@@ -136,12 +136,6 @@ done
%defattr(-,root,root,-)
%{_bindir}/dristat
%{_bindir}/drmstat
-%ifarch %{ix86} x86_64 ia64
-%{_bindir}/gem_basic
-%{_bindir}/gem_flink
-%{_bindir}/gem_mmap
-%{_bindir}/gem_readwrite
-%endif
%{_bindir}/getclient
%{_bindir}/getstats
%{_bindir}/getversion
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/libdrm.git/commit/?h=f20&id=81b9b58f8934466e17666693ff905a94cf418918
More information about the scm-commits
mailing list