commit 57acd88

tinyx: fixes

1@@ -0,0 +1 @@
2+feab72ca891bc04b18763763e15ee4e532369cdf

1@@ -0,0 +1,7 @@
2+.hell
3+.u-config
4+/libXfont
5+/libXtst
6+/libXdmcp
7+/freetype-harfbuzz
8+.curl

 1@@ -0,0 +1,52 @@
 2+#things we need to set to get tinyx to build
 3+
 4+VAR_DBE_DIR=dbe
 5+VAR_DIX_CFLAGS=-DHAVE_DIX_CONFIG_H
 6+VAR_LINUX_SUBDIRS=
 7+VAR_FBDEV_SUBDIRS=
 8+VAR_VESA_SUBDIRS=
 9+
10+EXTRA_CPPFLAGS=-Iinclude -Imiext/shadow -Ikdrive/src -Irender -Irandr -Imi -Imiext/damage -Ixfixes -IXext -Ifb -DINITARGS=void
11+EXTRA_LDFLAGS=-Wl,--start-group -lXfont -lfontenc -lfreetype -lharfbuzz -lpng16 -lz -lbz2 -lXtst -lXi -lXext -lX11 -lxcb -lXau -lexpat -lm -Wl,--end-group -pthread
12+DEF_PACKAGE_STRING="tinyx 1.3"
13+UNDEF_CSRG_BASED=1
14+DEF_OSNAME="Linux 6.15"
15+UNDEF_HAS_GETPEERUCRED=1
16+
17+
18+UNDEF_XDMCP=1
19+UNDEF_XDMAUTH=1
20+UNDEF_SCREENSAVER=1
21+UNDEF_DPMSExtension=1
22+UNDEF_XF86BIGFONT=1
23+UNDEF_RES=1
24+
25+COND_SCREENSAVER=0
26+COND_DPMS_Extension=0
27+COND_XF86BIGFONT=0
28+COND_RES=0
29+
30+CHECK_PKG=
31+EXTRA_PKG=
32+
33+COND_KDRIVE=1
34+COND_KDRIVELINUX=1
35+COND_KDRIVEFBDEV=1
36+COND_DBE=0
37+COND_RES=0
38+COND_SCREENSAVER=0
39+COND_XF86BIGFONT=0
40+COND_DPMSExtension=0
41+COND_XDMCP=0
42+COND_XDMAUTH=0
43+COND_NEED_STRLCAT=0
44+COND_KDRIVEVESA=0
45+COND_INSTALL_SETUID=0
46+VENDOR_STRING=
47+VENDOR_RELEASE=
48+SYS_LIBS=
49+PERMISSIVE=1
50+XSERVERCFLAGS_CFLAGS=
51+XSERVERLIBS_LIBS=
52+VAR_XSERVERCFLAGS_CFLAGS=
53+VAR_XSERVERLIBS_LIBS=

1@@ -0,0 +1,6 @@
2+name: tinyx
3+description: like x11, but smaller (and better)
4+license: GPLv3
5+upstream: https://github.com/tinycorelinux/tinyx
6+version: git
7+maintainer: lain@dalem.foo

 1@@ -0,0 +1,63 @@
 2+#!/bin/sh -ue
 3+NAME=tinyx
 4+VERSION=git
 5+RELEASE=1
 6+SOURCE="https://github.com/tinycorelinux/tinyx.git"
 7+
 8+build() {
 9+	_dest="${DESTDIR:-$PKG}"
10+	msg "copying satanfile..."
11+	cp "$PORTDIR/files/satanfile" ".satan" || die "failed to copy satanfile"
12+
13+	msg "generating with demiurge..."
14+	demiurge || die "demiurge failed"
15+
16+	msg "checking .demiurge libs..."
17+	grep -Ei '^(SYS_LIBS|XSERVER_LIBS|XDMCP)=' .demiurge || true
18+
19+	msg "patching .demiurge..."
20+	sed -i 's/^SYS_LIBS=.*/SYS_LIBS=/' .demiurge || die "sed SYS_LIBS failed"
21+	sed -i 's/^XSERVER_LIBS=.*/XSERVER_LIBS=/' .demiurge || die "sed XSERVER_LIBS failed"
22+	sed -i 's/^DEF_XDMCP=.*/DEF_XDMCP=/' .demiurge || die "sed DEF_XDMCP failed"
23+	sed -i 's/xdmcp//g' .demiurge || die "sed xdmcp failed"
24+	sed -i 's/Xdmcp//g' .demiurge || die "sed xdmcp failed"
25+
26+	msg "generating with satan..."
27+	satan gen PREFIX="$PREFIX" DESTDIR="${DESTDIR:-$PKG}" || die "satan gen failed"
28+
29+	msg "building tinyx..."
30+	samu || die "samu build failed"
31+
32+	msg "installing tinyx..."
33+	mkdir -p "$_dest/$PREFIX/bin"
34+	cp kdrive/fbdev/Xfbdev "$_dest/$PREFIX/bin/Xfbdev" || die "failed to install Xfbdev"
35+
36+	msg "fetching fonts..."
37+	_font_url="https://github.com/kyx0r/repo-main/releases/download/tinyxfont_1.0/tinyxfont.tar.gz"
38+	_font_file="$DISTDIR/tinyxfont.tar.gz"
39+	if [ ! -f "$_font_file" ]; then
40+		_download_file "$_font_file" "$_font_url" 0 || die "failed to fetch fonts"
41+	fi
42+
43+	msg "extracting fonts..."
44+	_tmpfont="/tmp/tinyx-fonts-$$"
45+	mkdir -p "$_tmpfont"
46+	tar -xzf "$_font_file" -C "$_tmpfont" || die "font extraction failed"
47+
48+	msg "installing fonts..."
49+	mkdir -p "$_dest/$PREFIX/share/fonts/misc"
50+	cp "$_tmpfont/misc/"*.pcf.gz "$_tmpfont/misc/fonts.alias" "$_tmpfont/misc/fonts.dir" "$_dest/$PREFIX/share/fonts/misc/" || die "font install failed"
51+	rm -rf "$_tmpfont"
52+
53+	msg "creating xfbdev wrapper..."
54+	mv "$_dest/$PREFIX/bin/Xfbdev" "$_dest/$PREFIX/bin/Xfbdev-exec" || die "failed to move Xfbdev"
55+
56+	cat > "$_dest/$PREFIX/bin/Xfbdev" << EOF
57+#!/bin/sh
58+exec Xfbdev-exec -fp $PREFIX/share/fonts/misc "\$@"
59+EOF
60+	chmod +x "$_dest/$PREFIX/bin/Xfbdev" || die "failed to chmod Xfbdev"
61+	chmod u+s "$_dest/$PREFIX/bin/Xfbdev-exec" || die "failed to chmod u+s Xfbdev-exec"
62+}
63+
64+. ${0%/*}/../../libsh/libdmake.sh

 1@@ -0,0 +1,62 @@
 2+#!/bin/sh -ue
 3+NAME=tinyx
 4+VERSION=git
 5+RELEASE=1
 6+SOURCE="https://github.com/tinycorelinux/tinyx.git"
 7+
 8+build() {
 9+	_dest="${DESTDIR:-$PKG}"
10+	msg "copying satanfile..."
11+	cp "$PORTDIR/files/satanfile" ".satan" || die "failed to copy satanfile"
12+
13+	msg "generating with demiurge..."
14+	demiurge || die "demiurge failed"
15+
16+	msg "checking .demiurge libs..."
17+	grep -Ei '^(SYS_LIBS|XSERVER_LIBS|XDMCP)=' .demiurge || true
18+
19+	msg "patching .demiurge..."
20+	sed -i 's/^SYS_LIBS=.*/SYS_LIBS=/' .demiurge || die "sed SYS_LIBS failed"
21+	sed -i 's/^XSERVER_LIBS=.*/XSERVER_LIBS=/' .demiurge || die "sed XSERVER_LIBS failed"
22+	sed -i 's/^DEF_XDMCP=.*/DEF_XDMCP=/' .demiurge || die "sed DEF_XDMCP failed"
23+	sed -i 's/xdcmp//g' .demiurge || die "sed xdmcp failed"
24+
25+	msg "generating with satan..."
26+	satan gen PREFIX="$PREFIX" DESTDIR="${DESTDIR:-$PKG}" || die "satan gen failed"
27+
28+	msg "building tinyx..."
29+	samu || die "samu build failed"
30+
31+	msg "installing tinyx..."
32+	mkdir -p "$_dest/$PREFIX/bin"
33+	cp kdrive/fbdev/Xfbdev "$_dest/$PREFIX/bin/Xfbdev" || die "failed to install Xfbdev"
34+
35+	msg "fetching fonts..."
36+	_font_url="https://github.com/kyx0r/repo-main/releases/download/tinyxfont_1.0/tinyxfont.tar.gz"
37+	_font_file="$DISTDIR/tinyxfont.tar.gz"
38+	if [ ! -f "$_font_file" ]; then
39+		_download_file "$_font_file" "$_font_url" 0 || die "failed to fetch fonts"
40+	fi
41+
42+	msg "extracting fonts..."
43+	_tmpfont="/tmp/tinyx-fonts-$$"
44+	mkdir -p "$_tmpfont"
45+	tar -xzf "$_font_file" -C "$_tmpfont" || die "font extraction failed"
46+
47+	msg "installing fonts..."
48+	mkdir -p "$_dest/$PREFIX/share/fonts/misc"
49+	cp "$_tmpfont/misc/"*.pcf.gz "$_tmpfont/misc/fonts.alias" "$_tmpfont/misc/fonts.dir" "$_dest/$PREFIX/share/fonts/misc/" || die "font install failed"
50+	rm -rf "$_tmpfont"
51+
52+	msg "creating xfbdev wrapper..."
53+	mv "$_dest/$PREFIX/bin/Xfbdev" "$_dest/$PREFIX/bin/Xfbdev-exec" || die "failed to move Xfbdev"
54+
55+	cat > "$_dest/$PREFIX/bin/Xfbdev" << EOF
56+#!/bin/sh
57+exec Xfbdev-exec -fp $PREFIX/share/fonts/misc "\$@"
58+EOF
59+	chmod +x "$_dest/$PREFIX/bin/Xfbdev" || die "failed to chmod Xfbdev"
60+	chmod u+s "$_dest/$PREFIX/bin/Xfbdev-exec" || die "failed to chmod u+s Xfbdev-exec"
61+}
62+
63+. ${0%/*}/../../libsh/libdmake.sh