[arch-commits] Commit in openal/repos/extra-x86_64 (PKGBUILD PKGBUILD ffmpeg-5.0.diff)

[Jan Steffens]

    Date: Sunday, April 24, 2022 @ 13:32:36
  Author: heftig
Revision: 443907

archrelease: copy trunk to extra-x86_64

Added:
  openal/repos/extra-x86_64/PKGBUILD
    (from rev 443906, openal/trunk/PKGBUILD)
Deleted:
  openal/repos/extra-x86_64/PKGBUILD
  openal/repos/extra-x86_64/ffmpeg-5.0.diff

-----------------+
 PKGBUILD        |  147 +++++++++++++++++++++++++-----------------------------
 ffmpeg-5.0.diff |   13 ----
 2 files changed, 70 insertions(+), 90 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-24 13:31:12 UTC (rev 443906)
+++ PKGBUILD	2022-04-24 13:32:36 UTC (rev 443907)
@@ -1,77 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Allan McRae <allan at archlinux.org>
-# Contributor: Jason Chu <jchu at xentac.net>
-
-pkgbase=openal
-pkgname=(openal openal-examples)
-pkgver=1.21.1
-pkgrel=3
-pkgdesc="Cross-platform 3D audio library, software implementation"
-arch=(x86_64)
-url="https://github.com/kcat/openal-soft"
-license=(LGPL)
-depends=(gcc-libs)
-makedepends=(alsa-lib libpulse fluidsynth portaudio jack qt5-base sdl2
-             libsndfile ffmpeg libmysofa git cmake ninja)
-optdepends=('qt5-base: alsoft-config GUI Configurator'
-            'fluidsynth: MIDI rendering'
-            'libmysofa: makemhr tool')
-_commit=ae4eacf147e2c2340cc4e02a790df04c793ed0a9  # tags/1.21.1
-source=("git+https://github.com/kcat/openal-soft#commit=$_commit"
-        ffmpeg-5.0.diff)
-sha512sums=('SKIP'
-            '9a2bcc2036799d4ca9d98845b75b4ae03d9f300e4e7ddf20f7b52239e625d3b064728cd48c5dc36862ae63d0a26ecd994aa4a1594b0ff45c93d226a1fe023337')
-
-pkgver() {
-  cd openal-soft
-  git describe --tags | sed 's/^openal-soft-//;s/-/+/g'
-}
-
-prepare() {
-  cd openal-soft
-
-  # Missing include
-  git cherry-pick -n 302e88dbf0f10224a5b87be4ce43b3fdd9d20184
-
-  # https://bugs.archlinux.org/task/72729
-  git cherry-pick -n b7ff1de48efda9ad54e6a3b4c1526722c371e832
-
-  # Fix build with FFmpeg 5.0
-  git apply -3 ../ffmpeg-5.0.diff
-}
-
-build() {
-  cmake -S openal-soft -B build -G Ninja \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=None \
-    -DCMAKE_INSTALL_LIBDIR=lib
-  cmake --build build
-}
-
-_pick() {
-  local p="$1" f d; shift
-  for f; do
-    d="$srcdir/$p/${f#$pkgdir/}"
-    mkdir -p "$(dirname "$d")"
-    mv "$f" "$d"
-    rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
-  done
-}
-
-package_openal() {
-  provides+=(libopenal.so)
-
-  DESTDIR="$pkgdir" cmake --install build
-  install -Dt "$pkgdir/usr/share/doc/openal" -m644 openal-soft/docs/*
-
-  cd "$pkgdir"
-  _pick examples usr/bin/al{ffplay,hrtf,latency,loopback,multireverb}
-  _pick examples usr/bin/al{play,record,reverb,stream,tonegen}
-}
-
-package_openal-examples() {
-  pkgdesc+=" (example programs)"
-  depends=("openal=$pkgver-$pkgrel" sdl2 libsndfile ffmpeg)
-  optdepends=()
-  mv examples/* "$pkgdir"
-}

Copied: openal/repos/extra-x86_64/PKGBUILD (from rev 443906, openal/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-04-24 13:32:36 UTC (rev 443907)
@@ -0,0 +1,70 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: Jason Chu <jchu at xentac.net>
+
+pkgbase=openal
+pkgname=(openal openal-examples)
+pkgver=1.22.0
+pkgrel=1
+pkgdesc="Cross-platform 3D audio library, software implementation"
+arch=(x86_64)
+url="https://github.com/kcat/openal-soft"
+license=(LGPL)
+depends=(gcc-libs)
+makedepends=(alsa-lib libpulse fluidsynth portaudio jack pipewire qt5-base sdl2
+             libsndfile ffmpeg libmysofa git cmake ninja)
+optdepends=('qt5-base: alsoft-config GUI Configurator'
+            'fluidsynth: MIDI rendering'
+            'libmysofa: makemhr tool')
+options=(debug)
+_commit=c1c63a27de66cd44ef756b190a73bfa8bc6dbbab  # master
+source=("git+https://github.com/kcat/openal-soft#commit=$_commit")
+b2sums=('SKIP')
+
+pkgver() {
+  cd openal-soft
+  git describe --tags | sed 's/^openal-soft-//;s/-/+/g'
+}
+
+prepare() {
+  cd openal-soft
+
+  # Fixup missing tag
+  git tag -f 1.22.0 c1c63a27de66cd44ef756b190a73bfa8bc6dbbab
+}
+
+build() {
+  cmake -S openal-soft -B build -G Ninja \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_INSTALL_LIBDIR=lib
+  cmake --build build
+}
+
+_pick() {
+  local p="$1" f d; shift
+  for f; do
+    d="$srcdir/$p/${f#$pkgdir/}"
+    mkdir -p "$(dirname "$d")"
+    mv "$f" "$d"
+    rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+  done
+}
+
+package_openal() {
+  provides+=(libopenal.so)
+
+  DESTDIR="$pkgdir" cmake --install build
+  install -Dt "$pkgdir/usr/share/doc/openal" -m644 openal-soft/docs/*
+
+  cd "$pkgdir"
+  _pick examples usr/bin/al{ffplay,hrtf,latency,loopback,multireverb}
+  _pick examples usr/bin/al{play,record,reverb,stream,tonegen}
+}
+
+package_openal-examples() {
+  pkgdesc+=" (example programs)"
+  depends=("openal=$pkgver-$pkgrel" sdl2 libsndfile ffmpeg)
+  optdepends=()
+  mv examples/* "$pkgdir"
+}

Deleted: ffmpeg-5.0.diff
===================================================================
--- ffmpeg-5.0.diff	2022-04-24 13:31:12 UTC (rev 443906)
+++ ffmpeg-5.0.diff	2022-04-24 13:32:36 UTC (rev 443907)
@@ -1,13 +0,0 @@
-diff --git i/examples/alffplay.cpp w/examples/alffplay.cpp
-index b9739e7b..806ef10c 100644
---- i/examples/alffplay.cpp
-+++ w/examples/alffplay.cpp
-@@ -1804,7 +1804,7 @@ int MovieState::streamComponentOpen(unsigned int stream_index)
-     if(avcodec_parameters_to_context(avctx.get(), mFormatCtx->streams[stream_index]->codecpar))
-         return -1;
- 
--    AVCodec *codec{avcodec_find_decoder(avctx->codec_id)};
-+    const AVCodec *codec{avcodec_find_decoder(avctx->codec_id)};
-     if(!codec || avcodec_open2(avctx.get(), codec, nullptr) < 0)
-     {
-         std::cerr<< "Unsupported codec: "<<avcodec_get_name(avctx->codec_id)