[arch-commits] Commit in mixxx/trunk (PKGBUILD)

[David Runge]

    Date: Monday, January 31, 2022 @ 14:38:09
  Author: dvzrv
Revision: 1121236

upgpkg: mixxx 2.3.1-4: Rebuild against ffmpeg 5.0. 

Simplify quoting in file.
Add upstream patch for ffmpeg >= 5.0 support.
Simplify calls to make/cmake.

Modified:
  mixxx/trunk/PKGBUILD

----------+
 PKGBUILD |   56 +++++++++++++++++++++++++++++++-------------------------
 1 file changed, 31 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-31 14:37:11 UTC (rev 1121235)
+++ PKGBUILD	2022-01-31 14:38:09 UTC (rev 1121236)
@@ -1,5 +1,5 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
 # Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
-# Contributor: David Runge <dvzrv at archlinux.org>
 # Contributor: Ali H. Caliskan <ali.h.caliskan AT gmail DOT com>
 # Contributor: Ryan Coyner <rcoyner at gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann at t-online.de>
@@ -6,55 +6,61 @@
 
 pkgname=mixxx
 pkgver=2.3.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Free, open source software for digital DJ'ing."
-arch=('x86_64')
+arch=(x86_64)
 url="https://www.mixxx.org"
-license=('GPL2')
-groups=('pro-audio')
+license=(GPL2)
+groups=(pro-audio)
 # TODO: package libshout-idjc
-depends=('gcc-libs' 'glibc' 'hidapi' 'lame' 'libglvnd' 'libmad' 'libmodplug'
-'libx11' 'openssl' 'opusfile' 'qt5-base' 'qt5-script' 'qt5-svg' 'qt5-x11extras'
-'qtkeychain' 'soundtouch' 'speex' 'sqlite' 'taglib' 'upower' 'wavpack')
-makedepends=('chromaprint' 'cmake' 'faad2' 'ffmpeg' 'fftw' 'flac' 'glib2' 'glu'
-'gperftools' 'libid3tag' 'libogg' 'libsndfile' 'libusb' 'libvorbis' 'lilv'
-'lv2' 'qt5-tools' 'portaudio' 'portmidi' 'protobuf' 'rubberband'
-'vamp-plugin-sdk')
-checkdepends=('xorg-server-xvfb')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}dj/${pkgname}/archive/${pkgver}.tar.gz"
-        add-missing-include.patch)
+depends=(gcc-libs glibc hidapi lame libglvnd libmad libmodplug libx11 openssl
+opusfile qt5-base qt5-script qt5-svg qt5-x11extras qtkeychain soundtouch speex
+sqlite taglib upower wavpack)
+makedepends=(chromaprint cmake faad2 ffmpeg fftw flac glib2 glu gperftools
+libid3tag libogg libsndfile libusb libvorbis lilv lv2 qt5-tools portaudio
+portmidi protobuf rubberband vamp-plugin-sdk)
+checkdepends=(xorg-server-xvfb)
+source=(
+  "${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}dj/${pkgname}/archive/${pkgver}.tar.gz"
+  "${pkgname}-2.3.1-ffmpeg5.patch::https://github.com/mixxxdj/mixxx/pull/4638.patch"
+  add-missing-include.patch
+)
 sha512sums=('17cf8dee2aaca2ed85067474d40b0955abd22268767a9c68dbc8126554e6b216ddab9a42b6c888606aca61fdcccccda3062f5b4f1f550722c5033c516e046816'
+            'e70ebc20251c34450c8cd8c75ce68fe42319b451f56f3c6ce60d118ff3d0b4eeb6ef3fe68f4a4b921345e36ab7afb5181defa7b88f455b5e7346bf21f3dda712'
             '3a3de0ca03652cb203c5627f37f7cf1fa661f8f0adb542f2569feff61d39232f9eb92e4ba86bae044dfd10c915d65fac6bd9330c93893643633dce0ccc45321c')
 b2sums=('08edfe19f5d0f16072762c3800e34ff37dcad478bde04356b0aae6a02ab99b115a5d1e8a33846f7f142228860bb5b19ded16b52dd464e4738462f6634b9fd6be'
+        '94e61a8278f3224b932789e37fff93ce49f2264daf62366eaf3afdcab9dcb95de7c7872f8b1ad77988f704b4be8f3ccb8c43b061003383dec14f04f1bbfe6f08'
         'ff844bb91a284883e54daf3912962cc256bbabc530c2dff9693081165ecf4e7b85f70fb6a49691b5dedb91347b038fc69ea3e78a81f51bd1869c502eaaf22848')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
+  # https://github.com/mixxxdj/mixxx/commit/e590711ca2a0882e331162d14405e25c49f7b774
   patch -Np1 -i ../add-missing-include.patch
+
+  # fix for ffmpeg >= 5.0
+  patch -Np1 -i ../"${pkgname}-2.3.1-ffmpeg5.patch"
 }
 
 build() {
-  cd "${pkgname}-${pkgver}"
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_BUILD_TYPE='Release' \
+        -DCMAKE_BUILD_TYPE=Release \
         -Wno-dev \
         -B build \
-        -S .
+        -S "${pkgname}-${pkgver}"
   make VERBOSE=1 -C build
 }
 
 check() {
   cd "${pkgname}-${pkgver}"
-  xvfb-run build/${pkgname}-test
+  xvfb-run ../build/${pkgname}-test
 }
 
 package() {
-  depends+=('libFLAC.so' 'libavcodec.so' 'libavformat.so' 'libavutil.so'
-  'libchromaprint.so' 'libfftw3.so' 'libglib-2.0.so' 'libid3tag.so'
-  'libgobject-2.0.so' 'liblilv-0.so' 'libogg.so' 'libportaudio.so'
-  'libportmidi.so' 'libprotobuf-lite.so' 'librubberband.so' 'libsndfile.so'
-  'libusb-1.0.so' 'libvorbis.so' 'libvorbisenc.so' 'libvorbisfile.so')
+  depends+=(libFLAC.so libavcodec.so libavformat.so libavutil.so
+  libchromaprint.so libfftw3.so libglib-2.0.so libid3tag.so libgobject-2.0.so
+  liblilv-0.so libogg.so libportaudio.so libportmidi.so libprotobuf-lite.so
+  librubberband.so libsndfile.so libusb-1.0.so libvorbis.so libvorbisenc.so
+  libvorbisfile.so)
 
-  cd "${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install -C build
 }