Switch to github.com/derselbst/aopsf

The bitbucket repo has been deleted, and kode54 has no mirror on GitHub,
but derselbst is apparently maintaining things somewhat instead. We
don't need to patch it any more!

4 files changed, 10 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index babc5638b9fe..7739783b19ca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,16 @@
 pkgbase = aopsf-git
 	pkgdesc = Audio Overload's PSF core, now in a proper library
-	pkgver = r27.8213121
+	pkgver = r40.3a3f594
 	pkgrel = 1
-	url = https://bitbucket.org/losnoco/aopsf
+	url = https://github.com/derselbst/aopsf
 	arch = x86_64
 	license = BSD
 	makedepends = git
 	provides = aopsf
 	conflicts = aopsf
-	source = aopsf-git::git+https://bitbucket.org/losnoco/aopsf.git
-	source = makefile.patch
-	source = decl.patch
+	source = aopsf-git::git+https://github.com/derselbst/aopsf.git
 	source = LICENSE.BSD
 	sha256sums = SKIP
-	sha256sums = 63033efed8fbbe7fb357e9204c00977ec41c0c58518441e2d9d60412e21c8229
-	sha256sums = b807bf78052965584faff4d3767c2ed9974c74c61fa469727b309bf263b6777f
 	sha256sums = 3fb3258f12e481be1326b6931269b55866bb3ed5c0e769ecad83f9e71c3cdfca
 
 pkgname = aopsf-git
diff --git a/PKGBUILD b/PKGBUILD
index 94db3c6b608b..2460b7ab3dcc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,15 @@
 pkgname=aopsf-git
-pkgver=r27.8213121
+pkgver=r40.3a3f594
 pkgrel=1
 pkgdesc="Audio Overload's PSF core, now in a proper library"
 arch=(x86_64)
-url='https://bitbucket.org/losnoco/aopsf'
+url='https://github.com/derselbst/aopsf'
 license=(BSD)
 makedepends=(git)
 provides=(${pkgname%-git})
 conflicts=(${pkgname%-git})
-source=(${pkgname}::git+https://bitbucket.org/losnoco/aopsf.git makefile.patch decl.patch LICENSE.BSD)
-sha256sums=('SKIP'
-            '63033efed8fbbe7fb357e9204c00977ec41c0c58518441e2d9d60412e21c8229'
-            'b807bf78052965584faff4d3767c2ed9974c74c61fa469727b309bf263b6777f'
-            '3fb3258f12e481be1326b6931269b55866bb3ed5c0e769ecad83f9e71c3cdfca')
+source=(${pkgname}::git+https://github.com/derselbst/aopsf.git LICENSE.BSD)
+sha256sums=('SKIP' '3fb3258f12e481be1326b6931269b55866bb3ed5c0e769ecad83f9e71c3cdfca')
 
 pkgver() {
   cd "$srcdir/$pkgname"
@@ -22,22 +19,17 @@ pkgver() {
   )
 }
 
-prepare() {
-  cd "$srcdir/$pkgname"
-  test -e Makefile || patch -p0 < "$srcdir"/makefile.patch
-  patch -p0 < "$srcdir"/decl.patch
-}
-
 build() {
   cd "$srcdir/$pkgname"
-  make
+  make libaopsf.so
 }
 
 package() {
   cd "$srcdir/$pkgname"
-  install -D -m644 -t "$pkgdir/usr/lib" libaopsf.so
+  install -D -m644 -t "$pkgdir/usr/lib" libaopsf.so.0
   install -D -m644 -t "$pkgdir/usr/include/aopsf" psx_external.h ao.h
   install -D -m644 -t "$pkgdir/usr/share/licenses/$pkgname" "$srcdir"/LICENSE.BSD
+  ln -sf libaopsf.so.0 "$pkgdir/usr/lib/libaopsf.so"
 }
 
 # vim:set sw=2 et:
diff --git a/decl.patch b/decl.patch
deleted file mode 100644
index c7788ce8e3da..000000000000
--- a/decl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git psx_hw.c psx_hw.c
-index 3e2a914..ec5ebf2 100644
---- psx_hw.c
-+++ psx_hw.c
-@@ -55,6 +55,8 @@
- #include "psx_external.h"
- #include "psx_internal.h"
- 
-+uint32 ioptimer_lw(struct IOPTIMER_STATE *state, offs_t offset, uint32 mem_mask);
-+
- #if DEBUG_THREADING
- static char *_ThreadStateNames[TS_MAXSTATE] = { "RUNNING", "DORMANT", "WAITEVFLAG", "WAITSEMA", "WAITDELAY", "SLEEPING" };
- #endif
diff --git a/makefile.patch b/makefile.patch
deleted file mode 100644
index f6a92a1cbdaa..000000000000
--- a/makefile.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff --git Makefile Makefile
-new file mode 100644
---- /dev/null
-+++ Makefile
-@@ -0,0 +1,3 @@
-+CFLAGS += -fPIC -DEMU_COMPILE -DEMU_LITTLE_ENDIAN -DLSB_FIRST
-+libaopsf.so: eng_psf.o eng_psf2.o psx.o psx_hw.o r3000dis.o spu/spu.o spu/spucore.o
-+	$(CC) -shared -o $@ $^