Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
kodi: dont break if built without dcadec support
Signed-off-by: Stephan Raue <stephan@openelec.tv>
- Loading branch information
Showing
1 changed file
with
34 additions
and
0 deletions.
There are no files selected for viewing
34 changes: 34 additions & 0 deletions
34
...enter/kodi/patches/kodi-999.21-configure.ac-dont-break-if-dcadec-is-missing-dcadec-.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
From a3b0b1fd46d726d93303f823dacf69977f34d9ae Mon Sep 17 00:00:00 2001 | ||
From: Stephan Raue <stephan@openelec.tv> | ||
Date: Sat, 16 May 2015 11:47:58 +0200 | ||
Subject: [PATCH] configure.ac: dont break if dcadec is missing, dcadec is a | ||
ffmpeg dep | ||
|
||
--- | ||
configure.ac | 3 +-- | ||
1 file changed, 1 insertion(+), 2 deletions(-) | ||
|
||
diff --git a/configure.ac b/configure.ac | ||
index 600325a..9daa246 100644 | ||
--- a/configure.ac | ||
+++ b/configure.ac | ||
@@ -1088,7 +1088,7 @@ AC_CHECK_HEADER([mpeg2dec/mpeg2convert.h],, AC_MSG_ERROR($missing_library), | ||
AC_CHECK_HEADER([jpeglib.h],, AC_MSG_ERROR($missing_library)) | ||
AC_CHECK_HEADER([ogg/ogg.h],, AC_MSG_ERROR($missing_library)) | ||
AC_CHECK_HEADER([vorbis/vorbisfile.h],, AC_MSG_ERROR($missing_library)) | ||
-PKG_CHECK_MODULES([LIBDCADEC], [dcadec],, AC_MSG_ERROR([libdcadec not found])) | ||
+PKG_CHECK_MODULES([LIBDCADEC], [dcadec],, AC_MSG_WARN([dcadec not found])) | ||
|
||
PKG_CHECK_MODULES([LIBCURL], [libcurl],, AC_MSG_ERROR([libcurl not found])) | ||
XB_FIND_SONAME([CURL], [curl]) | ||
@@ -1120,7 +1120,6 @@ PKG_CHECK_MODULES([GNUTLS], [gnutls], [have_gnutls=yes];AC_DEFINE([HAVE_GNUTLS], | ||
AC_CHECK_LIB([bz2], [main],, AC_MSG_ERROR($missing_library)) | ||
AC_CHECK_LIB([jpeg], [main],, AC_MSG_ERROR($missing_library)) # check for cximage | ||
AC_CHECK_LIB([tiff], [main],, AC_MSG_ERROR($missing_library)) | ||
-AC_CHECK_LIB([dcadec], [main],, AC_MSG_ERROR($missing_library)) | ||
if echo "$ARCH" | grep -q freebsd; then | ||
AC_CHECK_LIB([pthread], [main],LIBS="-pthread $LIBS", AC_MSG_ERROR($missing_library)) | ||
AC_CHECK_LIB([pthread], [pthread_set_name_np], | ||
-- | ||
1.9.3 | ||
|