--- src/CMakeLists.txt.orig	2015-12-12 08:41:35 UTC
+++ src/CMakeLists.txt
@@ -6,6 +6,14 @@ find_package(wxWidgets 3.0 COMPONENTS st
 endif (USE_WEBVIEW_STARTPAGE)
 include(${wxWidgets_USE_FILE})
 
+# Work around find_package(wxWidgets...) inability to detect absence of some
+# optional components (e.g., media)
+find_library(WX_MEDIA wx_gtk2u_media-3.0)
+if (NOT WX_MEDIA)
+	message(STATUS "wx_gtk2u_media-3.0 not found, removing from wxWidgets_LIBRARIES.")
+	list(REMOVE_ITEM wxWidgets_LIBRARIES -lwx_gtk2u_media-3.0)
+endif(NOT WX_MEDIA)
+
 if (USE_SFML_RENDERWINDOW)
 set(SFML_FIND_COMPONENTS system audio window graphics)
 ADD_DEFINITIONS(-DUSE_SFML_RENDERWINDOW)
@@ -57,7 +65,8 @@ endif()
 if(NOT ${GLEW_FOUND})
 	message(SEND_ERROR "GLEW required.")
 endif()
-include_directories(${FREEIMAGE_INCLUDE_DIR} ${SFML_INCLUDE_DIR} ${FTGL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${GLEW_INCLUDE_PATH} ${GTK2_INCLUDE_DIRS} . ./External/dumb ./Application)
+# Put local `dumb' directory first to avoid conflict with `audio/dumb' port
+include_directories(External/dumb ${FREEIMAGE_INCLUDE_DIR} ${SFML_INCLUDE_DIR} ${FTGL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${GLEW_INCLUDE_PATH} ${GTK2_INCLUDE_DIRS} . Application)
 
 if (NOT NO_FLUIDSYNTH)
 	include_directories(${FLUIDSYNTH_INCLUDE_DIR})