diff options
Diffstat (limited to 'x11/modular-xorg-server')
| -rw-r--r-- | x11/modular-xorg-server/Makefile | 52 |
1 files changed, 29 insertions, 23 deletions
diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile index a926ef97001..aa778dc9e9f 100644 --- a/x11/modular-xorg-server/Makefile +++ b/x11/modular-xorg-server/Makefile @@ -1,15 +1,16 @@ -# $NetBSD: Makefile,v 1.20 2007/10/29 16:04:53 shannonjr Exp $ +# $NetBSD: Makefile,v 1.21 2007/10/30 10:56:43 shannonjr Exp $ DISTNAME= xorg-server-1.3.0.0 PKGNAME= modular-${DISTNAME} -CATEGORIES= local +PKGREVISION= 3 +CATEGORIES= x11 MASTER_SITES= http://xorg.freedesktop.org/releases/individual/xserver/ EXTRACT_SUFX= .tar.bz2 SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS} PKG_DESTDIR_SUPPORT= user-destdir -MAINTAINER= shannonjr@NetBSD.org +MAINTAINER= joerg@NetBSD.org COMMENT= Xorg X11 Server from modular X.org X11 USE_LIBTOOL= YES @@ -18,23 +19,34 @@ PKGCONFIG_OVERRIDE+= xorg-server.pc.in USE_TOOLS+= pkg-config USE_TOOLS+= gmake CONFIGURE_ARGS+= --localstatedir=${VARBASE} +CONFIGURE_ARGS+= --enable-dri -PKG_SUPPORTED_OPTIONS= xglx +PKG_SUPPORTED_OPTIONS= dri PKG_OPTIONS_VAR= PKG_OPTIONS.xorg-server PKG_OPTIONS_LEGACY_OPTS=glx:dri .include "../../mk/bsd.options.mk" -.if !empty(PKG_OPTIONS:Mxglx) +.if !empty(PKG_OPTIONS:Mdri) +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} +DISTFILES+= MesaLib-6.5.2.tar.bz2 +SITES.MesaLib-6.5.2.tar.bz2= ${MASTER_SITE_SOURCEFORGE:=mesa3d/} +MESA_SRC= ${WRKDIR}/Mesa-6.5.2 +CONFIGURE_ARGS+= --enable-glx +CONFIGURE_ARGS+= --with-mesa-source=${MESA_SRC} +.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64" || \ + ${MACHINE_ARCH} == "alpha" +GLX_DEFINES+= -D__GLX_ALIGN64 +.endif CONFIGURE_ENV+= GLX_DEFINES=${GLX_DEFINES:M*:Q} +# glcore.h and dri_interface.h shipped with *proto are older than +# those in Mesa-6.5.2. Either patch them or trick the build into using +# the newer ones. +#BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.8nb1 +#BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.0.3nb1 PLIST_SUBST+= USE_DRI="" -CONFIGURE_ARGS+= --enable-xglx -CONFIGURE_ARGS+= --enable-xgl -CONFIGURE_ARGS+= --enable-xkb -CONFIGURE_ARGS+= --disable-dri -CONFIGURE_ARGS+= --disable-kdriveserver -CONFIGURE_ARGS+= --enable-dlopen -AUTOCONF_REQD= 2.61 -USE_TOOLS+= autoconf +.else +CONFIGURE_ARGS+= --disable-glx +PLIST_SUBST+= USE_DRI="@comment " .endif CONFIGURE_ENV+= APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5 @@ -49,25 +61,19 @@ BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=4.0 BUILDLINK_API_DEPENDS.kbproto+= kbproto>=1.0.3 BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.2.1 - post-extract: ${CP} ${FILESDIR}/modeline2c.awk ${WRKSRC}/hw/xfree86/common .if !empty(PKG_OPTIONS:Mdri) ${LN} -s ${MESA_SRC:Q}/include/GL ${WRKSRC:Q}/GL/glx/GL .endif -.if !empty(PKG_OPTIONS:Mxglx) -pre-configure: - cd ${WRKSRC} && autoconf - -.include "../../graphics/glitz/buildlink3.mk" -.include "../../graphics/cairo/buildlink3.mk" -.include "../../graphics/MesaLib/buildlink3.mk" -.endif .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../fonts/libfontenc/buildlink3.mk" -.include "../../mk/dlopen.buildlink3.mk" +.if empty(PKG_OPTIONS:Mdri) +# for GLX we already have the Mesa source +.include "../../graphics/MesaLib/buildlink3.mk" +.endif .include "../../x11/bigreqsproto/buildlink3.mk" .include "../../x11/compositeproto/buildlink3.mk" .include "../../x11/damageproto/buildlink3.mk" |