ports

commit c513c89d7b4c493aa64f962ec2321514204fe3aa
parent 7d3cdd9c7e4da2ab7137b27054841ec42f9a9a1c
Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date:   Sun, 27 Apr 2014 16:57:01 +0200

add tinyxserver

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

Diffstat:
A
tinyxserver/Makefile
 | 
75
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
tinyxserver/mkfile
 | 
6
++++++
A
tinyxserver/tinyxserver.mk
 | 
27
+++++++++++++++++++++++++++
A
tinyxserver/v.mk
 | 
1
+

4 files changed, 109 insertions(+), 0 deletions(-)
diff --git a/tinyxserver/Makefile b/tinyxserver/Makefile
@@ -0,0 +1,75 @@
+
+include standard_definitions.mk
+
+DEFS= -DNOERROR
+
+CFLAGS= -I.. -I../.. -I../../.. -I./include -I./common -I./render -I./Xext -I./lbx -I./fb -I./mi -I./miext/shadow -I./hw/kdrive -I./miext/layer -I./os $(COMMONDEFS) $(DEFS)
+
+OBJS=
+all:
+	cd render; make
+	cd dix; make
+	cd os; make
+	cd mi; make
+	cd Xext; make
+	cd Xext/extmod; make
+	cd XTrap; make
+	cd hw/kdrive; make
+	cd hw/kdrive/linux; make
+	cd fb; make
+	#cd hw/kdrive/vesa; make
+	cd miext/shadow; make
+	cd miext/layer; make
+	cd randr; make
+	cd hw/kdrive/fbdev; make
+	cd record; make
+	cd init; make
+	cd fonts; make
+	echo MARKER
+	echo ====
+	#$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(DEFS) $(LDFLAGS) -o Xvesa dix/libdix.a os/libos.a hw/kdrive/vesa/libvesa.a miext/layer/liblayer.a hw/kdrive/libkdrive.a hw/kdrive/linux/liblinux.a miext/shadow/libshadow.a fb/libfb.a mi/libmi.a Xext/libext.a Xext/extmod/libextmod.a XTrap/libxtrap.a randr/librandr.a render/librender.a record/librecord.a $(LINKDIR) -lXfont -lXinerama -lX11 -lXdmcp -lz -lm
+	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(DEFS) $(LDFLAGS) -o Xfbdev dix/libdix.a os/libos.a hw/kdrive/fbdev/libfbdev.a miext/layer/liblayer.a hw/kdrive/libkdrive.a hw/kdrive/linux/liblinux.a miext/shadow/libshadow.a fb/libfb.a mi/libmi.a Xext/libext.a Xext/extmod/libextmod.a XTrap/libxtrap.a randr/librandr.a render/librender.a record/librecord.a $(LINKDIR) -lXfont -lXinerama -lX11 -lXdmcp -lz -lm
+	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(DEFS) $(LDFLAGS) -o xinit init/xinit.o -lX11
+
+clean:
+	cd render; make clean
+	cd dix; make clean
+	cd os; make clean
+	cd mi; make clean
+	cd Xext; make clean
+	cd Xext/extmod; make clean
+	cd XTrap; make clean
+	cd hw/kdrive; make clean
+	cd hw/kdrive/linux; make clean
+	cd fb; make clean; cd ..
+	#cd hw/kdrive/vesa; make clean
+	cd miext/shadow; make clean
+	cd miext/layer; make clean
+	cd randr; make clean
+	cd hw/kdrive/fbdev; make clean
+	cd record; make clean
+	cd init; make clean
+	cd fonts; make clean
+	#rm -f Xvesa
+	rm -f Xfbdev
+	rm -f xinit
+install:
+	install -D -m 755 Xfbdev $(DESTDIR)/$(BINDIR)/Xfbdev
+	install -m 755 xinit $(DESTDIR)/$(BINDIR)/xinit
+	ln -s Xfbdev $(DESTDIR)/$(BINDIR)/X
+	cd fonts; for i in *.pcf fonts.alias; do install -D -m 644 $$i $(DESTDIR)/$(FONTDIR)/misc/$$i; done; cd ..
+	install -D -m 644 init/xinit.1 $(DESTDIR)/$(MANDIR)/man1/xinit.1
+	install -D -m 644 README $(DESTDIR)/$(DOCDIR)/tinyxserver/README
+	install -m 644 changelog $(DESTDIR)/$(DOCDIR)/tinyxserver/changelog
+	install -D -m 644 init/README.upstream $(DESTDIR)/$(DOCDIR)/xinit/README
+	install -m 644 init/ChangeLog $(DESTDIR)/$(DOCDIR)/xinit/ChangeLog
+	install -m 644 init/AUTHORS $(DESTDIR)/$(DOCDIR)/xinit/AUTHORS
+	install -m 644 init/COPYING $(DESTDIR)/$(DOCDIR)/xinit/COPYING
+	install -D -m 644 fonts/AUTHORS.misc $(DESTDIR)/$(DOCDIR)/font-misc-misc/AUTHORS
+	install -m 644 fonts/COPYING.misc $(DESTDIR)/$(DOCDIR)/font-misc-misc/COPYING
+	install -D -m 644 fonts/COPYING.cursor $(DESTDIR)/$(DOCDIR)/font-cursor-misc/COPYING
+	install -D -m 644 fonts/COPYING.alias $(DESTDIR)/$(DOCDIR)/font-alias/COPYING
+
+tarball:	clean
+	./make-tarball.sh
+
diff --git a/tinyxserver/mkfile b/tinyxserver/mkfile
@@ -0,0 +1,6 @@
+<$mkbuild/mk.3rdparty
+
+<v.mk
+src = tinyxserver
+url = http://dl.2f30.org/morpheus-pkgs/$arch/0.0/tinyxserver.tar.gz
+mkfile = ../tinyxserver.mk
diff --git a/tinyxserver/tinyxserver.mk b/tinyxserver/tinyxserver.mk
@@ -0,0 +1,27 @@
+TARG = tinyxserver
+DEPS = zlib tinyxlib
+
+<$mkbuild/mk.common-noinst
+
+tinyxserver:QV:
+	return
+	case "$arch" in
+	x86_64)
+		EXTRA_CFLAGS="-D_XSERVER64=1 $CFLAGS"
+		;;
+	i486)
+		EXTRA_CFLAGS="$CFLAGS"
+		;;
+	esac
+	EXTRA_CFLAGS="$EXTRA_CFLAGS $DEPS_CFLAGS $DEPS_LDFLAGS"
+	# fix typo in Makefile to use proper CFLAGS.
+	cp ../Makefile Makefile
+	make clean
+	make -j$nprocs CC="$CC" EXTRA_CFLAGS="$EXTRA_CFLAGS" \
+		FONTDIR="$prefix/share/fonts"
+
+install:QV:
+	make DESTDIR="$ROOT" BINDIR="/bin" install
+	cd "$ROOT/$prefix/share/fonts/misc"
+	mkfontscale
+	mkfontdir
diff --git a/tinyxserver/v.mk b/tinyxserver/v.mk
@@ -0,0 +1 @@
+v = 0.0