From 9ab42d29665875e76df5052160b720eece304570 Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Nov 07 2013 18:52:53 +0000 Subject: import xorg-x11-drv-intel-2.21.15-9.el7.src.rpm --- diff --git a/.xorg-x11-drv-intel.metadata b/.xorg-x11-drv-intel.metadata new file mode 100644 index 0000000..60119f5 --- /dev/null +++ b/.xorg-x11-drv-intel.metadata @@ -0,0 +1,2 @@ +7f29a7c413357295e815a6495a2fcf219a0ada3b SOURCES/intel-gpu-tools-20130611.tar.bz2 +6952e6e1deff1c4580ddee472dbc2223c3248d0f SOURCES/xf86-video-intel-2.21.15.tar.bz2 diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/0001-xwayland-Add-xwayland-support.patch b/SOURCES/0001-xwayland-Add-xwayland-support.patch new file mode 100644 index 0000000..a010881 --- /dev/null +++ b/SOURCES/0001-xwayland-Add-xwayland-support.patch @@ -0,0 +1,374 @@ +From d9769c193765ac303ad4d4760e57ff368df1f663 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= +Date: Mon, 24 Sep 2012 15:01:09 -0400 +Subject: [PATCH 1/2] xwayland: Add xwayland support + +--- + src/intel_device.c | 18 ++++++---- + src/intel_driver.h | 6 +++- + src/intel_module.c | 8 +++++ + src/uxa/intel.h | 2 ++ + src/uxa/intel_dri.c | 38 +++++++++++++++++++-- + src/uxa/intel_driver.c | 89 ++++++++++++++++++++++++++++++++++++++++++++------ + 6 files changed, 140 insertions(+), 21 deletions(-) + +diff --git a/src/intel_device.c b/src/intel_device.c +index d9ff8bc..370b03c 100644 +--- a/src/intel_device.c ++++ b/src/intel_device.c +@@ -181,14 +181,18 @@ int intel_open_device(int entity_num, + if (dev) + return dev->fd; + +- local_path = path ? strdup(path) : NULL; ++ if (!xorgWayland) { ++ local_path = path ? strdup(path) : NULL; + +- fd = __intel_open_device(pci, &local_path); +- if (fd == -1) +- goto err_path; ++ fd = __intel_open_device(pci, &local_path); ++ if (fd == -1) ++ goto err_path; + +- if (!__intel_check_device(fd)) +- goto err_close; ++ if (!__intel_check_device(fd)) ++ goto err_close; ++ } else { ++ fd = -1; ++ } + + dev = malloc(sizeof(*dev)); + if (dev == NULL) +@@ -207,7 +211,7 @@ int intel_open_device(int entity_num, + + xf86GetEntityPrivate(entity_num, intel_device_key)->ptr = dev; + +- return fd; ++ return xorgWayland ? 0 : fd; + + err_close: + close(fd); +diff --git a/src/intel_driver.h b/src/intel_driver.h +index 4768536..103d31e 100644 +--- a/src/intel_driver.h ++++ b/src/intel_driver.h +@@ -129,6 +129,10 @@ void intel_put_device(ScrnInfoPtr scrn); + + void __intel_uxa_release_device(ScrnInfoPtr scrn); + +-#define hosted() (0) ++#include ++#ifdef XORG_WAYLAND ++#include ++#define hosted() (xorgWayland) ++#endif + + #endif /* INTEL_DRIVER_H */ +diff --git a/src/intel_module.c b/src/intel_module.c +index b91152e..ec6d8b8 100644 +--- a/src/intel_module.c ++++ b/src/intel_module.c +@@ -30,6 +30,7 @@ + + #include + #include ++#include + #include + + #if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,6,99,0,0) +@@ -387,6 +388,10 @@ static Bool intel_driver_func(ScrnInfoPtr pScrn, + (*flag) = HW_SKIP_CONSOLE; + #endif + ++#ifdef HW_WAYLAND ++ if (xorgWayland) ++ (*flag) = HW_WAYLAND; ++#endif + return TRUE; + default: + /* Unknown or deprecated function */ +@@ -415,6 +420,9 @@ static enum accel_method { UXA, SNA } get_accel_method(void) + enum accel_method accel_method = DEFAULT_ACCEL_METHOD; + XF86ConfDevicePtr dev; + ++ if (xorgWayland) ++ return UXA; ++ + if (hosted()) + return SNA; + +diff --git a/src/uxa/intel.h b/src/uxa/intel.h +index 9b696cd..0b3b95c 100644 +--- a/src/uxa/intel.h ++++ b/src/uxa/intel.h +@@ -350,6 +350,8 @@ typedef struct intel_screen_private { + InputHandlerProc uevent_handler; + #endif + Bool has_prime_vmap_flush; ++ ++ struct xwl_screen *xwl_screen; + } intel_screen_private; + + #define INTEL_INFO(intel) ((intel)->info) +diff --git a/src/uxa/intel_dri.c b/src/uxa/intel_dri.c +index 0370034..74dabe6 100644 +--- a/src/uxa/intel_dri.c ++++ b/src/uxa/intel_dri.c +@@ -50,6 +50,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. + + #include "xf86.h" + #include "xf86_OSproc.h" ++#include "xf86Priv.h" + + #include "xf86Pci.h" + #include "xf86drm.h" +@@ -58,6 +59,10 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. + #include "shadow.h" + #include "fb.h" + ++#ifdef XORG_WAYLAND ++#include ++#endif ++ + #include "intel.h" + #include "i830_reg.h" + +@@ -1520,6 +1525,22 @@ out_complete: + return TRUE; + } + ++#if DRI2INFOREC_VERSION >= 10 ++static int intel_auth_magic3(ClientPtr client, ScreenPtr screen, uint32_t magic) ++ ++{ ++ ScrnInfoPtr scrn = xf86Screens[screen->myNum]; ++ intel_screen_private *intel = intel_get_screen_private(scrn); ++ ++ /* Not wayland, go stragight to drm */ ++ if (!xorgWayland) ++ return drmAuthMagic(intel->drmSubFD, magic); ++ ++ /* Forward the request to our host */ ++ return xwl_drm_authenticate(client, intel->xwl_screen, magic); ++} ++#endif ++ + static int dri2_server_generation; + #endif + +@@ -1617,14 +1638,25 @@ Bool I830DRI2ScreenInit(ScreenPtr screen) + info.CopyRegion = I830DRI2CopyRegion; + #if DRI2INFOREC_VERSION >= 4 + info.version = 4; +- info.ScheduleSwap = I830DRI2ScheduleSwap; +- info.GetMSC = I830DRI2GetMSC; +- info.ScheduleWaitMSC = I830DRI2ScheduleWaitMSC; ++ if (!xorgWayland) { ++ info.ScheduleSwap = I830DRI2ScheduleSwap; ++ info.GetMSC = I830DRI2GetMSC; ++ info.ScheduleWaitMSC = I830DRI2ScheduleWaitMSC; ++ } else { ++ info.ScheduleSwap = NULL; ++ info.GetMSC = NULL; ++ info.ScheduleWaitMSC = NULL; ++ } + info.numDrivers = 1; + info.driverNames = driverNames; + driverNames[0] = info.driverName; + #endif + ++#if DRI2INFOREC_VERSION >= 10 ++ info.version = 10; ++ info.AuthMagic3 = intel_auth_magic3; ++#endif ++ + return DRI2ScreenInit(screen, &info); + } + +diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c +index 675408d..e74ba60 100644 +--- a/src/uxa/intel_driver.c ++++ b/src/uxa/intel_driver.c +@@ -70,12 +70,17 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. + #include "intel_xvmc.h" + #endif + ++#ifdef XORG_WAYLAND ++#include ++#endif ++ + #include "legacy/legacy.h" + #include "uxa.h" + + #include + #include "i915_drm.h" + #include ++#include + + #include "intel_glamor.h" + #include "intel_options.h" +@@ -167,10 +172,16 @@ static Bool i830CreateScreenResources(ScreenPtr screen) + if (!(*screen->CreateScreenResources) (screen)) + return FALSE; + ++#ifdef XORG_WAYLAND ++ if (intel->xwl_screen) ++ xwl_screen_init(intel->xwl_screen, screen); ++#endif ++ + if (!intel_uxa_create_screen_resources(screen)) + return FALSE; + +- intel_copy_fb(scrn); ++ if (!intel->xwl_screen) ++ intel_copy_fb(scrn); + return TRUE; + } + +@@ -463,6 +474,27 @@ static void intel_setup_capabilities(ScrnInfoPtr scrn) + #endif + } + ++#ifdef XORG_WAYLAND ++static int intel_create_window_buffer(struct xwl_window *xwl_window, ++ PixmapPtr pixmap) ++{ ++ uint32_t name; ++ dri_bo *bo; ++ ++ bo = intel_get_pixmap_bo(pixmap); ++ if (bo == NULL || dri_bo_flink(bo, &name) != 0) ++ return BadDrawable; ++ ++ return xwl_create_window_buffer_drm(xwl_window, pixmap, name); ++} ++ ++static struct xwl_driver xwl_driver = { ++ .version = 1, ++ .use_drm = 1, ++ .create_window_buffer = intel_create_window_buffer ++}; ++#endif ++ + /** + * This is called before ScreenInit to do any require probing of screen + * configuration. +@@ -517,12 +549,6 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags) + + intel->PciInfo = xf86GetPciInfoForEntity(intel->pEnt->index); + +- if (!intel_open_drm_master(scrn)) { +- xf86DrvMsg(scrn->scrnIndex, X_ERROR, +- "Failed to become DRM master.\n"); +- return FALSE; +- } +- + scrn->monitor = scrn->confScreen->monitor; + scrn->progClock = TRUE; + scrn->rgbBits = 8; +@@ -561,6 +587,31 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags) + intel_check_chipset_option(scrn); + intel_check_dri_option(scrn); + ++#ifdef XORG_WAYLAND ++ if (xorgWayland) { ++ intel->xwl_screen = xwl_screen_create(); ++ if (!intel->xwl_screen) { ++ xf86DrvMsg(scrn->scrnIndex, X_ERROR, ++ "Failed to initialize xwayland.\n"); ++ return FALSE; ++ } ++ ++ if (!xwl_screen_pre_init(scrn, intel->xwl_screen, ++ 0, &xwl_driver)) { ++ xf86DrvMsg(scrn->scrnIndex, X_ERROR, ++ "Failed to pre-init xwayland screen\n"); ++ xwl_screen_destroy(intel->xwl_screen); ++ } ++ ++ intel->drmSubFD = xwl_screen_get_drm_fd(intel->xwl_screen); ++ } ++#endif ++ ++ if (!intel->xwl_screen && !intel_open_drm_master(scrn)) ++ xf86DrvMsg(scrn->scrnIndex, X_ERROR, ++ "Failed to become DRM master.\n"); ++ ++ + if (!intel_init_bufmgr(intel)) { + PreInitCleanup(scrn); + return FALSE; +@@ -599,6 +650,9 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags) + intel->swapbuffers_wait = xf86ReturnOptValBool(intel->Options, + OPTION_SWAPBUFFERS_WAIT, + TRUE); ++ if (!intel->xwl_screen) ++ intel->swapbuffers_wait = TRUE; ++ + xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Wait on SwapBuffers? %s\n", + intel->swapbuffers_wait ? "enabled" : "disabled"); + +@@ -620,7 +674,8 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags) + + I830XvInit(scrn); + +- if (!intel_mode_pre_init(scrn, intel->drmSubFD, intel->cpp)) { ++ if (!intel->xwl_screen && ++ !intel_mode_pre_init(scrn, intel->drmSubFD, intel->cpp)) { + PreInitCleanup(scrn); + return FALSE; + } +@@ -757,6 +812,11 @@ I830BlockHandler(BLOCKHANDLER_ARGS_DECL) + #ifdef INTEL_PIXMAP_SHARING + intel_dirty_update(screen); + #endif ++ ++#ifdef XORG_WAYLAND ++ if (intel->xwl_screen) ++ xwl_screen_post_damage(intel->xwl_screen); ++#endif + } + + static Bool +@@ -792,9 +852,16 @@ intel_flush_callback(CallbackListPtr *list, + pointer user_data, pointer call_data) + { + ScrnInfoPtr scrn = user_data; ++ intel_screen_private *intel = intel_get_screen_private(scrn); ++ + if (scrn->vtSema) { + intel_batch_submit(scrn); + intel_glamor_flush(intel_get_screen_private(scrn)); ++ ++#ifdef XORG_WAYLAND ++ if (intel->xwl_screen) ++ xwl_screen_post_damage(intel->xwl_screen); ++#endif + } + } + +@@ -1067,7 +1134,8 @@ I830ScreenInit(SCREEN_INIT_ARGS_DECL) + if (serverGeneration == 1) + xf86ShowUnusedOptions(scrn->scrnIndex, scrn->options); + +- intel_mode_init(intel); ++ if (!intel->xwl_screen) ++ intel_mode_init(intel); + + intel->suspended = FALSE; + +@@ -1182,7 +1250,8 @@ static Bool I830CloseScreen(CLOSE_SCREEN_ARGS_DECL) + } + + if (intel->front_buffer) { +- intel_mode_remove_fb(intel); ++ if (!intel->xwl_screen) ++ intel_mode_remove_fb(intel); + drm_intel_bo_unreference(intel->front_buffer); + intel->front_buffer = NULL; + } +-- +1.8.3.1 + diff --git a/SOURCES/0002-xwayland-shortcut-Enter-ExitVT.patch b/SOURCES/0002-xwayland-shortcut-Enter-ExitVT.patch new file mode 100644 index 0000000..a2e6178 --- /dev/null +++ b/SOURCES/0002-xwayland-shortcut-Enter-ExitVT.patch @@ -0,0 +1,38 @@ +From d9fb46c2caedf135c21c983a8e379e9bdfc5043d Mon Sep 17 00:00:00 2001 +From: Giovanni Campagna +Date: Wed, 21 Aug 2013 10:02:43 +0200 +Subject: [PATCH 2/2] xwayland: shortcut Enter/ExitVT + +Avoids a warning due to drmGetMaster and a crash with multimonitor, +caused by not having an intel_mode. +--- + src/uxa/intel_driver.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c +index e74ba60..1c38075 100644 +--- a/src/uxa/intel_driver.c ++++ b/src/uxa/intel_driver.c +@@ -1175,6 +1175,9 @@ static void I830LeaveVT(VT_FUNC_ARGS_DECL) + intel_screen_private *intel = intel_get_screen_private(scrn); + int ret; + ++ if (xorgWayland) ++ return TRUE; ++ + xf86RotateFreeShadow(scrn); + + xf86_hide_cursors(scrn); +@@ -1194,6 +1197,9 @@ static Bool I830EnterVT(VT_FUNC_ARGS_DECL) + intel_screen_private *intel = intel_get_screen_private(scrn); + int ret; + ++ if (xorgWayland) ++ return TRUE; ++ + ret = drmSetMaster(intel->drmSubFD); + if (ret) { + xf86DrvMsg(scrn->scrnIndex, X_WARNING, +-- +1.8.3.1 + diff --git a/SOURCES/intel-2.21.15-xserver-1.15-compat.patch b/SOURCES/intel-2.21.15-xserver-1.15-compat.patch new file mode 100644 index 0000000..6062a70 --- /dev/null +++ b/SOURCES/intel-2.21.15-xserver-1.15-compat.patch @@ -0,0 +1,12 @@ +diff -up xf86-video-intel-2.21.15/src/compat-api.h.jx xf86-video-intel-2.21.15/src/compat-api.h +--- xf86-video-intel-2.21.15/src/compat-api.h.jx 2013-05-21 06:15:11.000000000 -0400 ++++ xf86-video-intel-2.21.15/src/compat-api.h 2013-10-24 15:30:52.291337300 -0400 +@@ -158,4 +158,8 @@ static inline void FreePixmap(PixmapPtr + if ((d)->pScreen->SourceValidate) (d)->pScreen->SourceValidate(d, x, y, w, h) + #endif + ++#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,3,0) ++#define DamageUnregister(a, b) DamageUnregister(b) ++#endif ++ + #endif diff --git a/SOURCES/make-git-snapshot.sh b/SOURCES/make-git-snapshot.sh new file mode 100755 index 0000000..4d1ec9f --- /dev/null +++ b/SOURCES/make-git-snapshot.sh @@ -0,0 +1,22 @@ +#!/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=xf86-video-intel-$( 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/xorg/driver/xf86-video-intel $DIRNAME + +GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \ + | bzip2 > $DIRNAME.tar.bz2 + +# rm -rf $DIRNAME diff --git a/SOURCES/make-intel-gpu-tools-snapshot.sh b/SOURCES/make-intel-gpu-tools-snapshot.sh new file mode 100755 index 0000000..20416bc --- /dev/null +++ b/SOURCES/make-intel-gpu-tools-snapshot.sh @@ -0,0 +1,22 @@ +#!/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=intel-gpu-tools-$( date +%Y%m%d ) + +echo REF ${REF:+--reference $REF} +echo DIRNAME $DIRNAME +echo HEAD ${1:-HEAD} + +rm -rf $DIRNAME + +git clone --depth 1 ${REF:+--reference $REF} \ + git://git.freedesktop.org/git/xorg/app/intel-gpu-tools $DIRNAME + +GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \ + | bzip2 > $DIRNAME.tar.bz2 + +# rm -rf $DIRNAME diff --git a/SPECS/xorg-x11-drv-intel.spec b/SPECS/xorg-x11-drv-intel.spec new file mode 100644 index 0000000..9f0abb9 --- /dev/null +++ b/SPECS/xorg-x11-drv-intel.spec @@ -0,0 +1,355 @@ +%define moduledir %(pkg-config xorg-server --variable=moduledir ) +%define driverdir %{moduledir}/drivers +%define gputoolsdate 20130611 +#define gitdate 20120907 +#define gitrev .%{gitdate} + +%if 0%{?rhel} == 7 +%define rhel7 1 +%endif +%if 0%{?rhel} == 6 +%define rhel6 1 +%endif + +%if 0%{?rhel7} || 0%{?fedora} > 17 +%define prime 1 +%endif + +%if 0%{?rhel7} || 0%{?fedora} > 20 +%define kmsonly 1 +%endif + +#if 0%{?rhel7} || 0%{?fedora} > 19 +%if 0 +%define accel sna +%else +%define accel uxa +%endif + +Summary: Xorg X11 Intel video driver +Name: xorg-x11-drv-intel +Version: 2.21.15 +Release: 9%{?gitrev}%{?dist} +URL: http://www.x.org +License: MIT +Group: User Interface/X Hardware Support + +%if 0%{?gitdate} +Source0: xf86-video-intel-%{gitdate}.tar.bz2 +%else +Source0: http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2 +%endif +Source1: make-intel-gpu-tools-snapshot.sh +Source3: intel-gpu-tools-%{gputoolsdate}.tar.bz2 +Source4: make-git-snapshot.sh + +Patch1: 0001-xwayland-Add-xwayland-support.patch +Patch2: 0002-xwayland-shortcut-Enter-ExitVT.patch +Patch3: intel-2.21.15-xserver-1.15-compat.patch + +ExclusiveArch: %{ix86} x86_64 ia64 + +BuildRequires: autoconf automake libtool +BuildRequires: flex bison +BuildRequires: xorg-x11-server-devel >= 1.10.99.902 +BuildRequires: libXvMC-devel +BuildRequires: mesa-libGL-devel >= 6.5-9 +BuildRequires: libdrm-devel >= 2.4.25 +BuildRequires: kernel-headers >= 2.6.32.3 +BuildRequires: libudev-devel +BuildRequires: libxcb-devel >= 1.5 +BuildRequires: xcb-util-devel +BuildRequires: cairo-devel + +Requires: Xorg %(xserver-sdk-abi-requires ansic) +Requires: Xorg %(xserver-sdk-abi-requires videodrv) +%if !0%{?rhel} +Requires: xserver-abi(xwayland) = 1 +%endif + +%description +X.Org X11 Intel video driver. + +%package devel +Summary: Xorg X11 Intel video driver development package +Group: Development/System +Requires: %{name} = %{version}-%{release} +Provides: xorg-x11-drv-intel-devel = %{version}-%{release} + +%description devel +X.Org X11 Intel video driver development package. + +%package -n intel-gpu-tools +Summary: Debugging tools for Intel graphics chips +Group: Development/Tools + +%description -n intel-gpu-tools +Debugging tools for Intel graphics chips + +%if 0%{?gitdate} +%define dirsuffix %{gitdate} +%else +%define dirsuffix %{version} +%endif + +%prep +%setup -q -n xf86-video-intel-%{?gitdate:%{gitdate}}%{!?gitdate:%{dirsuffix}} -b3 +%if !0%{?rhel} +%patch1 -p1 -b .wl1 +%patch2 -p1 -b .wl2 +%endif +%patch3 -p1 -b .compat + +%build + +#export CFLAGS="$RPM_OPT_FLAGS -fno-omit-frame-pointer" +# we patched configure.ac +#%{?gitdate:autoreconf -v --install} +autoreconf -v --install + +%configure \ +%if !0%{?rhel7} +%ifnarch %{ix86} + --enable-kms-only \ +%endif +%endif + %{?kmsonly:--enable-kms-only} \ + --disable-static \ + --enable-dri \ + --enable-xvmc \ + --enable-sna \ + --with-default-accel=%{accel} +make + +pushd ../intel-gpu-tools-%{gputoolsdate} +mkdir -p m4 +autoreconf -f -i -v +# --disable-dumper: quick_dump is both not recommended for packaging yet, +# and requires python3 to build; i'd like to keep this spec valid for rhel6 +# for at least a bit longer +%configure %{!?prime:--disable-nouveau} --disable-dumper +make +popd + +%install +rm -rf $RPM_BUILD_ROOT + +make install DESTDIR=$RPM_BUILD_ROOT + +pushd ../intel-gpu-tools-%{gputoolsdate} +make install DESTDIR=$RPM_BUILD_ROOT +popd + +find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f -- + +# libXvMC opens the versioned file name, these are useless +rm -f $RPM_BUILD_ROOT%{_libdir}/libI*XvMC.so + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc COPYING +%{driverdir}/intel_drv.so +%ifarch %{ix86} +%if !0%{?rhel7}%{?kmsonly} +%{_libdir}/libI810XvMC.so.1* +%endif +%endif +%{_libdir}/libIntelXvMC.so.1* +%{_mandir}/man4/i* + +%files devel +%defattr(-,root,root,-) +%{_bindir}/intel-gen4asm +%{_bindir}/intel-gen4disasm +%{_libdir}/pkgconfig/intel-gen4asm.pc + +%files -n intel-gpu-tools +%defattr(-,root,root,-) +%doc COPYING +%{_bindir}/intel_* +%{_mandir}/man1/intel_*.1* + +%changelog +* Wed Nov 06 2013 Adam Jackson - 2.21.15-9 +- 1.15RC1 ABI rebuild + +* Mon Oct 28 2013 Adam Jackson - 2.21.15-8 +- Don't patch in xwayland in RHEL + +* Fri Oct 25 2013 Adam Jackson - 2.21.15-7 +- ABI rebuild + +* Thu Oct 24 2013 Adam Jackson 2.21.15-6 +- Disable UMS support in F21+ + +* Thu Oct 24 2013 Adam Jackson 2.21.15-5 +- xserver 1.15 API compat + +* Wed Oct 02 2013 Adam Jackson 2.21.15-4 +- Default to uxa again + +* Mon Sep 23 2013 Adam Jackson 2.21.15-2 +- Change xwayland requires to be explicitly versioned + +* Mon Sep 23 2013 Adam Jackson 2.21.15-1 +- intel 2.21.15 +- xwayland support + +* Tue Aug 06 2013 Dave Airlie 2.21.14-1 +- intel 2.21.24 +- add fix to make build - re-enable autoreconf + +* Sun Aug 04 2013 Fedora Release Engineering - 2.21.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Jul 23 2013 Adam Jackson 2.21.12-1 +- intel 2.21.12 + +* Tue Jun 11 2013 Adam Jackson 2.21.9-1 +- intel 2.21.9 +- New i-g-t snapshot +- Drop useless symlinks from -devel +- Repurpose -devel for intel-gen4{,dis}asm +- Default to SNA in F20+ + +* Tue May 28 2013 Adam Jackson 2.21.8-1 +- intel 2.21.8 + +* Fri Apr 12 2013 Dave Airlie 2.21.6-1 +- intel 2.21.6 + +* Thu Mar 21 2013 Adam Jackson 2.21.5-1 +- intel 2.21.5 + +* Mon Mar 11 2013 Adam Jackson 2.21.4-1 +- intel 2.21.4 + +* Thu Mar 07 2013 Adam Jackson 2.21.3-1 +- intel 2.21.3 + +* Thu Mar 07 2013 Peter Hutterer - 2.21.2-4 +- ABI rebuild + +* Fri Feb 15 2013 Peter Hutterer - 2.21.2-3 +- ABI rebuild + +* Fri Feb 15 2013 Peter Hutterer - 2.21.2-2 +- ABI rebuild + +* Tue Feb 12 2013 Adam Jackson 2.21.2-1 +- intel 2.21.2 +- New i-g-t snapshot +- Pre-F16 changelog trim + +* Wed Jan 16 2013 Adam Jackson 2.20.18-2 +- Compensate for rawhide's aclocal breaking in a newly stupid way + +* Wed Jan 16 2013 Adam Jackson 2.20.18-1 +- intel 2.20.18 + +* Tue Jan 08 2013 Dave Airlie 2.20.17-2 +- Fix damage issue for reverse prime work + +* Fri Jan 04 2013 Adam Jackson 2.20.17-1 +- intel 2.20.17 + +* Wed Jan 02 2013 Dave Airlie 2.20.16-2 +- Fix uxa bug that trips up ilk on 3.7 kernels + +* Mon Dec 17 2012 Adam Jackson 2.20.16-1 +- intel 2.20.16 + +* Wed Nov 28 2012 Adam Jackson 2.20.14-1 +- intel 2.20.14 + +* Mon Oct 22 2012 Adam Jackson 2.20.12-1 +- intel 2.20.12 + +* Fri Oct 19 2012 Adam Jackson 2.20.10-2 +- Today's i-g-t +- Don't bother building the nouveau bits of i-g-t on OSes without an X + server with prime support. + +* Mon Oct 15 2012 Dave Airlie 2.20.10-1 +- intel 2.20.10 + +* Fri Oct 05 2012 Adam Jackson 2.20.9-1 +- intel 2.20.9 +- Today's intel-gpu-tools snapshot + +* Fri Sep 21 2012 Adam Jackson 2.20.8-1 +- intel 2.20.8 + +* Mon Sep 10 2012 Adam Jackson 2.20.7-1 +- intel 2.20.7 + +* Fri Sep 07 2012 Dave Airlie 2.20.6-2 +- latest upstream git snapshot with prime + fixes + +* Tue Sep 04 2012 Adam Jackson 2.20.6-2 +- Only bother to build UMS (read: i810) support on 32-bit. If you've + managed to build a machine with an i810 GPU but a 64-bit CPU, please + don't have done that. + +* Tue Sep 04 2012 Adam Jackson 2.20.6-1 +- intel 2.20.6 (#853783) + +* Thu Aug 30 2012 Adam Jackson 2.20.5-2 +- Don't package I810XvMC when not building legacy i810 + +* Mon Aug 27 2012 Adam Jackson 2.20.5-1 +- intel 2.20.5 + +* Mon Aug 20 2012 Adam Jackson 2.20.4-3 +- Rebuild for new xcb-util soname + +* Mon Aug 20 2012 Adam Jackson 2.20.4-2 +- Backport some patches to avoid binding to non-i915.ko-driven Intel GPUs, + like Cedarview and friends (#849475) + +* Mon Aug 20 2012 Adam Jackson 2.20.4-1 +- intel 2.20.4 + +* Thu Aug 16 2012 Dave Airlie 2.20.3-3 +- fix vmap flush to correct upstream version in prime patch + +* Thu Aug 16 2012 Dave Airlie 2.20.3-2 +- snapshot upstream + add prime support for now + +* Wed Aug 15 2012 Adam Jackson 2.20.3-1 +- intel 2.20.3 + +* Wed Aug 01 2012 Adam Jackson 2.20.2-1 +- intel 2.20.2 +- Only disable UMS in RHEL7, since i810 exists in RHEL6 + +* Mon Jul 23 2012 Adam Jackson 2.20.1-1 +- intel 2.20.1 + +* Sun Jul 22 2012 Fedora Release Engineering - 2.20.0-2.20120718 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Jul 18 2012 Dave Airlie 2.20.0-1.20120718 +- todays git snapshot + +* Tue Jun 12 2012 Dave Airlie 2.19.0-5.20120612 +- today's git snapshot +- resurrect copy-fb + +* Tue May 29 2012 Adam Jackson 2.19.0-4.20120529 +- Today's git snapshot +- Enable SNA (default is still UXA, use Option "AccelMethod" to switch) +- build-fix.patch: Fix build with Fedora's default cflags + +* Tue May 29 2012 Adam Jackson 2.19.0-3 +- Don't autoreconf the driver, fixes build on F16. + +* Mon May 21 2012 Adam Jackson 2.19.0-2 +- Disable UMS support in RHEL. +- Trim some Requires that haven't been needed since F15. + +* Thu May 03 2012 Adam Jackson 2.19.0-1 +- intel 2.19.0