summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatti Niemenmaa2016-08-08 19:06:54 +0300
committerMatti Niemenmaa2016-08-08 19:08:11 +0300
commitec566288f516926a93626eb72c95f49ffa77c488 (patch)
treed797fe22ff4e7beac3259a3a1098d57de03f1a93
parent670a1d3a827cf4f8bfb8e14272493a41ffae2cda (diff)
downloadaur-ec566288f516926a93626eb72c95f49ffa77c488.tar.gz
Patch Makefile to use 32-bit source on i686
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD7
-rw-r--r--makefile-i686.patch13
3 files changed, 24 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 90a05483a12..eca83fdfe4a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Mon Aug 8 16:08:09 UTC 2016
pkgbase = lazyusf2-git
pkgdesc = Library for decoding Nintendo 64 Sound Format files using Mupen64plus
pkgver = r69.ab6a646
- pkgrel = 1
+ pkgrel = 2
url = https://bitbucket.org/kode54/lazyusf2
arch = i686
arch = x86_64
@@ -13,9 +15,11 @@ pkgbase = lazyusf2-git
depends = zlib
source = lazyusf2-git::git+https://bitbucket.org/kode54/lazyusf2.git
source = makefile.patch
+ source = makefile-i686.patch
source = LICENSE.CC0
sha256sums = SKIP
sha256sums = 7a48693ef6e9d41d7f0fa93094603b5decad888454a1fc9bbf6de8fdf88e3995
+ sha256sums = cc7592e8f50a89725949b6e69079104ded03cdbb7173cf2da82c2f3c4cae2e4d
sha256sums = a90051e82202a5dc51162127c6834f8434fb2ece57795317951420fe6a8f4562
pkgname = lazyusf2-git
diff --git a/PKGBUILD b/PKGBUILD
index e538e8b345f..21db881b48e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=lazyusf2-git
pkgver=r69.ab6a646
-pkgrel=1
+pkgrel=2
pkgdesc="Library for decoding Nintendo 64 Sound Format files using Mupen64plus"
arch=(i686 x86_64)
url='https://bitbucket.org/kode54/lazyusf2'
@@ -11,9 +11,11 @@ depends=(glibc zlib)
makedepends=(git grep)
source=(${pkgname}::git+https://bitbucket.org/kode54/lazyusf2.git
makefile.patch
+ makefile-i686.patch
LICENSE.CC0)
sha256sums=('SKIP'
'7a48693ef6e9d41d7f0fa93094603b5decad888454a1fc9bbf6de8fdf88e3995'
+ 'cc7592e8f50a89725949b6e69079104ded03cdbb7173cf2da82c2f3c4cae2e4d'
'a90051e82202a5dc51162127c6834f8434fb2ece57795317951420fe6a8f4562')
pkgver() {
@@ -27,6 +29,9 @@ pkgver() {
prepare() {
cd "$srcdir/$pkgname"
patch Makefile "$srcdir"/makefile.patch
+ if [[ $CARCH = i686 ]]; then
+ patch Makefile "$srcdir"/makefile-i686.patch
+ fi
}
build() {
diff --git a/makefile-i686.patch b/makefile-i686.patch
new file mode 100644
index 00000000000..c73c61ffda6
--- /dev/null
+++ b/makefile-i686.patch
@@ -0,0 +1,13 @@
+diff --git Makefile Makefile
+index 0bd0b91..c297794 100755
+--- Makefile
++++ Makefile
+@@ -5,7 +5,7 @@ OBJS_RECOMPILER_32 = r4300/x86/assemble.o r4300/x86/gbc.o r4300/x86/gcop0.o r430
+
+ OBJS_RECOMPILER_64 = r4300/x86_64/assemble.o r4300/x86_64/gbc.o r4300/x86_64/gcop0.o r4300/x86_64/gcop1.o r4300/x86_64/gcop1_d.o r4300/x86_64/gcop1_l.o r4300/x86_64/gcop1_s.o r4300/x86_64/gcop1_w.o r4300/x86_64/gr4300.o r4300/x86_64/gregimm.o r4300/x86_64/gspecial.o r4300/x86_64/gtlb.o r4300/x86_64/regcache.o r4300/x86_64/rjump.o
+
+-OBJS = ai/ai_controller.o api/callbacks.o debugger/dbg_decoder.o main/main.o main/rom.o main/savestates.o main/util.o memory/memory.o pi/cart_rom.o pi/pi_controller.o r4300/cached_interp.o r4300/cp0.o r4300/cp1.o r4300/exception.o r4300/interupt.o r4300/mi_controller.o r4300/pure_interp.o r4300/r4300.o r4300/r4300_core.o r4300/recomp.o r4300/reset.o r4300/tlb.o rdp/rdp_core.o ri/rdram.o ri/rdram_detection_hack.o ri/ri_controller.o rsp/rsp_core.o rsp_hle/alist.o rsp_hle/alist_audio.o rsp_hle/alist_naudio.o rsp_hle/alist_nead.o rsp_hle/audio.o rsp_hle/cicx105.o rsp_hle/hle.o rsp_hle/jpeg.o rsp_hle/memory.o rsp_hle/mp3.o rsp_hle/musyx.o rsp_hle/plugin.o rsp_lle/rsp.o si/cic.o si/game_controller.o si/n64_cic_nus_6105.o si/pif.o si/si_controller.o usf/usf.o usf/barray.o usf/resampler.o vi/vi_controller.o $(OBJS_RECOMPILER_64)
++OBJS = ai/ai_controller.o api/callbacks.o debugger/dbg_decoder.o main/main.o main/rom.o main/savestates.o main/util.o memory/memory.o pi/cart_rom.o pi/pi_controller.o r4300/cached_interp.o r4300/cp0.o r4300/cp1.o r4300/exception.o r4300/interupt.o r4300/mi_controller.o r4300/pure_interp.o r4300/r4300.o r4300/r4300_core.o r4300/recomp.o r4300/reset.o r4300/tlb.o rdp/rdp_core.o ri/rdram.o ri/rdram_detection_hack.o ri/ri_controller.o rsp/rsp_core.o rsp_hle/alist.o rsp_hle/alist_audio.o rsp_hle/alist_naudio.o rsp_hle/alist_nead.o rsp_hle/audio.o rsp_hle/cicx105.o rsp_hle/hle.o rsp_hle/jpeg.o rsp_hle/memory.o rsp_hle/mp3.o rsp_hle/musyx.o rsp_hle/plugin.o rsp_lle/rsp.o si/cic.o si/game_controller.o si/n64_cic_nus_6105.o si/pif.o si/si_controller.o usf/usf.o usf/barray.o usf/resampler.o vi/vi_controller.o $(OBJS_RECOMPILER_32)
+
+ OPTS = -O3 -DDYNAREC -I.
+ ROPTS = -O3 -DARCH_MIN_SSE2 -I.