summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Cholasta2020-05-15 07:52:04 +0200
committerJan Cholasta2020-05-27 07:00:39 +0200
commit03e54401a8304bb4f54cad2399e74e554e3b1ad5 (patch)
tree6ef5f8d37de17811de5fcfd20612c6eb924350f7
parentc3193028595d9630f92540570d4999d17a52ecd3 (diff)
downloadaur-03e54401a8304bb4f54cad2399e74e554e3b1ad5.tar.gz
zmusic-git-1.1.0+4+gfbb3a50-1
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD34
-rw-r--r--libzmusic.so.1-1.1.0-x86_64.dump.gz (renamed from libzmusic.so.arch.1-1.1.0-x86_64.dump.gz)bin37914 -> 37914 bytes
-rw-r--r--libzmusiclite.so.1-1.1.0-x86_64.dump.gz (renamed from libzmusiclite.so.arch.1-1.1.0-x86_64.dump.gz)bin18719 -> 18719 bytes
4 files changed, 26 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ed8184739b9..0f61e139c3d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = zmusic-git
pkgdesc = GZDoom's music system as a standalone library (git version)
- pkgver = 1.1.0+2+gb9d22fb
+ pkgver = 1.1.0+4+gfbb3a50
pkgrel = 1
url = https://github.com/coelckers/ZMusic
arch = x86_64
@@ -24,8 +24,8 @@ pkgbase = zmusic-git
source = 0001-Use-correct-soundfont-path.patch
sha256sums = SKIP
sha256sums = 6c1b5bf589e5c36186869276ade865d35fdf860241dcd2e0f557e5a82dfd066f
- source_x86_64 = libzmusic.so.arch.1-1.1.0-x86_64.dump.gz
- source_x86_64 = libzmusiclite.so.arch.1-1.1.0-x86_64.dump.gz
+ source_x86_64 = libzmusic.so.1-1.1.0-x86_64.dump.gz
+ source_x86_64 = libzmusiclite.so.1-1.1.0-x86_64.dump.gz
sha256sums_x86_64 = eb6276f8bbd6db3e2e0bb742138ea4e3a273663128311c7a9df4f254236bbd35
sha256sums_x86_64 = d490fe9bdd34e5622c2dbda3d605d49545ae1cc17abda6f0c5c898a0087e2123
diff --git a/PKGBUILD b/PKGBUILD
index 0ebcd508bbf..7cd3a708dce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Jan Cholasta <grubber at grubber cz>
pkgname=zmusic-git
-pkgver=1.1.0+2+gb9d22fb
+pkgver=1.1.0+4+gfbb3a50
pkgrel=1
pkgdesc="GZDoom's music system as a standalone library (git version)"
arch=('x86_64')
@@ -13,12 +13,11 @@ checkdepends=('abi-compliance-checker')
provides=('zmusic')
conflicts=('zmusic')
_srcname=ZMusic
-_sover=arch.1
_checkver=1.1.0
source=("${_srcname}::git+https://github.com/coelckers/ZMusic"
'0001-Use-correct-soundfont-path.patch')
-source_x86_64=("libzmusic.so.${_sover}-${_checkver}-x86_64.dump.gz"
- "libzmusiclite.so.${_sover}-${_checkver}-x86_64.dump.gz")
+source_x86_64=("libzmusic.so.1-${_checkver}-x86_64.dump.gz"
+ "libzmusiclite.so.1-${_checkver}-x86_64.dump.gz")
sha256sums=('SKIP'
'6c1b5bf589e5c36186869276ade865d35fdf860241dcd2e0f557e5a82dfd066f')
sha256sums_x86_64=('eb6276f8bbd6db3e2e0bb742138ea4e3a273663128311c7a9df4f254236bbd35'
@@ -31,7 +30,6 @@ pkgver() {
prepare() {
cd $_srcname
- echo "set_target_properties(zmusic zmusiclite PROPERTIES SOVERSION ${_sover})" >>source/CMakeLists.txt
patch -i "$srcdir"/0001-Use-correct-soundfont-path.patch -p 1
}
@@ -51,12 +49,20 @@ check() {
if [ $_checkver = ${pkgver%%+*} ]; then
return
fi
- if [ "$srcdir"/libzmusic.so.*-${_checkver}-${CARCH}.dump.gz \
- != "$srcdir"/libzmusic.so.${_sover}-${_checkver}-${CARCH}.dump.gz ]; then
+
+ _soverbumped=true
+ cd "$srcdir"/$_srcname/build/source
+ for _lib in libzmusic.so.* libzmusiclite.so.*; do
+ if [ -f "$srcdir"/"${_lib}-${_checkver}-${CARCH}.dump" ]; then
+ _soverbumped=false
+ break
+ fi
+ done
+ if $_soverbumped; then
return
fi
- cd $_srcname
+ cd "$srcdir"/$_srcname
mkdir -p check
cmake -B check \
-D CMAKE_BUILD_TYPE=Debug \
@@ -67,10 +73,14 @@ check() {
-D DYN_SNDFILE=OFF
make -C check
- for _lib in libzmusic.so.${_sover} libzmusiclite.so.${_sover}; do
- _old="$srcdir"/${_lib}-${_checkver}-${CARCH}.dump
+ cd "$srcdir"/$_srcname/check/source
+ for _lib in libzmusic.so.* libzmusiclite.so.*; do
+ _old="$srcdir"/"${_lib}-${_checkver}-${CARCH}.dump"
+ if [ ! -f "$_old" ]; then
+ continue
+ fi
_new=${_lib}-${pkgver}-${CARCH}.dump
- abi-dumper check/source/$_lib -lver $pkgver -public-headers include -output $_new
+ abi-dumper $_lib -lver $pkgver -public-headers ../../include -output $_new
abi-compliance-checker -l $_lib -old $_old -new $_new
done
}
@@ -78,5 +88,7 @@ check() {
package() {
cd $_srcname
make -C build install DESTDIR="$pkgdir"
+ ln -s libzmusic.so.1 "$pkgdir"/usr/lib/libzmusic.so.arch.1
+ ln -s libzmusiclite.so.1 "$pkgdir"/usr/lib/libzmusiclite.so.arch.1
install licenses/{bsd,dumb,legal,zmusic}.txt -t "$pkgdir"/usr/share/licenses/$pkgname -D -m 644
}
diff --git a/libzmusic.so.arch.1-1.1.0-x86_64.dump.gz b/libzmusic.so.1-1.1.0-x86_64.dump.gz
index 31950ff6637..31950ff6637 100644
--- a/libzmusic.so.arch.1-1.1.0-x86_64.dump.gz
+++ b/libzmusic.so.1-1.1.0-x86_64.dump.gz
Binary files differ
diff --git a/libzmusiclite.so.arch.1-1.1.0-x86_64.dump.gz b/libzmusiclite.so.1-1.1.0-x86_64.dump.gz
index 89c5b8992d8..89c5b8992d8 100644
--- a/libzmusiclite.so.arch.1-1.1.0-x86_64.dump.gz
+++ b/libzmusiclite.so.1-1.1.0-x86_64.dump.gz
Binary files differ