diff options
author | lesi <lesi@FreeBSD.org> | 2004-08-31 08:18:27 +0800 |
---|---|---|
committer | lesi <lesi@FreeBSD.org> | 2004-08-31 08:18:27 +0800 |
commit | 097a029b1c8f79bec8f00be8a1355772ccfeb05a (patch) | |
tree | 5641f095ba586374dbaee36afe4076a0bc28cec6 /x11-servers/xorg-server | |
parent | d4a1a48613ff6c3f5377e8a93261d51c13095fdf (diff) | |
download | freebsd-ports-gnome-097a029b1c8f79bec8f00be8a1355772ccfeb05a.tar.gz freebsd-ports-gnome-097a029b1c8f79bec8f00be8a1355772ccfeb05a.tar.zst freebsd-ports-gnome-097a029b1c8f79bec8f00be8a1355772ccfeb05a.zip |
Fix missing symbol with SiS driver [1].
Fix package list (partly [2]).
PR: ports/69790 [1], ports/70376 [2]
Submitted by: Andreas Kohn (andreas AT syndrom23.de) [1]
John R. Makosky (jrm-spam1 AT crackpot.org) [2]
Approved by: anholt (mentor)
Diffstat (limited to 'x11-servers/xorg-server')
-rw-r--r-- | x11-servers/xorg-server/Makefile | 62 | ||||
-rw-r--r-- | x11-servers/xorg-server/Makefile.inc | 1 | ||||
-rw-r--r-- | x11-servers/xorg-server/files/patch-xf86drmCompat.c | 28 | ||||
-rw-r--r-- | x11-servers/xorg-server/files/patch-xorg.cf | 22 | ||||
-rw-r--r-- | x11-servers/xorg-server/pkg-plist | 86 |
5 files changed, 149 insertions, 50 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 8e16cc2cc6b9..8f51bca26fc6 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= server PORTVERSION= 6.7.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-servers MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ PKGNAMEPREFIX= xorg- @@ -40,20 +40,30 @@ MAN1= Xorg.1 \ xorgcfg.1 \ xorgconfig.1 MAN4= citron.4 \ + dmc.4 \ dynapro.4 \ elographics.4 \ fbdevhw.4 \ + fpit.4 \ + glint.4 \ + js_x.4 \ kbd.4 \ keyboard.4 \ + mga.4 \ microtouch.4 \ mouse.4 \ mutouch.4 \ - nv.4 \ + palmax.4 \ + penmount.4 \ r128.4 \ radeon.4 \ + tdfx.4 \ + tek4957.4 \ + vga.4 \ void.4 \ wacom.4 -MAN5= xorg.conf.5 +MAN5= getconfig.5 \ + xorg.conf.5 XBUILD_DIRS= lib/font programs/Xserver XINCLUDE_DIRS= lib/xtrans @@ -67,6 +77,13 @@ NOT_FOR_ARCHS= ia64 IGNORE= is part of X.Org. For switching to X.Org, read UPDATING entry 20040723 .endif +.if ${ARCH} == alpha +PLIST_SUB+= ALPHA_NA="@comment " +.else +PLIST_SUB+= ALPHA_NA="" +MAN4+= vesa.4 +.endif + .if ${ARCH} == ia64 PLIST_SUB+= IA64_NA="@comment " .else @@ -76,39 +93,48 @@ PLIST_SUB+= IA64_NA="" .if ${ARCH} == sparc64 PLIST_SUB+= SPARC64="" PLIST_SUB+= SPARC64_NA="@comment " -MAN4+= sunffb.4 +MAN4+= sunbw2.4 \ + suncg14.4 \ + suncg3.4 \ + suncg6.4 \ + sunffb.4 \ + sunleo.4 \ + suntcx.4 .else PLIST_SUB+= SPARC64="@comment " PLIST_SUB+= SPARC64_NA="" -MAN4+= glint.4 \ - mga.4 \ +MAN4+= cirrus.4 \ + nv.4 \ rendition.4 \ s3virge.4 \ savage.4 \ - siliconmotion.4 \ - sis.4 \ - tdfx.4 \ - vga.4 + siliconmotion.4 .endif .if ${ARCH} == i386 PLIST_SUB+= I386="" MAN1+= scanpci.1 +MAN4+= i740.4 \ + i810.4 \ + nsc.4 \ + via.4 \ + vmware.4 +.else +PLIST_SUB+= I386="@comment " +.endif + +.if ${ARCH} == amd64 || ${ARCH} == i386 +PLIST_SUB+= AMD64_I386="" MAN4+= apm.4 \ chips.4 \ - cirrus.4 \ cyrix.4 \ i128.4 \ - i740.4 \ - i810.4 \ neomagic.4 \ - nsc.4 \ + sis.4 \ trident.4 \ - tseng.4 \ - vesa.4 \ - vmware.4 + tseng.4 .else -PLIST_SUB+= I386="@comment " +PLIST_SUB+= AMD64_I386="@comment " .endif .if !defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO diff --git a/x11-servers/xorg-server/Makefile.inc b/x11-servers/xorg-server/Makefile.inc index 0ec983afc858..0700d273c508 100644 --- a/x11-servers/xorg-server/Makefile.inc +++ b/x11-servers/xorg-server/Makefile.inc @@ -48,6 +48,7 @@ SERVER_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Imakefil ${PORTSDIR}/x11-servers/xorg-server/files/patch-os-Imakefile \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-savage-pci-id \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86sym.c \ + ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86drmCompat.c \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-xkbout.c .if !target(do-configure) diff --git a/x11-servers/xorg-server/files/patch-xf86drmCompat.c b/x11-servers/xorg-server/files/patch-xf86drmCompat.c new file mode 100644 index 000000000000..98d4c84a0a03 --- /dev/null +++ b/x11-servers/xorg-server/files/patch-xf86drmCompat.c @@ -0,0 +1,28 @@ +--- programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c.orig Sun Aug 22 17:35:50 2004 ++++ programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c Sun Aug 22 17:36:11 2004 +@@ -77,8 +77,8 @@ + #include "mga_drm.h" + #include "r128_drm.h" + #include "radeon_drm.h" +-#ifndef __FreeBSD__ + #include "sis_drm.h" ++#ifndef __FreeBSD__ + #include "i810_drm.h" + #include "i830_drm.h" + #endif +@@ -1012,7 +1012,6 @@ + } + } + +-#ifndef __FreeBSD__ + /* SiS */ + + Bool drmSiSAgpInit(int driSubFD, int offset, int size) +@@ -1026,6 +1025,7 @@ + return 1; /* TRUE */ + } + ++#ifndef __FreeBSD__ + /* I830 */ + + Bool drmI830CleanupDma(int driSubFD) diff --git a/x11-servers/xorg-server/files/patch-xorg.cf b/x11-servers/xorg-server/files/patch-xorg.cf index b1c5d758c83c..b3f55760761f 100644 --- a/x11-servers/xorg-server/files/patch-xorg.cf +++ b/x11-servers/xorg-server/files/patch-xorg.cf @@ -1,5 +1,5 @@ ---- config/cf/xorg.cf.orig Sun May 9 21:05:27 2004 -+++ config/cf/xorg.cf Sun May 9 21:05:28 2004 +--- config/cf/xorg.cf.orig Wed Aug 25 04:46:40 2004 ++++ config/cf/xorg.cf Wed Aug 25 04:53:17 2004 @@ -388,7 +388,7 @@ GlideDriver i128 NscDriver \ ati i810 AgpGartDrivers DevelDrivers ark \ @@ -9,3 +9,21 @@ dummy XF86OSCardDrivers XF86ExtraCardDrivers # endif +@@ -485,7 +485,7 @@ + # define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \ + neomagic tdfx savage cirrus tseng trident \ + chips apm i128 ati ark cyrix siliconmotion \ +- vga dummy fbdev vesa ++ vga dummy vesa + # endif + + /* DRI tdfx driver needs Glide, which is not available for AMD64 */ +@@ -589,7 +589,7 @@ + /* Pure SBUS and PCI drivers should go first */ + # ifndef XF86CardDrivers + # define XF86CardDrivers sunffb sunleo suncg6 suncg3 suncg14 suntcx \ +- sunbw2 glint mga tdfx ati vesa vga fbdev \ ++ sunbw2 glint mga tdfx ati vesa vga \ + XF86OSCardDrivers XF86ExtraCardDrivers \ + DevelDrivers + # endif diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist index 5833bf56bdb5..56a3728fbaa8 100644 --- a/x11-servers/xorg-server/pkg-plist +++ b/x11-servers/xorg-server/pkg-plist @@ -17,9 +17,28 @@ bin/pcitweak %%I386%%bin/scanpci bin/xorgcfg bin/xorgconfig +include/X11/bitmaps/card.xbm +include/X11/bitmaps/down.xbm +include/X11/bitmaps/keyboard.xbm +include/X11/bitmaps/left.xbm +include/X11/bitmaps/monitor.xbm +include/X11/bitmaps/mouse.xbm +include/X11/bitmaps/narrower.xbm +include/X11/bitmaps/right.xbm +include/X11/bitmaps/shorter.xbm +include/X11/bitmaps/taller.xbm +include/X11/bitmaps/up.xbm +include/X11/bitmaps/wider.xbm +include/X11/pixmaps/card.xpm +include/X11/pixmaps/computer.xpm +include/X11/pixmaps/keyboard.xpm +include/X11/pixmaps/monitor.xpm +include/X11/pixmaps/mouse.xpm +lib/X11/Cards lib/X11/Options lib/X11/XF86Config.98 lib/X11/XF86Config.eg +lib/X11/app-defaults/XOrgCfg lib/X11/doc/BUILD lib/X11/doc/BugReport lib/X11/doc/DESIGN @@ -27,24 +46,24 @@ lib/X11/doc/Install lib/X11/doc/LICENSE lib/X11/doc/README lib/X11/doc/README.DECtga -%%I386%%lib/X11/doc/README.I128 -%%I386%%lib/X11/doc/README.SiS +lib/X11/doc/README.I128 +lib/X11/doc/README.SiS lib/X11/doc/README.XKB-Config lib/X11/doc/README.XKB-Enhancing -%%I386%%lib/X11/doc/README.apm +lib/X11/doc/README.apm lib/X11/doc/README.ati -%%I386%%lib/X11/doc/README.chips -%%I386%%lib/X11/doc/README.cyrix +lib/X11/doc/README.chips +lib/X11/doc/README.cyrix lib/X11/doc/README.dps lib/X11/doc/README.fonts -%%I386%%lib/X11/doc/README.i740 -%%I386%%lib/X11/doc/README.i810 +lib/X11/doc/README.i740 +lib/X11/doc/README.i810 lib/X11/doc/README.mouse -%%I386%%lib/X11/doc/README.newport +lib/X11/doc/README.newport lib/X11/doc/README.r128 lib/X11/doc/README.rapidaccess -%%SPARC64_NA%%%%IA64_NA%%lib/X11/doc/README.rendition -%%SPARC64_NA%%%%IA64_NA%%lib/X11/doc/README.s3virge +lib/X11/doc/README.rendition +lib/X11/doc/README.s3virge lib/X11/doc/RELNOTES lib/X11/doc/Versions lib/X11/doc/VideoBoard98 @@ -85,40 +104,46 @@ lib/modules/codeconv/libKSCJOHAB.a lib/modules/codeconv/libMULEENCODING.a lib/modules/codeconv/libTCVN.a lib/modules/codeconv/libVISCII.a -%%I386%%lib/modules/drivers/apm_drv.o -%%I386%%lib/modules/drivers/ark_drv.o +%%AMD64_I386%%lib/modules/drivers/apm_drv.o +%%AMD64_I386%%lib/modules/drivers/ark_drv.o lib/modules/drivers/ati_drv.o lib/modules/drivers/atimisc_drv.o -%%I386%%lib/modules/drivers/chips_drv.o -%%I386%%lib/modules/drivers/cirrus_alpine.o -%%I386%%lib/modules/drivers/cirrus_drv.o -%%I386%%lib/modules/drivers/cirrus_laguna.o -%%I386%%lib/modules/drivers/cyrix_drv.o -lib/modules/drivers/dummy_drv.o -%%SPARC64_NA%%lib/modules/drivers/glint_drv.o -%%I386%%lib/modules/drivers/i128_drv.o +%%AMD64_I386%%lib/modules/drivers/chips_drv.o +%%SPARC64_NA%%lib/modules/drivers/cirrus_alpine.o +%%SPARC64_NA%%lib/modules/drivers/cirrus_drv.o +%%SPARC64_NA%%lib/modules/drivers/cirrus_laguna.o +%%AMD64_I386%%lib/modules/drivers/cyrix_drv.o +%%AMD64_I386%%lib/modules/drivers/dummy_drv.o +lib/modules/drivers/glint_drv.o +%%AMD64_I386%%lib/modules/drivers/i128_drv.o %%I386%%lib/modules/drivers/i740_drv.o %%I386%%lib/modules/drivers/i810_drv.o -%%SPARC64_NA%%lib/modules/drivers/mga_drv.o -%%I386%%lib/modules/drivers/neomagic_drv.o +lib/modules/drivers/mga_drv.o +%%AMD64_I386%%lib/modules/drivers/neomagic_drv.o %%I386%%lib/modules/drivers/nsc_drv.o -lib/modules/drivers/nv_drv.o +%%SPARC64_NA%%lib/modules/drivers/nv_drv.o lib/modules/drivers/r128_drv.o lib/modules/drivers/radeon_drv.o %%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/rendition_drv.o -lib/modules/drivers/riva128.o +%%SPARC64_NA%%lib/modules/drivers/riva128.o %%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3_drv.o %%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3virge_drv.o %%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/savage_drv.o %%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/siliconmotion_drv.o -%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/sis_drv.o +%%AMD64_I386%%lib/modules/drivers/sis_drv.o +%%SPARC64%%lib/modules/drivers/sunbw2_drv.o +%%SPARC64%%lib/modules/drivers/suncg14_drv.o +%%SPARC64%%lib/modules/drivers/suncg3_drv.o +%%SPARC64%%lib/modules/drivers/suncg6_drv.o %%SPARC64%%lib/modules/drivers/sunffb_drv.o -%%SPARC64_NA%%lib/modules/drivers/tdfx_drv.o +%%SPARC64%%lib/modules/drivers/sunleo_drv.o +%%SPARC64%%lib/modules/drivers/suntcx_drv.o +lib/modules/drivers/tdfx_drv.o %%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/tga_drv.o -%%I386%%lib/modules/drivers/trident_drv.o -%%I386%%lib/modules/drivers/tseng_drv.o -%%I386%%lib/modules/drivers/vesa_drv.o -%%SPARC64_NA%%lib/modules/drivers/vga_drv.o +%%AMD64_I386%%lib/modules/drivers/trident_drv.o +%%AMD64_I386%%lib/modules/drivers/tseng_drv.o +%%ALPHA_NA%%lib/modules/drivers/vesa_drv.o +lib/modules/drivers/vga_drv.o %%I386%%lib/modules/drivers/via_drv.o %%I386%%lib/modules/drivers/vmware_drv.o lib/modules/extensions/libGLcore.a @@ -181,5 +206,6 @@ lib/modules/libxf24_32bpp.a lib/modules/libxf4bpp.a lib/modules/libxf8_16bpp.a lib/modules/libxf8_32bpp.a +%%SPARC64%%lib/modules/libxf8_32wid.a %%SPARC64_NA%%lib/modules/v10002d.uc %%SPARC64_NA%%lib/modules/v20002d.uc |