xserver-xorg-video-trident: Changes to 'debian-experimental'
ChangeLog | 14 ++++++++++++++
debian/changelog | 3 ++-
src/trident_dga.c | 4 ++--
src/trident_driver.c | 2 --
4 files changed, 18 insertions(+), 5 deletions(-)
New commits:
commit 4c5611423118e8e3426b9bd1030fe332dfe86ec6
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Tue Sep 24 14:37:36 2013 +0200
Add changelog entries.
diff --git a/ChangeLog b/ChangeLog
index 27c8bf1..c1583fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+commit 48c15909691e28ad2c188a2978b1c8ef3d9d8760
+Author: Timo Aaltonen <tjaalton@ubuntu.com>
+Date: Wed Sep 26 11:01:26 2012 +0300
+
+ Fix loading the driver without XAA
+
+commit 30787294c837aefa8820b6f76f00fe30d4e54181
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Sep 25 08:55:01 2012 -0400
+
+ Remove mibstore.h
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
commit 3098fe7193cbfe4a885a60b93e71796b70e4fa2a
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 17 16:05:09 2012 +1000
commit 7b29e1f76aab503560b9929ae6a918e2b02393af
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Tue Sep 24 14:21:48 2013 +0200
Release to experimental.
diff --git a/debian/changelog b/debian/changelog
index f68529a..7441804 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-xserver-xorg-video-trident (1:1.3.6-1) UNRELEASED; urgency=low
+xserver-xorg-video-trident (1:1.3.6-1) experimental; urgency=low
* New upstream release.
+ * Grab some patches to fix building from git.
-- Maarten Lankhorst <maarten.lankhorst@canonical.com> Thu, 19 Jul 2012 13:21:51 +0200
commit 48c15909691e28ad2c188a2978b1c8ef3d9d8760
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Wed Sep 26 11:01:26 2012 +0300
Fix loading the driver without XAA
diff --git a/src/trident_dga.c b/src/trident_dga.c
index 0263aa7..c4b5b9a 100644
--- a/src/trident_dga.c
+++ b/src/trident_dga.c
@@ -37,10 +37,10 @@
static Bool TRIDENT_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **,
int *, int *, int *);
static Bool TRIDENT_SetMode(ScrnInfoPtr, DGAModePtr);
-static void TRIDENT_Sync(ScrnInfoPtr);
static int TRIDENT_GetViewport(ScrnInfoPtr);
static void TRIDENT_SetViewport(ScrnInfoPtr, int, int, int);
#ifdef HAVE_XAA_H
+static void TRIDENT_Sync(ScrnInfoPtr);
static void TRIDENT_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
static void TRIDENT_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
#if 0
@@ -56,8 +56,8 @@ DGAFunctionRec TRIDENTDGAFuncs = {
TRIDENT_SetMode,
TRIDENT_SetViewport,
TRIDENT_GetViewport,
- TRIDENT_Sync,
#ifdef HAVE_XAA_H
+ TRIDENT_Sync,
TRIDENT_FillRect,
TRIDENT_BlitRect,
#if 0
commit 30787294c837aefa8820b6f76f00fe30d4e54181
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Sep 25 08:55:01 2012 -0400
Remove mibstore.h
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/trident_driver.c b/src/trident_driver.c
index dc12b76..408c870 100644
--- a/src/trident_driver.c
+++ b/src/trident_driver.c
@@ -56,7 +56,6 @@
#include "mipointer.h"
-#include "mibstore.h"
#include "shadow.h"
#include "trident.h"
#include "trident_regs.h"
@@ -3037,7 +3036,6 @@ TRIDENTScreenInit(SCREEN_INIT_ARGS_DECL)
TridentAccelInit(pScreen);
}
- miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
/* Initialise cursor functions */
Reply to: