Date: Friday, March 3, 2023 @ 09:18:16
  Author: dvzrv
Revision: 1409192

upgpkg: mixxx 2.3.3-4: Rebuild against ffmpeg 6.

Change dependency arrays to be one dep per line.
Move cmake options to local array for better handling.
Consolidate cmake calls to adhere to packaging guidelines.

Modified:
  mixxx/trunk/PKGBUILD

----------+
 PKGBUILD |  100 +++++++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 78 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2023-03-03 09:13:42 UTC (rev 1409191)
+++ PKGBUILD    2023-03-03 09:18:16 UTC (rev 1409192)
@@ -6,7 +6,7 @@
 
 pkgname=mixxx
 pkgver=2.3.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Free, open source software for digital DJing"
 arch=(x86_64)
 url="https://www.mixxx.org";
@@ -13,37 +13,93 @@
 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)
+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)
+source=(https://github.com/${pkgname}dj/$pkgname/archive/$pkgver/$pkgname-$pkgver.tar.gz)
 
sha512sums=('6bd3809802f2f66af7d840db6ce006d7e46a824cf460ea9ae1bcff81f17483debd2ef47fd68d0da82671afaf01b6c3bc2522e02b41d992e08bc98f4d3d68120f')
 
b2sums=('1b3d863341afbdce86c61c4689494a334a689d02aaf5a700aa74d3291843f028d77ef7d62e545d05377ffb1f9a5077529c3a77a2b4a5e8ce20823728a8fe8d80')
 
 build() {
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_BUILD_TYPE=Release \
-        -Wno-dev \
-        -B build \
-        -S $pkgname-$pkgver
-  make VERBOSE=1 -C build
+  local cmake_options=(
+    -B build
+    -DCMAKE_BUILD_TYPE=Release
+    -DCMAKE_INSTALL_PREFIX=/usr
+    -S $pkgname-$pkgver
+    -Wno-dev
+  )
+
+  cmake "${cmake_options[@]}"
+  cmake --build build --verbose
 }
 
 check() {
-  cd $pkgname-$pkgver
-  xvfb-run ../build/$pkgname-test
+  xvfb-run ctest --test-dir build --output-on-failure
 }
 
 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+=(
+    chromaprint libchromaprint.so
+    flac libFLAC.so
+    ffmpeg libavcodec.so libavformat.so libavutil.so
+    fftw libfftw3.so
+    glib2 libgobject-2.0.so
+    libid3tag libid3tag.so
+    libogg libogg.so
+    libsndfile libsndfile.so
+    libusb libusb-1.0.so
+    libvorbis libvorbis.so libvorbisenc.so libvorbisfile.so
+    lilv liblilv-0.so
+    portaudio libportaudio.so
+    portmidi libportmidi.so
+    protobuf libprotobuf-lite.so
+    rubberband librubberband.so
+  )
 
-  make DESTDIR="$pkgdir" install -C build
+  DESTDIR="$pkgdir" cmake --install build
 }

Reply via email to