commit 7d8d17a7c303f73c9594bf861fb93d6548d0ffa4 Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Sat Sep 28 22:31:35 2024 +0200
- use system libdjinterop; seems to build with 0.21.0, so disable strict matching mixxx-libdjinterop.patch | 11 +++++++++++ mixxx.spec | 3 +++ 2 files changed, 14 insertions(+) --- diff --git a/mixxx.spec b/mixxx.spec index 81285ee..6f1b23b 100644 --- a/mixxx.spec +++ b/mixxx.spec @@ -25,6 +25,7 @@ Source0: https://github.com/mixxxdj/mixxx/archive/%{version}/%{name}-%{version}. Patch0: %{name}-build-type.patch Patch1: %{name}-taglib2.patch Patch2: %{name}-msgsl.patch +Patch3: %{name}-libdjinterop.patch URL: https://mixxx.org/ BuildRequires: OpenGL-devel BuildRequires: Qt5Concurrent-devel >= %{qt5_ver} @@ -53,6 +54,7 @@ BuildRequires: gtest-devel %{?with_hidapi:BuildRequires: hidapi-devel >= 0.11.2} BuildRequires: lame-libs-devel BuildRequires: libchromaprint-devel +BuildRequires: libdjinterop-devel >= 0.20.2 BuildRequires: libebur128-devel BuildRequires: libid3tag-devel BuildRequires: libmad-devel @@ -134,6 +136,7 @@ Podstawowe skórki dla programu Mixxx. %patch0 -p1 %{?with_taglib2:%patch1 -p1} %patch2 -p1 +%patch3 -p1 %build %cmake -B build \ diff --git a/mixxx-libdjinterop.patch b/mixxx-libdjinterop.patch new file mode 100644 index 0000000..c788276 --- /dev/null +++ b/mixxx-libdjinterop.patch @@ -0,0 +1,11 @@ +--- mixxx-2.4.1/CMakeLists.txt.orig 2024-09-28 21:47:06.674846532 +0200 ++++ mixxx-2.4.1/CMakeLists.txt 2024-09-28 22:01:31.953175308 +0200 +@@ -2283,7 +2283,7 @@ if(ENGINEPRIME) + # statically. This situation should be reviewed once libdjinterop hits version 1.x. + set(LIBDJINTEROP_VERSION 0.20.2) + # Look whether an existing installation of libdjinterop matches the required version. +- find_package(DjInterop ${LIBDJINTEROP_VERSION} EXACT CONFIG) ++ find_package(DjInterop ${LIBDJINTEROP_VERSION} CONFIG) + if(NOT DjInterop_FOUND) + find_package(DjInterop ${LIBDJINTEROP_VERSION} EXACT MODULE) + endif() ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/mixxx.git/commitdiff/7d8d17a7c303f73c9594bf861fb93d6548d0ffa4 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit