Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/libdrm.git#f9254acf932b0771bc4af934391caab4549d78e5
This commit is contained in:
DistroBaker 2020-11-04 04:08:54 +00:00
parent 311f45b05b
commit a3ce7e60aa
4 changed files with 13 additions and 9 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/libdrm-2.*.tar.bz2 /libdrm-2.*.tar.bz2
/libdrm-2.4.101.tar.xz /libdrm-2.4.101.tar.xz
/libdrm-2.4.102.tar.xz /libdrm-2.4.102.tar.xz
/libdrm-2.4.103.tar.xz

View File

@ -1,7 +1,7 @@
diff -uNr libdrm-2.4.69.orig/xf86drm.c libdrm-2.4.69/xf86drm.c diff -up libdrm-2.4.103/xf86drm.c.dma libdrm-2.4.103/xf86drm.c
--- libdrm-2.4.69.orig/xf86drm.c 2016-07-20 20:42:39.000000000 +0200 --- libdrm-2.4.103/xf86drm.c.dma 2020-11-04 13:24:14.000000000 +1000
+++ libdrm-2.4.69/xf86drm.c 2016-07-21 08:00:10.411599806 +0200 +++ libdrm-2.4.103/xf86drm.c 2020-11-04 13:42:04.190975193 +1000
@@ -484,11 +484,6 @@ @@ -507,11 +507,6 @@ drm_public int drmAvailable(void)
int fd; int fd;
if ((fd = drmOpenMinor(0, 1, DRM_NODE_PRIMARY)) < 0) { if ((fd = drmOpenMinor(0, 1, DRM_NODE_PRIMARY)) < 0) {
@ -13,7 +13,7 @@ diff -uNr libdrm-2.4.69.orig/xf86drm.c libdrm-2.4.69/xf86drm.c
return 0; return 0;
} }
@@ -661,38 +656,6 @@ @@ -704,38 +699,6 @@ static int drmOpenByName(const char *nam
} }
} }
@ -25,7 +25,7 @@ diff -uNr libdrm-2.4.69.orig/xf86drm.c libdrm-2.4.69/xf86drm.c
- int retcode; - int retcode;
- -
- sprintf(proc_name, "/proc/dri/%d/name", i); - sprintf(proc_name, "/proc/dri/%d/name", i);
- if ((fd = open(proc_name, 0, 0)) >= 0) { - if ((fd = open(proc_name, O_RDONLY, 0)) >= 0) {
- retcode = read(fd, buf, sizeof(buf)-1); - retcode = read(fd, buf, sizeof(buf)-1);
- close(fd); - close(fd);
- if (retcode) { - if (retcode) {

View File

@ -47,8 +47,8 @@ end}
Name: libdrm Name: libdrm
Summary: Direct Rendering Manager runtime library Summary: Direct Rendering Manager runtime library
Version: 2.4.102 Version: 2.4.103
Release: 2%{?dist} Release: 1%{?dist}
License: MIT License: MIT
URL: https://dri.freedesktop.org URL: https://dri.freedesktop.org
@ -286,6 +286,9 @@ cp %{SOURCE1} %{buildroot}%{_docdir}/libdrm
%endif %endif
%changelog %changelog
* Wed Nov 04 2020 Dave Airlie <airlied@redhat.com> - 2.4.103-1
- Update to 2.4.103
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.102-2 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.102-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (libdrm-2.4.102.tar.xz) = 386afd228efd809fe32776a6ff5d9dd95d1409a6a6a89b3806a3b42ed27e84f1e090f3b7834973f834d6b0d1342b7034447fe8690d072f85f03292d7795c3e0c SHA512 (libdrm-2.4.103.tar.xz) = 15b098b962008271400692b6b15ecb7e22676f8698e0220ad969735ac2315ccc737d19558afb6abda82bae15117e5f306c048184a2369f434b85ecaa670ca885