diff options
| author | Stephen Gregoratto | 2020-03-30 13:36:22 +1100 |
|---|---|---|
| committer | Stephen Gregoratto | 2020-03-30 13:36:22 +1100 |
| commit | 91cc8b80d9be3f81d62626a39feb3096eb696c56 (patch) | |
| tree | 7331116f0896355c205926a0969b283f4bba793f | |
| parent | 6f942a81b0e4a14fc4f8a53f4f02563a678395d9 (diff) | |
| download | aur-91cc8b80d9be3f81d62626a39feb3096eb696c56.tar.gz | |
Patch makefile to use C/LD flags, fix licenses
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | PKGBUILD | 32 | ||||
| -rw-r--r-- | adlmidi-git.patch | 47 |
4 files changed, 78 insertions, 16 deletions
@@ -1,18 +1,22 @@ pkgbase = adlmidi-git pkgdesc = CLI MIDI player using OPL3 emulation - pkgver = 1.2.6.1.r0.8aa85de - pkgrel = 2 + pkgver = 1.2.6.1.r6.d0a4276 + pkgrel = 1 url = https://bisqwit.iki.fi/source/adlmidi.html arch = i686 arch = x86_64 + arch = armv6h + arch = armv7h license = GPL3 - license = GPL2+ + license = GPL2 makedepends = git depends = sdl2 optdepends = ffmpeg: recording output to video file conflicts = adlmidi source = git://bisqwit.iki.fi/adlmidi.git + source = adlmidi-git.patch sha256sums = SKIP + sha256sums = 606c4d3643ddf2accf445ede3a8f5b7371a6fdc5f9885a8a77aca998a5a0d7c8 pkgname = adlmidi-git diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..14c00d01ae4a --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +* +!.SRCINFO +!PKGBUILD +!.gitignore +!adlmidi-git.patch @@ -1,29 +1,35 @@ -# Maintainer: Stephen Gregoratto <themanhimself at sgregoratto dot me> +# Maintainer: Stephen Gregoratto <dev@sgregoratto.me> pkgname=adlmidi-git -pkgver=1.2.6.1.r0.8aa85de -pkgrel=2 +pkgver=1.2.6.1.r6.d0a4276 +pkgrel=1 pkgdesc="CLI MIDI player using OPL3 emulation" url="https://bisqwit.iki.fi/source/adlmidi.html" -license=('GPL3' 'GPL2+') -arch=('i686' 'x86_64') +license=('GPL3' 'GPL2') +arch=('i686' 'x86_64' 'armv6h' 'armv7h') depends=('sdl2') makedepends=('git') optdepends=('ffmpeg: recording output to video file') conflicts=(adlmidi) -source=("git://bisqwit.iki.fi/adlmidi.git") -sha256sums=('SKIP') +source=("git://bisqwit.iki.fi/adlmidi.git" + "adlmidi-git.patch") +sha256sums=('SKIP' + '606c4d3643ddf2accf445ede3a8f5b7371a6fdc5f9885a8a77aca998a5a0d7c8') pkgver() { - cd "${pkgname/-git}" - git describe --long --tags origin/release | sed 's/\([^-]*-\)g/r\1/;s/-/./g' + cd "${pkgname%-git}" + git describe --long --tags origin/release | sed 's/\([^-]*-\)g/r\1/;s/-/./g' +} + +prepare() { + cd "${pkgname%-git}" + patch -Np1 -i "$srcdir/adlmidi-git.patch" } build() { - cd "${pkgname/-git}" - make + cd "${pkgname%-git}" + make } package() { - cd "${pkgname/-git}" - install -D ./adlmidi "${pkgdir}"/usr/bin/adlmidi + install -Dm755 "${pkgname%-git}/adlmidi" "$pkgdir/usr/bin/adlmidi" } diff --git a/adlmidi-git.patch b/adlmidi-git.patch new file mode 100644 index 000000000000..24581d9d968a --- /dev/null +++ b/adlmidi-git.patch @@ -0,0 +1,47 @@ +diff -ura adlmidi.old/make.rules adlmidi.new/make.rules +--- adlmidi.old/make.rules 2020-03-30 13:13:14.541696493 +1100 ++++ adlmidi.new/make.rules 2020-03-30 13:25:26.653224604 +1100 +@@ -101,38 +101,9 @@ + \ + obj/.keep + +-INSTALLPROGS=adlmidi ++adlmidi: src/midiplay.o src/dbopl.o src/adldata.o ++ $(CXX) $(LDLIBS) $(SDL) $(LDFLAGS) -o $@ $^ + +-all: adlmidi gen_adldata dumpmiles dumpbank +- +-adlmidi: obj/midiplay.o obj/dbopl.o obj/adldata.o +- $(CXXLINK) $^ $(DEBUG) $(SDL) -o $@ $(LDLIBS) +- +-obj/midiplay.o: src/midiplay.cc src/dbopl.h src/adldata.hh +- $(CXX) $(CPPFLAGS) $< $(DEBUG) $(SDL) -c -o $@ +- +-obj/dbopl.o: src/dbopl.cpp src/dbopl.h +- $(CXX) $(CPPFLAGS) $< $(DEBUG) -c -o $@ +- +-obj/adldata.o: src/adldata.cc src/adldata.hh +- $(CXX) $(CPPFLAGS) $< $(DEBUG) -c -o $@ +- +-gen_adldata: obj/gen_adldata.o obj/dbopl.o +- $(CXXLINK) $^ $(DEBUG) -o $@ $(LDLIBS) +- +-obj/gen_adldata.o: utils/gen_adldata.cc src/dbopl.h +- $(CXX) $(CPPFLAGS) -I./src $< $(DEBUG) -c -o $@ +- +-dumpmiles: obj/dumpmiles.o +- $(CXXLINK) $^ $(DEBUG) -o $@ $(LDLIBS) +- +-obj/dumpmiles.o: utils/dumpmiles.cc +- $(CXX) $(CPPFLAGS) $< $(DEBUG) -c -o $@ +- +-dumpbank: obj/dumpbank.o +- $(CXXLINK) $^ $(DEBUG) -o $@ $(LDLIBS) +- +-obj/dumpbank.o: utils/dumpbank.cc +- $(CXX) $(CPPFLAGS) $< $(DEBUG) -c -o $@ +- +-include depfun.mak ++src/midiplay.o: src/dbopl.h src/adldata.hh ++src/dbopl.o: src/dbopl.h ++src/adldata.o: src/adldata.hh |