Author: dnusinow Date: 2006-09-30 14:26:02 -0400 (Sat, 30 Sep 2006) New Revision: 3566
Added: trunk/driver/xserver-xorg-video-via/debian/patches/02_card32_redefine.diff Modified: trunk/driver/xserver-xorg-video-via/debian/changelog trunk/driver/xserver-xorg-video-via/debian/patches/01_missing_assert.diff trunk/driver/xserver-xorg-video-via/debian/patches/series Log: * Add 01_remove_assert.diff Thanks Starling for an alternate patch, but this patch is stolen from upstream. Closes: #389335 * Add 02_card32_redefine.diff because via_drmclient.h defines CARD32 if uint32_t isn't defined. This patch includes stdint.h in the file so this doesn't come in to play, thus fixing an FTBFS. Modified: trunk/driver/xserver-xorg-video-via/debian/changelog =================================================================== --- trunk/driver/xserver-xorg-video-via/debian/changelog 2006-09-30 17:07:42 UTC (rev 3565) +++ trunk/driver/xserver-xorg-video-via/debian/changelog 2006-09-30 18:26:02 UTC (rev 3566) @@ -1,9 +1,12 @@ xserver-xorg-video-via (1:0.2.1-5) unstable; urgency=low - * Add 01_missing_assert.diff to add missing include to via_dri.c. Thanks - Starling. Closes: #389335 + * Add 01_remove_assert.diff Thanks Starling for an alternate patch, but + this patch is stolen from upstream. Closes: #389335 + * Add 02_card32_redefine.diff because via_drmclient.h defines CARD32 if + uint32_t isn't defined. This patch includes stdint.h in the file so this + doesn't come in to play, thus fixing an FTBFS. - -- David Nusinow <[EMAIL PROTECTED]> Sat, 30 Sep 2006 12:05:15 -0400 + -- David Nusinow <[EMAIL PROTECTED]> Sat, 30 Sep 2006 14:18:59 -0400 xserver-xorg-video-via (1:0.2.1-4) unstable; urgency=low Modified: trunk/driver/xserver-xorg-video-via/debian/patches/01_missing_assert.diff =================================================================== --- trunk/driver/xserver-xorg-video-via/debian/patches/01_missing_assert.diff 2006-09-30 17:07:42 UTC (rev 3565) +++ trunk/driver/xserver-xorg-video-via/debian/patches/01_missing_assert.diff 2006-09-30 18:26:02 UTC (rev 3566) @@ -1,13 +1,12 @@ -Index: xserver-xorg-video-via/src/via_dri.c +Index: xserver-xorg-video-via-0.2.1/src/via_dri.c =================================================================== ---- xserver-xorg-video-via.orig/src/via_dri.c 2006-09-30 12:04:00.000000000 -0400 -+++ xserver-xorg-video-via/src/via_dri.c 2006-09-30 12:04:19.000000000 -0400 -@@ -44,6 +44,8 @@ - #include "via_id.h" - #include "xf86drm.h" +--- xserver-xorg-video-via-0.2.1.orig/src/via_dri.c 2006-09-30 14:00:13.000000000 -0400 ++++ xserver-xorg-video-via-0.2.1/src/via_dri.c 2006-09-30 14:00:18.000000000 -0400 +@@ -850,7 +850,6 @@ + drm_via_sarea_t *saPriv; -+#include <assert.h> -+ - #define VIDEO 0 - #define AGP 1 - #define AGP_PAGE_SIZE 4096 + saPriv=(drm_via_sarea_t *)DRIGetSAREAPrivate(pScreen); +- assert(saPriv); + memset(saPriv, 0, sizeof(*saPriv)); + saPriv->ctxOwner = -1; + } Added: trunk/driver/xserver-xorg-video-via/debian/patches/02_card32_redefine.diff =================================================================== --- trunk/driver/xserver-xorg-video-via/debian/patches/02_card32_redefine.diff (rev 0) +++ trunk/driver/xserver-xorg-video-via/debian/patches/02_card32_redefine.diff 2006-09-30 18:26:02 UTC (rev 3566) @@ -0,0 +1,12 @@ +Index: xserver-xorg-video-via-0.2.1/src/via_drmclient.h +=================================================================== +--- xserver-xorg-video-via-0.2.1.orig/src/via_drmclient.h 2006-09-30 14:15:10.000000000 -0400 ++++ xserver-xorg-video-via-0.2.1/src/via_drmclient.h 2006-09-30 14:16:20.000000000 -0400 +@@ -26,6 +26,7 @@ + + #include "drm.h" + #include "xf86drm.h" ++#include <stdint.h> + + #ifndef uint32_t + #define uint32_t CARD32 Modified: trunk/driver/xserver-xorg-video-via/debian/patches/series =================================================================== --- trunk/driver/xserver-xorg-video-via/debian/patches/series 2006-09-30 17:07:42 UTC (rev 3565) +++ trunk/driver/xserver-xorg-video-via/debian/patches/series 2006-09-30 18:26:02 UTC (rev 3566) @@ -1 +1,2 @@ 01_missing_assert.diff +02_card32_redefine.diff -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]