Index: head/x11-drivers/xf86-video-mga/Makefile =================================================================== --- head/x11-drivers/xf86-video-mga/Makefile (revision 489157) +++ head/x11-drivers/xf86-video-mga/Makefile (revision 489158) @@ -1,15 +1,15 @@ # $FreeBSD$ PORTNAME= xf86-video-mga -PORTVERSION= 1.6.5 -PORTREVISION= 4 +PORTVERSION= 2.0.0 PORTEPOCH= 3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org mga display driver +USES= gl USE_GL= gl XORG_CAT= driver .include Index: head/x11-drivers/xf86-video-mga/distinfo =================================================================== --- head/x11-drivers/xf86-video-mga/distinfo (revision 489157) +++ head/x11-drivers/xf86-video-mga/distinfo (revision 489158) @@ -1,3 +1,3 @@ -TIMESTAMP = 1484715465 -SHA256 (xorg/driver/xf86-video-mga-1.6.5.tar.bz2) = b663cd8e6364f7c4e2637b9fcab9861d0e3971518c73b00d213f6545a1289422 -SIZE (xorg/driver/xf86-video-mga-1.6.5.tar.bz2) = 478350 +TIMESTAMP = 1546479273 +SHA256 (xorg/driver/xf86-video-mga-2.0.0.tar.bz2) = 268946e1a13e9d80e4f724a0740df9e6e8c8bad37697fcbf456924e9fdbb5d79 +SIZE (xorg/driver/xf86-video-mga-2.0.0.tar.bz2) = 452486 Index: head/x11-drivers/xf86-video-mga/files/patch-src_mga__driver.c =================================================================== --- head/x11-drivers/xf86-video-mga/files/patch-src_mga__driver.c (revision 489157) +++ head/x11-drivers/xf86-video-mga/files/patch-src_mga__driver.c (nonexistent) @@ -1,23 +0,0 @@ -# Correct a string that should be const -# Cast away a warning as done earlier in the same function -# ---- src/mga_driver.c.orig 2017-01-17 22:40:29 UTC -+++ src/mga_driver.c -@@ -1933,7 +1933,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) - } else { - int from = X_DEFAULT; - #ifdef USE_EXA -- char *s = xf86GetOptValString(pMga->Options, OPTION_ACCELMETHOD); -+ const char *s = xf86GetOptValString(pMga->Options, OPTION_ACCELMETHOD); - #endif - pMga->NoAccel = FALSE; - pMga->Exa = FALSE; -@@ -2644,7 +2644,7 @@ MGAMapMem(ScrnInfoPtr pScrn) - err = pci_device_map_range(dev, - region->base_addr, region->size, - PCI_DEV_MAP_FLAG_WRITABLE, -- &pMga->IOBase); -+ (void **)&pMga->IOBase); - - if (err) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, Property changes on: head/x11-drivers/xf86-video-mga/files/patch-src_mga__driver.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/x11-drivers/xf86-video-mga/files/patch-src_mga__dacG.c =================================================================== --- head/x11-drivers/xf86-video-mga/files/patch-src_mga__dacG.c (revision 489157) +++ head/x11-drivers/xf86-video-mga/files/patch-src_mga__dacG.c (nonexistent) @@ -1,31 +0,0 @@ -# Use fabs for doubles -# Cast away a couple type warnings as done elsewhere -# ---- src/mga_dacG.c.orig 2017-01-17 22:40:29 UTC -+++ src/mga_dacG.c -@@ -940,8 +940,8 @@ MGAGCalcClock ( ScrnInfoPtr pScrn, long - /* - * Pick the closest frequency. - */ -- if ( abs(calc_f - f_vco) < m_err ) { -- m_err = abs(calc_f - f_vco); -+ if ( fabs(calc_f - f_vco) < m_err ) { -+ m_err = fabs(calc_f - f_vco); - *best_m = m; - *best_n = n; - } -@@ -2124,12 +2124,12 @@ mgag_create_i2c_bus(const char *name, un - I2CBusPtr I2CPtr = xf86CreateI2CBusRec(); - - if (I2CPtr != NULL) { -- I2CPtr->BusName = name; -+ I2CPtr->BusName = (char *)name; - I2CPtr->scrnIndex = scrn_index; - I2CPtr->I2CPutBits = MGAG_I2CPutBits; - I2CPtr->I2CGetBits = MGAG_I2CGetBits; - I2CPtr->AcknTimeout = 5; -- I2CPtr->DriverPrivate.ptr = & i2c_priv[bus_index]; -+ I2CPtr->DriverPrivate.ptr = (void *)&i2c_priv[bus_index]; - - if (!xf86I2CBusInit(I2CPtr)) { - xf86DestroyI2CBusRec(I2CPtr, TRUE, TRUE); Property changes on: head/x11-drivers/xf86-video-mga/files/patch-src_mga__dacG.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/x11-drivers/xf86-video-mga/files/patch-src_mga__merge.c =================================================================== --- head/x11-drivers/xf86-video-mga/files/patch-src_mga__merge.c (revision 489157) +++ head/x11-drivers/xf86-video-mga/files/patch-src_mga__merge.c (nonexistent) @@ -1,58 +0,0 @@ -# Correct strings that should be const -# ---- src/mga_merge.c.orig 2017-01-17 22:40:29 UTC -+++ src/mga_merge.c -@@ -18,12 +18,12 @@ - #include "fbdevhw.h" - - static int --StrToRanges(range* r, char* s) { -+StrToRanges(range* r, const char* s) { - float num=0.0; - int rangenum=0; - Bool gotdash = FALSE; - Bool nextdash = FALSE; -- char* strnum=NULL; -+ const char* strnum=NULL; - do { - switch(*s) { - case '0': case '1': case '2': case '3': case '4': case '5': -@@ -117,7 +117,7 @@ CopyModeNLink(ScrnInfoPtr pScrn, Display - } - - static DisplayModePtr --GetModeFromName(char* str, DisplayModePtr i) -+GetModeFromName(const char* str, DisplayModePtr i) - { - DisplayModePtr c = i; - if(!i) return NULL; -@@ -130,9 +130,9 @@ GetModeFromName(char* str, DisplayModePt - - /* takes a config file string of MetaModes and generates a MetaModeList */ - static DisplayModePtr --GenerateModeList(ScrnInfoPtr pScrn, char* str, -+GenerateModeList(ScrnInfoPtr pScrn, const char* str, - DisplayModePtr i, DisplayModePtr j, MgaScrn2Rel srel) { -- char* strmode = str; -+ const char* strmode = str; - char modename[256]; - Bool gotdash = FALSE; - MgaScrn2Rel sr; -@@ -165,7 +165,7 @@ GenerateModeList(ScrnInfoPtr pScrn, char - } else { - mode1 = GetModeFromName(modename,i); - if(!mode1) { -- char* tmps = str; -+ const char* tmps = str; - xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, - "Mode: \"%s\" is not a supported mode for monitor 1\n",modename); - /* find if a monitor2 mode follows */ -@@ -232,7 +232,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, i - MGAPtr pMga1; - MessageType from; - int i; -- char* s; -+ const char* s; - ClockRangePtr clockRanges; - MgaScrn2Rel Monitor2Pos; - Property changes on: head/x11-drivers/xf86-video-mga/files/patch-src_mga__merge.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property