multimedia/plex-home-theater: Fix build failure with fribidi-0.19.7.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
This commit is contained in:
David Spencer 2016-04-11 13:56:01 +01:00 committed by Willy Sudiarto Raharjo
parent 30ac9806f4
commit 40611f2661
2 changed files with 51 additions and 0 deletions

View file

@ -0,0 +1,47 @@
--- a/plex/CMakeModules/FindFriBiDi.cmake
+++ b/plex/CMakeModules/FindFriBiDi.cmake
@@ -10,43 +10,9 @@
# FRIBIDI_LIBRARY, where to find the FriBiDi library.
include(CheckSymbolExists)
+include(FindPkgConfig)
+pkg_check_modules(FRIBIDI fribidi)
-SET(FRIBIDI_FOUND "NO")
-
-# Set variable in temp var, otherwise FIND_PATH might fail
-# unset isn't present in the required version of cmake.
-FIND_PATH(xFRIBIDI_INCLUDE_DIR fribidi.h
- PATHS /usr/local/include
- /usr/include
- PATH_SUFFIXES fribidi
- )
-set(FRIBIDI_INCLUDE_DIR ${xFRIBIDI_INCLUDE_DIR})
-
-SET(FRIBIDI_NAMES ${FRIBIDI_NAMES} fribidi libfribidi)
-FIND_LIBRARY(FRIBIDI_LIBRARY
- NAMES ${FRIBIDI_NAMES}
- PATHS /usr/lib /usr/local/lib
- )
-
-IF (FRIBIDI_LIBRARY AND FRIBIDI_INCLUDE_DIR)
- SET(CMAKE_REQUIRED_INCLUDES ${FRIBIDI_INCLUDE_DIR})
- SET(CMAKE_REQUIRED_LIBRARIES ${FRIBIDI_LIBRARY})
- CHECK_SYMBOL_EXISTS(fribidi_utf8_to_unicode fribidi.h FOUND_fribidi_utf8_to_unicode)
- CHECK_SYMBOL_EXISTS(fribidi_charset_to_unicode fribidi.h FOUND_fribidi_charset_to_unicode)
- if(FOUND_fribidi_charset_to_unicode)
- SET(FRIBIDI_LIBRARIES ${FRIBIDI_LIBRARY})
- SET(FRIBIDI_FOUND "YES")
- elseif(FOUND_fribidi_utf8_to_unicode)
- SET(FRIBIDI_LIBRARIES ${FRIBIDI_LIBRARY})
- SET(FRIBIDI_FOUND "YES")
- add_definitions(-DOLD_FRIBIDI)
- MESSAGE(STATUS "Legacy FriBiDi: ${FRIBIDI_LIBRARY}")
- else()
- SET(FRIBIDI_LIBRARIES "NOTFOUND")
- SET(FRIBIDI_INCLUDE_DIR "NOTFOUND")
- SET(FRIBIDI_FOUND "NO")
- endif()
-ENDIF (FRIBIDI_LIBRARY AND FRIBIDI_INCLUDE_DIR)
IF (FRIBIDI_FOUND)

View file

@ -78,6 +78,10 @@ sed -i 's/ ShairPort//' plex/CMakeModules/PlatformConfigLINUX.cmake
# Disables AES for VIA CPU's due to segfaults. Thanks to Philip van der Hoeven.
patch -p0 < $CWD/disable_via_ace.patch
# Find fribidi-0.19.7
# https://raw.githubusercontent.com/foux/fouxlay/master/media-tv/plex-home-theater/files/fribidi.patch
patch -p1 < $CWD/fribidi.patch
mkdir build
cd build