From 268f61b107920320b7e0ef564788c58d740a4251 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 30 Mar 2017 07:18:12 +0200 Subject: [PATCH] Update to 2.4.76 Signed-off-by: Igor Gnatenko --- ...itly-check-for-pkg-config-at-the-top.patch | 34 ------------------- libdrm.spec | 10 +++--- sources | 2 +- 3 files changed, 6 insertions(+), 40 deletions(-) delete mode 100644 0001-configure-Explicitly-check-for-pkg-config-at-the-top.patch diff --git a/0001-configure-Explicitly-check-for-pkg-config-at-the-top.patch b/0001-configure-Explicitly-check-for-pkg-config-at-the-top.patch deleted file mode 100644 index 427eaed..0000000 --- a/0001-configure-Explicitly-check-for-pkg-config-at-the-top.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b983b054d4f1a6be67105e90f0ae2064f91a762c Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Thu, 23 Mar 2017 12:07:03 -0400 -Subject: [PATCH] configure: Explicitly check for pkg-config at the top level - -If you don't, then the first place the m4 expands is: - - if test "x$INTEL" != "xno"; then - PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) - fi - -So on non-Intel architectures we never find it in the path, and all -subsequent PKG_CHECK_MODULESes fail. Boo autoconf. - -Signed-off-by: Adam Jackson ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index 8e593324..2e50d3ef 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -28,6 +28,7 @@ AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_SRCDIR([Makefile.am]) - AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_AUX_DIR([build-aux]) -+PKG_PROG_PKG_CONFIG - - # Require xorg-macros minimum of 1.12 for XORG_WITH_XSLTPROC - m4_ifndef([XORG_MACROS_VERSION], --- -2.12.0 - diff --git a/libdrm.spec b/libdrm.spec index 0701f2f..34fc611 100644 --- a/libdrm.spec +++ b/libdrm.spec @@ -6,8 +6,8 @@ Name: libdrm Summary: Direct Rendering Manager runtime library -Version: 2.4.75 -Release: 3%{?dist} +Version: 2.4.76 +Release: 1%{?dist} License: MIT URL: https://dri.freedesktop.org @@ -27,9 +27,6 @@ BuildRequires: valgrind-devel %endif BuildRequires: xorg-x11-util-macros -# sodding autoconf -Patch0: 0001-configure-Explicitly-check-for-pkg-config-at-the-top.patch - # hardcode the 666 instead of 660 for device nodes Patch3: libdrm-make-dri-perms-okay.patch # remove backwards compat not needed on Fedora @@ -230,6 +227,9 @@ rm -f %{buildroot}%{_includedir}/%{name}/{r300_reg.h,via_3d_reg.h} %{_mandir}/man7/drm*.7* %changelog +* Thu Mar 30 2017 Igor Gnatenko - 2.4.76-1 +- Update to 2.4.76 + * Thu Mar 23 2017 Adam Jackson - 2.4.75-3 - Fix pkg-config detection on non-Intel diff --git a/sources b/sources index bfaefa4..eaa3015 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libdrm-2.4.75.tar.bz2) = 7d30029dfc384024eb6a82a04122064366572f5888ac4594fd9e02bc0a22ed2d154bef1840bd24f0543b77460d6359d7e424d424e10f4256ee3c898041be2292 +SHA512 (libdrm-2.4.76.tar.bz2) = 29aa3085fe71f9adaca654e408e74b3f850b82c4af7035fe147d848ad038dac8749619dfa91b1ef24e2ab1d97719d91de4fa67684ef7582285ebc9802aa4d615