diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2017-01-23 00:40:30 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2017-01-23 00:40:30 +0000 |
| commit | 8df2d2be9b70f4fe1e755c9cc04bc452445cabbb (patch) | |
| tree | 0925b495d89df79648584eb71fd4f2dccc7274f4 /x11-drivers | |
| parent | Update to 1.4.7 (diff) | |
Update to 2.3.9
PR: 216291
Submitted by: matthew@reztek.cz
Notes
Notes:
svn path=/head/; revision=432180
Diffstat (limited to 'x11-drivers')
| -rw-r--r-- | x11-drivers/xf86-video-savage/Makefile | 4 | ||||
| -rw-r--r-- | x11-drivers/xf86-video-savage/distinfo | 5 | ||||
| -rw-r--r-- | x11-drivers/xf86-video-savage/files/patch-src_savage__dri.c | 13 | ||||
| -rw-r--r-- | x11-drivers/xf86-video-savage/files/patch-src_savage__video.c | 17 |
4 files changed, 34 insertions, 5 deletions
diff --git a/x11-drivers/xf86-video-savage/Makefile b/x11-drivers/xf86-video-savage/Makefile index 00d6c981c843..da33d00348fd 100644 --- a/x11-drivers/xf86-video-savage/Makefile +++ b/x11-drivers/xf86-video-savage/Makefile @@ -1,15 +1,13 @@ # $FreeBSD$ PORTNAME= xf86-video-savage -PORTVERSION= 2.3.8 +PORTVERSION= 2.3.9 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org savage display driver USE_GL= gl - XORG_CAT= driver -USE_XORG= xf86driproto glproto .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-savage/distinfo b/x11-drivers/xf86-video-savage/distinfo index e4338f5659ca..b6dac36e2228 100644 --- a/x11-drivers/xf86-video-savage/distinfo +++ b/x11-drivers/xf86-video-savage/distinfo @@ -1,2 +1,3 @@ -SHA256 (xorg/driver/xf86-video-savage-2.3.8.tar.bz2) = fdcea4a86532bceb50095eaf0fe2f38bbfa160e98463b815f4b549eb9985fa63 -SIZE (xorg/driver/xf86-video-savage-2.3.8.tar.bz2) = 418649 +TIMESTAMP = 1484716274 +SHA256 (xorg/driver/xf86-video-savage-2.3.9.tar.bz2) = 2c93c4db1f71e725dda0caee5821253129d4b52d7aa0fd720593e7769bceec86 +SIZE (xorg/driver/xf86-video-savage-2.3.9.tar.bz2) = 433686 diff --git a/x11-drivers/xf86-video-savage/files/patch-src_savage__dri.c b/x11-drivers/xf86-video-savage/files/patch-src_savage__dri.c new file mode 100644 index 000000000000..e00519b07a59 --- /dev/null +++ b/x11-drivers/xf86-video-savage/files/patch-src_savage__dri.c @@ -0,0 +1,13 @@ +# Correct types in a format string +# +--- src/savage_dri.c.orig 2017-01-17 22:43:40 UTC ++++ src/savage_dri.c +@@ -894,7 +894,7 @@ Bool SAVAGEDRIScreenInit( ScreenPtr pScr + } + + xf86DrvMsg( pScrn->scrnIndex, X_INFO, +- "[drm] Sarea %d+%d: %d\n", ++ "[drm] Sarea %lu+%lu: %lu\n", + sizeof(XF86DRISAREARec), sizeof(SAVAGESAREAPrivRec), + sizeof(XF86DRISAREARec) + sizeof(SAVAGESAREAPrivRec) ); + diff --git a/x11-drivers/xf86-video-savage/files/patch-src_savage__video.c b/x11-drivers/xf86-video-savage/files/patch-src_savage__video.c new file mode 100644 index 000000000000..a1fba8286766 --- /dev/null +++ b/x11-drivers/xf86-video-savage/files/patch-src_savage__video.c @@ -0,0 +1,17 @@ +# Correct type in a couple format strings +# +--- src/savage_video.c.orig 2017-01-17 22:43:40 UTC ++++ src/savage_video.c +@@ -303,10 +303,10 @@ unsigned int GetBlendForFourCC2000( int + + void savageOUTREG( SavagePtr psav, unsigned long offset, unsigned long value ) + { +- ErrorF( "MMIO %08lx, was %08lx, want %08lx,", ++ ErrorF( "MMIO %08lx, was %08x, want %08lx,", + offset, (CARD32)MMIO_IN32( psav->MapBase, offset ), value ); + MMIO_OUT32( psav->MapBase, offset, value ); +- ErrorF( " now %08lx\n", (CARD32)MMIO_IN32( psav->MapBase, offset ) ); ++ ErrorF( " now %08x\n", (CARD32)MMIO_IN32( psav->MapBase, offset ) ); + } + + #if 0 |