[upd] 0.4.11→0.5.0

- Separate libopenmpt-modplug
- Remove openmpt123-minimal

2 files changed, 23 insertions, 79 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 83f1d389622d..f9b53d120a8e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
 pkgbase = libopenmpt
 	pkgdesc = A cross-platform C++ and C library to decode tracked music files (modules) into a raw PCM audio stream.
-	pkgver = 0.4.11
+	pkgver = 0.5.0
 	pkgrel = 1
 	url = http://lib.openmpt.org/
 	arch = i686
 	arch = x86_64
 	license = BSD
-	makedepends = sdl2
 	makedepends = portaudio
 	makedepends = libsndfile
 	makedepends = flac
@@ -16,30 +15,16 @@ pkgbase = libopenmpt
 	depends = gcc-libs
 	depends = libvorbis
 	depends = mpg123
-	source = https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-0.4.11+release.makefile.tar.gz
-	sha256sums = a5c90100dcbb95cfee1ebe90bb5a74f9ce562e3c4da848386c2001ef567ecba6
+	source = https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-0.5.0+release.autotools.tar.gz
+	sha256sums = 43cba54a3f7220c3cc5baae1e2c19a5af7196bfdb95ff4d0c4979d9fbc6c837e
 
 pkgname = libopenmpt
 
 pkgname = openmpt123
 	pkgdesc = A cross-platform command-line or terminal based module file player.
-	depends = libopenmpt=0.4.11
-	depends = sdl2
+	depends = libopenmpt=0.5.0
 	depends = portaudio
 	depends = libsndfile
 	depends = flac
 	depends = libpulse
 
-pkgname = openmpt123-minimal
-	pkgdesc = A cross-platform command-line or terminal based module file player (with minimal dependencies).
-	depends = libopenmpt=0.4.11
-	depends = sdl2
-	conflicts = openmpt123
-
-pkgname = libopenmpt-modplug
-	pkgdesc = libmodplug compat layer/bridge to libopenmpt
-	install = libopenmpt-modplug.install
-	depends = libopenmpt=0.4.11
-	provides = libmodplug
-	conflicts = libmodplug
-
diff --git a/PKGBUILD b/PKGBUILD
index 5c1edce2e6d1..a230c70eb8c4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
 
 pkgbase=libopenmpt
-pkgname=(libopenmpt openmpt123 openmpt123-minimal libopenmpt-modplug)
-_pkgver=0.4.11+release
+pkgname=(libopenmpt openmpt123)
+_pkgver=0.5.0+release.autotools
 pkgver=${_pkgver%+*}
 pkgrel=1
 pkgdesc='A cross-platform C++ and C library to decode tracked music files (modules) into a raw PCM audio stream.'
@@ -10,83 +10,42 @@ arch=('i686' 'x86_64')
 url='http://lib.openmpt.org/'
 license=('BSD')
 depends=('zlib' 'gcc-libs' 'libvorbis' 'mpg123')
-makedepends=('sdl2' 'portaudio' 'libsndfile' 'flac' 'help2man' 'libpulse')
-source=("https://lib.openmpt.org/files/$pkgname/src/$pkgname-${_pkgver}.makefile.tar.gz")
-sha256sums=('a5c90100dcbb95cfee1ebe90bb5a74f9ce562e3c4da848386c2001ef567ecba6')
+makedepends=('portaudio' 'libsndfile' 'flac' 'help2man' 'libpulse')
+source=("https://lib.openmpt.org/files/$pkgname/src/$pkgname-${_pkgver}.tar.gz")
+sha256sums=('43cba54a3f7220c3cc5baae1e2c19a5af7196bfdb95ff4d0c4979d9fbc6c837e')
 
 build() {
-  cd $pkgbase-${_pkgver%-*}
+  cd $pkgbase-$_pkgver
 
-  make PREFIX=/usr CONFIG=gcc STATIC_LIB=0 NO_SDL=1 TEST=0 #VERBOSE=2
-
-  # additional, minimal openmpt123 version
-  cp bin/openmpt123.norpath bin/openmpt123_full
-  rm openmpt123/openmpt123.o bin/openmpt123{,.norpath}
-  make PREFIX=/usr CONFIG=gcc STATIC_LIB=0 NO_SDL=1 \
-    NO_PORTAUDIO=1 NO_FLAC=1 NO_SNDFILE=1 NO_PULSEAUDIO=1 TEST=0 #VERBOSE=2
-  cp bin/openmpt123.norpath bin/openmpt123_minimal
+  ./configure --prefix=/usr --enable-silent-rules
+  make
 }
 
 check() {
-  cd $pkgbase-${_pkgver%-*}
+  cd $pkgbase-$_pkgver
 
-  make test
+  make check
 }
 
 package_libopenmpt() {
-  cd $pkgbase-${_pkgver%-*}
-
-  make PREFIX=/usr DESTDIR="$pkgdir" OPENMPT123=0 TEST=0 install
-
-  # license
-  install -Dm0644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
+  make -C $pkgbase-$_pkgver DESTDIR="$pkgdir" install
 
-package_libopenmpt-modplug() {
-  pkgdesc='libmodplug compat layer/bridge to libopenmpt'
-  depends=("libopenmpt=$pkgver")
-  conflicts=('libmodplug')
-  provides=('libmodplug')
-  install='libopenmpt-modplug.install'
-
-  # library
-  cd $pkgbase-${_pkgver%-*}
-  make PREFIX=/usr DESTDIR="$pkgdir" TEST=0 install-modplug
-
-  # headers
-  install -d "$pkgdir"/usr/include/libmodplug
-  install -m0644 include/modplug/include/libmodplug/{stdafx,sndfile,modplug}.h "$pkgdir"/usr/include/libmodplug
-
-  # pkg-config
-  install -Dm0644 include/modplug/include/libmodplug/libmodplug.pc.in "$pkgdir"/usr/lib/pkgconfig/libmodplug.pc
-  sed -e 's|@.*prefix@|/usr|g;s|@libdir@|/usr/lib|' -i "$pkgdir"/usr/lib/pkgconfig/libmodplug.pc
+  # separate openmpt123
+  rm -r "$pkgdir"/usr/{share/man,bin}
 
   # link license
-  install -d "$pkgdir"/usr/share/licenses
-  ln -s $pkgbase "$pkgdir"/usr/share/licenses/$pkgname
+  mkdir -p "$pkgdir"/usr/share/licenses/$pkgname
+  ln -s ../../doc/$pkgname/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
 package_openmpt123() {
   pkgdesc='A cross-platform command-line or terminal based module file player.'
-  depends=("libopenmpt=$pkgver" 'sdl2' 'portaudio' 'libsndfile' 'flac' 'libpulse')
+  depends=("libopenmpt=$pkgver" 'portaudio' 'libsndfile' 'flac' 'libpulse')
 
-  cd $pkgbase-${_pkgver%-*}/bin
-  install -Dm755 openmpt123_full "$pkgdir"/usr/bin/openmpt123
-  install -Dm644 openmpt123.1 "$pkgdir"/usr/share/man/man1/openmpt123.1
+  make -C $pkgbase-$_pkgver DESTDIR="$pkgdir" install
   
-  # link license
-  install -d "$pkgdir"/usr/share/licenses
-  ln -s $pkgbase "$pkgdir"/usr/share/licenses/$pkgname
-}
-
-package_openmpt123-minimal() {
-  pkgdesc='A cross-platform command-line or terminal based module file player (with minimal dependencies).'
-  depends=("libopenmpt=$pkgver" 'sdl2')
-  conflicts=('openmpt123')
-
-  cd $pkgbase-${_pkgver%-*}/bin
-  install -Dm0755 openmpt123_minimal "$pkgdir"/usr/bin/openmpt123
-  install -Dm0644 openmpt123.1 "$pkgdir"/usr/share/man/man1/openmpt123.1
+  # separate libopenmpt
+  rm -r "$pkgdir"/usr/{lib,include,share/doc}
 
   # link license
   install -d "$pkgdir"/usr/share/licenses