diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 26 | ||||
| -rw-r--r-- | makefile-i686.patch | 13 | ||||
| -rw-r--r-- | makefile.patch | 30 |
4 files changed, 25 insertions, 54 deletions
@@ -1,9 +1,7 @@ -# 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 = 2 + pkgver = r83.95d71f6 + pkgrel = 1 url = https://bitbucket.org/kode54/lazyusf2 arch = i686 arch = x86_64 @@ -15,11 +13,9 @@ 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 = 42eda354f4e97a0235ea747a1b0b1edf3c4e9eeec3655d3f9f9514605c2a9180 sha256sums = a90051e82202a5dc51162127c6834f8434fb2ece57795317951420fe6a8f4562 pkgname = lazyusf2-git @@ -1,8 +1,8 @@ # Maintainer: Matti Niemenmaa <matti.niemenmaa+aur ät iki dȯt fi> pkgname=lazyusf2-git -pkgver=r69.ab6a646 -pkgrel=2 +pkgver=r83.95d71f6 +pkgrel=1 pkgdesc="Library for decoding Nintendo 64 Sound Format files using Mupen64plus" arch=(i686 x86_64) url='https://bitbucket.org/kode54/lazyusf2' @@ -11,11 +11,9 @@ 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' + '42eda354f4e97a0235ea747a1b0b1edf3c4e9eeec3655d3f9f9514605c2a9180' 'a90051e82202a5dc51162127c6834f8434fb2ece57795317951420fe6a8f4562') pkgver() { @@ -29,25 +27,25 @@ pkgver() { prepare() { cd "$srcdir/$pkgname" patch Makefile "$srcdir"/makefile.patch - if [[ $CARCH = i686 ]]; then - patch Makefile "$srcdir"/makefile-i686.patch - fi } build() { cd "$srcdir/$pkgname" - ROPTS="-c -O3 -I." - CFLAGS="$CFLAGS -fPIC" - { grep \^flags /proc/cpuinfo | fgrep -qw ssse3 && CFLAGS+=" -mssse3" && ROPTS+=" -DARCH_MIN_SSSE3"; } || - { grep \^flags /proc/cpuinfo | fgrep -qw sse2 && CFLAGS+=" -msse2" && ROPTS+=" -DARCH_MIN_SSE2"; } - make liblazyusf.{a,so} CFLAGS="$CFLAGS" ROPTS="$ROPTS" + OPTFLAGS=$CFLAGS + { grep \^flags /proc/cpuinfo | fgrep -qw ssse3 && OPTFLAGS+=" -mssse3 -DARCH_MIN_SSSE3"; } || + { grep \^flags /proc/cpuinfo | fgrep -qw sse2 && OPTFLAGS+=" -msse2 -DARCH_MIN_SSE2"; } + export LDFLAGS="$LDFLAGS -Wl,-Bsymbolic" + make liblazyusf.{a,so} OPTFLAGS="$OPTFLAGS -Irsp_hle/msvc-compat" } package() { cd "$srcdir/$pkgname" install -D -m644 -t "$pkgdir/usr/include" usf/usf.h - install -D -m644 -t "$pkgdir/usr/lib" liblazyusf.{a,so} + install -D -m644 -t "$pkgdir/usr/lib" liblazyusf.{a,so.*} install -D -m644 -t "$pkgdir/usr/share/licenses/$pkgname" "$srcdir"/LICENSE.CC0 + ldconfig -n "$pkgdir/usr/lib" + cd "$pkgdir/usr/lib" + ln -sf liblazyusf.so.*.0 liblazyusf.so } # vim:set sw=2 et: diff --git a/makefile-i686.patch b/makefile-i686.patch deleted file mode 100644 index c73c61ffda6d..000000000000 --- a/makefile-i686.patch +++ /dev/null @@ -1,13 +0,0 @@ -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.
diff --git a/makefile.patch b/makefile.patch index b3b317a2b9a9..b3e0e5757937 100644 --- a/makefile.patch +++ b/makefile.patch @@ -1,23 +1,13 @@ -diff --git i/Makefile w/Makefile ---- i/Makefile -+++ w/Makefile -@@ -7,14 +7,17 @@ OBJS_RECOMPILER_64 = r4300/x86_64/assemble.o r4300/x86_64/gbc.o r4300/x86_64/gco -
- OBJS = ai/ai_controller.o api/callbacks.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)
-
--OPTS = -O3 -DDYNAREC -I.
--ROPTS = -O3 -DARCH_MIN_SSE2 -I.
-+OPTS = -c -O3 -DDYNAREC -I.
-+ROPTS = -c -O3 -DARCH_MIN_SSE2 -I.
-
- all: liblazyusf.a bench dumpresampled
-
- liblazyusf.a : $(OBJS)
+diff --git Makefile Makefile +index 4baf9e5..2b5e2e8 100755 +--- Makefile ++++ Makefile +@@ -21,7 +21,7 @@ liblazyusf.a : $(OBJS) $(AR) rcs $@ $^
-+liblazyusf.so : $(OBJS)
-+ $(CC) $(CFLAGS) -Wl,-Bsymbolic -shared -lm -lz -o $@ $^
-+
- bench : test/bench.o liblazyusf.a
- $(CC) -o $@ $^ ../psflib/libpsflib.a -lz
+ liblazyusf.so: $(OBJS)
+- $(CC) $^ -shared -Wl,-soname -Wl,$@.2 -o $@.2.0
++ $(CC) $(LDFLAGS) $^ -shared -Wl,-soname -Wl,$@.2 -o $@.2.0
+ bench : test/bench.o liblazyusf.a
+ $(CC) -o $@ $^ ../psflib/libpsflib.a -lz -lm
|