$ git diff --patch-with-stat --summary 54c37b76fe983b46079416d11f54c894192aace8..267fd179c2249d0a82e97f6b281ddf33ec8bb1cd
.abf.yml | 3 +-
libdrm-2.4.0-no-bc.patch | 54 -----------------------------
libdrm-2.4.25-check-programs.patch | 10 ------
libdrm.spec | 69 +++++++++++++++++---------------------
make-git-snapshot.sh | 22 ------------
5 files changed, 32 insertions(+), 126 deletions(-)
delete mode 100644 libdrm-2.4.0-no-bc.patch
delete mode 100644 libdrm-2.4.25-check-programs.patch
delete mode 100755 make-git-snapshot.sh
diff --git a/.abf.yml b/.abf.yml
index 16e6745..7b235ad 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,3 +1,2 @@
sources:
- libdrm-2.4.89.tar.bz2: 43123da26271df9a29deb687c1855bef3fed249c
- libdrm-2.4.91.tar.bz2: 44e42ce3cd41666e343ba393c73f6f1ad9fe1e74
+ libdrm-2.4.92.tar.bz2: aad04c8e35cd3ab589ff085b20f75ba43e086647
diff --git a/libdrm-2.4.0-no-bc.patch b/libdrm-2.4.0-no-bc.patch
deleted file mode 100644
index e3624a6..0000000
--- a/libdrm-2.4.0-no-bc.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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_PRIMARY)) < 0) {
--#ifdef __linux__
-- /* Try proc for backward Linux compatibility */
-- if (!access("/proc/dri/0", R_OK))
-- return 1;
--#endif
- return 0;
- }
-
-@@ -659,38 +654,6 @@ static int drmOpenByName(const char *nam
- }
- }
-
--#ifdef __linux__
-- /* Backward-compatibility /proc support */
-- for (i = 0; i < 8; i++) {
-- char proc_name[64], buf[512];
-- char *driver, *pt, *devstring;
-- int retcode;
--
-- sprintf(proc_name, "/proc/dri/%d/name", i);
-- if ((fd = open(proc_name, 0, 0)) >= 0) {
-- retcode = read(fd, buf, sizeof(buf)-1);
-- close(fd);
-- if (retcode) {
-- buf[retcode-1] = '\0';
-- for (driver = pt = buf; *pt && *pt != ' '; ++pt)
-- ;
-- if (*pt) { /* Device is next */
-- *pt = '\0';
-- if (!strcmp(driver, name)) { /* Match */
-- for (devstring = ++pt; *pt && *pt != ' '; ++pt)
-- ;
-- if (*pt) { /* Found busid */
-- return drmOpenByBusid(++pt, type);
-- } else { /* No busid */
-- return drmOpenDevice(strtol(devstring, NULL, 0),i, type);
-- }
-- }
-- }
-- }
-- }
-- }
--#endif
--
- return -1;
- }
-
diff --git a/libdrm-2.4.25-check-programs.patch b/libdrm-2.4.25-check-programs.patch
deleted file mode 100644
index 29949ee..0000000
--- a/libdrm-2.4.25-check-programs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -up libdrm-2.4.25/tests/Makefile.am.jx libdrm-2.4.25/tests/Makefile.am
---- libdrm-2.4.25/tests/Makefile.am.jx 2011-03-21 09:39:24.000000000 -0400
-+++ libdrm-2.4.25/tests/Makefile.am 2011-04-18 11:40:17.000000000 -0400
-@@ -58,3 +58,6 @@ endif
- check_PROGRAMS += $(TESTS)
-
- endif
-+
-+check-programs:
-+ @echo $(check_PROGRAMS)
diff --git a/libdrm.spec b/libdrm.spec
index e26c2da..e32c4ce 100644
--- a/libdrm.spec
+++ b/libdrm.spec
@@ -4,10 +4,9 @@
%define kms_major 1
%define libkms %mklibname kms %{kms_major}
-%ifarch %{ix86} x86_64
+%ifnarch %{armx}
%define intel_major 1
%define libintel %mklibname drm_intel %{intel_major}
-%endif
%define nouveau_major 2
%define libnouveau %mklibname drm_nouveau %{nouveau_major}
%define radeon_major 1
@@ -15,6 +14,7 @@
# amdgpu
%define amdgpu_major 1
%define libamdgpu %mklibname drm_amdgpu %{amdgpu_major}
+%endif
%ifarch %{armx}
# exynos
@@ -39,28 +39,27 @@
Summary: Userspace interface to kernel DRM services
Name: libdrm
-Version: 2.4.91
+Version: 2.4.92
Release: 1
Group: System/Libraries
License: MIT/X11
Url: http://dri.freedesktop.org
Source0: http://dri.freedesktop.org/libdrm/libdrm-%{version}.tar.bz2
Source1: 91-drm-modeset.rules
-# Backports from git:
# hardcode the 666 instead of 660 for device nodes
Patch3: libdrm-make-dri-perms-okay.patch
-# remove backwards compat not needed on Fedora
-#Patch4: libdrm-2.4.0-no-bc.patch
Patch6: drm-update-arm.patch
# For building man pages
BuildRequires: docbook-style-xsl
+BuildRequires: docbook-dtd42-xml
BuildRequires: xsltproc
BuildRequires: kernel-headers
BuildRequires: pkgconfig(pthread-stubs)
-BuildRequires: pkgconfig(udev)
BuildRequires: pkgconfig(pciaccess)
BuildRequires: pkgconfig(xorg-macros)
+BuildRequires: pkgconfig(atomic_ops)
+BuildRequires: meson
%description
Userspace interface to kernel DRM services.
@@ -68,6 +67,7 @@ Userspace interface to kernel DRM services.
%package common
Summary: Common files for the userspace interface to kernel DRM services
Group: System/Libraries
+Requires: coreutils
%description common
Common files for the userspace interface to kernel DRM services.
@@ -78,6 +78,9 @@ Group: System/Libraries
Provides: %{name} = %{version}
Requires: %{name}-common
+%description -n %{libname}
+Userspace interface to kernel DRM services
+
%package -n %{libkms}
Summary: Shared library for KMS
Group: System/Libraries
@@ -92,7 +95,6 @@ Group: System/Libraries
%description -n %{libintel}
Shared library for Intel kernel Direct Rendering Manager services.
-%endif
%package -n %{libnouveau}
Summary: Shared library for Nouveau kernel DRM services
@@ -116,6 +118,7 @@ Conflicts: %{_lib}drm2 < 2.4.5-2
%description -n %{libamdgpu}
Shared library for AMD GPU kernel Direct Rendering Manager services.
+%endif
# ARM stuff
%ifarch %{armx}
@@ -194,12 +197,12 @@ Summary: Development files for %{name}
Group: Development/X11
Requires: %{libname} = %{version}
Requires: %{libkms} = %{version}
-%ifarch %{ix86} x86_64
+%ifnarch %{armx}
Requires: %{libintel} = %{version}
-%endif
Requires: %{libnouveau} = %{version}
Requires: %{libradeon} = %{version}
Requires: %{libamdgpu} = %{version}
+%endif
%ifarch %{armx}
Requires: %{libexynos} = %{version}
Requires: %{libfreedreno} = %{version}
@@ -216,48 +219,38 @@ Obsoletes: %{_lib}drm-static-devel
%description -n %{devname}
Development files for %{name}.
-%track
-prog %{name} = {
- url = http://dri.freedesktop.org/libdrm/
- regex = %{name}-(__VER__)\.tar\.bz2
- version = %{version}
-}
-
%prep
%setup -q
%apply_patches
-# Needed for patch4
-autoreconf -fv --install
%build
-%configure \
- --enable-udev \
-%ifnarch %{ix86} x86_64
- --disable-intel \
-%endif
+%meson \
%ifarch %{armx}
- --enable-exynos-experimental-api \
- --enable-freedreno-experimental-api \
- --enable-tegra-experimental-api \
- --enable-omap-experimental-api \
- --enable-etnaviv-experimental-api \
- --enable-vc4 \
+ -Dintel=false \
+ -Dradeon=false \
+ -Damdgpu=false \
+ -Dnouveau=false \
+ -Domap=true \
+ -Dexynos=true \
+ -Dfreedreno=true \
+ -Dtegra=true \
+ -Detnaviv=true \
%endif
- --enable-udev
+ -Dvc4=false \
+ -Dlibkms=true
-%make CFLAGS="%{optflags} -DMAJOR_IN_SYSMACROS"
+%meson_build
%install
-%makeinstall_std
+%meson_install
install -m644 %{SOURCE1} -D %{buildroot}/lib/udev/rules.d/91-drm-modeset.rules
-# (cg) Note that RH remove drm.h drm_mode.h drm_sarea.h r300_reg.h via_3d_reg.h
-# and we should perhaps do the same? (previous attempts have not gone well :)
-
%files common
+%ifnarch %{armx}
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*.ids
+%endif
/lib/udev/rules.d/91-drm-modeset.rules
%files -n %{libname}
@@ -266,10 +259,9 @@ install -m644 %{SOURCE1} -D %{buildroot}/lib/udev/rules.d/91-drm-modeset.rules
%files -n %{libkms}
%{_libdir}/libkms.so.%{kms_major}*
-%ifarch %{ix86} x86_64
+%ifnarch %{armx}
%files -n %{libintel}
%{_libdir}/libdrm_intel.so.%{intel_major}*
-%endif
%files -n %{libnouveau}
%{_libdir}/libdrm_nouveau.so.%{nouveau_major}*
@@ -279,6 +271,7 @@ install -m644 %{SOURCE1} -D %{buildroot}/lib/udev/rules.d/91-drm-modeset.rules
%files -n %{libamdgpu}
%{_libdir}/libdrm_amdgpu.so.%{amdgpu_major}*
+%endif
%ifarch %{armx}
%files -n %{libexynos}
diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh
deleted file mode 100755
index 888855e..0000000
--- a/make-git-snapshot.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# Usage: ./make-git-snapshot.sh [COMMIT]
-#
-# to make a snapshot of the given tag/branch. Defaults to HEAD.
-# Point env var REF to a local mesa repo to reduce clone time.
-
-DIRNAME=libdrm-$( date +%Y%m%d )
-
-echo REF ${REF:+--reference $REF}
-echo DIRNAME $DIRNAME
-echo HEAD ${1:-HEAD}
-
-rm -rf $DIRNAME
-
-git clone ${REF:+--reference $REF} \
- git://git.freedesktop.org/git/mesa/drm $DIRNAME
-
-GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
- | bzip2 > $DIRNAME.tar.bz2
-
-# rm -rf $DIRNAME