[Performous-commit] Vincent Le Ligeour : Added explicit webcam/midi disabling

[Tapio V. <aa...@us...>]

Module: performous
Branch: joinmenu
Commit: 5ad067bd0953dbba3b3964bbd2e412c5e07aa1ce

Author: Vincent Le Ligeour <yo...@us...>
Date:   Wed Jul 21 12:45:28 2010 +0200

Added explicit webcam/midi disabling

---

 game/CMakeLists.txt                                |   36 ++++++++++++--------
 .../games-arcade/performous/performous-9999.ebuild |    4 ++
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index 17a11e7..5a4fa1f 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -96,24 +96,32 @@ else()
 	message(STATUS "Internationalization: Disabled (libintl not found)")
 endif()
 
-find_package(PortMidi)
-if(PortMidi_FOUND)
-	include_directories(${PortMidi_INCLUDE_DIRS})
-	list(APPEND LIBS ${PortMidi_LIBRARIES})
-	add_definitions("-DUSE_PORTMIDI")
-	message(STATUS "MIDI I/O: Enabled")
+if(NOT NO_PORTMIDI)
+	find_package(PortMidi)
+	if(PortMidi_FOUND)
+		include_directories(${PortMidi_INCLUDE_DIRS})
+		list(APPEND LIBS ${PortMidi_LIBRARIES})
+		add_definitions("-DUSE_PORTMIDI")
+		message(STATUS "MIDI I/O: Enabled")
+	else()
+		message(STATUS "MIDI I/O: Disabled (libportmidi not found)")
+	endif()
 else()
-	message(STATUS "MIDI I/O: Disabled (libportmidi not found)")
+	message(STATUS "MIDI I/O: Disabled (explicitly disabled)")
 endif()
 
-find_package(OpenCV)
-if(OpenCV_FOUND)
-	include_directories(${OpenCV_INCLUDE_DIRS})
-	list(APPEND LIBS ${OpenCV_LIBRARIES})
-	add_definitions("-DUSE_OPENCV")
-	message(STATUS "Webcam support: Enabled")
+if(NOT NO_WEBCAM)
+	find_package(OpenCV)
+	if(OpenCV_FOUND)
+		include_directories(${OpenCV_INCLUDE_DIRS})
+		list(APPEND LIBS ${OpenCV_LIBRARIES})
+		add_definitions("-DUSE_OPENCV")
+		message(STATUS "Webcam support: Enabled")
+	else()
+		message(STATUS "Webcam support: Disabled (libcv/libhighgui not found)")
+	endif()
 else()
-	message(STATUS "Webcam support: Disabled (libcv/libhighgui not found)")
+	message(STATUS "Webcam support: Disabled (explicitly disabled)")
 endif()
 
 
diff --git a/portage-overlay/games-arcade/performous/performous-9999.ebuild b/portage-overlay/games-arcade/performous/performous-9999.ebuild
index ba82507..d2a1ad5 100644
--- a/portage-overlay/games-arcade/performous/performous-9999.ebuild
+++ b/portage-overlay/games-arcade/performous/performous-9999.ebuild
@@ -91,12 +91,16 @@ src_configure() {
 		$(cmake-utils_use pulseaudio LibDA_PLUGIN_PULSEAUDIO)
 		$(cmake-utils_use_enable tools TOOLS)
 		$(cmake-utils_use_enable editor EDITOR)
+		$(cmake-utils_use_no webcam WEBCAM)
 		-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}
 		-DSHARE_INSTALL=share/performous
 		-DLOCALE_DIR=/usr/share
 		-DLIBDA_AUTODETECT_PLUGINS=false
 		-DLIBDA_PLUGIN_TESTING=false
 		-DCMAKE_BUILD_TYPE=Release"
+#	local mycmakeargs="
+#		$(cmake-utils_use_no midi MIDI)
+#		${mycmakeargs}"
 
 	cmake-utils_src_configure
 }