diff options
| author | David Spencer <idlemoor@slackbuilds.org> | 2016-04-11 13:56:01 +0100 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-04-12 17:34:23 +0700 |
| commit | 40611f26611e2626bc8025ca7fed3e960525a053 (patch) | |
| tree | 39fa7fa5d092d576db1837f51a58c12260c7d08c | |
| parent | 30ac9806f4de9fee64e1b312fe859f8f840a17a2 (diff) | |
multimedia/plex-home-theater: Fix build failure with fribidi-0.19.7.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
| -rw-r--r-- | multimedia/plex-home-theater/fribidi.patch | 47 | ||||
| -rw-r--r-- | multimedia/plex-home-theater/plex-home-theater.SlackBuild | 4 |
2 files changed, 51 insertions, 0 deletions
diff --git a/multimedia/plex-home-theater/fribidi.patch b/multimedia/plex-home-theater/fribidi.patch new file mode 100644 index 0000000000000..3b135bdfc3ca3 --- /dev/null +++ b/multimedia/plex-home-theater/fribidi.patch @@ -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) diff --git a/multimedia/plex-home-theater/plex-home-theater.SlackBuild b/multimedia/plex-home-theater/plex-home-theater.SlackBuild index 3f0a9beffc87b..c23fad3237739 100644 --- a/multimedia/plex-home-theater/plex-home-theater.SlackBuild +++ b/multimedia/plex-home-theater/plex-home-theater.SlackBuild @@ -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 |