aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--x11-servers/XFree86-4-Server-snap/Makefile51
-rw-r--r--x11-servers/XFree86-4-Server-snap/distinfo1
-rw-r--r--x11-servers/XFree86-4-Server-snap/pkg-plist13
-rw-r--r--x11-servers/XFree86-4-Server/Makefile51
-rw-r--r--x11-servers/XFree86-4-Server/distinfo1
-rw-r--r--x11-servers/XFree86-4-Server/pkg-plist13
-rw-r--r--x11/XFree86-4-libraries/files/patch-g55018
-rw-r--r--x11/XFree86-4-libraries/files/patch-r128dri18
-rw-r--r--x11/XFree86-4-libraries/files/patch-r128xmesa13
-rw-r--r--x11/XFree86-4-libraries/files/patch-z4427
10 files changed, 134 insertions, 72 deletions
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index a10a80bcb74a..6aa58229950d 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Server
PORTVERSION= 4.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XFREE}
MASTER_SITE_SUBDIR= 4.1.0
@@ -82,28 +82,18 @@ HasXdmAuth?= DEFAULT
HasSecureRPC?= DEFAULT
HasPam?= DEFAULT
ExtendedInputDevices?= DEFAULT
-.if !defined(I_WANT_TO_FIX_BUILDING_DRI_MODULES)
-BuildXF86DRI= NO
-BuildXF86DRM= NO
-PLIST_SUB+= DRI="@comment "
-.else
-.if ${OSVERSION} < 500013 && ${MACHINE} != alpha
.if (exists(/sys) || exists(/usr/src/sys))
BuildXF86DRI= YES
-BuildXF86DRM= YES
PLIST_SUB+= DRI=""
.else
-_pre-fetch::
+pre-fetch::
@${ECHO_MSG} "DRI would not build: kernel source required in /sys."
-.endif # have /sys
-.else
BuildXF86DRI= NO
-BuildXF86DRM= NO
PLIST_SUB+= DRI="@comment "
-_pre-fetch::
- @${ECHO_MSG} "DRI would not build: incompatible with SMPng and alpha"
-.endif # PRE_SMPNG && !alpha
-.endif # DRI is totally broken
+.endif # have /sys
+# DRM and DRI kernel modules bundled with 4.1.0 are broken
+BuildXF86DRM= NO
+PLIST_SUB+= DRI_KMOD="@comment "
.if ${ARCH} == i386
PLIST_SUB+= I386:=""
@@ -139,27 +129,30 @@ MAN4+= citron.4 \
PLIST_SUB+= XIE:="@comment "
.endif
-.if !defined(INCOMPATIBLE_WITH_4_1_0)
+.if ${BuildXF86DRI} == YES
.if !defined(WITH_MATROX_GXX_DRIVER)
HaveMatroxHal= NO
PLIST_SUB+= MATROX="@comment "
-_pre-fetch::
+pre-fetch::
@${ECHO_MSG} "Define WITH_MATROX_GXX_DRIVER to enable the official Matrox drivers for"
- @${ECHO_MSG} "the G200, G400 and G450 graphic adapters."
+ @${ECHO_MSG} "the G200, G400, G450 and G550 graphic adapters."
.else
+NO_PACKAGE= "Matrox drivers may not be distributed."
HaveMatroxHal= YES
-MGA_DRIVER_VERSION= 1_2_0beta
-MASTER_SITES+= ftp://ftp.matrox.com/pub/mga/archive/linux/2001/beta_${MGA_DRIVER_VERSION:S/beta//}/
-DISTFILES+= mga-${MGA_DRIVER_VERSION}.tgz
-EXTRACT_ONLY= X410src-1.tgz
+MGA_DRIVER_VERSION= 133_143
+MASTER_SITES+= ftp://ftp.matrox.com/pub/mga/archive/linux/2001/beta_${MGA_DRIVER_VERSION}/
+DISTFILES+= mga-${MGA_DRIVER_VERSION}-source.tgz
PLIST_SUB+= MATROX=""
post-patch::
- @${MV} ${WRKSRC}/programs/Xserver/hw/xfree86/drivers/mga \
- ${WRKSRC}/programs/Xserver/hw/xfree86/drivers/mga.old
- @${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/mga-${MGA_DRIVER_VERSION}.tgz \
- -C ${WRKSRC}/programs/Xserver/hw/xfree86/drivers
+ @(cd ${WRKSRC}; \
+ ${MV} programs/Xserver/hw/xfree86/drivers/mga \
+ programs/Xserver/hw/xfree86/drivers/mga.old; \
+ ${MV} ../mgasource/mga-1.4.3/mga programs/Xserver/hw/xfree86/drivers)
+post-install::
+ ${INSTALL_DATA} ${WRKSRC}/programs/Xserver/hw/xfree86/drivers/mga/README ${PREFIX}/lib/X11/doc/README.mga
+ ${INSTALL_DATA} ${WRKSRC}/programs/Xserver/hw/xfree86/drivers/mga/README_HALLIB ${PREFIX}/lib/X11/doc/README.mga_HALLIB
.endif # !WITH_MATROX_GXX_DRIVER
-.endif # INCOMPATIBLE_WITH_4_1_0
+.endif
do-configure:
cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
@@ -176,7 +169,7 @@ post-build:
.endif
@${CAT} ${.CURDIR}/pkg-message >> ${PKGMESSAGE}
-post-install:
+post-install::
@${SED} -e s,/usr/X11R6,${PREFIX}, ${PKGMESSAGE}
strip ${PREFIX}/bin/XFree86
diff --git a/x11-servers/XFree86-4-Server-snap/distinfo b/x11-servers/XFree86-4-Server-snap/distinfo
index e4b5e84b9421..8e671ced5d59 100644
--- a/x11-servers/XFree86-4-Server-snap/distinfo
+++ b/x11-servers/XFree86-4-Server-snap/distinfo
@@ -1 +1,2 @@
MD5 (xc/X410src-1.tgz) = 2d4709f7106a1d65c175be445a3d3c32
+MD5 (xc/mga-133_143-source.tgz) = 849bf57f23f1684fea970459f919d1f2
diff --git a/x11-servers/XFree86-4-Server-snap/pkg-plist b/x11-servers/XFree86-4-Server-snap/pkg-plist
index 1fe8887c9b29..906a6bb10c95 100644
--- a/x11-servers/XFree86-4-Server-snap/pkg-plist
+++ b/x11-servers/XFree86-4-Server-snap/pkg-plist
@@ -30,6 +30,8 @@ lib/X11/doc/README.dps
lib/X11/doc/README.fonts
%%I386:%%lib/X11/doc/README.i740
%%I386:%%lib/X11/doc/README.i810
+%%MATROX%%lib/X11/doc/README.mga
+%%MATROX%%lib/X11/doc/README.mga_HALLIB
lib/X11/doc/README.mouse
%%I386:%%lib/X11/doc/README.newport
%%I386:%%lib/X11/doc/README.r128
@@ -44,11 +46,11 @@ lib/X11/etc/Xinstall.sh
lib/X11/etc/sun.termcap
lib/X11/etc/sun.terminfo
lib/X11/etc/xmodmap.std
-%%DRI%%lib/X11/kernel/drm.ko
-%%DRI%%lib/X11/kernel/gamma.ko
-%%DRI%%lib/X11/kernel/mga.ko
-%%DRI%%lib/X11/kernel/tdfx.ko
-%%DRI%%@dirrm lib/X11/kernel
+%%DRI_KMOD%%lib/X11/kernel/drm.ko
+%%DRI_KMOD%%lib/X11/kernel/gamma.ko
+%%DRI_KMOD%%lib/X11/kernel/mga.ko
+%%DRI_KMOD%%lib/X11/kernel/tdfx.ko
+%%DRI_KMOD%%@dirrm lib/X11/kernel
lib/X11/xserver/SecurityPolicy
lib/modules/codeconv/libARABIC.a
lib/modules/codeconv/libARMSCII8.a
@@ -83,6 +85,7 @@ lib/modules/codeconv/libVISCII.a
%%DRI%%lib/modules/dri/gamma_dri.so
%%I386:%%%%DRI%%lib/modules/dri/i810_dri.so
%%DRI%%lib/modules/dri/mga_dri.so
+%%DRI%%lib/modules/dri/radeon_dri.so
%%I386:%%%%DRI%%lib/modules/dri/r128_dri.so
%%I386:%%%%DRI%%lib/modules/dri/sis_dri.so
%%I386:%%lib/modules/drivers/apm_drv.o
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index a10a80bcb74a..6aa58229950d 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Server
PORTVERSION= 4.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XFREE}
MASTER_SITE_SUBDIR= 4.1.0
@@ -82,28 +82,18 @@ HasXdmAuth?= DEFAULT
HasSecureRPC?= DEFAULT
HasPam?= DEFAULT
ExtendedInputDevices?= DEFAULT
-.if !defined(I_WANT_TO_FIX_BUILDING_DRI_MODULES)
-BuildXF86DRI= NO
-BuildXF86DRM= NO
-PLIST_SUB+= DRI="@comment "
-.else
-.if ${OSVERSION} < 500013 && ${MACHINE} != alpha
.if (exists(/sys) || exists(/usr/src/sys))
BuildXF86DRI= YES
-BuildXF86DRM= YES
PLIST_SUB+= DRI=""
.else
-_pre-fetch::
+pre-fetch::
@${ECHO_MSG} "DRI would not build: kernel source required in /sys."
-.endif # have /sys
-.else
BuildXF86DRI= NO
-BuildXF86DRM= NO
PLIST_SUB+= DRI="@comment "
-_pre-fetch::
- @${ECHO_MSG} "DRI would not build: incompatible with SMPng and alpha"
-.endif # PRE_SMPNG && !alpha
-.endif # DRI is totally broken
+.endif # have /sys
+# DRM and DRI kernel modules bundled with 4.1.0 are broken
+BuildXF86DRM= NO
+PLIST_SUB+= DRI_KMOD="@comment "
.if ${ARCH} == i386
PLIST_SUB+= I386:=""
@@ -139,27 +129,30 @@ MAN4+= citron.4 \
PLIST_SUB+= XIE:="@comment "
.endif
-.if !defined(INCOMPATIBLE_WITH_4_1_0)
+.if ${BuildXF86DRI} == YES
.if !defined(WITH_MATROX_GXX_DRIVER)
HaveMatroxHal= NO
PLIST_SUB+= MATROX="@comment "
-_pre-fetch::
+pre-fetch::
@${ECHO_MSG} "Define WITH_MATROX_GXX_DRIVER to enable the official Matrox drivers for"
- @${ECHO_MSG} "the G200, G400 and G450 graphic adapters."
+ @${ECHO_MSG} "the G200, G400, G450 and G550 graphic adapters."
.else
+NO_PACKAGE= "Matrox drivers may not be distributed."
HaveMatroxHal= YES
-MGA_DRIVER_VERSION= 1_2_0beta
-MASTER_SITES+= ftp://ftp.matrox.com/pub/mga/archive/linux/2001/beta_${MGA_DRIVER_VERSION:S/beta//}/
-DISTFILES+= mga-${MGA_DRIVER_VERSION}.tgz
-EXTRACT_ONLY= X410src-1.tgz
+MGA_DRIVER_VERSION= 133_143
+MASTER_SITES+= ftp://ftp.matrox.com/pub/mga/archive/linux/2001/beta_${MGA_DRIVER_VERSION}/
+DISTFILES+= mga-${MGA_DRIVER_VERSION}-source.tgz
PLIST_SUB+= MATROX=""
post-patch::
- @${MV} ${WRKSRC}/programs/Xserver/hw/xfree86/drivers/mga \
- ${WRKSRC}/programs/Xserver/hw/xfree86/drivers/mga.old
- @${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/mga-${MGA_DRIVER_VERSION}.tgz \
- -C ${WRKSRC}/programs/Xserver/hw/xfree86/drivers
+ @(cd ${WRKSRC}; \
+ ${MV} programs/Xserver/hw/xfree86/drivers/mga \
+ programs/Xserver/hw/xfree86/drivers/mga.old; \
+ ${MV} ../mgasource/mga-1.4.3/mga programs/Xserver/hw/xfree86/drivers)
+post-install::
+ ${INSTALL_DATA} ${WRKSRC}/programs/Xserver/hw/xfree86/drivers/mga/README ${PREFIX}/lib/X11/doc/README.mga
+ ${INSTALL_DATA} ${WRKSRC}/programs/Xserver/hw/xfree86/drivers/mga/README_HALLIB ${PREFIX}/lib/X11/doc/README.mga_HALLIB
.endif # !WITH_MATROX_GXX_DRIVER
-.endif # INCOMPATIBLE_WITH_4_1_0
+.endif
do-configure:
cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
@@ -176,7 +169,7 @@ post-build:
.endif
@${CAT} ${.CURDIR}/pkg-message >> ${PKGMESSAGE}
-post-install:
+post-install::
@${SED} -e s,/usr/X11R6,${PREFIX}, ${PKGMESSAGE}
strip ${PREFIX}/bin/XFree86
diff --git a/x11-servers/XFree86-4-Server/distinfo b/x11-servers/XFree86-4-Server/distinfo
index e4b5e84b9421..8e671ced5d59 100644
--- a/x11-servers/XFree86-4-Server/distinfo
+++ b/x11-servers/XFree86-4-Server/distinfo
@@ -1 +1,2 @@
MD5 (xc/X410src-1.tgz) = 2d4709f7106a1d65c175be445a3d3c32
+MD5 (xc/mga-133_143-source.tgz) = 849bf57f23f1684fea970459f919d1f2
diff --git a/x11-servers/XFree86-4-Server/pkg-plist b/x11-servers/XFree86-4-Server/pkg-plist
index 1fe8887c9b29..906a6bb10c95 100644
--- a/x11-servers/XFree86-4-Server/pkg-plist
+++ b/x11-servers/XFree86-4-Server/pkg-plist
@@ -30,6 +30,8 @@ lib/X11/doc/README.dps
lib/X11/doc/README.fonts
%%I386:%%lib/X11/doc/README.i740
%%I386:%%lib/X11/doc/README.i810
+%%MATROX%%lib/X11/doc/README.mga
+%%MATROX%%lib/X11/doc/README.mga_HALLIB
lib/X11/doc/README.mouse
%%I386:%%lib/X11/doc/README.newport
%%I386:%%lib/X11/doc/README.r128
@@ -44,11 +46,11 @@ lib/X11/etc/Xinstall.sh
lib/X11/etc/sun.termcap
lib/X11/etc/sun.terminfo
lib/X11/etc/xmodmap.std
-%%DRI%%lib/X11/kernel/drm.ko
-%%DRI%%lib/X11/kernel/gamma.ko
-%%DRI%%lib/X11/kernel/mga.ko
-%%DRI%%lib/X11/kernel/tdfx.ko
-%%DRI%%@dirrm lib/X11/kernel
+%%DRI_KMOD%%lib/X11/kernel/drm.ko
+%%DRI_KMOD%%lib/X11/kernel/gamma.ko
+%%DRI_KMOD%%lib/X11/kernel/mga.ko
+%%DRI_KMOD%%lib/X11/kernel/tdfx.ko
+%%DRI_KMOD%%@dirrm lib/X11/kernel
lib/X11/xserver/SecurityPolicy
lib/modules/codeconv/libARABIC.a
lib/modules/codeconv/libARMSCII8.a
@@ -83,6 +85,7 @@ lib/modules/codeconv/libVISCII.a
%%DRI%%lib/modules/dri/gamma_dri.so
%%I386:%%%%DRI%%lib/modules/dri/i810_dri.so
%%DRI%%lib/modules/dri/mga_dri.so
+%%DRI%%lib/modules/dri/radeon_dri.so
%%I386:%%%%DRI%%lib/modules/dri/r128_dri.so
%%I386:%%%%DRI%%lib/modules/dri/sis_dri.so
%%I386:%%lib/modules/drivers/apm_drv.o
diff --git a/x11/XFree86-4-libraries/files/patch-g550 b/x11/XFree86-4-libraries/files/patch-g550
new file mode 100644
index 000000000000..ac6622733ce7
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-g550
@@ -0,0 +1,18 @@
+--- programs/Xserver/hw/xfree86/common/xf86PciInfo.h.orig Fri May 11 16:56:10 2001
++++ programs/Xserver/hw/xfree86/common/xf86PciInfo.h Sat Oct 20 11:28:09 2001
+@@ -358,6 +358,7 @@
+ #define PCI_CHIP_MGAG200_PCI 0x0520
+ #define PCI_CHIP_MGAG200 0x0521
+ #define PCI_CHIP_MGAG400 0x0525
++#define PCI_CHIP_MGAG550 0x2527
+ #define PCI_CHIP_IMPRESSION 0x0D10
+ #define PCI_CHIP_MGAG100_PCI 0x1000
+ #define PCI_CHIP_MGAG100 0x1001
+@@ -964,6 +965,7 @@
+ {PCI_CHIP_MGAG200_PCI, "MGA G200 PCI",0},
+ {PCI_CHIP_MGAG200, "MGA G200 AGP",0},
+ {PCI_CHIP_MGAG400, "MGA G400 AGP",0},
++ {PCI_CHIP_MGAG550, "MGA G550 AGP",0},
+ {PCI_CHIP_MGAG100_PCI, "MGA G100 PCI",0},
+ {PCI_CHIP_MGAG100, "MGA G100 AGP",0},
+ {0x0000, NULL,0}}},
diff --git a/x11/XFree86-4-libraries/files/patch-r128dri b/x11/XFree86-4-libraries/files/patch-r128dri
new file mode 100644
index 000000000000..c09b58c6ad40
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-r128dri
@@ -0,0 +1,18 @@
+--- programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c.orig Sat Oct 6 05:29:25 2001
++++ programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c Fri Oct 5 17:28:40 2001
+@@ -985,12 +985,12 @@
+ /* Check the r128 DRM version */
+ version = drmGetVersion(info->drmFD);
+ if (version) {
+- if (version->version_major != 2 ||
+- version->version_minor < 1) {
++ if (version->version_major != 3 ||
++ version->version_minor < 0) {
+ /* incompatible drm version */
+ xf86DrvMsg(pScreen->myNum, X_ERROR,
+ "[dri] R128DRIScreenInit failed because of a version mismatch.\n"
+- "[dri] r128.o kernel module version is %d.%d.%d but version 2.1.x is needed.\n"
++ "[dri] r128.o kernel module version is %d.%d.%d but version 3.0 or greater is needed.\n"
+ "[dri] Disabling the DRI.\n",
+ version->version_major,
+ version->version_minor,
diff --git a/x11/XFree86-4-libraries/files/patch-r128xmesa b/x11/XFree86-4-libraries/files/patch-r128xmesa
new file mode 100644
index 000000000000..fc33b516da12
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-r128xmesa
@@ -0,0 +1,13 @@
+--- lib/GL/mesa/src/drv/r128/r128_xmesa.c.orig Fri Oct 5 17:21:31 2001
++++ lib/GL/mesa/src/drv/r128/r128_xmesa.c Fri Oct 5 17:22:59 2001
+@@ -80,8 +80,8 @@
+ }
+
+ /* Check that the DRM driver version is compatible */
+- if ( sPriv->drmMajor != 2 ||
+- sPriv->drmMinor < 1 ) {
++ if ( sPriv->drmMajor != 3 /*||
++ sPriv->drmMinor < 1*/ ) {
+ char msg[1000];
+ sprintf( msg, "R128 DRI driver expected DRM driver version 2.1.x but got version %d.%d.%d", sPriv->drmMajor, sPriv->drmMinor, sPriv->drmPatch );
+ __driMesaMessage( msg );
diff --git a/x11/XFree86-4-libraries/files/patch-z44 b/x11/XFree86-4-libraries/files/patch-z44
index 72f7badb2a5f..9b6f755f2e6c 100644
--- a/x11/XFree86-4-libraries/files/patch-z44
+++ b/x11/XFree86-4-libraries/files/patch-z44
@@ -1,16 +1,35 @@
--- lib/GL/GL/Imakefile.orig Tue Apr 3 11:29:31 2001
-+++ lib/GL/GL/Imakefile Thu Jun 7 03:19:35 2001
-@@ -214,7 +214,7 @@
++++ lib/GL/GL/Imakefile Sat Oct 20 10:14:30 2001
+@@ -214,14 +214,17 @@
#undef _LinkBuildLibrary
#define _LinkBuildLibrary(lib) LinkBuildLibrary(lib)
-
-+#if !defined(LibInstall) || LibInstall
#if NormalLibGlx
NormalLibraryTarget($(LIBNAME),$(UOBJS))
++#if !defined(LibInstall) || LibInstall
InstallLibrary($(LIBNAME),$(USRLIBDIR))
-@@ -239,5 +239,5 @@
+ #endif
++#endif
+ #if SharedLibGlx
+ SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(OBJS),$(OBJS) $(THREADOBJS),.,.)
++#if !defined(LibInstall) || LibInstall
+ InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR))
++#endif
+ #if LinkGLToUsrLib && AlternateUsrLibDir
+ install::
+ MakeDir($(DESTDIR)$(SYSTEMUSRLIBDIR))
+@@ -233,11 +236,14 @@
+ #endif
+ #if DebugLibGlx
+ DebuggedLibraryTarget($(LIBNAME),$(DOBJS))
++#if !defined(LibInstall) || LibInstall
+ InstallLibrary($(LIBNAME)_d,$(USRLIBDIR))
+ #endif
++#endif
+ #if ProfileLibGlx
ProfiledLibraryTarget($(LIBNAME),$(POBJS))
++#if !defined(LibInstall) || LibInstall
InstallLibrary($(LIBNAME)_p,$(USRLIBDIR))
#endif
-
generated by cgit (git 2.34.1) at 2024-12-16 11:33:32 +0800