patch-configure_in 2.4 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950
  1. --- xbmc-14.0-Helix.orig/configure.in 2014-12-22 17:11:35.000000000 -0600
  2. +++ xbmc-14.0-Helix/configure.in 2014-12-28 02:47:04.799045092 -0600
  3. @@ -55,13 +55,6 @@ AC_DEFUN([XB_ADD_CODEC],
  4. # check for library basenames
  5. AC_DEFUN([XB_FIND_SONAME],
  6. [
  7. - if echo "$host" | grep -q freebsd ; then
  8. - AC_MSG_CHECKING([for lib$2 soname])
  9. - $1_SONAME=[`ldconfig -r | sed -n "s;.* \(/.*lib$2\.so.*\)$;\1;p" | head -n 1`]
  10. - if test x$$1_SONAME != x ; then
  11. - $1_SONAME=[`basename $$1_SONAME`]
  12. - fi
  13. - elif [[ "$host_vendor" != "apple" ]]; then
  14. AC_MSG_CHECKING([for lib$2 soname])
  15. $1_FILENAME=$($CC -nostdlib -o /dev/null $LDFLAGS $4 -l$2 -Wl,-M 2>/dev/null | grep "^LOAD.*$2" | awk '{V=2; print $V}')
  16. if [[ -z $$1_FILENAME ]]; then
  17. @@ -71,24 +64,6 @@ AC_DEFUN([XB_FIND_SONAME],
  18. if [[ ! -z $$1_FILENAME ]]; then
  19. $1_SONAME=$($OBJDUMP -p $$1_FILENAME | grep "SONAME.*$2" | awk '{V=2; print $V}')
  20. fi
  21. - else
  22. - AC_MSG_CHECKING([for lib$2 dylib])
  23. - gcc_lib_path=[`$CC -print-search-dirs 2>/dev/null | fgrep libraries: | sed 's/[^=]*=\(.*\)/\1/' | sed 's/:/ /g'`]
  24. - env_lib_path=[`echo $LDFLAGS | sed 's/-L[ ]*//g'`]
  25. - if test "$cross_compiling" = yes; then
  26. - host_lib_path=""
  27. - else
  28. - host_lib_path="/usr/lib /usr/local/lib"
  29. - fi
  30. - for path in $gcc_lib_path $env_lib_path $host_lib_path; do
  31. - lib=[`ls -- $path/lib$2.dylib 2>/dev/null`]
  32. - if test x$lib != x; then
  33. - # we want the path/name that is embedded in the dylib
  34. - $1_FILENAME=[`otool -L $lib | grep -v lib$2.dylib | grep lib$2 | awk '{V=1; print $V}'`]
  35. - $1_SONAME=[`basename $$1_FILENAME`]
  36. - fi
  37. - done
  38. - fi
  39. if [[ -z "$$1_SONAME" ]]; then
  40. AC_MSG_RESULT([no])
  41. if test -z "$3" || test "x${$3}" = "xyes"; then
  42. @@ -1015,7 +990,7 @@ if test "$use_gles" = "yes"; then
  43. AC_DEFINE([HAVE_LIBEGL],[1],["Define to 1 if you have the `EGL' library (-lEGL)."])
  44. AC_DEFINE([HAVE_LIBGLESV2],[1],["Define to 1 if you have the `GLESv2' library (-lGLESv2)."])
  45. AC_MSG_RESULT(== WARNING: OpenGLES support is assumed.)
  46. - LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm -lmmal -lmmal_core -lmmal_util"
  47. + LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm -lmmal -lmmal_core -lmmal_util -lkhrn_static -lpthread -lm"
  48. else
  49. AC_CHECK_LIB([EGL], [main],, AC_MSG_ERROR($missing_library))
  50. AC_CHECK_LIB([GLESv2],[main],, AC_MSG_ERROR($missing_library))