diff --git a/libdrm.changes b/libdrm.changes index ef89b3c..b487db9 100644 --- a/libdrm.changes +++ b/libdrm.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Sep 23 10:53:52 UTC 2012 - sndirsch@suse.com + +- u_Fix-compilation-on-systems-that-don-t-provide-O_CLOE.patch + * Fix compilation on systems that don't provide O_CLOEXEC. + Patch suggestion by Thomas Klausner . + See also http://mail-index.netbsd.org/pkgsrc-changes/2012/08/13/msg076887.html + ------------------------------------------------------------------- Thu Sep 20 22:13:32 UTC 2012 - sndirsch@suse.com diff --git a/libdrm.spec b/libdrm.spec index 43f7e8e..d2351a1 100644 --- a/libdrm.spec +++ b/libdrm.spec @@ -38,6 +38,7 @@ Source: http://dri.freedesktop.org/libdrm/%{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 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf >= 2.63 @@ -156,6 +157,7 @@ Group: System/Libraries %prep %setup -q %patch1 -p1 +%patch2 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" diff --git a/u_Fix-compilation-on-systems-that-don-t-provide-O_CLOE.patch b/u_Fix-compilation-on-systems-that-don-t-provide-O_CLOE.patch new file mode 100644 index 0000000..26710d8 --- /dev/null +++ b/u_Fix-compilation-on-systems-that-don-t-provide-O_CLOE.patch @@ -0,0 +1,30 @@ +From 23fb372294bb72335157bc5b9b5a60235ce72f41 Mon Sep 17 00:00:00 2001 +From: Stefan Dirsch +Date: Sun, 23 Sep 2012 12:50:40 +0200 +Subject: [PATCH] Fix compilation on systems that don't provide O_CLOEXEC. + +Patch suggestion by Thomas Klausner . See +also http://mail-index.netbsd.org/pkgsrc-changes/2012/08/13/msg076887.html +--- + include/drm/drm.h | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/include/drm/drm.h b/include/drm/drm.h +index a847689..a6164ae 100644 +--- a/include/drm/drm.h ++++ b/include/drm/drm.h +@@ -618,7 +618,11 @@ struct drm_get_cap { + __u64 value; + }; + ++#ifdef O_CLOEXEC + #define DRM_CLOEXEC O_CLOEXEC ++#else ++#define DRM_CLOEXEC 0 ++#endif + struct drm_prime_handle { + __u32 handle; + +-- +1.7.3.4 +