[upd] 0.2.8414.beta25→0.3.1

2 files changed, 11 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8fb57bfe5829..5f2d8e94af1b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libopenmpt
 	pkgdesc = A cross-platform C++ and C library to decode tracked music files (modules) into a raw PCM audio stream.
-	pkgver = 0.2.8414.beta25
+	pkgver = 0.3.1
 	pkgrel = 1
 	url = http://lib.openmpt.org/
 	arch = i686
@@ -16,14 +16,14 @@ pkgbase = libopenmpt
 	depends = gcc-libs
 	depends = libvorbis
 	depends = mpg123
-	source = http://lib.openmpt.org/files/libopenmpt/src/libopenmpt-0.2.8414-beta25.tar.gz
-	sha256sums = 97d66425efc7fbff0f214218f958525cb7ac6238b1194b7e57372a063fc503a6
+	source = https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-0.3.1+release.makefile.tar.gz
+	sha256sums = 9b0639d131106c872d3988b9af3400e275b73d87953f90c58b16a42bfa96a94c
 
 pkgname = libopenmpt
 
 pkgname = openmpt123
 	pkgdesc = A cross-platform command-line or terminal based module file player.
-	depends = libopenmpt=0.2.8414.beta25
+	depends = libopenmpt=0.3.1
 	depends = sdl2
 	depends = portaudio
 	depends = libsndfile
@@ -32,14 +32,14 @@ pkgname = openmpt123
 
 pkgname = openmpt123-minimal
 	pkgdesc = A cross-platform command-line or terminal based module file player (with minimal dependencies).
-	depends = libopenmpt=0.2.8414.beta25
+	depends = libopenmpt=0.3.1
 	depends = sdl2
 	conflicts = openmpt123
 
 pkgname = libopenmpt-modplug
 	pkgdesc = libmodplug compat layer/bridge to libopenmpt
 	install = libopenmpt-modplug.install
-	depends = libopenmpt=0.2.8414.beta25
+	depends = libopenmpt=0.3.1
 	provides = libmodplug
 	conflicts = libmodplug
 
diff --git a/PKGBUILD b/PKGBUILD
index bdf99ff6471b..8f726643bb80 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgbase=libopenmpt
 pkgname=(libopenmpt openmpt123 openmpt123-minimal libopenmpt-modplug)
-_pkgver=0.2.8414-beta25
-pkgver=${_pkgver/-/.}
+_pkgver=0.3.1+release
+pkgver=${_pkgver%+*}
 pkgrel=1
 pkgdesc='A cross-platform C++ and C library to decode tracked music files (modules) into a raw PCM audio stream.'
 arch=('i686' 'x86_64')
@@ -11,8 +11,8 @@ url='http://lib.openmpt.org/'
 license=('BSD')
 depends=('zlib' 'gcc-libs' 'libvorbis' 'mpg123')
 makedepends=('sdl2' 'portaudio' 'libsndfile' 'flac' 'help2man' 'libpulse')
-source=("http://lib.openmpt.org/files/$pkgname/src/$pkgname-${_pkgver}.tar.gz")
-sha256sums=('97d66425efc7fbff0f214218f958525cb7ac6238b1194b7e57372a063fc503a6')
+source=("https://lib.openmpt.org/files/$pkgname/src/$pkgname-${_pkgver}.makefile.tar.gz")
+sha256sums=('9b0639d131106c872d3988b9af3400e275b73d87953f90c58b16a42bfa96a94c')
 
 build() {
   cd $pkgbase-${_pkgver%-*}
@@ -39,7 +39,7 @@ package_libopenmpt() {
   make PREFIX=/usr DESTDIR="$pkgdir" OPENMPT123=0 TEST=0 install
 
   # license
-  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+  install -Dm0644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
 package_libopenmpt-modplug() {
@@ -52,11 +52,6 @@ package_libopenmpt-modplug() {
   cd $pkgbase-${_pkgver%-*}
   make PREFIX=/usr DESTDIR="$pkgdir" TEST=0 install-modplug
 
-  # fix soname to match libmodplug
-  rm -f "$pkgdir"/usr/lib/libmodplug.so.*
-  ln -s libmodplug.so "$pkgdir"/usr/lib/libmodplug.so.1
-  ln -s libmodplug.so.1 "$pkgdir"/usr/lib/libmodplug.so.1.0.0
-
   # link license
   install -d "$pkgdir"/usr/share/licenses
   ln -s $pkgbase "$pkgdir"/usr/share/licenses/$pkgname