[arch-commits] Commit in tinyemu/trunk (PKGBUILD jslinux.sh)

[Alexander Rødseth]

    Date: Monday, April 1, 2019 @ 13:07:03
  Author: arodseth
Revision: 446932

upgpkg: tinyemu 2019_02_10-2

Modified:
  tinyemu/trunk/PKGBUILD
Deleted:
  tinyemu/trunk/jslinux.sh

------------+
 PKGBUILD   |   60 ++++++++++++-----------------------------------------------
 jslinux.sh |    3 --
 2 files changed, 13 insertions(+), 50 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-01 13:01:22 UTC (rev 446931)
+++ PKGBUILD	2019-04-01 13:07:03 UTC (rev 446932)
@@ -1,48 +1,31 @@
 # Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
 
-pkgbase=tinyemu
-pkgname=(tinyemu jslinux)
+pkgname=tinyemu
 pkgver=2019_02_10
-pkgrel=1
+pkgrel=2
 pkgdesc='RISC-V system emulator'
 arch=(x86_64)
 groups=(risc-v)
 url='https://bellard.org/tinyemu/'
 license=(MIT)
-makedepends=(gendesk setconf sdl)
-source=("https://bellard.org/tinyemu/$pkgname-${pkgver//_/-}.tar.gz"
-        'https://bellard.org/jslinux/buildroot-riscv64-xwin.cfg'
-        'https://bellard.org/jslinux/bbl64-4.15.bin'
-        'https://roboticoverlords.org/risc-v.png'
-        jslinux.sh)
-# risc-v.png is drawn by me, in mtPaint. CC0.
-# Link to a better icon is more than welcome! :)
-sha256sums=('0a2ded13a51bc3d6e69afd29c6a4709b327256ea36e562a5d9fa253cd224fa5b'
-            'f9eee1622553a24cd58a193ae7d0e5db30415e515d8c5e5d7f3f8c31e9627477'
-            '81b7dc5671a457d4cdf85690efd5948b228a3f7e7788d0ade57b939f5f450ee1'
-            'e3da1fd27e0a12e7c8be082ec33e36133a4beb171a59f4e6cbfec33f8dd8160c'
-            'f48f00a16613668b795d1c83333b948f75c4eda7e647ab7f509a306e4ac34e2a')
+depends=(curl sdl)
+makedepends=(setconf)
+source=("https://bellard.org/tinyemu/$pkgname-${pkgver//_/-}.tar.gz")
+sha256sums=('0a2ded13a51bc3d6e69afd29c6a4709b327256ea36e562a5d9fa253cd224fa5b')
 
 prepare() {
-  gendesk -n -f \
-    --name=TinyEMU \
-    --pkgname="$pkgname" \
-    --pkgdesc="$pkgdesc" \
-    --exec=jslinux \
-    --categories=Emulator \
-    --comment='RISC-V Emulator'
-  setconf "$pkgbase-${pkgver//_/-}/Makefile" bindir /usr/bin
+  local m="$pkgname-${pkgver//_/-}/Makefile"
+  setconf "$m" bindir="/usr/bin"
+  setconf "$m" CFLAGS="-O2 -Wall -g -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -MMD $CFLAGS -w"
+  setconf "$m" LDFLAGS="$LDFLAGS"
 }
 
 build() {
-  make -C "$pkgbase-${pkgver//_/-}"
+  make -C "$pkgname-${pkgver//_/-}"
 }
 
-package_tinyemu() {
-  depends=('curl' 'sdl')
-  optdepends=('jslinux: Launcher for JS/Linux running on emulated RISC-V')
-
-  cd "$pkgbase-${pkgver//_/-}"
+package() {
+  cd "$pkgname-${pkgver//_/-}"
   install -d "$pkgdir/usr/bin"
   make DESTDIR="$pkgdir" install
   install -Dm644 readme.txt \
@@ -51,21 +34,4 @@
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
-package_jslinux() {
-  depends=('tinyemu')
-
-  install -Dm644 buildroot-riscv64-xwin.cfg \
-    "$pkgdir/usr/share/$pkgbase/buildroot-riscv64-xwin.cfg"
-  install -Dm644 bbl64-4.15.bin "$pkgdir/usr/share/$pkgbase/bbl64-4.15.bin"
-  install -Dm755 jslinux.sh "$pkgdir/usr/bin/jslinux"
-  install -Dm644 tinyemu.desktop \
-    "$pkgdir/usr/share/applications/tinyemu.desktop"
-  install -Dm644 risc-v.png \
-    "$pkgdir/usr/share/pixmaps/tinyemu.png"
-  install -Dm644 "$pkgbase-${pkgver//_/-}/readme.txt" \
-    "$pkgdir/usr/share/doc/$pkgname/readme.txt"
-  install -Dm644 "$pkgbase-${pkgver//_/-}/MIT-LICENSE.txt" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
 # vim: ts=2 sw=2 et:

Deleted: jslinux.sh
===================================================================
--- jslinux.sh	2019-04-01 13:01:22 UTC (rev 446931)
+++ jslinux.sh	2019-04-01 13:07:03 UTC (rev 446932)
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /usr/share/tinyemu
-temu -m 1024 'buildroot-riscv64-xwin.cfg'