summaryrefslogtreecommitdiff
path: root/x11/xf86-video-tga
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2015-04-02 22:16:45 +0000
committertnn <tnn@pkgsrc.org>2015-04-02 22:16:45 +0000
commit63b347a3794aa0969919b11cedc838e16eaf0876 (patch)
treeaea38d1cc76fa68c85ab33d13f6bc46e84e0e8d8 /x11/xf86-video-tga
parent0ba28bf955cf2f2d6ad061ec9bf363a0a9c7fd34 (diff)
downloadpkgsrc-63b347a3794aa0969919b11cedc838e16eaf0876.tar.gz
Make xf86-video-* drivers build against xorg-server-1.17 in addition to the
old 1.12 server. Mostly from FDO git. (xf86-video-ati6 was manually ported)
Diffstat (limited to 'x11/xf86-video-tga')
-rw-r--r--x11/xf86-video-tga/distinfo4
-rw-r--r--x11/xf86-video-tga/patches/patch-src_tga__accel.c21
-rw-r--r--x11/xf86-video-tga/patches/patch-src_tga__driver.c30
3 files changed, 54 insertions, 1 deletions
diff --git a/x11/xf86-video-tga/distinfo b/x11/xf86-video-tga/distinfo
index 67542174cad..c39995d9f13 100644
--- a/x11/xf86-video-tga/distinfo
+++ b/x11/xf86-video-tga/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.4 2013/05/16 06:29:45 richard Exp $
+$NetBSD: distinfo,v 1.5 2015/04/02 22:16:48 tnn Exp $
SHA1 (xf86-video-tga-1.2.2.tar.bz2) = 0b96ebd6907b9efb278056ce701f330c22c550d8
RMD160 (xf86-video-tga-1.2.2.tar.bz2) = 1312240c77ddb3561a65b6c4c09962428fa15d02
Size (xf86-video-tga-1.2.2.tar.bz2) = 318943 bytes
+SHA1 (patch-src_tga__accel.c) = dbe0efa0bb8505b20c3a96d2ade6f712f2921b56
+SHA1 (patch-src_tga__driver.c) = 539cee2a20001f6b1002ab756e2e8f47cd6d82e3
diff --git a/x11/xf86-video-tga/patches/patch-src_tga__accel.c b/x11/xf86-video-tga/patches/patch-src_tga__accel.c
new file mode 100644
index 00000000000..2d4bc740c31
--- /dev/null
+++ b/x11/xf86-video-tga/patches/patch-src_tga__accel.c
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_tga__accel.c,v 1.1 2015/04/02 22:16:48 tnn Exp $
+
+From b7022db0559cd1b6cd3eb6b5abf6896a607b478d Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 08:55:00 -0400
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+diff --git a/src/tga_accel.c b/src/tga_accel.c
+index 35af1a4..b414df5 100644
+--- src/tga_accel.c
++++ src/tga_accel.c
+@@ -37,7 +37,6 @@
+ #include "xf86cmap.h"
+ #include "mipointer.h"
+
+-#include "mibstore.h"
+ #include "miline.h"
+
+ #include "tga_regs.h"
diff --git a/x11/xf86-video-tga/patches/patch-src_tga__driver.c b/x11/xf86-video-tga/patches/patch-src_tga__driver.c
new file mode 100644
index 00000000000..49160277aac
--- /dev/null
+++ b/x11/xf86-video-tga/patches/patch-src_tga__driver.c
@@ -0,0 +1,30 @@
+$NetBSD: patch-src_tga__driver.c,v 1.1 2015/04/02 22:16:48 tnn Exp $
+
+From b7022db0559cd1b6cd3eb6b5abf6896a607b478d Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 08:55:00 -0400
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+diff --git a/src/tga_driver.c b/src/tga_driver.c
+index dd4f3e6..90d2660 100644
+--- src/tga_driver.c
++++ src/tga_driver.c
+@@ -46,8 +46,6 @@
+
+ /* software cursor */
+ #include "mipointer.h"
+-/* backing store */
+-#include "mibstore.h"
+
+ /* #include "mibank.h" */
+ /* colormap manipulation */
+@@ -1451,7 +1449,6 @@ TGAScreenInit(SCREEN_INIT_ARGS_DECL)
+
+ fbPictureInit (pScreen, 0, 0);
+
+- miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ xf86SetSilkenMouse(pScreen);
+