Hello community,
here is the log from the commit of package xf86-video-trident for
openSUSE:Factory checked in at 2013-03-22 13:06:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-video-trident (Old)
and /work/SRC/openSUSE:Factory/.xf86-video-trident.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-trident", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-video-trident/xf86-video-trident.changes
2012-09-18 14:01:59.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.xf86-video-trident.new/xf86-video-trident.changes
2013-03-22 13:06:31.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Mar 21 16:25:21 UTC 2013 - [email protected]
+
+- Add mibstore.patch, fixes build with xorg-server 1.14
+- Fix loading the driver without XAA
+
+-------------------------------------------------------------------
New:
----
U_Fix-loading-the-driver-without-XAA.patch
U_Remove-mibstore.h.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-video-trident.spec ++++++
--- /var/tmp/diff_new_pack.Ypc4BK/_old 2013-03-22 13:06:32.000000000 +0100
+++ /var/tmp/diff_new_pack.Ypc4BK/_new 2013-03-22 13:06:32.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xf86-video-trident
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,6 +24,8 @@
Group: System/X11/Servers/XF86_4
Url: http://xorg.freedesktop.org/
Source0:
http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2
+Patch0: U_Remove-mibstore.h.patch
+Patch1: U_Fix-loading-the-driver-without-XAA.patch
BuildRequires: pkg-config
BuildRequires: pkgconfig(fontsproto)
BuildRequires: pkgconfig(pciaccess) >= 0.8.0
@@ -72,6 +74,8 @@
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
%build
%configure
++++++ U_Fix-loading-the-driver-without-XAA.patch ++++++
>From 48c15909691e28ad2c188a2978b1c8ef3d9d8760 Mon Sep 17 00:00:00 2001
From: Timo Aaltonen <[email protected]>
Date: Wed, 26 Sep 2012 11:01:26 +0300
Subject: [PATCH 2/2] Fix loading the driver without XAA
---
src/trident_dga.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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
--
1.7.10.4
++++++ U_Remove-mibstore.h.patch ++++++
>From 30787294c837aefa8820b6f76f00fe30d4e54181 Mon Sep 17 00:00:00 2001
From: Adam Jackson <[email protected]>
Date: Tue, 25 Sep 2012 08:55:01 -0400
Subject: [PATCH 1/2] Remove mibstore.h
Signed-off-by: Adam Jackson <[email protected]>
---
src/trident_driver.c | 2 --
1 file changed, 2 deletions(-)
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 */
--
1.7.10.4
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
