summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoraksr2017-01-25 19:16:28 +0100
committeraksr2017-01-25 19:16:28 +0100
commit691f22f35aefb94ab43fbfa91dd626cf77c09c95 (patch)
treebee0b669ade864f15e33195a1713e62e5d2a90c9
parent13df2d4543e8501e32cfc3c7568f7960e31f44d5 (diff)
downloadaur-691f22f35aefb94ab43fbfa91dd626cf77c09c95.tar.gz
Use fbpad-mkfn if it's available...
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD39
-rw-r--r--conf.h60
-rw-r--r--config.h6
4 files changed, 89 insertions, 28 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3787809dc0f..e934fb7db1a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Wed Mar 23 05:06:41 UTC 2016
+# Wed Jan 25 18:14:59 UTC 2017
pkgbase = fbpad-git
pkgdesc = A small linux framebuffer virtual terminal.
- pkgver = 0.r261.d11a8ba
+ pkgver = r269.dbf1a4f
pkgrel = 1
url = http://repo.or.cz/w/fbpad.git
install = fbpad-git.install
@@ -18,19 +18,19 @@ pkgbase = fbpad-git
provides = fbpad
conflicts = fbpad
source = fbpad-git::git://repo.or.cz/fbpad.git
- source = config.h
+ source = conf.h
source = fbpad-256.info
source = LICENSE
md5sums = SKIP
- md5sums = d81cdedda7b34c160212273e1554e2ac
+ md5sums = efe9649ca617e55d526921b0a9105c9e
md5sums = 185b9d6ec1c539213226a3e2509c7ccd
md5sums = ec67f29a7dec10f86ef31515ed657a91
sha1sums = SKIP
- sha1sums = 5db81b84caf6a4509f088619bfa700a6b438f600
+ sha1sums = 4cd6b4cbf2c25626c4e4d60b21726d0baf6092d8
sha1sums = dbb816fe37faf0acb4e1a916d7493787c2b647fc
sha1sums = 76a535243054e1fdd9caaa46a1571cd381d74353
sha256sums = SKIP
- sha256sums = 8ca0f3f42e4ae83ad3ca7766c948bfa303f9501662558c76b6db684b61a9d13e
+ sha256sums = 6f964a7b68108de13bcd4a8825a713c67a7a928a5f664406fd6e21fb0247178b
sha256sums = fb8ae049aa7d41fb285cbf7aa4487b28014273ebcfceefb4d58fb07018312e9c
sha256sums = 0ea8d51c57a3a59ca57428b6fe9b47fdb1fde281fc1b095c9832872e85b09a72
diff --git a/PKGBUILD b/PKGBUILD
index 6a4a161e062..1d9a8317f8f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Contributor: Sara <sara at archlinux dot us>
# Maintainer: aksr <aksr at t-com dot me>
pkgname=fbpad-git
-pkgver=0.r261.d11a8ba
+pkgver=r269.dbf1a4f
pkgrel=1
pkgdesc="A small linux framebuffer virtual terminal."
arch=('i686' 'x86_64')
@@ -16,34 +16,32 @@ conflicts=('fbpad')
replaces=()
backup=()
options=()
-install=$pkgname.install
+install=${pkgname}.install
source=("$pkgname::git://repo.or.cz/fbpad.git"
- 'config.h'
- 'fbpad-256.info'
- 'LICENSE')
+ 'conf.h' 'fbpad-256.info' 'LICENSE')
noextract=()
md5sums=('SKIP'
- 'd81cdedda7b34c160212273e1554e2ac'
+ 'efe9649ca617e55d526921b0a9105c9e'
'185b9d6ec1c539213226a3e2509c7ccd'
'ec67f29a7dec10f86ef31515ed657a91')
sha1sums=('SKIP'
- '5db81b84caf6a4509f088619bfa700a6b438f600'
+ '4cd6b4cbf2c25626c4e4d60b21726d0baf6092d8'
'dbb816fe37faf0acb4e1a916d7493787c2b647fc'
'76a535243054e1fdd9caaa46a1571cd381d74353')
sha256sums=('SKIP'
- '8ca0f3f42e4ae83ad3ca7766c948bfa303f9501662558c76b6db684b61a9d13e'
+ '6f964a7b68108de13bcd4a8825a713c67a7a928a5f664406fd6e21fb0247178b'
'fb8ae049aa7d41fb285cbf7aa4487b28014273ebcfceefb4d58fb07018312e9c'
'0ea8d51c57a3a59ca57428b6fe9b47fdb1fde281fc1b095c9832872e85b09a72')
pkgver() {
cd $srcdir/$pkgname
- printf "0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+ printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
prepare() {
cd $srcdir/$pkgname
## Custom config.h
- cp $srcdir/config.h config.h
+ cp $srcdir/conf.h conf.h
}
build() {
@@ -53,19 +51,22 @@ build() {
package() {
cd $srcdir/$pkgname
- install -Dm755 $srcdir/$pkgname/fbpad $pkgdir/usr/bin/fbpad
- install -Dm644 $srcdir/$pkgname/README $pkgdir/usr/share/doc/$pkgname/README
- install -Dm644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+ install -Dm755 ../$pkgname/fbpad $pkgdir/usr/bin/fbpad
+ install -Dm644 ../$pkgname/README $pkgdir/usr/share/doc/${pkgname%-*}/README
+ install -Dm644 ../LICENSE $pkgdir/usr/share/licenses/${pkgname%-*}/LICENSE
## Compile terminfo
mkdir -p $pkgdir/usr/share/terminfo
tic -x -o $pkgdir/usr/share/terminfo $srcdir/fbpad-256.info
+
## Setup fonts
- ft2tf /usr/share/fonts/TTF/DejaVuSansMono.ttf:6 >$srcdir/font.ttf
- ft2tf /usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf:6 >$srcdir/fonti.ttf
- ft2tf /usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf:6 >$srcdir/fontb.ttf
+ if [ -x /usr/bin/fbpad-mkfn ]; then FT2TF="fbpad-mkfn -h20 -w10"; SZ="17h120v100b0a1"; else FT2TF=ft2tf; SZ=6; fi
+ $FT2TF /usr/share/fonts/TTF/DejaVuSansMono.ttf:$SZ > $srcdir/font-r.tf
+ $FT2TF /usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf:$SZ > $srcdir/font-i.tf
+ $FT2TF /usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf:$SZ > $srcdir/font-b.tf
+
## Install fonts
- install -Dm644 $srcdir/font.ttf $pkgdir/usr/share/$pkgname/font.ttf
- install -Dm644 $srcdir/fonti.ttf $pkgdir/usr/share/$pkgname/fonti.ttf
- install -Dm644 $srcdir/fontb.ttf $pkgdir/usr/share/$pkgname/fontb.ttf
+ install -Dm644 ../font-r.tf $pkgdir/usr/share/${pkgname%-*}/font-r.tf
+ install -Dm644 ../font-i.tf $pkgdir/usr/share/${pkgname%-*}/font-i.tf
+ install -Dm644 ../font-b.tf $pkgdir/usr/share/${pkgname%-*}/font-b.tf
}
diff --git a/conf.h b/conf.h
new file mode 100644
index 00000000000..b6e93e13311
--- /dev/null
+++ b/conf.h
@@ -0,0 +1,60 @@
+/* framebuffer device */
+#define FBDEV "/dev/fb0"
+
+/* list of tags */
+#define TAGS "xnlhtr01uiva-"
+#define TAGS_SAVED ""
+
+/* programs mapped to m-c, m-m, m-e */
+#define SHELL {"bash"}
+#define EDITOR {"vim"}
+#define MAIL {"mutt"}
+
+/* fbval_t should match framebuffer depth */
+typedef unsigned int fbval_t;
+
+/* tinyfont files for regular, italic, and bold fonts */
+#define FR "/usr/share/fbpad/font-r.tf"
+#define FI "/usr/share/fbpad/font-i.tf"
+#define FB "/usr/share/fbpad/font-b.tf"
+
+/* foreground and background colors */
+#define FGCOLOR COLOR0
+#define BGCOLOR COLORF
+
+/* where to write the screen shot */
+#define SCRSHOT "/tmp/scr"
+
+/* lock command password; NULL disables locking */
+#define PASS NULL
+
+/* optimized version of fb_val() */
+#define FB_VAL(r, g, b) fb_val((r), (g), (b))
+
+/* brighten colors 0-7 for bold text */
+#define BRIGHTEN 1
+
+/* black */
+#define COLOR0 0x000000
+#define COLOR8 0x555555
+/* red */
+#define COLOR1 0xaa0000
+#define COLOR9 0xff5555
+/* green */
+#define COLOR2 0x00aa00
+#define COLORA 0x55ff55
+/* yellow */
+#define COLOR3 0xaa5500
+#define COLORB 0xffff55
+/* blue */
+#define COLOR4 0x0000aa
+#define COLORC 0x5555ff
+/* magenta */
+#define COLOR5 0xaa00aa
+#define COLORD 0xff55ff
+/* cyan */
+#define COLOR6 0x00aaaa
+#define COLORE 0x55ffff
+/* white */
+#define COLOR7 0xaaaaaa
+#define COLORF 0xffffff
diff --git a/config.h b/config.h
index 7cb572b33d2..e50ccfa7500 100644
--- a/config.h
+++ b/config.h
@@ -14,9 +14,9 @@
typedef unsigned int fbval_t;
/* tinyfont files for regular, italic, and bold fonts */
-#define FR "/usr/share/fbpad-git/font.ttf"
-#define FI "/usr/share/fbpad-git/fonti.ttf"
-#define FB "/usr/share/fbpad-git/fontb.ttf"
+#define FR "/usr/share/fbpad/font.tf"
+#define FI "/usr/share/fbpad/fonti.tf"
+#define FB "/usr/share/fbpad/fontb.tf"
/* foreground and background colors */
#define FGCOLOR 0