[deps] Removed expat dependency

xbmc · Apr 9, 2023 · 8816b90 · 8816b90
1 parent 4b6ca27
commit 8816b90
Show file tree

Hide file tree

Showing 12 changed files with 3 additions and 37 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -143,7 +143,6 @@ include_directories(${INCLUDES}
 
 set(CMAKE_FIND_FRAMEWORK LAST)
 
-find_package(EXPAT REQUIRED)
 find_package(Bento4 REQUIRED)
 find_package(Pugixml REQUIRED)
 
@@ -156,9 +155,7 @@ endif()
 
 add_definitions(-DUNICODE -D_UNICODE)
 
-include_directories(${EXPAT_INCLUDE_DIRS}
-                    ${PUGIXML_INCLUDE_DIRS})
-list(APPEND DEPLIBS ${EXPAT_LIBRARIES})
+include_directories(${PUGIXML_INCLUDE_DIRS})
 
 if(CORE_SYSTEM_NAME STREQUAL ios OR CORE_SYSTEM_NAME STREQUAL darwin_embedded)
   set(BENTOUSESTCFS 1)

diff --git a/debian/control b/debian/control
@@ -2,8 +2,7 @@ Source: kodi-inputstream-adaptive
 Priority: extra
 Maintainer: Team Kodi <[email protected]>
 Build-Depends: debhelper (>= 9.0.0), cmake, libgtest-dev,
-               kodi-addon-dev, pkg-config, libexpat1-dev,
-               libpugixml-dev
+               kodi-addon-dev, pkg-config, libpugixml-dev
 Standards-Version: 3.9.8
 Section: libs
 Homepage: https://kodi.tv

diff --git a/depends/common/expat/CMakeLists.txt b/depends/common/expat/CMakeLists.txt
diff --git a/depends/common/expat/expat.sha256 b/depends/common/expat/expat.sha256
diff --git a/depends/common/expat/expat.txt b/depends/common/expat/expat.txt
diff --git a/depends/windows/expat/expat.sha256 b/depends/windows/expat/expat.sha256
diff --git a/depends/windows/expat/expat.txt b/depends/windows/expat/expat.txt
diff --git a/depends/windows/expat/flags.txt b/depends/windows/expat/flags.txt
diff --git a/depends/windowsstore/expat/expat.sha256 b/depends/windowsstore/expat/expat.sha256
diff --git a/depends/windowsstore/expat/expat.txt b/depends/windowsstore/expat/expat.txt
diff --git a/depends/windowsstore/expat/flags.txt b/depends/windowsstore/expat/flags.txt
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
@@ -44,7 +44,7 @@ add_executable(${BINARY}
     ../utils/XMLUtils.cpp
     )
 
-target_link_libraries(${BINARY} PRIVATE ${EXPAT_LIBRARIES} ${PUGIXML_LIBRARIES} ${GTEST_LIBRARIES} Threads::Threads ${CMAKE_DL_LIBS})
+target_link_libraries(${BINARY} PRIVATE ${PUGIXML_LIBRARIES} ${GTEST_LIBRARIES} Threads::Threads ${CMAKE_DL_LIBS})
 
 set(TEST_DATA_DIR "${CMAKE_SOURCE_DIR}/src/test/manifests")
 add_test(NAME manifest_tests COMMAND ${BINARY} "${TEST_DATA_DIR}")