From 8235f794e74f3325317d2c362d53522cc3ba9390 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 27 Feb 2016 20:32:57 +0100 Subject: kodi: update to Jarvis --- package/kodi/Makefile | 12 +++---- package/kodi/patches/patch-Makefile_include_in | 10 ------ package/libcrossguid/Makefile | 42 +++++++++++++++++++++++++ package/libcrossguid/guid.o | Bin 0 -> 9148 bytes package/libdcadec/Makefile | 31 ++++++++++++++++++ 5 files changed, 79 insertions(+), 16 deletions(-) delete mode 100644 package/kodi/patches/patch-Makefile_include_in create mode 100644 package/libcrossguid/Makefile create mode 100644 package/libcrossguid/guid.o create mode 100644 package/libdcadec/Makefile diff --git a/package/kodi/Makefile b/package/kodi/Makefile index 21e429cd1..a2d3b2557 100644 --- a/package/kodi/Makefile +++ b/package/kodi/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= kodi -PKG_VERSION:= 15.2 +PKG_VERSION:= 16.0 PKG_RELEASE:= 1 -PKG_HASH:= dd8aeb942e6de5d1488e243e1346cff3f6597e21b5131a3ba72ff5cc82037110 +PKG_HASH:= 0421ea1337cdee674f8a36d995f54152b5ddc4100e53410b3aeeb3b3f7d53946 PKG_DESCR:= software media player PKG_SECTION:= mm/video PKG_DEPENDS:= boost python2 libsquish libbluray @@ -17,7 +17,7 @@ PKG_DEPENDS+= yajl tinyxml libsqlite libpcrecpp libpng libncurses PKG_DEPENDS+= libpcre libcdio libfreetype libsamplerate libuuid PKG_DEPENDS+= taglib libjasper libmp3lame libmicrohttpd libgtk2 PKG_DEPENDS+= libgpg-error libudev python2-mod-sqlite libffmpeg -PKG_DEPENDS+= libxslt libvorbisenc alsa-lib glib libglu +PKG_DEPENDS+= libxslt libvorbisenc alsa-lib glib libglu libdcadec PKG_BUILDDEP:= boost python2 libass ffmpeg libglew rtmpdump PKG_BUILDDEP+= libmpeg2 libmad libjpeg-turbo libogg libvorbis PKG_BUILDDEP+= curl flac bzip2 libtiff liblzo yajl mesa @@ -26,15 +26,15 @@ PKG_BUILDDEP+= libsamplerate taglib libjasper lame libmicrohttpd PKG_BUILDDEP+= eudev alsa-lib glib glu libmodplug libgtk2 PKG_BUILDDEP+= libgpg-error dbus libxslt libvorbis libbluray PKG_BUILDDEP+= swig-host liblzo-host libpng-host libjpeg-turbo-host -PKG_BUILDDEP+= zip-host unzip-host giflib-host libsquish +PKG_BUILDDEP+= zip-host unzip-host giflib-host libsquish libdcadec PKG_NEEDS:= threads rt c++ PKG_URL:= http://kodi.tv/ PKG_SITES:= http://mirrors.kodi.tv/releases/source/ PKG_CFLINE_KODI:= select ADK_PACKAGE_GPU_VIV_BIN_MX6Q if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 -DISTFILES:= $(PKG_VERSION)-Isengard.tar.gz -WRKDIST= ${WRKDIR}/xbmc-$(PKG_VERSION)-Isengard +DISTFILES:= $(PKG_VERSION)-Jarvis.tar.gz +WRKDIST= ${WRKDIR}/xbmc-$(PKG_VERSION)-Jarvis PKG_CHOICES_KODI:= WITH_LIBRESSL WITH_OPENSSL PKGCD_WITH_OPENSSL:= use openssl for crypto diff --git a/package/kodi/patches/patch-Makefile_include_in b/package/kodi/patches/patch-Makefile_include_in deleted file mode 100644 index 2a5732b30..000000000 --- a/package/kodi/patches/patch-Makefile_include_in +++ /dev/null @@ -1,10 +0,0 @@ ---- kodi-ff25ea118e3580bb1ebcbb7c450ed933da1782be.orig/Makefile.include.in 2015-05-25 11:50:29.000000000 -0500 -+++ kodi-ff25ea118e3580bb1ebcbb7c450ed933da1782be/Makefile.include.in 2015-05-25 11:53:49.490501827 -0500 -@@ -37,6 +37,7 @@ CFLAGS+=@CFLAGS@ - CFLAGS_FOR_BUILD+=@CFLAGS_FOR_BUILD@ - LDFLAGS+=@LDFLAGS@ - LDFLAGS_FOR_BUILD+=@LDFLAGS_FOR_BUILD@ -+INCLUDES+=@CPPFLAGS@ - INCLUDES+=-I@abs_top_srcdir@/lib - INCLUDES+=-I@abs_top_srcdir@/xbmc - INCLUDES+=-I@abs_top_srcdir@/addons/library.kodi.guilib diff --git a/package/libcrossguid/Makefile b/package/libcrossguid/Makefile new file mode 100644 index 000000000..54749eeef --- /dev/null +++ b/package/libcrossguid/Makefile @@ -0,0 +1,42 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= libcrossguid +PKG_VERSION:= 8f399e8bd4252be9952f3dfa8199924cc8487ca4 +PKG_RELEASE:= 1 +PKG_DESCR:= c++ guid library +PKG_SECTION:= libs/misc +PKG_URL:= https://github.com/graeme-hill/crossguid +PKG_SITES:= https://github.com/graeme-hill/crossguid.git +PKG_OPTS:= dev + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBCROSSGUID,libcrossguid,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + +TARGET_CPPFLAGS+= -DGUID_LIBUUID +TARGET_CXXFLAGS+= -std=c++11 + +do-build: + $(TARGET_CXX) $(TARGET_CPPFLAGS) $(TARGET_CXXFLAGS) $(TARGET_LDFLAGS) \ + -c -o $(WRKBUILD)/guid.o $(WRKBUILD)/guid.cpp + $(TARGET_AR) rvs $(WRKBUILD)/libcrossguid.a $(WRKBUILD)/guid.o + +do-install: + $(INSTALL_DIR) $(WRKINST)/usr/lib + $(INSTALL_DIR) $(WRKINST)/usr/include + $(CP) $(WRKBUILD)/libcrossguid.a $(WRKINST)/usr/lib + $(CP) $(WRKBUILD)/guid.h $(WRKINST)/usr/include + +libcrossguid-install: + $(INSTALL_DIR) $(IDIR_LIBCROSSGUID)/usr/lib + $(CP) $(WRKINST)/usr/lib/libcrossguid.a \ + $(IDIR_LIBCROSSGUID)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libcrossguid/guid.o b/package/libcrossguid/guid.o new file mode 100644 index 000000000..127591802 Binary files /dev/null and b/package/libcrossguid/guid.o differ diff --git a/package/libdcadec/Makefile b/package/libdcadec/Makefile new file mode 100644 index 000000000..2b63779d3 --- /dev/null +++ b/package/libdcadec/Makefile @@ -0,0 +1,31 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= libdcadec +PKG_VERSION:= 0.2.0 +PKG_RELEASE:= 1 +PKG_HASH:= ed9d207fde3e8d576f3af8b0d1235b3371e315175757173689104efcaebf0d44 +PKG_DESCR:= dts coherent acoustics decoder with support for hd extensions +PKG_SECTION:= libs/audio +PKG_URL:= https://github.com/foo86/dcadec +PKG_SITES:= https://github.com/foo86/dcadec/archive/v0.2.0.tar.gz +PKG_OPTS:= dev + +DISTFILES:= v$(PKG_VERSION).tar.gz +WRKDIST= $(WRKDIR)/dcadec-$(PKG_VERSION) + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBDCADEC,libdcadec,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +XAKE_FLAGS+= PREFIX=/usr +CONFIG_STYLE:= manual + +libdcadec-install: + $(INSTALL_DIR) $(IDIR_LIBDCADEC)/usr/lib + $(CP) $(WRKINST)/usr/lib/liblibdcadec*.so* \ + $(IDIR_LIBDCADEC)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk -- cgit v1.2.3