summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Whatson2018-12-10 00:23:32 +1000
committerAndrew Whatson2018-12-10 00:23:32 +1000
commit6f4857bbb3947a6a6b50c361d50c23e62ea0d0ec (patch)
tree3f9c221e8eec58b05caef9f08c4e58ab4a49888e
parent9722dab9331462bbe94ad3b54ab69803a8cfbab9 (diff)
downloadaur-6f4857bbb3947a6a6b50c361d50c23e62ea0d0ec.tar.gz
Update for CMake build
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD46
-rw-r--r--setup_faudio_aur.verb14
3 files changed, 34 insertions, 32 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 17892ccd3022..95ba029bd410 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = faudio-wrappers-git
pkgdesc = Accuracy-focused XAudio reimplementation for open platforms
- pkgver = r950.5893b35
- pkgrel = 2
+ pkgver = r979.a98be73
+ pkgrel = 1
url = https://github.com/FNA-XNA/FAudio
arch = i686
arch = x86_64
@@ -15,7 +15,7 @@ pkgbase = faudio-wrappers-git
source = git+https://github.com/FNA-XNA/FAudio
source = setup_faudio_aur.verb
sha256sums = SKIP
- sha256sums = 2ddaebc61ad13e26625da6a7252f67a914aaf3cb3a31e34e332562b6a4238aae
+ sha256sums = 2d8825fd34496d903666580f166396da8f6c792efa6a15b5247f69f953d10dc8
pkgname = faudio-wrappers-win32-git
arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 7a672cb177a9..11220141459f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@ _pkgbase=faudio-wrappers
_gitname=FAudio
pkgbase=${_pkgbase}-git
pkgname=("${_pkgbase}-win32-git" "${_pkgbase}-win64-git")
-pkgver=r950.5893b35
-pkgrel=2
+pkgver=r979.a98be73
+pkgrel=1
pkgdesc="Accuracy-focused XAudio reimplementation for open platforms"
arch=('i686' 'x86_64')
url='https://github.com/FNA-XNA/FAudio'
@@ -15,7 +15,7 @@ makedepends=('git' 'mingw-w64-gcc' 'mingw-w64-sdl2' 'mingw-w64-ffmpeg')
source=('git+https://github.com/FNA-XNA/FAudio'
'setup_faudio_aur.verb')
sha256sums=('SKIP'
- '2ddaebc61ad13e26625da6a7252f67a914aaf3cb3a31e34e332562b6a4238aae')
+ '2d8825fd34496d903666580f166396da8f6c792efa6a15b5247f69f953d10dc8')
pkgver() {
cd "$srcdir/${_gitname}"
@@ -23,25 +23,24 @@ pkgver() {
}
_build_faudio-wrappers() {
- cd "$srcdir/${_gitname}"
-
_mingw=$1
- export PATH=/usr/${_mingw}/bin:${PATH}
- export CC=${_mingw}-gcc
- export CXX=${_mingw}-g++
- export AR=${_mingw}-ar
- export DLLTOOL=${_mingw}-dlltool
+ _builddir="${srcdir}/${_gitname}/build-${_mingw}"
+ _installdir="${srcdir}/${_gitname}/install-${_mingw}"
+
+ mkdir -p "${_builddir}"
+ cd "${_builddir}"
+
unset LDFLAGS
- export DISABLE_XNASONG=1
- export FAUDIO_RELEASE=1
- export FAUDIO_FFMPEG=1
- export FAUDIO_FFMPEG_PREFIX=/usr/${_mingw}
+ ${_mingw}-cmake .. \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX="${_installdir}" \
+ -DFFMPEG=ON \
+ -DBUILD_CPP=ON \
+ -DINSTALL_MINGW_DEPENDENCIES=ON
- make clean
make
- make -C cpp
}
build() {
@@ -50,15 +49,20 @@ build() {
}
_package_faudio-wrappers() {
- cd "$srcdir/${_gitname}"
-
_arch=$1
_mingw=$2
+
_pkgname="${_pkgbase}-win${_arch}"
+ _builddir="${srcdir}/${_gitname}/build-${_mingw}"
+ _installdir="${srcdir}/${_gitname}/install-${_mingw}"
+
+ cd "${_builddir}"
+
+ make install
- install -D -t "${pkgdir}/usr/share/${_pkgname}" "cpp/build_win${_arch}"/*.dll
- install -D -m644 -t "${pkgdir}/usr/share/${_pkgname}" ../setup_faudio_aur.verb
- install -D -m644 -t "${pkgdir}/usr/share/licenses/${_pkgname}" LICENSE
+ install -D -t "${pkgdir}/usr/share/${_pkgname}" "${_installdir}/bin"/*.dll
+ install -D -m644 -t "${pkgdir}/usr/share/${_pkgname}" ../../setup_faudio_aur.verb
+ install -D -m644 -t "${pkgdir}/usr/share/licenses/${_pkgname}" ../LICENSE
install -d "${pkgdir}/usr/bin"
find "${pkgdir}/usr/share/${_pkgname}" -name '*.dll' -exec ${_mingw}-strip --strip-unneeded {} \;
diff --git a/setup_faudio_aur.verb b/setup_faudio_aur.verb
index 8abd2ab49f34..021abd979ba5 100644
--- a/setup_faudio_aur.verb
+++ b/setup_faudio_aur.verb
@@ -34,10 +34,9 @@ w_metadata setup_faudio_aur dlls \
file29='FAudio.dll' \
file30='SDL2.dll' \
file31='libwinpthread-1.dll' \
- file32='libiconv-2.dll' \
- file33='avcodec-58.dll' \
- file34='avutil-56.dll' \
- file35='swresample-3.dll' \
+ file32='avcodec-58.dll' \
+ file33='avutil-56.dll' \
+ file34='swresample-3.dll' \
installed_file1="${W_SYSTEM32_DLLS_WIN}/xaudio2_0.dll" \
installed_file2="${W_SYSTEM32_DLLS_WIN}/xaudio2_1.dll" \
installed_file3="${W_SYSTEM32_DLLS_WIN}/xaudio2_2.dll" \
@@ -69,10 +68,9 @@ w_metadata setup_faudio_aur dlls \
installed_file29="${W_SYSTEM32_DLLS_WIN}/FAudio.dll" \
installed_file30="${W_SYSTEM32_DLLS_WIN}/SDL2.dll" \
installed_file31="${W_SYSTEM32_DLLS_WIN}/libwinpthread-1.dll" \
- installed_file32="${W_SYSTEM32_DLLS_WIN}/libiconv-2.dll" \
- installed_file33="${W_SYSTEM32_DLLS_WIN}/avcodec-58.dll" \
- installed_file34="${W_SYSTEM32_DLLS_WIN}/avutil-56.dll" \
- installed_file35="${W_SYSTEM32_DLLS_WIN}/swresample-3.dll" \
+ installed_file32="${W_SYSTEM32_DLLS_WIN}/avcodec-58.dll" \
+ installed_file33="${W_SYSTEM32_DLLS_WIN}/avutil-56.dll" \
+ installed_file34="${W_SYSTEM32_DLLS_WIN}/swresample-3.dll" \
homepage='https://github.com/FNA-XNA/FAudio'
FAUDIO_ROOT_DIR=$(dirname "$(readlink -f $1)")