From 12d2a79814987afd34c457a5e4365d7167972bc0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 27 Dec 2014 14:44:43 -0600 Subject: unbreak kodi and util-linux, bad qa day. --- package/kodi/Makefile | 4 ++-- package/kodi/patches/patch-configure_in | 22 ---------------------- 2 files changed, 2 insertions(+), 24 deletions(-) (limited to 'package/kodi') diff --git a/package/kodi/Makefile b/package/kodi/Makefile index ea6a2df4e..688100184 100644 --- a/package/kodi/Makefile +++ b/package/kodi/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= kodi PKG_VERSION:= 14.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_HASH:= 11746d95cc59361f36ce6ea9d0d36bbd9ec3376e991f5ec1720f8ff740b91192 PKG_DESCR:= software media player PKG_SECTION:= mm/video @@ -14,7 +14,7 @@ PKG_DEPENDS+= libass libmpeg2 libmad libdbus libglew mesalib PKG_DEPENDS+= libjpeg-turbo libogg libvorbis libmodplug libcurl PKG_DEPENDS+= libflac libbz2 libtiff liblzo libressl PKG_DEPENDS+= yajl tinyxml libsqlite libpcrecpp libpng libncurses -PKG_DEPENDS+= libpcre libcdio libfreetype libsamplerate +PKG_DEPENDS+= libpcre libcdio libfreetype libsamplerate libuuid PKG_DEPENDS+= taglib libjasper libmp3lame libmicrohttpd PKG_DEPENDS+= libgpg-error libudev python2-mod-sqlite libffmpeg PKG_DEPENDS+= libxslt libvorbisenc alsa-lib glib libglu librt diff --git a/package/kodi/patches/patch-configure_in b/package/kodi/patches/patch-configure_in index 7bbafe474..c82fc1830 100644 --- a/package/kodi/patches/patch-configure_in +++ b/package/kodi/patches/patch-configure_in @@ -49,25 +49,3 @@ else AC_CHECK_LIB([EGL], [main],, AC_MSG_ERROR($missing_library)) AC_CHECK_LIB([GLESv2],[main],, AC_MSG_ERROR($missing_library)) -@@ -1066,21 +1042,6 @@ AC_CHECK_HEADER([vorbis/vorbisfile.h],, - AC_CHECK_HEADER([libmodplug/modplug.h],, AC_MSG_ERROR($missing_library)) - - AC_CHECK_HEADER([curl/curl.h],, AC_MSG_ERROR($missing_library)) --XB_FIND_SONAME([CURL], [curl]) --AC_MSG_CHECKING([for CRYPTO_set_locking_callback(0) in $CURL_SONAME]) --if test "$host_vendor" = "apple" ; then -- libchecker="$NM" -- searchpattern="T [_]?CRYPTO_set_locking_call" --else -- libchecker="$READELF -s" -- searchpattern="CRYPTO_set_locking_call" --fi --if test $($libchecker $CURL_FILENAME | grep -Eq "${searchpattern}" ; echo $?) -eq 0 ; then -- AC_MSG_RESULT(yes) -- AC_DEFINE([HAS_CURL_STATIC], [1], [Whether OpenSSL inside libcurl is static.]) --else -- AC_MSG_RESULT(no) --fi - - AC_CHECK_HEADER([openssl/crypto.h], AC_DEFINE([HAVE_OPENSSL],[1],[Define if we have openssl]),) - AC_CHECK_HEADER([gcrypt.h], gcrypt_headers_available=yes,gcrypt_headers_available=no) -- cgit v1.2.3