2 files changed, 24 insertions, 11 deletions
diff --git a/ports/libass/CMakeLists.txt b/ports/libass/CMakeLists.txt
index 32d7ef097..7345e515f 100644
--- a/ports/libass/CMakeLists.txt
+++ b/ports/libass/CMakeLists.txt
@@ -7,18 +7,30 @@ configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
-# This is Windows-specific. Other acceptable values on different platforms should be
-#    macOS - CONFIG_CORETEXT
-#    linux - CONFIG_FONTCONFIG
-add_compile_definitions(CONFIG_DIRECTWRITE)
+if(WIN32)
+  add_compile_definitions(CONFIG_DIRECTWRITE)
+elseif(APPLE)
+  add_compile_definitions(CONFIG_CORETEXT)
+else()
+  add_compile_definitions(CONFIG_FONTCONFIG)
+endif()
+
 add_compile_definitions(CONFIG_FREETYPE)
 add_compile_definitions(CONFIG_FRIBIDI)
 add_compile_definitions(CONFIG_HARFBUZZ)
 
 file (GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/libass/*.c)
 
-list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$")
-list(FILTER SOURCES EXCLUDE REGEX ".*ass_fontconfig.c$")
+if(WIN32)
+  list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$")
+  list(FILTER SOURCES EXCLUDE REGEX ".*ass_fontconfig.c$")
+elseif(APPLE)
+  list(FILTER SOURCES EXCLUDE REGEX ".*ass_directwrite.c$")
+  list(FILTER SOURCES EXCLUDE REGEX ".*ass_fontconfig.c$")
+else()
+  list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$")
+  list(FILTER SOURCES EXCLUDE REGEX ".*ass_directwrite.c$")
+endif()
 
 find_package(Freetype REQUIRED)
 
@@ -35,13 +47,13 @@ find_library(HARFBUZZ_LIBRARY NAMES harfbuzz)
 
 add_library(ass ${SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/libass.def)
 
-target_include_directories(ass PRIVATE 
-  ${FRIBIDI_INCLUDE_DIR} 
+target_include_directories(ass PRIVATE
+  ${FRIBIDI_INCLUDE_DIR}
   ${HARFBUZZ_INCLUDE_DIR})
 
-target_link_libraries(ass PRIVATE 
-  Freetype::Freetype 
-  ${FRIBIDI_LIBRARY} 
+target_link_libraries(ass PRIVATE
+  Freetype::Freetype
+  ${FRIBIDI_LIBRARY}
   ${HARFBUZZ_LIBRARY})
 
 install(TARGETS ass
diff --git a/ports/libass/CONTROL b/ports/libass/CONTROL
index ea25ea9a1..3c11a9e9c 100644
--- a/ports/libass/CONTROL
+++ b/ports/libass/CONTROL
@@ -1,4 +1,5 @@
 Source: libass
 Version: 0.14.0
+Port-Version: 1
 Build-Depends: freetype, fribidi, harfbuzz, dirent (windows)
 Description: libass is a portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format.