ports

morpheus ports
git clone git://git.2f30.org/ports.git
Log | Files | Refs | LICENSE

commit 9a47a4555925fa8c7672fe0657aad5da612851aa
parent 9f3859fb63618a355cebc5771385aa242899e95c
Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date:   Thu May 22 12:12:03 +0200

add xorgxf86dgaproto, use it for xorg

its required for xf86-video-fbdev

Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>

Diffstat:
xorgprotoall/deps.mk | 1+
xorgserver/xorgserver.mk | 14+++++++-------
xorgxf86dgaproto/depsinc.mk | 7+++++++
xorgxf86dgaproto/mkfile | 6++++++
xorgxf86dgaproto/v.mk | 1+
xorgxf86dgaproto/xorgxf86dgaproto.mk | 10++++++++++
6 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/xorgprotoall/deps.mk b/xorgprotoall/deps.mk @@ -18,5 +18,6 @@ DEPS = \ xorgxcmiscproto \ xorgxextproto \ xorgxf86bigfontproto \ + xorgxf86dgaproto \ xorgxineramaproto \ xorgxproto diff --git a/xorgserver/xorgserver.mk b/xorgserver/xorgserver.mk @@ -1,11 +1,7 @@ # openssl is used for --with-sha1=libcrypto TARG = xorgserver DEPS = xorglibpixman xorglibx11 openssl xorglibpciaccess \ - xorgxproto xorginputproto xorgxextproto xorgxineramaproto \ - xorgresourceproto xorgscrnsaverproto xorgkbproto xorgvideoproto \ - xorgfontsproto xorgrenderproto xorgdamageproto xorgfixesproto \ - xorgcompositeproto xorgbigreqsproto xorgxcmiscproto \ - xorgrecordproto xorglibxau xorgrandrproto xorglibxkbfile \ + xorgprotoall xorglibxau xorglibxkbfile \ xorgxtrans xorglibxfont freetype xorglibfontenc libpng zlib <$mkbuild/mk.common-noinst @@ -32,10 +28,13 @@ xorgserver:QV: export XSERVERCFLAGS_LIBS="${LDFLAGS}" export XSERVERLIBS_CFLAGS="${CFLAGS}" export XSERVERLIBS_LIBS="${LDFLAGS}" - # TODO: delete $ROOT/lib $ROOT/include for packaging only. + export XORG_MODULES_CFLAGS="${CFLAGS}" + export XORG_MODULES_LIBS="${LDFLAGS}" + export DGA_CFLAGS="-I${xorgxf86dgaproto_includedir}" + export DGA_LIBS="-L${xorgxf86dgaproto_libdir}" # TODO: make able to run server rootless or setuid binary? export CC="$CC -static" - # + # NOTE: xorgvideofbdev requires --enable-dga. ./configure \ --prefix="$prefix" \ --mandir="$ROOT/$prefix/share/man" \ @@ -51,6 +50,7 @@ xorgserver:QV: --disable-config-hal \ --disable-shared \ --enable-static \ + --enable-dga \ --enable-xfbdev \ --enable-kdrive \ --enable-kdrive-kbd \ diff --git a/xorgxf86dgaproto/depsinc.mk b/xorgxf86dgaproto/depsinc.mk @@ -0,0 +1,7 @@ +<$xorgxf86dgaproto_DEPDIR/v.mk + +xorgxf86dgaproto_libdir = ${xorgxf86dgaproto_DEPDIR}/xf86dgaproto-$v/lib/lib +xorgxf86dgaproto_includedir = ${xorgxf86dgaproto_DEPDIR}/xf86dgaproto-$v/lib/include + +DEPS_CFLAGS = $DEPS_CFLAGS -I${xorgxf86dgaproto_includedir} +DEPS_LDFLAGS = $DEPS_LDFLAGS diff --git a/xorgxf86dgaproto/mkfile b/xorgxf86dgaproto/mkfile @@ -0,0 +1,6 @@ +<$mkbuild/mk.3rdparty + +<v.mk +src = xf86dgaproto-$v +url = http://xorg.freedesktop.org/releases/individual/proto/xf86dgaproto-$v.tar.bz2 +mkfile = ../xorgxf86dgaproto.mk diff --git a/xorgxf86dgaproto/v.mk b/xorgxf86dgaproto/v.mk @@ -0,0 +1 @@ +v = 2.1 diff --git a/xorgxf86dgaproto/xorgxf86dgaproto.mk b/xorgxf86dgaproto/xorgxf86dgaproto.mk @@ -0,0 +1,10 @@ +TARG = xorgxf86dgaproto + +<$mkbuild/mk.common-noinst + +xorgxf86dgaproto:QV: + ./configure \ + --prefix="$prefix" \ + --mandir="$ROOT/share/man" + make -j$nprocs + make install DESTDIR="`pwd`/lib"