Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=17786548a61414b3300ea89c5829948664c30931
commit 17786548a61414b3300ea89c5829948664c30931 Author: James Buren <[email protected]> Date: Fri Oct 26 17:45:47 2012 -0500 xf86-video-intel-2.20.12-1-x86_64 * version bump * rebuild with xorg-server 1.13.0 * remove *proto from makedepends diff --git a/source/x11/xf86-video-intel/FrugalBuild b/source/x11/xf86-video-intel/FrugalBuild index 253bb79..87b7fb5 100644 --- a/source/x11/xf86-video-intel/FrugalBuild +++ b/source/x11/xf86-video-intel/FrugalBuild @@ -4,21 +4,20 @@ USE_DEVEL=${USE_DEVEL:-"n"} pkgname=xf86-video-intel -pkgver=2.19.0 +pkgver=2.20.12 Fuse $USE_DEVEL && pkgver=2.7.99.1.55.g66ceedc -pkgrel=3 +pkgrel=1 pkgdesc="X.Org driver for Intel cards (opensource)" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.12.2' 'libxvmc>=1.0.4-3' 'systemd>=188') -makedepends=('randrproto>=1.3.0' 'renderproto' 'videoproto>=2.2.2' 'xf86driproto>=2.0.4' \ - 'xf86dgaproto' 'glproto' 'xineramaproto' 'util-macros>=1.2.1' 'resourceproto') +depends=('xorg-server>=1.13.0' 'libxvmc>=1.0.4-3' 'xcb-util' 'systemd>=188') +makedepends=('util-macros>=1.2.1') Finclude xorg replaces=('xf86-video-i810') conflicts=('xf86-video-i810') provides=('xf86-video-i810') Fconfopts+=" --enable-dri" -sha1sums=('131934cf5e90bd48c883804cc644c4cb8b1de100') +sha1sums=('472e7b1a9bf299089bb7fbfbb3d37d1ee6b20db6') if Fuse $USE_DEVEL; then unset source sha1sums diff --git a/source/x11/xf86-video-intel/intel-abi-fix.diff b/source/x11/xf86-video-intel/intel-abi-fix.diff deleted file mode 100644 index bd634db..0000000 --- a/source/x11/xf86-video-intel/intel-abi-fix.diff +++ /dev/null @@ -1,191 +0,0 @@ -diff --git a/src/ch7017/ch7017.c b/src/ch7017/ch7017.c -index 01e414f..6b27d05 100644 ---- a/src/ch7017/ch7017.c -+++ b/src/ch7017/ch7017.c -@@ -34,7 +34,6 @@ - - #include "xf86.h" - #include "xf86_OSproc.h" --#include "xf86Resources.h" - #include "compiler.h" - #include "miscstruct.h" - #include "xf86i2c.h" -diff --git a/src/ch7xxx/ch7xxx.c b/src/ch7xxx/ch7xxx.c -index 13ba102..cad507d 100644 ---- a/src/ch7xxx/ch7xxx.c -+++ b/src/ch7xxx/ch7xxx.c -@@ -34,7 +34,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #include <string.h> - #include "xf86.h" - #include "xf86_OSproc.h" --#include "xf86Resources.h" - #include "compiler.h" - #include "miscstruct.h" - #include "xf86i2c.h" -diff --git a/src/i810_driver.c b/src/i810_driver.c -index 4b8c459..f158f5d 100644 ---- a/src/i810_driver.c -+++ b/src/i810_driver.c -@@ -55,8 +55,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - #include "xf86.h" - #include "xf86_OSproc.h" --#include "xf86Resources.h" --#include "xf86RAC.h" - #include "xf86cmap.h" - #include "compiler.h" - #include "mibstore.h" -@@ -549,10 +547,6 @@ I810PreInit(ScrnInfoPtr pScrn, int flags) - - pI810->PciInfo = xf86GetPciInfoForEntity(pI810->pEnt->index); - -- if (xf86RegisterResources(pI810->pEnt->index, NULL, ResNone)) -- return FALSE; -- pScrn->racMemFlags = RAC_FB | RAC_COLORMAP; -- - /* Set pScrn->monitor */ - pScrn->monitor = pScrn->confScreen->monitor; - -@@ -937,9 +931,6 @@ I810PreInit(ScrnInfoPtr pScrn, int flags) - - /* We won't be using the VGA access after the probe */ - I810SetMMIOAccess(pI810); -- xf86SetOperatingState(resVgaIo, pI810->pEnt->index, ResUnusedOpr); -- xf86SetOperatingState(resVgaMem, pI810->pEnt->index, ResDisableOpr); -- - return TRUE; - } - -diff --git a/src/i810_hwmc.c b/src/i810_hwmc.c -index 12ffdd9..1c3ffc9 100644 ---- a/src/i810_hwmc.c -+++ b/src/i810_hwmc.c -@@ -41,7 +41,6 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - #include "xf86.h" - #include "xf86_OSproc.h" --#include "xf86Resources.h" - #include "compiler.h" - #include "xf86PciInfo.h" - #include "xf86Pci.h" -diff --git a/src/i810_video.c b/src/i810_video.c -index 9528bc7..c82fcc9 100644 ---- a/src/i810_video.c -+++ b/src/i810_video.c -@@ -41,7 +41,6 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - #include "xf86.h" - #include "xf86_OSproc.h" --#include "xf86Resources.h" - #include "compiler.h" - #include "xf86PciInfo.h" - #include "xf86Pci.h" -diff --git a/src/i830_driver.c b/src/i830_driver.c -index 33079fe..f701231 100644 ---- a/src/i830_driver.c -+++ b/src/i830_driver.c -@@ -51,8 +51,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. - - #include "xf86.h" - #include "xf86_OSproc.h" --#include "xf86Resources.h" --#include "xf86RAC.h" - #include "xf86Priv.h" - #include "xf86cmap.h" - #include "compiler.h" -@@ -1540,13 +1538,6 @@ I830PreInit(ScrnInfoPtr pScrn, int flags) - if (!i830_open_drm_master(pScrn)) - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to become DRM master.\n"); - -- -- if (xf86RegisterResources(pI830->pEnt->index, NULL, ResNone)) { -- PreInitCleanup(pScrn); -- return FALSE; -- } -- -- pScrn->racMemFlags = RAC_FB | RAC_COLORMAP; - pScrn->monitor = pScrn->confScreen->monitor; - pScrn->progClock = TRUE; - pScrn->rgbBits = 8; -@@ -1632,8 +1623,6 @@ I830PreInit(ScrnInfoPtr pScrn, int flags) - - /* We won't be using the VGA access after the probe. */ - I830SetMMIOAccess(pI830); -- xf86SetOperatingState(resVgaIo, pI830->pEnt->index, ResUnusedOpr); -- xf86SetOperatingState(resVgaMem, pI830->pEnt->index, ResDisableOpr); - } - - /* Load the dri2 module if requested. */ -diff --git a/src/i830_i2c.c b/src/i830_i2c.c -index 8392d0a..4ba073d 100644 ---- a/src/i830_i2c.c -+++ b/src/i830_i2c.c -@@ -31,8 +31,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. - - #include "xf86.h" - #include "xf86_OSproc.h" --#include "xf86Resources.h" --#include "xf86RAC.h" - #include "xf86cmap.h" - #include "compiler.h" - #include "mibstore.h" -diff --git a/src/i830_video.c b/src/i830_video.c -index 92b6324..9fb0b56 100644 ---- a/src/i830_video.c -+++ b/src/i830_video.c -@@ -56,7 +56,6 @@ - - #include "xf86.h" - #include "xf86_OSproc.h" --#include "xf86Resources.h" - #include "compiler.h" - #include "xf86PciInfo.h" - #include "xf86Pci.h" -diff --git a/src/i915_hwmc.c b/src/i915_hwmc.c -index 6712caa..7e0f145 100644 ---- a/src/i915_hwmc.c -+++ b/src/i915_hwmc.c -@@ -32,7 +32,6 @@ - - #include "xf86.h" - #include "xf86_OSproc.h" --#include "xf86Resources.h" - #include "compiler.h" - #include "xf86PciInfo.h" - #include "xf86Pci.h" -diff --git a/src/ivch/ivch.c b/src/ivch/ivch.c -index dffe334..79da11a 100644 ---- a/src/ivch/ivch.c -+++ b/src/ivch/ivch.c -@@ -31,7 +31,6 @@ - - #include "xf86.h" - #include "xf86_OSproc.h" --#include "xf86Resources.h" - #include "compiler.h" - #include "miscstruct.h" - #include "xf86i2c.h" -diff --git a/src/sil164/sil164.c b/src/sil164/sil164.c -index c90bed3..e43107a 100644 ---- a/src/sil164/sil164.c -+++ b/src/sil164/sil164.c -@@ -35,7 +35,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - #include "xf86.h" - #include "xf86_OSproc.h" --#include "xf86Resources.h" - #include "compiler.h" - #include "miscstruct.h" - #include "xf86i2c.h" -diff --git a/src/tfp410/tfp410.c b/src/tfp410/tfp410.c -index 4d3bb8a..a8985f7 100644 ---- a/src/tfp410/tfp410.c -+++ b/src/tfp410/tfp410.c -@@ -34,7 +34,6 @@ - - #include "xf86.h" - #include "xf86_OSproc.h" --#include "xf86Resources.h" - #include "compiler.h" - #include "miscstruct.h" - #include "xf86i2c.h" diff --git a/source/x11/xf86-video-intel/xextproto71.diff b/source/x11/xf86-video-intel/xextproto71.diff deleted file mode 100644 index e467ac6..0000000 --- a/source/x11/xf86-video-intel/xextproto71.diff +++ /dev/null @@ -1,175 +0,0 @@ -From 0a4c4c5fe8ebad2dd13f5770bd90a194eebb2890 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <[email protected]> -Date: Thu, 16 Jul 2009 01:40:15 +0000 -Subject: Update to xextproto 7.1 support. - -DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers -need to include dpmsconst.h if xextproto 7.1 is available. - -SHM is now shm.h instead of shmstr. Requires definition of ShmFuncs that's -not exported by the server. - -Signed-off-by: Peter Hutterer <[email protected]> ---- -diff --git a/configure.ac b/configure.ac -index 077c1ff..3857470 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -101,6 +101,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) - - # Checks for pkg-config packages - PKG_CHECK_MODULES(XORG, [xorg-server >= 1.6 xproto fontsproto $REQUIRED_MODULES]) -+PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], -+ HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), -+ HAVE_XEXTPROTO_71="no") -+AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) - - sdkdir=$(pkg-config --variable=sdkdir xorg-server) - drm_cflags=$(pkg-config --cflags libdrm) -diff --git a/src/ch7017/ch7017.c b/src/ch7017/ch7017.c -index 759fc24..01e414f 100644 ---- a/src/ch7017/ch7017.c -+++ b/src/ch7017/ch7017.c -@@ -39,8 +39,13 @@ - #include "miscstruct.h" - #include "xf86i2c.h" - #include "xf86Crtc.h" -+#ifdef HAVE_XEXTPROTO_71 -+#include <X11/extensions/dpmsconst.h> -+#else - #define DPMS_SERVER - #include <X11/extensions/dpms.h> -+#endif -+ - - #include "../i2c_vid.h" - #include "ch7017_reg.h" -diff --git a/src/ch7xxx/ch7xxx.c b/src/ch7xxx/ch7xxx.c -index 8a439e4..13ba102 100644 ---- a/src/ch7xxx/ch7xxx.c -+++ b/src/ch7xxx/ch7xxx.c -@@ -39,8 +39,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #include "miscstruct.h" - #include "xf86i2c.h" - #include "xf86Crtc.h" -+#ifdef HAVE_XEXTPROTO_71 -+#include <X11/extensions/dpmsconst.h> -+#else - #define DPMS_SERVER - #include <X11/extensions/dpms.h> -+#endif -+ - - #include "../i2c_vid.h" - #include "ch7xxx.h" -diff --git a/src/ivch/ivch.c b/src/ivch/ivch.c -index 873afcc..dffe334 100644 ---- a/src/ivch/ivch.c -+++ b/src/ivch/ivch.c -@@ -36,8 +36,13 @@ - #include "miscstruct.h" - #include "xf86i2c.h" - #include "xf86Crtc.h" -+#ifdef HAVE_XEXTPROTO_71 -+#include <X11/extensions/dpmsconst.h> -+#else - #define DPMS_SERVER - #include <X11/extensions/dpms.h> -+#endif -+ - #include <unistd.h> - - #include "../i2c_vid.h" -diff --git a/src/sil164/sil164.c b/src/sil164/sil164.c -index 410a681..c90bed3 100644 ---- a/src/sil164/sil164.c -+++ b/src/sil164/sil164.c -@@ -40,8 +40,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #include "miscstruct.h" - #include "xf86i2c.h" - #include "xf86Crtc.h" -+#ifdef HAVE_XEXTPROTO_71 -+#include <X11/extensions/dpmsconst.h> -+#else - #define DPMS_SERVER - #include <X11/extensions/dpms.h> -+#endif -+ - - #include "../i2c_vid.h" - #include "sil164.h" -diff --git a/src/tfp410/tfp410.c b/src/tfp410/tfp410.c -index c2c4fc3..4d3bb8a 100644 ---- a/src/tfp410/tfp410.c -+++ b/src/tfp410/tfp410.c -@@ -39,8 +39,13 @@ - #include "miscstruct.h" - #include "xf86i2c.h" - #include "xf86Crtc.h" -+#ifdef HAVE_XEXTPROTO_71 -+#include <X11/extensions/dpmsconst.h> -+#else - #define DPMS_SERVER - #include <X11/extensions/dpms.h> -+#endif -+ - - #include "../i2c_vid.h" - #include "tfp410.h" -diff --git a/uxa/uxa-priv.h b/uxa/uxa-priv.h -index 3d2b776..d469474 100644 ---- a/uxa/uxa-priv.h -+++ b/uxa/uxa-priv.h -@@ -42,9 +42,13 @@ - #define NEED_EVENTS - #include <X11/Xproto.h> - #ifdef MITSHM -+#ifdef HAVE_XEXTPROTO_71 -+#include <X11/extensions/shm.h> -+#else - #define _XSHM_SERVER_ - #include <X11/extensions/shmstr.h> - #endif -+#endif - #include "scrnintstr.h" - #include "pixmapstr.h" - #include "windowstr.h" -@@ -321,9 +325,34 @@ uxa_get_image (DrawablePtr pDrawable, int x, int y, int w, int h, - extern const GCOps uxa_ops; - - #ifdef MITSHM -+/* XXX these come from shmint.h, which isn't exported by the server */ -+ -+#ifdef HAVE_XEXTPROTO_71 -+/* Up to xextproto 7.1, these were provided in shmstr.h */ -+typedef struct _ShmFuncs { -+ PixmapPtr (* CreatePixmap)(ScreenPtr pScreen, -+ int width, -+ int height, -+ int depth, -+ char *addr); -+ void (* PutImage)(DrawablePtr dst, -+ GCPtr pGC, -+ int depth, -+ unsigned int format, -+ int w, -+ int h, -+ int sx, -+ int sy, -+ int sw, -+ int sh, -+ int dx, -+ int dy, -+ char *data); -+} ShmFuncs, *ShmFuncsPtr; -+#endif -+ - extern ShmFuncs uxa_shm_funcs; - --/* XXX these come from shmint.h, which isn't exported by the server */ - void - ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs); - --- -cgit v0.8.2 - _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
