[arch-commits] Commit in lib32-openal/repos/multilib-x86_64 (PKGBUILD PKGBUILD)

[Jan Steffens]

    Date: Sunday, July 23, 2017 @ 10:41:33
  Author: heftig
Revision: 246122

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-openal/repos/multilib-x86_64/PKGBUILD
    (from rev 246121, lib32-openal/trunk/PKGBUILD)
Deleted:
  lib32-openal/repos/multilib-x86_64/PKGBUILD

----------+
 PKGBUILD |   90 +++++++++++++++++++++++++++++++------------------------------
 1 file changed, 46 insertions(+), 44 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-23 10:40:19 UTC (rev 246121)
+++ PKGBUILD	2017-07-23 10:41:33 UTC (rev 246122)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Allan McRae <allan at archlinux.org>
-# Contributor: Jason Chu <jchu at xentac.net>
-
-pkgname=lib32-openal
-pkgver=1.18.0
-pkgrel=2
-pkgdesc="A cross-platform 3D audio library (32-bit)"
-arch=(x86_64)
-url="http://www.openal.org/"
-license=(LGPL)
-depends=(lib32-glibc openal)
-makedepends=(lib32-alsa-lib pkgconfig cmake lib32-libpulse lib32-portaudio lib32-jack
-             git gcc-multilib)
-_commit=61e43d4039277c538f3f6e0af7c988e7d71d8558  # tags/openal-soft-1.18.0
-options=('!strip' 'debug')
-source=("git+https://github.com/kcat/openal-soft#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd openal-soft
-  git describe --tags | sed 's/^openal-soft-//;s/-/+/g'
-}
-
-prepare() {
-  mkdir build
-  cd openal-soft
-}
-
-build() {
-  export CC="gcc -m32 -mstackrealign"
-  export CXX="g++ -m32 -mstackrealign"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd build
-  cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_LIBDIR=lib32 ../openal-soft
-  make
-}
-
-package() {
-  make -C build DESTDIR="$pkgdir" install
-  rm -rv "$pkgdir"/usr/{include,share,bin}
-}

Copied: lib32-openal/repos/multilib-x86_64/PKGBUILD (from rev 246121, lib32-openal/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-07-23 10:41:33 UTC (rev 246122)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: Jason Chu <jchu at xentac.net>
+
+pkgname=lib32-openal
+pkgver=1.18.0
+pkgrel=2
+pkgdesc="Cross-platform 3D audio library, software implementation (32-bit)"
+arch=(x86_64)
+url="https://github.com/kcat/openal-soft"
+license=(LGPL)
+depends=(lib32-glibc openal)
+makedepends=(lib32-alsa-lib pkgconfig cmake lib32-libpulse lib32-portaudio lib32-jack
+             git gcc-multilib)
+_commit=61e43d4039277c538f3f6e0af7c988e7d71d8558  # tags/openal-soft-1.18.0
+source=("git+https://github.com/kcat/openal-soft#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd openal-soft
+  git describe --tags | sed 's/^openal-soft-//;s/-/+/g'
+}
+
+prepare() {
+  mkdir build
+  cd openal-soft
+
+  # https://bugs.archlinux.org/task/54908
+  git cherry-pick -n d4f3490a880f779f460332689a396ade69840f50
+}
+
+build() {
+  export CC="gcc -m32 -mstackrealign"
+  export CXX="g++ -m32 -mstackrealign"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  cd build
+  cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_LIBDIR=lib32 ../openal-soft
+  make
+}
+
+package() {
+  make -C build DESTDIR="$pkgdir" install
+  rm -rv "$pkgdir"/usr/{include,share,bin}
+}