libxxf86dga: Changes to 'upstream-unstable'

[Julien Cristau <jcristau@alioth.debian.org>]

 .gitignore    |    1 +
 configure.ac  |    4 ++--
 src/XF86DGA.c |    6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 5968e0f1e992db63b003f2389657cd527a806efd
Author: Eric Anholt <eric@anholt.net>
Date:   Wed Sep 5 10:17:57 2007 -0700

    Bump to 1.0.2 and require updated xf86dgaproto for the prototype update.

diff --git a/configure.ac b/configure.ac
index 4f24e26..03939ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.57])
 
-AC_INIT(libXxf86dga, 1.0.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86dga)
+AC_INIT(libXxf86dga, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86dga)
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
@@ -11,7 +11,7 @@ AC_PROG_CC
 AC_PROG_LIBTOOL
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XXF86DGA, xproto x11 xextproto xext xf86dgaproto)
+PKG_CHECK_MODULES(XXF86DGA, xproto x11 xextproto xext [xf86dgaproto >= 2.0.3])
 
 XORG_CHECK_MALLOC_ZERO
 XORG_MANPAGE_SECTIONS

commit 625a9c61265cdd1de3da425843a1a8de80d67c78
Author: James Cloos <cloos@jhcloos.com>
Date:   Mon Sep 3 05:53:50 2007 -0400

    Add *~ to .gitignore to skip patch/emacs droppings

diff --git a/.gitignore b/.gitignore
index 7250f89..912f131 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ MakeOut
 missing
 mkinstalldirs
 xxf86dga.pc
+*~

commit b3d86af10895f30ffb2999c28c5864b2be8681f6
Author: Wang Zhenyu <zhenyu.z.wang@intel.com>
Date:   Wed Apr 18 09:35:56 2007 +0800

    Fix sign extension bug on x86_64 system.
    
    In XF86DGAGetVideoLL(), we pass offset param as 'int' type, but
    later we cast it to 'unsigned long' in calling MapPhysAddress().
    This causes page table error on x86_64 system like below:
    
    dga: Corrupted page table at address 2b9712b1b000
    PGD 702a4067 PUD 6f830067 PMD 6f864067 PTE ffffffff80040027
    Bad pagetable: 000f [1] SMP
    CPU 0
    Modules linked in: i915 drm dm_mirror dm_mod video button battery asus_acpi ac parport_pc parport nvram uhci_hcd ehci_hcd snd_hda_intel snd_hda_codec snd_seq_dummy snd_seq_oss snd_seq_midi_event snd_seq snd_seq_device snd_pcm_oss snd_mixer_oss pcspkr snd_pcm i2c_i801 i2c_core e1000 snd_timer snd soundcore snd_page_alloc
    Pid: 2509, comm: dga Not tainted 2.6.21-rc6 #2
    RIP: 0033:[<0000003d119754a0>]  [<0000003d119754a0>]
    RSP: 002b:00007fff98f0d4c8  EFLAGS: 00010202
    RAX: 0000000000008000 RBX: 0000000000000001 RCX: 00002b9712b1b000
    RDX: 0000000000200000 RSI: 0000000000000071 RDI: 00002b9712b1b000
    RBP: 0000000000000000 R08: 7171717171717171 R09: 0000000000000000
    R10: 0000000000000000 R11: 0000003d119753e0 R12: 0000000000000000
    R13: 00007fff98f0d730 R14: 0000000000503010 R15: 0000000000000000
    FS:  00002b9712b19f60(0000) GS:ffffffff8060d000(0000) knlGS:0000000000000000
    CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
    CR2: 00002b9712b1b000 CR3: 000000006ffdb000 CR4: 00000000000006e0
    Process dga (pid: 2509, threadinfo ffff8100718de000, task ffff81006ffd67a0)
    
    RIP  [<0000003d119754a0>]
     RSP <00007fff98f0d4c8>
    
    This patch requires latest xf86dgaproto to build.

diff --git a/src/XF86DGA.c b/src/XF86DGA.c
index 95d7596..573a53f 100644
--- a/src/XF86DGA.c
+++ b/src/XF86DGA.c
@@ -98,7 +98,7 @@ Bool XF86DGAQueryVersion(
 Bool XF86DGAGetVideoLL(
     Display* dpy,
     int screen,
-    int *offset,
+    unsigned int *offset,
     int *width, 
     int *bank_size, 
     int *ram_size
@@ -120,7 +120,7 @@ Bool XF86DGAGetVideoLL(
 	return False;
     }
 
-    *offset = /*(char *)*/rep.offset;
+    *offset = rep.offset;
     *width = rep.width;
     *bank_size = rep.bank_size;
     *ram_size = rep.ram_size;
@@ -678,7 +678,7 @@ XF86DGAGetVideo(
     int *bank, 
     int *ram
 ){
-    /*unsigned long*/ int offset;
+    unsigned int offset;
     static int beenHere = 0;
     ScrPtr sp;
     MapPtr mp;