diff --git a/x11-drivers/xlibre-xf86-video-mga/Makefile b/x11-drivers/xlibre-xf86-video-mga/Makefile index cd0cde029608..b7d67847d416 100644 --- a/x11-drivers/xlibre-xf86-video-mga/Makefile +++ b/x11-drivers/xlibre-xf86-video-mga/Makefile @@ -1,19 +1,14 @@ PORTNAME= xlibre-xf86-video-mga -PORTVERSION= 2.1.0.1 +PORTVERSION= 25.0.0 CATEGORIES= x11-drivers MAINTAINER= b-aazbsd@proton.me COMMENT= XLibre mga display driver WWW= https://github.com/X11Libre/xf86-video-mga/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS_INSTALL= xf86-video-mga - -GH_TAGNAME= 368f2e8 USES= xlibre-cat:driver -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share - .include diff --git a/x11-drivers/xlibre-xf86-video-mga/distinfo b/x11-drivers/xlibre-xf86-video-mga/distinfo index 16268ff9085f..37103214ceb8 100644 --- a/x11-drivers/xlibre-xf86-video-mga/distinfo +++ b/x11-drivers/xlibre-xf86-video-mga/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1760818379 -SHA256 (xlibre/driver/X11Libre-xf86-video-mga-2.1.0.1-368f2e8_GH0.tar.gz) = 24b96158a4dd6c48d5beb87bcb2ab9d3af7aced6285629af2a9c7786eed42dba -SIZE (xlibre/driver/X11Libre-xf86-video-mga-2.1.0.1-368f2e8_GH0.tar.gz) = 158294 +TIMESTAMP = 1766525198 +SHA256 (xlibre/driver/X11Libre-xf86-video-mga-25.0.0-xlibre-xf86-video-mga-25.0.0_GH0.tar.gz) = af619a36e6b7c8f951e3c1329889bbacd8864ed8dea32d306ab8cfd748b24ad4 +SIZE (xlibre/driver/X11Libre-xf86-video-mga-25.0.0-xlibre-xf86-video-mga-25.0.0_GH0.tar.gz) = 152084 diff --git a/x11-drivers/xlibre-xf86-video-mga/files/patch-src_mga__dac3026.c b/x11-drivers/xlibre-xf86-video-mga/files/patch-src_mga__dac3026.c index 4a225c085a78..060c2ed2ba84 100644 --- a/x11-drivers/xlibre-xf86-video-mga/files/patch-src_mga__dac3026.c +++ b/x11-drivers/xlibre-xf86-video-mga/files/patch-src_mga__dac3026.c @@ -1,15 +1,15 @@ # Fix a style warning # --- src/mga_dac3026.c.orig 2017-01-17 22:40:29 UTC +++ src/mga_dac3026.c @@ -886,8 +886,8 @@ MGA3026LoadCursorImage( - outTi3026dreg(TVP3026_WADR_PAL, 0x00); + outTi3026dreg(TVP3026_WADR_PAL, 0x00); while(i--) { - while (INREG8(0x1FDA) & 0x01); - while (!(INREG8(0x1FDA) & 0x01)); + while (INREG8(0x1FDA) & 0x01) {} + while (!(INREG8(0x1FDA) & 0x01)) {} - outTi3026dreg(TVP3026_CUR_RAM, *(src++)); + outTi3026dreg(TVP3026_CUR_RAM, *(src++)); } } diff --git a/x11-drivers/xlibre-xf86-video-mga/files/patch-src_mga__dri.c b/x11-drivers/xlibre-xf86-video-mga/files/patch-src_mga__dri.c index 1c4114bc5920..59b612e3d81d 100644 --- a/x11-drivers/xlibre-xf86-video-mga/files/patch-src_mga__dri.c +++ b/x11-drivers/xlibre-xf86-video-mga/files/patch-src_mga__dri.c @@ -1,22 +1,22 @@ # Use the correct constants for this type # --- src/mga_dri.c.orig 2017-01-17 22:40:29 UTC +++ src/mga_dri.c @@ -316,7 +316,7 @@ static void MGAWaitForIdleDMA( ScrnInfoP for (;;) { do { /* first ask for quiescent and flush */ - lock.flags = DRM_LOCK_QUIESCENT | DRM_LOCK_FLUSH; + lock.flags = _DRM_LOCK_QUIESCENT | _DRM_LOCK_FLUSH; do { ret = drmCommandWrite( pMga->drmFD, DRM_MGA_FLUSH, &lock, sizeof( drm_lock_t ) ); @@ -324,7 +324,7 @@ static void MGAWaitForIdleDMA( ScrnInfoP /* if it's still busy just try quiescent */ - if ( ret == -EBUSY ) { + if ( ret == -EBUSY ) { - lock.flags = DRM_LOCK_QUIESCENT; + lock.flags = _DRM_LOCK_QUIESCENT; do { ret = drmCommandWrite( pMga->drmFD, DRM_MGA_FLUSH, &lock, sizeof( drm_lock_t ) ); diff --git a/x11-drivers/xlibre-xf86-video-mga/pkg-plist b/x11-drivers/xlibre-xf86-video-mga/pkg-plist index 8b7a3276b562..6172b1c16dd9 100644 --- a/x11-drivers/xlibre-xf86-video-mga/pkg-plist +++ b/x11-drivers/xlibre-xf86-video-mga/pkg-plist @@ -1,2 +1,2 @@ -lib/xorg/modules/xlibre-25.0/drivers/mga_drv.so +%%MODULEDIR%%/drivers/mga_drv.so share/man/man4/mga.4x.gz