I have made the following changes intended for : CE:Adaptation:x86-generic / xorg-x11-drv-intel
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/7088 Thank You, Marko Saukko [This message was auto-generated] --- Request # 7088: Messages from BOSS: State: review at 2012-10-19T20:35:02 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:sage:branches:CE:Adaptation:x86-generic / xorg-x11-drv-intel -> CE:Adaptation:x86-generic / xorg-x11-drv-intel changes files: -------------- --- xorg-x11-drv-intel.changes +++ xorg-x11-drv-intel.changes @@ -0,0 +1,4 @@ +* Wed Oct 17 2012 Marko Saukko <[email protected]> - 2.20.10 +- Update to 2.20.10 +- Added 0001-No-SwapLimitValidate-in-DRI2InfoRec-anymore.patch + old: ---- xf86-video-intel-2.18.0.tar.bz2 new: ---- 0001-No-SwapLimitValidate-in-DRI2InfoRec-anymore.patch xf86-video-intel-2.20.10.tar.bz2 spec files: ----------- --- xorg-x11-drv-intel.spec +++ xorg-x11-drv-intel.spec @@ -1,49 +1,49 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.23 +# Generated by: spectacle version 0.25 # + +Name: xorg-x11-drv-intel + # >> macros # << macros -Name: xorg-x11-drv-intel Summary: Xorg X11 Intel video driver -Version: 2.18.0 +Version: 2.20.10 Release: 1 Group: System/X Hardware Support License: MIT URL: http://www.x.org/ Source0: http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2 Source100: xorg-x11-drv-intel.yaml +Patch0: 0001-No-SwapLimitValidate-in-DRI2InfoRec-anymore.patch Requires: xorg-x11-server-Xorg Requires: hwdata -BuildRequires: pkgconfig(xorg-server) -BuildRequires: pkgconfig(libdrm) -BuildRequires: pkgconfig(xf86driproto) -BuildRequires: pkgconfig(xvmc) -BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(xorg-macros) >= 1.8 +BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xrender) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(pixman-1) >= 0.24 +BuildRequires: pkgconfig(dri2proto) +BuildRequires: pkgconfig(xvmc) +BuildRequires: pkgconfig(xorg-server) >= 1.6 BuildRequires: pkgconfig(xproto) BuildRequires: pkgconfig(fontsproto) -BuildRequires: pkgconfig(randrproto) -BuildRequires: pkgconfig(renderproto) -BuildRequires: pkgconfig(xextproto) -BuildRequires: pkgconfig(glproto) -BuildRequires: pkgconfig(xineramaproto) -BuildRequires: pkgconfig(xi) -BuildRequires: pkgconfig(dri2proto) -BuildRequires: pkgconfig(xext) -BuildRequires: pkgconfig(xfixes) -BuildRequires: pkgconfig(libudev) - +BuildRequires: pkgconfig(libdrm) >= 2.4.24 +BuildRequires: pkgconfig(xf86driproto) +BuildRequires: pkgconfig(pciaccess) +BuildRequires: pkgconfig(gl) %description Xorg Intel video driver - %prep %setup -q -n xf86-video-intel-%{version} +# 0001-No-SwapLimitValidate-in-DRI2InfoRec-anymore.patch +%patch0 -p1 # >> setup # << setup @@ -59,6 +59,7 @@ # >> build post # << build post + %install rm -rf %{buildroot} # >> install pre @@ -69,15 +70,9 @@ # << install post - - - - %files %defattr(-,root,root,-) # >> files %(pkg-config xorg-server --variable=moduledir )/drivers/intel_drv.so %doc %{_mandir}/man4/i* # << files - - other changes: -------------- ++++++ 0001-No-SwapLimitValidate-in-DRI2InfoRec-anymore.patch (new) --- 0001-No-SwapLimitValidate-in-DRI2InfoRec-anymore.patch +++ 0001-No-SwapLimitValidate-in-DRI2InfoRec-anymore.patch @@ -0,0 +1,25 @@ +From 1c2ce4e36f6697b8ab8e3e85ffa096c2d02f14b7 Mon Sep 17 00:00:00 2001 +From: Marko Saukko <[email protected]> +Date: Wed, 17 Oct 2012 08:37:58 +0000 +Subject: [PATCH] No SwapLimitValidate in DRI2InfoRec anymore. + +Signed-off-by: Marko Saukko <[email protected]> +--- + src/sna/sna_dri.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/sna/sna_dri.c b/src/sna/sna_dri.c +index 15ac46a..02a324d 100644 +--- a/src/sna/sna_dri.c ++++ b/src/sna/sna_dri.c +@@ -2342,7 +2342,6 @@ bool sna_dri_open(struct sna *sna, ScreenPtr screen) + + #if DRI2INFOREC_VERSION >= 6 + info.version = 6; +- info.SwapLimitValidate = NULL; + info.ReuseBufferNotify = NULL; + #endif + +-- +1.7.10.3 + ++++++ xf86-video-intel-2.18.0.tar.bz2 -> xf86-video-intel-2.20.10.tar.bz2 (108135 lines skipped) ++++++ xorg-x11-drv-intel.yaml --- xorg-x11-drv-intel.yaml +++ xorg-x11-drv-intel.yaml @@ -1,6 +1,6 @@ Name: xorg-x11-drv-intel Summary: Xorg X11 Intel video driver -Version: 2.18.0 +Version: 2.20.10 Release: 1 Group: System/X Hardware Support Description: Xorg Intel video driver @@ -8,28 +8,27 @@ URL: http://www.x.org/ Sources: - http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2 +Patches: + - 0001-No-SwapLimitValidate-in-DRI2InfoRec-anymore.patch Requires: - xorg-x11-server-Xorg - hwdata PkgConfigBR: - - xorg-server - - libdrm - - xf86driproto + - xorg-macros >= 1.8 + - libudev + - x11 + - xrender + - xext + - pixman-1 >= 0.24 + - dri2proto - xvmc - - gl - - x11 + - xorg-server >= 1.6 - xproto - fontsproto - - randrproto - - renderproto - - xextproto - - glproto - - xineramaproto - - xi - - dri2proto - - xext - - xfixes - - libudev + - libdrm >= 2.4.24 + - xf86driproto + - pciaccess + - gl Configure: reconfigure ConfigOptions: - --enable-dri
