diff --git a/srcpkgs/xf86-video-vesa/patches/git-fixes.patch b/srcpkgs/xf86-video-vesa/patches/git-fixes.patch deleted file mode 100644 index 5ddc079c9d6..00000000000 --- a/srcpkgs/xf86-video-vesa/patches/git-fixes.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 7aafaf56fbca97f36c775462c1ceea3e03700c42 Mon Sep 17 00:00:00 2001 -From: Alexandr Shadchin -Date: Sat, 18 Aug 2012 14:53:34 +0000 -Subject: Fix check function in VESASaveRestore - -Signed-off-by: Alexandr Shadchin -Reviewed-by: Peter Hutterer -Signed-off-by: Peter Hutterer ---- -diff --git a/src/vesa.c b/src/vesa.c -index 8ac77da..11cd26c 100644 ---- src/vesa.c -+++ src/vesa.c -@@ -1626,7 +1626,7 @@ VESASaveRestore(ScrnInfoPtr pScrn, vbeSaveRestoreFunction function) - { - VESAPtr pVesa; - -- if (MODE_QUERY < 0 || function > MODE_RESTORE) -+ if (function < MODE_QUERY || function > MODE_RESTORE) - return (FALSE); - - pVesa = VESAGetRec(pScrn); --- -cgit v0.9.0.2-2-gbebe -From 60d2dc115c4b6210d3b1e05f5b0c39d1f7917cbc Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 25 Sep 2012 12:55:03 +0000 -Subject: Remove mibstore.h - -Signed-off-by: Adam Jackson ---- -diff --git a/src/vesa.c b/src/vesa.c -index 11cd26c..b73d104 100644 ---- src/vesa.c -+++ src/vesa.c -@@ -49,9 +49,6 @@ - /* All drivers initialising the SW cursor need this */ - #include "mipointer.h" - --/* All drivers implementing backing store need this */ --#include "mibstore.h" -- - /* Colormap handling */ - #include "micmap.h" - #include "xf86cmap.h" -@@ -1081,7 +1078,6 @@ VESAScreenInit(SCREEN_INIT_ARGS_DECL) - VESADGAInit(pScrn, pScreen); - - xf86SetBlackWhitePixels(pScreen); -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - - /* software cursor */ --- -cgit v0.9.0.2-2-gbebe diff --git a/srcpkgs/xf86-video-vesa/template b/srcpkgs/xf86-video-vesa/template index e88ee734c5a..d50252743bd 100644 --- a/srcpkgs/xf86-video-vesa/template +++ b/srcpkgs/xf86-video-vesa/template @@ -1,9 +1,8 @@ # Template build file for 'xf86-video-vesa'. pkgname=xf86-video-vesa -_distver="2.3.2" -version="2:${_distver}" -wrksrc="${pkgname}-${_distver}" -revision=5 +version="2:2.3.3" +wrksrc="${pkgname}-${version#*:}" +revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel>=1.14" @@ -11,10 +10,8 @@ short_desc="Xorg VESA video driver" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " -distfiles="${XORG_SITE}/driver/${pkgname}-${_distver}.tar.bz2" -checksum=144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3 -long_desc=" - This is the X11 video driver for Generic VESA video cards." +distfiles="${XORG_SITE}/driver/${pkgname}-${version#*:}.tar.bz2" +checksum=ce8b75e5a40e9dae76f2ac9e2880f7f73a848653ca2eed5880f52dc2c0d3aef8 if [ "$CROSS_BUILD" ]; then CFLAGS="-I$XBPS_CROSS_BASE/usr/include/xorg"