diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2014-12-22 10:10:34 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2014-12-22 10:10:34 +0100 |
| commit | b390eafdcf03f34ac6e2c22be43c27fbc93f01f0 (patch) | |
| tree | 40e52d2c4ec574872e9a5bc8f9f1b83aad9a5517 /package | |
| parent | c3f5dca02273cc360b9f4a5f48dbf7b870f933df (diff) | |
depend on libressl or openssl
Diffstat (limited to 'package')
| -rw-r--r-- | package/kodi/Makefile | 16 | ||||
| -rw-r--r-- | package/kodi/patches/patch-tools_TexturePacker_Makefile_in | 13 | ||||
| -rw-r--r-- | package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp | 6 |
3 files changed, 29 insertions, 6 deletions
diff --git a/package/kodi/Makefile b/package/kodi/Makefile index c0e1866a9..267a259f5 100644 --- a/package/kodi/Makefile +++ b/package/kodi/Makefile @@ -12,15 +12,15 @@ PKG_SECTION:= mm/video PKG_DEPENDS:= boost python2 libstdcxx glibc-gconv PKG_DEPENDS+= libass libmpeg2 libmad libdbus PKG_DEPENDS+= libjpeg-turbo libogg libvorbis libmodplug libcurl -PKG_DEPENDS+= libflac libopenssl libbz2 libtiff liblzo +PKG_DEPENDS+= libflac libbz2 libtiff liblzo libressl PKG_DEPENDS+= yajl tinyxml libsqlite libpcrecpp libpng libncurses PKG_DEPENDS+= libpcre libcdio libfreetype libsamplerate PKG_DEPENDS+= taglib libjasper libmp3lame libmicrohttpd PKG_DEPENDS+= libgpg-error libudev python2-mod-sqlite libffmpeg PKG_DEPENDS+= libxslt libvorbisenc alsa-lib glib libglu librt -PKG_BUILDDEP:= boost python2 libass ffmpeg +PKG_BUILDDEP:= boost python2 libass ffmpeg libressl PKG_BUILDDEP+= libmpeg2 libmad libjpeg-turbo libogg libvorbis -PKG_BUILDDEP+= curl flac openssl bzip2 libtiff liblzo yajl +PKG_BUILDDEP+= curl flac bzip2 libtiff liblzo yajl PKG_BUILDDEP+= tinyxml sqlite pcre libpng libcdio freetype PKG_BUILDDEP+= libsamplerate taglib libjasper lame libmicrohttpd PKG_BUILDDEP+= eudev alsa-lib glib glu libmodplug @@ -30,6 +30,14 @@ PKG_BUILDDEP+= zip-host unzip-host PKG_URL:= http://xbmc.org/ PKG_SITES:= http://www.openadk.org/distfiles/ +PKG_CHOICES_KODI:= WITH_LIBRESSL WITH_OPENSSL +PKGCD_WITH_LIBRESSL:= with libressl +PKGCS_WITH_LIBRESSL:= libressl +PKGCB_WITH_LIBRESSL:= libressl +PKGCD_WITH_OPENSSL:= with openssl +PKGCS_WITH_OPENSSL:= libopenssl +PKGCB_WITH_OPENSSL:= openssl + PKG_FLAVOURS_KODI:= WITH_SMB WITH_NFS WITH_SSH WITH_AVAHI WITH_CEC PKG_FLAVOURS_KODI+= WITH_AFP WITH_WEBSERVER WITH_RTMP WITH_BLURAY @@ -177,6 +185,8 @@ pre-configure: (cd $(WRKBUILD)/lib/cpluff && env PATH='$(AUTOTOOL_PATH)' ./autogen.sh) pre-build: + $(SED) "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#" \ + $(WRKBUILD)/tools/TexturePacker/Makefile.in PATH='$(HOST_PATH)' \ make CXX="${HOST_CXX}" CC="${HOST_CC}" CFLAGS="${HOST_CFLAGS}" \ CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}" \ diff --git a/package/kodi/patches/patch-tools_TexturePacker_Makefile_in b/package/kodi/patches/patch-tools_TexturePacker_Makefile_in new file mode 100644 index 000000000..bdd6f679f --- /dev/null +++ b/package/kodi/patches/patch-tools_TexturePacker_Makefile_in @@ -0,0 +1,13 @@ +--- kodi-14.0rc3.orig/tools/TexturePacker/Makefile.in 2014-12-09 14:19:32.000000000 +0100 ++++ kodi-14.0rc3/tools/TexturePacker/Makefile.in 2014-12-20 19:50:10.000000000 +0100 +@@ -33,5 +33,10 @@ $(TARGET): $(SRCS) @abs_top_srcdir@/xbmc + # TexturePacker run native on build system, build it with native tools + make -C @abs_top_srcdir@/lib/libsquish/ libsquish-native.so + $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) $(DEFINES) $(NATIVE_ARCH) $(SRCS) $(LDFLAGS_FOR_BUILD) -o $(TARGET) ++ifeq ($(findstring Darwin,$(shell uname -s)),Darwin) ++ install_name_tool -change /usr/lib/libSDL_image-1.2.0.dylib \ ++ @@STAGING_HOST_DIR@@/usr/lib/libSDL_image-1.2.0.dylib \ ++ $(TARGET) ++endif + + include @abs_top_srcdir@/Makefile.include diff --git a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp b/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp index 1660c5a36..8780e81db 100644 --- a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp +++ b/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp @@ -1,6 +1,6 @@ ---- kodi-14.0rc2.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2014-12-05 19:38:44.000000000 -0600 -+++ kodi-14.0rc2/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2014-12-07 03:43:25.308418001 -0600 -@@ -520,8 +520,8 @@ void CDVDDemuxFFmpeg::Reset() +--- kodi-14.0rc3.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2014-12-09 14:19:32.000000000 +0100 ++++ kodi-14.0rc3/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2014-12-20 04:27:04.000000000 +0100 +@@ -534,8 +534,8 @@ void CDVDDemuxFFmpeg::Reset() void CDVDDemuxFFmpeg::Flush() { // naughty usage of an internal ffmpeg function |