summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-05-24 10:20:20 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2015-05-24 10:26:59 (GMT)
commitda366ca3f603a4aa435a25bc8568c33b32b960fc (patch)
tree3a869d7749435e1f20f0575348c94830dffcdc19
parent97dbbe0a028fd734618ef1a80ccdf39c6488772f (diff)
update kodi to latest git version, add necessary packages
-rw-r--r--package/kodi/Makefile37
-rw-r--r--package/kodi/patches/patch-configure_in50
-rw-r--r--package/kodi/patches/patch-tools_Linux_kodi_sh_in39
-rw-r--r--package/kodi/patches/patch-tools_TexturePacker_Makefile_in13
-rw-r--r--package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp13
-rw-r--r--package/libsquish/Makefile25
-rw-r--r--package/libsquish/patches/patch-Makefile10
-rw-r--r--package/platform/Makefile25
8 files changed, 77 insertions, 135 deletions
diff --git a/package/kodi/Makefile b/package/kodi/Makefile
index 330fd45..3bf0a03 100644
--- a/package/kodi/Makefile
+++ b/package/kodi/Makefile
@@ -4,11 +4,11 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= kodi
-PKG_VERSION:= 7cc53a9a3da77869d1d5d3d3d9971b4bd1641b50
-PKG_RELEASE:= 2
+PKG_VERSION:= ff25ea118e3580bb1ebcbb7c450ed933da1782be
+PKG_RELEASE:= 1
PKG_DESCR:= software media player
PKG_SECTION:= mm/video
-PKG_DEPENDS:= boost python2 libstdcxx glibc-gconv
+PKG_DEPENDS:= boost python2 libstdcxx glibc-gconv libsquish
PKG_DEPENDS+= libass libmpeg2 libmad libdbus libglew mesalib
PKG_DEPENDS+= libjpeg-turbo libogg libvorbis libmodplug libcurl
PKG_DEPENDS+= libflac libbz2 libtiff liblzo libopenssl libnettle
@@ -25,12 +25,12 @@ PKG_BUILDDEP+= libsamplerate taglib libjasper lame libmicrohttpd
PKG_BUILDDEP+= eudev alsa-lib glib glu libmodplug libgtk2
PKG_BUILDDEP+= libgpg-error dbus libxslt libvorbis
PKG_BUILDDEP+= swig-host sdl-host sdl-image-host liblzo-host
-PKG_BUILDDEP+= zip-host unzip-host
+PKG_BUILDDEP+= zip-host unzip-host libsquish
PKG_URL:= http://kodi.tv/
PKG_SITES:= https://github.com/xbmc/xbmc.git
PKG_FLAVOURS_KODI:= WITH_SMB WITH_NFS WITH_SSH WITH_AVAHI WITH_CEC
-PKG_FLAVOURS_KODI+= WITH_AFP WITH_WEBSERVER WITH_RTMP WITH_BLURAY
+PKG_FLAVOURS_KODI+= WITH_WEBSERVER WITH_RTMP WITH_BLURAY WITH_LIRC
PKGFD_WITH_SMB:= enable samba support
PKGFB_WITH_SMB:= samba
@@ -47,15 +47,15 @@ PKGFS_WITH_AVAHI:= libavahi
PKGFD_WITH_CEC:= enable cec support
PKGFB_WITH_CEC:= libcec
PKGFS_WITH_CEC:= libcec
-PKGFD_WITH_AFP:= enable afp support
-PKGFB_WITH_AFP:= afpfs-ng
-PKGFS_WITH_AFP:= libafpclient
PKGFD_WITH_RTMP:= enable rtmp support
PKGFB_WITH_RTMP:= rtmpdump
PKGFS_WITH_RTMP:= librtmp
PKGFD_WITH_BLURAY:= enable bluray support
PKGFB_WITH_BLURAY:= libbluray
PKGFS_WITH_BLURAY:= libbluray
+PKGFD_WITH_LIRC:= enable lirc support
+PKGFB_WITH_LIRC:= lirc
+PKGFS_WITH_LIRC:= lirc
PKGFD_WITH_WEBSERVER:= enable internal webserver support
# libiconv missing, freescale GL libraries linked against glibc
@@ -124,11 +124,6 @@ CONFIGURE_ARGS+= --enable-libbluray
else
CONFIGURE_ARGS+= --disable-libbluray
endif
-ifneq ($(ADK_PACKAGE_KODI_WITH_AFP),)
-CONFIGURE_ARGS+= --enable-afpclient
-else
-CONFIGURE_ARGS+= --disable-afpclient
-endif
ifneq ($(ADK_PACKAGE_KODI_WITH_SMB),)
CONFIGURE_ARGS+= --enable-samba
else
@@ -154,6 +149,11 @@ CONFIGURE_ARGS+= --enable-rtmp
else
CONFIGURE_ARGS+= --disable-rtmp
endif
+ifneq ($(ADK_PACKAGE_KODI_WITH_LIRC),)
+CONFIGURE_ARGS+= --enable-lirc
+else
+CONFIGURE_ARGS+= --disable-lirc
+endif
ifneq ($(ADK_PACKAGE_KODI_WITH_AVAHI),)
CONFIGURE_ARGS+= --enable-avahi
else
@@ -169,33 +169,30 @@ ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
CONFIGURE_ARGS+= --with-platform=raspberry-pi \
--enable-player=omxplayer \
--enable-gles \
- --disable-sdl \
--disable-x11
endif
ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI2),y)
CONFIGURE_ARGS+= --with-platform=raspberry-pi \
--enable-player=omxplayer \
--enable-gles \
- --disable-sdl \
--disable-x11
endif
ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y)
CONFIGURE_ARGS+= --disable-x11 \
- --disable-sdl \
--enable-gles \
--enable-codec=imxvpu
endif
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}" \
-C $(WRKBUILD)/tools/depends/native/JsonSchemaBuilder
+ PATH='$(HOST_PATH)' \
+ make CXX="${HOST_CXX}" CC="${HOST_CC}" CFLAGS="${HOST_CFLAGS}" \
+ CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}" \
+ -C $(WRKBUILD)/tools/depends/native/TexturePacker
kodi-install:
$(INSTALL_DIR) $(IDIR_KODI)/usr/lib/kodi/addons
diff --git a/package/kodi/patches/patch-configure_in b/package/kodi/patches/patch-configure_in
deleted file mode 100644
index dfd4a32..0000000
--- a/package/kodi/patches/patch-configure_in
+++ /dev/null
@@ -1,50 +0,0 @@
---- xbmc-14.0-Helix.orig/configure.in 2014-12-22 17:11:35.000000000 -0600
-+++ xbmc-14.0-Helix/configure.in 2014-12-28 02:47:04.799045092 -0600
-@@ -55,13 +55,6 @@ AC_DEFUN([XB_ADD_CODEC],
- # check for library basenames
- AC_DEFUN([XB_FIND_SONAME],
- [
-- if echo "$host" | grep -q freebsd ; then
-- AC_MSG_CHECKING([for lib$2 soname])
-- $1_SONAME=[`ldconfig -r | sed -n "s;.* \(/.*lib$2\.so.*\)$;\1;p" | head -n 1`]
-- if test x$$1_SONAME != x ; then
-- $1_SONAME=[`basename $$1_SONAME`]
-- fi
-- elif [[ "$host_vendor" != "apple" ]]; then
- AC_MSG_CHECKING([for lib$2 soname])
- $1_FILENAME=$($CC -nostdlib -o /dev/null $LDFLAGS $4 -l$2 -Wl,-M 2>/dev/null | grep "^LOAD.*$2" | awk '{V=2; print $V}')
- if [[ -z $$1_FILENAME ]]; then
-@@ -71,24 +64,6 @@ AC_DEFUN([XB_FIND_SONAME],
- if [[ ! -z $$1_FILENAME ]]; then
- $1_SONAME=$($OBJDUMP -p $$1_FILENAME | grep "SONAME.*$2" | awk '{V=2; print $V}')
- fi
-- else
-- AC_MSG_CHECKING([for lib$2 dylib])
-- gcc_lib_path=[`$CC -print-search-dirs 2>/dev/null | fgrep libraries: | sed 's/[^=]*=\(.*\)/\1/' | sed 's/:/ /g'`]
-- env_lib_path=[`echo $LDFLAGS | sed 's/-L[ ]*//g'`]
-- if test "$cross_compiling" = yes; then
-- host_lib_path=""
-- else
-- host_lib_path="/usr/lib /usr/local/lib"
-- fi
-- for path in $gcc_lib_path $env_lib_path $host_lib_path; do
-- lib=[`ls -- $path/lib$2.dylib 2>/dev/null`]
-- if test x$lib != x; then
-- # we want the path/name that is embedded in the dylib
-- $1_FILENAME=[`otool -L $lib | grep -v lib$2.dylib | grep lib$2 | awk '{V=1; print $V}'`]
-- $1_SONAME=[`basename $$1_FILENAME`]
-- fi
-- done
-- fi
- if [[ -z "$$1_SONAME" ]]; then
- AC_MSG_RESULT([no])
- if test -z "$3" || test "x${$3}" = "xyes"; then
-@@ -1015,7 +990,7 @@ if test "$use_gles" = "yes"; then
- AC_DEFINE([HAVE_LIBEGL],[1],["Define to 1 if you have the `EGL' library (-lEGL)."])
- AC_DEFINE([HAVE_LIBGLESV2],[1],["Define to 1 if you have the `GLESv2' library (-lGLESv2)."])
- AC_MSG_RESULT(== WARNING: OpenGLES support is assumed.)
-- LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm -lmmal -lmmal_core -lmmal_util"
-+ LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm -lmmal -lmmal_core -lmmal_util -lkhrn_static -lpthread -lm"
- else
- AC_CHECK_LIB([EGL], [main],, AC_MSG_ERROR($missing_library))
- AC_CHECK_LIB([GLESv2],[main],, AC_MSG_ERROR($missing_library))
diff --git a/package/kodi/patches/patch-tools_Linux_kodi_sh_in b/package/kodi/patches/patch-tools_Linux_kodi_sh_in
deleted file mode 100644
index 2d0e188..0000000
--- a/package/kodi/patches/patch-tools_Linux_kodi_sh_in
+++ /dev/null
@@ -1,39 +0,0 @@
---- kodi-14.0rc2.orig/tools/Linux/kodi.sh.in 2014-12-05 19:38:43.000000000 -0600
-+++ kodi-14.0rc2/tools/Linux/kodi.sh.in 2014-12-07 08:33:01.128418001 -0600
-@@ -86,15 +86,7 @@ print_crash_report()
- echo -n " Kernel: " >> $FILE
- uname -rvs >> $FILE
- echo -n " Release: " >> $FILE
-- if [ -f /etc/os-release ]; then
-- . /etc/os-release
-- echo $NAME $VERSION >> $FILE
-- elif command_exists lsb_release; then
-- echo >> $FILE
-- lsb_release -a 2> /dev/null | sed -e 's/^/ /' >> $FILE
-- else
-- echo "lsb_release not available" >> $FILE
-- fi
-+ echo OpenADK >> $FILE
- echo "############## END SYSTEM INFO ##############" >> $FILE
- echo >> $FILE
- echo "############### STACK TRACE #################" >> $FILE
-@@ -138,19 +130,6 @@ print_crash_report()
- }
-
- migrate_home
--python @datadir@/${bin_name}/FEH.py $SAVED_ARGS
--RET=$?
--if [ $RET -ne 0 ]; then
-- exit $RET
--fi
--
--if command_exists gdb; then
-- # Output warning in case ulimit is unsupported by shell
-- eval ulimit -c unlimited
-- if [ ! $? = "0" ]; then
-- echo "${bin_name}: ulimit is unsupported by this shell" 1>&2
-- fi
--fi
-
- LOOP=1
- while [ $(( $LOOP )) = "1" ]
diff --git a/package/kodi/patches/patch-tools_TexturePacker_Makefile_in b/package/kodi/patches/patch-tools_TexturePacker_Makefile_in
deleted file mode 100644
index 0fe1e08..0000000
--- a/package/kodi/patches/patch-tools_TexturePacker_Makefile_in
+++ /dev/null
@@ -1,13 +0,0 @@
---- xbmc-14.0-Helix.orig/tools/TexturePacker/Makefile.in 2014-12-22 17:11:35.000000000 -0600
-+++ xbmc-14.0-Helix/tools/TexturePacker/Makefile.in 2014-12-27 13:48:57.427472564 -0600
-@@ -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 \
-+ /home/wbx/myapp/host_x86_64-linux-gnu/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
deleted file mode 100644
index 4f24390..0000000
--- a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- xbmc-14.0-Helix.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2014-12-22 17:11:35.000000000 -0600
-+++ xbmc-14.0-Helix/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2014-12-25 13:38:23.629060371 -0600
-@@ -538,8 +538,8 @@ void CDVDDemuxFFmpeg::Reset()
- void CDVDDemuxFFmpeg::Flush()
- {
- // naughty usage of an internal ffmpeg function
-- if (m_pFormatContext)
-- av_read_frame_flush(m_pFormatContext);
-+ //if (m_pFormatContext)
-+ // av_read_frame_flush(m_pFormatContext);
-
- m_currentPts = DVD_NOPTS_VALUE;
-
diff --git a/package/libsquish/Makefile b/package/libsquish/Makefile
new file mode 100644
index 0000000..5ce5e6f
--- /dev/null
+++ b/package/libsquish/Makefile
@@ -0,0 +1,25 @@
+# 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:= libsquish
+PKG_VERSION:= 1.10
+PKG_RELEASE:= 1
+PKG_HASH:= a0118a79d927058b656e94dc4ffce5da37839962e4952be1fedbbdd901b42848
+PKG_DESCR:= c++ compression library
+PKG_SECTION:= libs/misc
+PKG_SITES:= http://sources.openelec.tv/devel/
+PKG_OPTS:= dev
+
+DISTFILES:= $(PKG_NAME)-$(PKG_VERSION)-openelec.tar.gz
+WRKDIST= ${WRKDIR}/${PKG_NAME}-$(PKG_VERSION)-openelec
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBSQUISH,libsquish,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
+
+CONFIG_STYLE:= manual
+XAKE_FLAGS+= INSTALL_DIR="${WRKINST}/usr"
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/libsquish/patches/patch-Makefile b/package/libsquish/patches/patch-Makefile
new file mode 100644
index 0000000..702db40
--- /dev/null
+++ b/package/libsquish/patches/patch-Makefile
@@ -0,0 +1,10 @@
+--- libsquish-1.10-openelec.orig/Makefile 2015-01-09 09:52:04.000000000 -0600
++++ libsquish-1.10-openelec/Makefile 2015-05-22 16:32:55.398921290 -0500
+@@ -10,6 +10,7 @@ LIB = libsquish.a
+ all : $(LIB) squish.pc
+
+ install : $(LIB) squish.pc
++ mkdir -p $(INSTALL_DIR)/include $(INSTALL_DIR)/lib/pkgconfig
+ install squish.h $(INSTALL_DIR)/include
+ install libsquish.a $(INSTALL_DIR)/lib
+ install squish.pc $(INSTALL_DIR)/lib/pkgconfig
diff --git a/package/platform/Makefile b/package/platform/Makefile
new file mode 100644
index 0000000..d413198
--- /dev/null
+++ b/package/platform/Makefile
@@ -0,0 +1,25 @@
+# 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:= platform
+PKG_VERSION:= aafa6e9f3b86f2258f5f75809849743b1779072b
+PKG_RELEASE:= 1
+PKG_DESCR:= platform library used by libcec
+PKG_SECTION:= libs/misc
+PKG_URL:= https://github.com/Pulse-Eight/platform
+PKG_SITES:= https://github.com/Pulse-Eight/platform.git
+PKG_LIBNAME:= libplatform
+PKG_OPTS:= dev
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBPLATFORM,libplatform,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
+
+CONFIG_STYLE:= cmake
+
+libplatform-install:
+ :
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk