Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_163766434414570"
MIME-Version: 1.0
Date: Tue, 23 Nov 2021 10:45:44 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/audio/mixxx/patches
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20211123104544.527A2FAEC@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_163766434414570
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Tue Nov 23 10:45:44 UTC 2021

Added Files:
	pkgsrc/audio/mixxx/patches: patch-CMakeLists.txt

Log Message:
mixxx: add missing patch


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/mixxx/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_163766434414570
Content-Disposition: inline
Content-Length: 2503
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Added files:

Index: pkgsrc/audio/mixxx/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/audio/mixxx/patches/patch-CMakeLists.txt:1.1
--- /dev/null	Tue Nov 23 10:45:44 2021
+++ pkgsrc/audio/mixxx/patches/patch-CMakeLists.txt	Tue Nov 23 10:45:44 2021
@@ -0,0 +1,57 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2021/11/23 10:45:44 nia Exp $
+
+- Make PortMidi optional.
+- CMake is not able to properly detect the version of hidapi.
+
+--- CMakeLists.txt.orig	2021-09-29 13:23:02.000000000 +0000
++++ CMakeLists.txt
+@@ -460,8 +460,6 @@ add_library(mixxx-lib STATIC EXCLUDE_FRO
+   src/controllers/midi/midimessage.cpp
+   src/controllers/midi/midioutputhandler.cpp
+   src/controllers/midi/midiutils.cpp
+-  src/controllers/midi/portmidicontroller.cpp
+-  src/controllers/midi/portmidienumerator.cpp
+   src/controllers/softtakeover.cpp
+   src/database/mixxxdb.cpp
+   src/database/schemamanager.cpp
+@@ -1534,8 +1532,6 @@ add_executable(mixxx-test
+   src/test/performancetimer_test.cpp
+   src/test/playcountertest.cpp
+   src/test/playlisttest.cpp
+-  src/test/portmidicontroller_test.cpp
+-  src/test/portmidienumeratortest.cpp
+   src/test/queryutiltest.cpp
+   src/test/rangelist_test.cpp
+   src/test/readaheadmanager_test.cpp
+@@ -1931,9 +1927,19 @@ target_include_directories(mixxx-lib SYS
+ target_link_libraries(mixxx-lib PRIVATE PortAudioRingBuffer)
+ 
+ # PortMidi
+-find_package(PortMidi REQUIRED)
+-target_include_directories(mixxx-lib SYSTEM PUBLIC ${PortMidi_INCLUDE_DIRS})
+-target_link_libraries(mixxx-lib PRIVATE ${PortMidi_LIBRARIES})
++find_package(PortMidi)
++cmake_dependent_option(PORTMIDI "PortMidi MIDI device support" ON "${PortMidi_FOUND}" OFF)
++if(PORTMIDI)
++  target_include_directories(mixxx-lib SYSTEM PUBLIC ${PortMidi_INCLUDE_DIRS})
++  target_compile_definitions(mixxx-lib PUBLIC __PORTMIDI__)
++  target_link_libraries(mixxx-lib PRIVATE ${PortMidi_LIBRARIES})
++  target_sources(mixxx-lib PRIVATE
++    src/controllers/midi/portmidicontroller.cpp
++    src/controllers/midi/portmidienumerator.cpp
++    src/test/portmidicontroller_test.cpp
++    src/test/portmidienumeratortest.cpp
++  )
++endif()
+ 
+ # Protobuf
+ if(STATIC_DEPS)
+@@ -2601,7 +2607,7 @@ find_package(LibUSB)
+ # USB HID controller support
+ option(HID "USB HID controller support" ON)
+ if(HID)
+-  find_package(hidapi 0.10.1)
++  find_package(hidapi)
+   if(NOT hidapi_FOUND)
+     message(STATUS "Linking internal libhidapi statically")
+     add_library(mixxx-hidapi STATIC EXCLUDE_FROM_ALL)


--_----------=_163766434414570--