update

3 files changed, 11 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4228c8b70de9..8087754112f8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libvgm-git
 	pkgdesc = Library for decoding and playing VGM files
-	pkgver = r408.5fe3883
+	pkgver = r413.49e9450
 	pkgrel = 1
 	url = https://github.com/ValleyBell/libvgm
 	arch = x86_64
@@ -13,9 +13,7 @@ pkgbase = libvgm-git
 	makedepends = git
 	makedepends = cmake
 	source = git+https://github.com/ValleyBell/libvgm.git
-	source = libvgm-fix-shared-build.patch
 	md5sums = SKIP
-	md5sums = fd9cdfd3f3e6bc849feb3f76fd1f0a82
 
 pkgname = libvgm-player-git
 	pkgdesc = libvgm player library
diff --git a/PKGBUILD b/PKGBUILD
index 1bae9f545cb6..be3cc95cba38 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: John Regan <john@jrjrtech.com>
 pkgname=('libvgm-player-git' 'libvgm-emu-git' 'libvgm-utils-git' 'libvgm-audio-git' 'libvgm-common-git' 'vgm2wav-git' 'vgmplayer-git')
 pkgbase=libvgm-git
-pkgver=r408.5fe3883
+pkgver=r413.49e9450
 pkgrel=1
 pkgdesc="Library for decoding and playing VGM files"
 arch=(x86_64 i686)
@@ -9,11 +9,9 @@ url="https://github.com/ValleyBell/libvgm"
 license=('GPL')
 makedepends=('zlib' 'alsa-lib' 'libpulse' 'libao' 'git' 'cmake')
 
-source=('git+https://github.com/ValleyBell/libvgm.git'
-'libvgm-fix-shared-build.patch')
+source=('git+https://github.com/ValleyBell/libvgm.git')
 
-md5sums=('SKIP'
-'fd9cdfd3f3e6bc849feb3f76fd1f0a82')
+md5sums=('SKIP')
 
 pkgver() {
 	cd "$srcdir/${pkgbase%-git}"
@@ -21,13 +19,9 @@ pkgver() {
 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-prepare() {
-	cd "$srcdir/${pkgbase%-git}"
-	patch -p1 -i "$srcdir/${pkgbase%-git}-fix-shared-build.patch"
-}
-
 build() {
 	cd "$srcdir/${pkgbase%-git}"
+    rm -rf build
     mkdir build
     cd build
     cmake -DLIBRARY_TYPE=SHARED -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_BUILD_RPATH=TRUE -DCMAKE_INSTALL_PREFIX=/usr ..
@@ -39,6 +33,8 @@ package_libvgm-common-git() {
 	cd "$srcdir/${pkgbase%-git}/build"
 	make DESTDIR="$pkgdir/" install
 
+    rm -rf "$pkgdir/usr/bin"
+
     rm -rf "$pkgdir/usr/lib/libvgm-audio"*
     rm -rf "$pkgdir/usr/lib/libvgm-emu"*
     rm -rf "$pkgdir/usr/lib/libvgm-player"*
@@ -61,6 +57,7 @@ package_libvgm-audio-git() {
 	cd "$srcdir/${pkgbase%-git}/build"
 	make DESTDIR="$pkgdir/" install
 
+    rm -rf "$pkgdir/usr/bin"
     rm -rf "$pkgdir/usr/lib/libvgm-emu"*
     rm -rf "$pkgdir/usr/lib/libvgm-player"*
     rm -rf "$pkgdir/usr/lib/libvgm-utils"*
@@ -86,6 +83,7 @@ package_libvgm-emu-git() {
 	cd "$srcdir/${pkgbase%-git}/build"
 	make DESTDIR="$pkgdir/" install
 
+    rm -rf "$pkgdir/usr/bin"
     rm -rf "$pkgdir/usr/lib/libvgm-audio"*
     rm -rf "$pkgdir/usr/lib/libvgm-player"*
     rm -rf "$pkgdir/usr/lib/libvgm-utils"*
@@ -110,6 +108,7 @@ package_libvgm-player-git() {
 	cd "$srcdir/${pkgbase%-git}/build"
 	make DESTDIR="$pkgdir/" install
 
+    rm -rf "$pkgdir/usr/bin"
     rm -rf "$pkgdir/usr/lib/libvgm-audio"*
     rm -rf "$pkgdir/usr/lib/libvgm-emu"*
     rm -rf "$pkgdir/usr/lib/libvgm-utils"*
@@ -134,6 +133,7 @@ package_libvgm-utils-git() {
 	cd "$srcdir/${pkgbase%-git}/build"
 	make DESTDIR="$pkgdir/" install
 
+    rm -rf "$pkgdir/usr/bin"
     rm -rf "$pkgdir/usr/lib/libvgm-audio"*
     rm -rf "$pkgdir/usr/lib/libvgm-emu"*
     rm -rf "$pkgdir/usr/lib/libvgm-player"*
diff --git a/libvgm-fix-shared-build.patch b/libvgm-fix-shared-build.patch
deleted file mode 100644
index 6c9800e0473d..000000000000
--- a/libvgm-fix-shared-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 6e74d886ff48476c26b51f8e6faeaf71f0bac0fc Mon Sep 17 00:00:00 2001
-From: John Regan <john@jrjrtech.com>
-Date: Fri, 9 Oct 2020 12:10:34 -0400
-Subject: [PATCH] example player: list utils as dependency
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f31b805..04f50d3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -177,7 +177,7 @@ endif(BUILD_TESTS)
- if(BUILD_PLAYER)
- add_executable(player player.cpp player/dblk_compr.c)
- target_include_directories(player PRIVATE ${PROJECT_SOURCE_DIR})
--target_link_libraries(player PRIVATE vgm-audio vgm-player)
-+target_link_libraries(player PRIVATE vgm-audio vgm-player vgm-utils)
- if(USE_SANITIZERS)
- 	add_sanitizers(player)
- endif(USE_SANITIZERS)