diff options
| -rw-r--r-- | .SRCINFO | 11 | ||||
| -rw-r--r-- | PKGBUILD | 33 | ||||
| -rw-r--r-- | inthandler.diff | 12 | ||||
| -rw-r--r-- | noconvtool.diff | 24 |
4 files changed, 16 insertions, 64 deletions
@@ -1,23 +1,21 @@ pkgbase = libdragon-git - pkgver = r110.b26fce6 + pkgver = r610.6fbe02fa pkgrel = 1 url = http://www.dragonminded.com/n64dev/libdragon - arch = i686 arch = x86_64 license = custom:UNLICENSE makedepends = git - makedepends = mips64-elf-gcc-stage1 depends = libpng + depends = mips64-elf-gcc depends = mips64-elf-newlib - source = git://github.com/DragonMinded/libdragon.git - source = noconvtool.diff + source = git+https://github.com/DragonMinded/libdragon.git#branch=trunk sha256sums = SKIP - sha256sums = ec37b8d10ee3911979092916a6b9361e62b13a3a3cfb1736281d6baf304bfc95 pkgname = libdragon-git pkgdesc = Open source library for Nintendo 64 game development install = libdragon.install arch = any + depends = mips64-elf-gcc depends = mips64-elf-newlib provides = libdragon conflicts = libdragon @@ -33,4 +31,3 @@ pkgname = libdragon-tools-git provides = libdragon-tools conflicts = libdragon-tools options = - @@ -1,30 +1,24 @@ #Maintainer: Simon Eriksson <simon.eriksson.1187+aur AT gmail.com> pkgname=('libdragon-git' 'libdragon-tools-git') -pkgver=r110.b26fce6 +pkgver=r610.6fbe02fa pkgrel=1 url="http://www.dragonminded.com/n64dev/libdragon" -arch=('i686' 'x86_64') +arch=('x86_64') license=('custom:UNLICENSE') -makedepends=('git' 'mips64-elf-gcc-stage1') -depends=('libpng' 'mips64-elf-newlib') -source=("git://github.com/DragonMinded/libdragon.git" "noconvtool.diff") -sha256sums=('SKIP' - 'ec37b8d10ee3911979092916a6b9361e62b13a3a3cfb1736281d6baf304bfc95' ) +makedepends=('git') +depends=('libpng' 'mips64-elf-gcc' 'mips64-elf-newlib') +source=("git+https://github.com/DragonMinded/libdragon.git#branch=trunk") +sha256sums=('SKIP') pkgver() { cd libdragon printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } -prepare(){ - cd libdragon - patch -p1 < "${srcdir}/noconvtool.diff" -} - build(){ cd libdragon - N64_INST=/usr make + CFLAGS="" CXXFLAGS="" LDFLAGS="" ASFLAGS="" N64_INST=/usr make N64_INST=/usr make tools } @@ -34,20 +28,17 @@ package_libdragon-git(){ provides=('libdragon') conflicts=('libdragon') arch=('any') - depends=('mips64-elf-newlib') + depends=('mips64-elf-gcc' 'mips64-elf-newlib') install='libdragon.install' - + cd libdragon - + mkdir -p "${pkgdir}/etc/profile.d/" echo 'export N64_INST=/usr' > "${pkgdir}/etc/profile.d/libdragon.sh" chmod 755 "${pkgdir}/etc/profile.d/libdragon.sh" - mkdir -p "${pkgdir}/usr/mips64-elf/"{include,lib} - make INSTALLDIR="${pkgdir}/usr" install - - # strip it manually - find "${pkgdir}/usr/mips64-elf/lib" -type f -exec /usr/bin/mips64-elf-strip --strip-unneeded {} \; 2>/dev/null || true + mkdir -p "${pkgdir}/usr/mips64-elf/"{include,lib} "${pkgdir}/usr/include" + make INSTALLDIR="${pkgdir}/usr" install #install license install -D -m644 LICENSE.md "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" diff --git a/inthandler.diff b/inthandler.diff deleted file mode 100644 index 80a2537fa0f8..000000000000 --- a/inthandler.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/inthandler.S b/src/inthandler.S -index 1e81563..3e958a8 100644 ---- a/src/inthandler.S -+++ b/src/inthandler.S -@@ -235,7 +235,6 @@ endint: - - .section .bss - .global __baseRegAddr -- .long __baseRegAddr - - .align 8 - __baseRegAddr: diff --git a/noconvtool.diff b/noconvtool.diff deleted file mode 100644 index e048eb912bb0..000000000000 --- a/noconvtool.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/tools/mksprite/Makefile b/tools/mksprite/Makefile -index ab3cb88..f8e80ec 100644 ---- a/tools/mksprite/Makefile -+++ b/tools/mksprite/Makefile -@@ -1,17 +1,14 @@ - INSTALLDIR = $(N64_INST) - CFLAGS = -std=gnu99 -O2 -Wall -Werror -I../../include -lpng - --all: mksprite convtool -+all: mksprite - - mksprite: mksprite.c --convtool: convtool.c - --install: mksprite convtool -+install: mksprite - install -m 0755 mksprite $(INSTALLDIR)/bin -- install -m 0755 convtool $(INSTALLDIR)/bin - - .PHONY: clean install - - clean: - rm -rf mksprite -- rm -rf convtool |