[SCM] kodi-pvr-vdr-vnsi/master: drop DX9, rendering OSD on Windows requires DX11
tiber-guest at users.alioth.debian.org
tiber-guest at users.alioth.debian.org
Fri Nov 4 00:20:22 UTC 2016
The following commit has been merged in the master branch:
commit 50f006a0925abce0e929fe7bd3cc467c2e495041
Author: xbmc <xbmc>
Date: Sat Apr 9 15:29:28 2016 +0200
drop DX9, rendering OSD on Windows requires DX11
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3019396..92bfb9a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,15 +38,7 @@ if(NOT WIN32)
endif()
endif()
else()
- find_package(D3DX9)
- if(D3DX9_FOUND)
- set(INCLUDES ${D3DX9_INCLUDE_DIR})
- set(DEPLIBS ${D3DX9_LIBRARIES})
- add_definitions(-DHAS_DX)
- message(STATUS "VDR OSD support enabled via DirectX")
- else()
- message(STATUS " VDR OSD support disabled because DirectX wasn't found")
- endif()
+ message(STATUS " VDR OSD support disabled because it is not migrated to DX11 yet")
endif()
list(APPEND VDR_SOURCES src/client.cpp
diff --git a/FindD3DX9.cmake b/FindD3DX9.cmake
deleted file mode 100644
index 0ae11d0..0000000
--- a/FindD3DX9.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-# - Find Direct3D 9 Extensions
-# Find the Direct3D9 Extensions includes and libraries
-#
-# D3DX9_INCLUDE_DIR - where to find d3d9x.h
-# D3DX9_LIBRARIES - List of libraries when using D3DX9.
-# D3DX9_FOUND - True if D3DX9 found.
-
-if(D3DX9_INCLUDE_DIR)
- # Already in cache, be silent
- set(D3DX9_FIND_QUIETLY TRUE)
-endif(D3DX9_INCLUDE_DIR)
-
-find_path(D3DX9_INCLUDE_DIR d3dx9.h
-HINTS "$ENV{DXSDK_DIR}/Include"
-)
-
-find_library(D3DX9_LIBRARY
-NAMES d3dx9
-HINTS "$ENV{DXSDK_DIR}/Lib/$ENV{PROCESSOR_ARCHITECTURE}"
-HINTS "$ENV{DXSDK_DIR}/lib"
-)
-
-# Handle the QUIETLY and REQUIRED arguments and set D3D9X_FOUND to TRUE if
-# all listed variables are TRUE.
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(D3DX9 DEFAULT_MSG
-D3DX9_INCLUDE_DIR D3DX9_LIBRARY)
-mark_as_advanced(D3DX9_INCLUDE_DIR D3DX9_LIBRARY)
--
kodi-pvr-vdr-vnsi packaging
More information about the pkg-multimedia-commits
mailing list