[arch-commits] Commit in mixxx/trunk (PKGBUILD mixxx-mp4v2-c++.patch)

[Antonio Rojas]

    Date: Saturday, May 8, 2021 @ 15:36:20
  Author: arojas
Revision: 928851

Use C++ to check for libmp4v2

Added:
  mixxx/trunk/mixxx-mp4v2-c++.patch
Modified:
  mixxx/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |    9 +++++++--
 mixxx-mp4v2-c++.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-08 15:23:37 UTC (rev 928850)
+++ PKGBUILD	2021-05-08 15:36:20 UTC (rev 928851)
@@ -20,12 +20,17 @@
 'libogg' 'libsndfile' 'libusb' 'libvorbis' 'lilv' 'lv2' 'qt5-tools' 'portaudio'
 'portmidi' 'protobuf' 'rubberband' 'scons' 'vamp-plugin-sdk')
 checkdepends=('xorg-server-xvfb')
-source=("https://github.com/${pkgname}dj/${pkgname}/archive/release-${pkgver}.tar.gz")
-sha512sums=('34f67088ea2271cb13b75d001d3814237b1b6c2052646d670a36e341fb78e24c34d361a3eb03b0dbfb2d94b0026fecc9125713d7533aac7e99161c27090115fa')
+source=("https://github.com/${pkgname}dj/${pkgname}/archive/release-${pkgver}.tar.gz"
+         mixxx-mp4v2-c++.patch)
+sha512sums=('34f67088ea2271cb13b75d001d3814237b1b6c2052646d670a36e341fb78e24c34d361a3eb03b0dbfb2d94b0026fecc9125713d7533aac7e99161c27090115fa'
+            'c7ea562ac32e46ec12302cb3c50f2152d172830cfe669f230f810dff51c1421ae7811a96a26cbc06f28be6cf1900f9fc161ff91dfcad659831bd0ff24dea3cd7')
 
 prepare() {
   mv -v "${pkgname}-release-${pkgver}" "${pkgname}-${pkgver}"
   cd "${pkgname}-${pkgver}"
+
+# Check for mp4v2 headers in C++ mode, since using mp4v2 in C is broken https://github.com/TechSmith/mp4v2/issues/47
+  patch -p1 < ../mixxx-mp4v2-c++.patch
 }
 
 build() {

Added: mixxx-mp4v2-c++.patch
===================================================================
--- mixxx-mp4v2-c++.patch	                        (rev 0)
+++ mixxx-mp4v2-c++.patch	2021-05-08 15:36:20 UTC (rev 928851)
@@ -0,0 +1,26 @@
+diff --git a/build/features.py b/build/features.py
+index 7d5c76249f..2275567e4b 100644
+--- a/build/features.py
++++ b/build/features.py
+@@ -502,7 +502,7 @@ class FAAD(Feature):
+         if not self.enabled(build):
+             return
+ 
+-        have_mp4v2_h = conf.CheckHeader('mp4v2/mp4v2.h')
++        have_mp4v2_h = conf.CheckHeader('mp4v2/mp4v2.h', language='C++')
+         have_mp4v2 = conf.CheckLib(['mp4v2', 'libmp4v2'], autoadd=False)
+         have_mp4_h = conf.CheckHeader('mp4.h')
+         have_mp4 = conf.CheckLib('mp4', autoadd=False)
+diff --git a/plugins/soundsourcem4a/SConscript b/plugins/soundsourcem4a/SConscript
+index 9f9a74cbca..9f8006908a 100644
+--- a/plugins/soundsourcem4a/SConscript
++++ b/plugins/soundsourcem4a/SConscript
+@@ -38,7 +38,7 @@ if int(build.flags['faad']):
+ 
+     conf = Configure(env)
+ 
+-    have_mp4v2_h = conf.CheckHeader('mp4v2/mp4v2.h')
++    have_mp4v2_h = conf.CheckHeader('mp4v2/mp4v2.h', language='C++')
+     if have_mp4v2_h:
+         env.Append(CPPDEFINES = '__MP4V2__')
+