diff --git a/common/shlibs b/common/shlibs index 4fd224dd30..9d7f1c56c6 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1197,7 +1197,7 @@ libmmal_core.so rpi-userland-0.0.0.0.20150907_1 libmmal_util.so rpi-userland-0.0.0.0.20150907_1 libOpenVG.so rpi-userland-0.0.0.0.20150907_1 liblockdev.so.1 lockdev-1.0.3_1 -libcec.so.3.0 libcec-3.0.1_1 +libcec.so.3 libcec-3.1.0_1 libpython3.3m.so.1.0 python3-3.3.0_1 librump.so.0 netbsd-rumpkernel-20130321_1 librumpvfs.so.0 netbsd-rumpkernel-20130321_1 @@ -2129,6 +2129,7 @@ libembree.so.2 embree-2.5.1_1 libgtkimageview.so.0 gtkimageview-1.6.4_1 libgoocanvas.so.3 goocanvas1-1.0.0_1 libplatform.so.2.0 platform-2.0.1_1 +libp8-platform.so.2.0 p8-platform-2.0.1_1 libfacter.so.3.0.2 facter-3.0.2_1 libOIS-1.3.0.so ois-1.3_1 libSILLY.so.1 silly-0.1.0_1 @@ -2402,3 +2403,4 @@ libqxmpp.so.0 qxmpp-0.9.3_1 libunwind.so.1 llvm-libunwind-3.8.0_1 libc++abi.so.1 libcxxabi-3.8.0_1 libfastjson.so.3 libfastjson-0.99.2_1 +libdcadec.so.0 dcadec-0.2.0_1 diff --git a/srcpkgs/crossguid/template b/srcpkgs/crossguid/template new file mode 100644 index 0000000000..6753fe4910 --- /dev/null +++ b/srcpkgs/crossguid/template @@ -0,0 +1,25 @@ +# Template file for 'crossguid' +pkgname=crossguid +version=0.0.20160317 +revision=1 +_githash="8f399e8bd4252be9952f3dfa8199924cc8487ca4" +_gitshort="${_githash:0:7}" +short_desc="Lightweight cross platform C++ GUID/UUID library (git $_gitshort)" +maintainer="Enno Boland " +license="GPL-3" +homepage="https://github.com/graeme-hill/crossguid" +distfiles="$homepage/archive/$_githash.tar.gz" +makedepends="libuuid-devel" +checksum=022c9f02cc36e865cd8fd0111a597ff2bd91988deeb348dbe2aba64aed1abd99 +wrksrc=$pkgname-$_githash + +do_build() { + $CXX -c guid.cpp -o guid.o $CXXFLAGS -std=c++11 -DGUID_LIBUUID + ar rvs libcrossguid.a guid.o +} + +do_install() { + vlicense LICENSE + vinstall libcrossguid.a 644 usr/lib + vinstall guid.h 644 usr/include +} diff --git a/srcpkgs/dcadec-devel b/srcpkgs/dcadec-devel new file mode 120000 index 0000000000..d9356cbddd --- /dev/null +++ b/srcpkgs/dcadec-devel @@ -0,0 +1 @@ +dcadec \ No newline at end of file diff --git a/srcpkgs/dcadec/template b/srcpkgs/dcadec/template new file mode 100644 index 0000000000..d8f8c879c7 --- /dev/null +++ b/srcpkgs/dcadec/template @@ -0,0 +1,24 @@ +# Template file for 'dcadec' +pkgname=dcadec +version=0.2.0 +revision=1 +build_style=gnu-makefile +short_desc="DTS Coherent Acoustics decoder with support for HD extensions" +maintainer="Enno Boland " +license="LGPL-2" +homepage="https://github.com/foo86/dcadec" +distfiles="$homepage/archive/v0.2.0.tar.gz" +checksum=ed9d207fde3e8d576f3af8b0d1235b3371e315175757173689104efcaebf0d44 +CFLAGS='-std=gnu99' +make_build_args="CONFIG_SHARED=TRUE" +make_install_args="CONFIG_SHARED=TRUE" + +dcadec-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} diff --git a/srcpkgs/kodi-rpi/patches/fix-rsxs.patch b/srcpkgs/kodi-rpi/patches/fix-rsxs.patch deleted file mode 120000 index 466b63939e..0000000000 --- a/srcpkgs/kodi-rpi/patches/fix-rsxs.patch +++ /dev/null @@ -1 +0,0 @@ -../../kodi/patches/fix-rsxs.patch \ No newline at end of file diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template index 1fede4972f..8769cdc3b4 100644 --- a/srcpkgs/kodi-rpi/template +++ b/srcpkgs/kodi-rpi/template @@ -1,16 +1,16 @@ # Template file for 'kodi-rpi' pkgname=kodi-rpi -version=15.2 -revision=3 +version=16.0 +revision=1 patch_args="-Np1" -_codename="Isengard" +_codename="Jarvis" wrksrc="xbmc-${version}-${_codename}" short_desc="A software media player and entertainment hub for digital media (RPi)" maintainer="Juan RP " -homepage="http://www.kodi.tv" +homepage="http://www.kodi.tv/" license="GPL-2" distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz" -checksum=dd8aeb942e6de5d1488e243e1346cff3f6597e21b5131a3ba72ff5cc82037110 +checksum=0421ea1337cdee674f8a36d995f54152b5ddc4100e53410b3aeeb3b3f7d53946 nopie=yes only_for_archs="armv6l armv6l-musl armv7l armv7l-musl" @@ -26,8 +26,8 @@ makedepends=" jasper-devel faac-devel faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel librtmp-devel - tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel libxslt-devel - libcec-devel libmicrohttpd-devel libcdio-devel python-devel libssh-devel rpi-userland-devel" + tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel libxslt-devel libuuid-devel giflib-devel + libcec-devel libmicrohttpd-devel libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel crossguid" # The following dependencies are dlopen(3)ed. depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame diff --git a/srcpkgs/kodi/kodi-15.2-generated-addons.tar.xz b/srcpkgs/kodi/kodi-15.2-generated-addons.tar.xz new file mode 100644 index 0000000000..858ea36a8f Binary files /dev/null and b/srcpkgs/kodi/kodi-15.2-generated-addons.tar.xz differ diff --git a/srcpkgs/kodi/patches/fix-musl.patch b/srcpkgs/kodi/patches/fix-musl.patch index 337895245d..e44e5a280c 100644 --- a/srcpkgs/kodi/patches/fix-musl.patch +++ b/srcpkgs/kodi/patches/fix-musl.patch @@ -1,82 +1,36 @@ ---- ./lib/SlingboxLib/SlingboxLib.cpp 2013-12-12 21:47:49.000000000 +0000 -+++ ./lib/SlingboxLib/SlingboxLib.cpp 2014-04-15 06:07:15.746789122 +0000 -@@ -29,7 +29,9 @@ - #include - #include - #include -+#include - #include -+#include - #define INVALID_SOCKET (SOCKET)(~0) - #define SOCKET_ERROR (-1) - #endif ---- ./xbmc/visualizations/XBMCProjectM/libprojectM/BeatDetect.cpp 2014-04-15 05:52:42.214313750 +0000 -+++ ./xbmc/visualizations/XBMCProjectM/libprojectM/BeatDetect.cpp 2014-04-15 05:49:51.921324165 +0000 -@@ -33,7 +33,7 @@ - - #include "Common.hpp" - #include "PCM.hpp" --#include -+#include "math.h" - #include "BeatDetect.hpp" - - #ifdef _WIN32 ---- ./xbmc/cores/DllLoader/ldt_keeper.c.orig -+++ ./xbmc/cores/DllLoader/ldt_keeper.c -@@ -48,7 +48,7 @@ - #if defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 0)) - _syscall3( int, modify_ldt, int, func, void *, ptr, unsigned long, bytecount ); - #else --#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt) -+#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt) - #define modify_ldt(a,b,c) syscall( __NR_modify_ldt, a, b, c); - #else - int modify_ldt(int func, void *ptr, unsigned long bytecount); ---- ./tools/depends/native/TexturePacker/src/XBTFWriter.cpp -+++ ./tools/depends/native/TexturePacker/src/XBTFWriter.cpp -@@ -23,11 +23,7 @@ - #include - #include "guilib/XBTF.h" - #include "utils/EndianSwap.h" --#if defined(TARGET_FREEBSD) || defined(TARGET_DARWIN) - #include --#elif !defined(TARGET_DARWIN) --#include --#endif - #include - - #define WRITE_STR(str, size, file) fwrite(str, size, 1, file) ---- ./configure.ac.orig -+++ ./configure.ac -@@ -604,7 +604,7 @@ +diff -upr xbmc-16.0-Jarvis.orig/configure.ac xbmc-16.0-Jarvis/configure.ac +--- xbmc-16.0-Jarvis.orig/configure.ac 2016-03-19 07:28:05.389703445 +0100 ++++ xbmc-16.0-Jarvis/configure.ac 2016-03-19 07:35:44.771669064 +0100 +@@ -564,7 +564,7 @@ case $host in use_x11=no - build_shared_lib=yes + build_shared_lib=yes ;; - i*86*-linux-gnu*|i*86*-*-linux-uclibc*) + i*86*-linux-gnu*|i*86*-*-linux-uclibc*|i*86*-linux-musl*) + target_platform=target_linux ARCH="i486-linux" if test "$use_cpu" = "no" -a "$cross_compiling" = "yes"; then - use_arch="x86" -@@ -625,7 +625,7 @@ +@@ -586,7 +586,7 @@ case $host in fi fi ;; - x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*) + x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*|x86_64-*-linux-musl*) + target_platform=target_linux ARCH="x86_64-linux" if test "$use_cpu" = "no" -a "$cross_compiling" = "yes"; then - use_arch="x86_64" -@@ -681,7 +681,7 @@ +@@ -645,7 +645,7 @@ case $host in powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*) ARCH="powerpc64-linux" ;; - arm*-*-linux-gnu*|arm*-*-linux-uclibc*) + arm*-*-linux-gnu*|arm*-*-linux-uclibc*|arm*-*-linux-musl*) + target_platform=target_linux ARCH="arm" use_arch="arm" - use_joystick=no ---- ./m4/xbmc_arch.m4.orig 2015-10-19 08:31:15.000000000 +0200 -+++ ./m4/xbmc_arch.m4 2015-11-05 18:50:57.346659240 +0100 +diff -upr xbmc-16.0-Jarvis.orig/m4/xbmc_arch.m4 xbmc-16.0-Jarvis/m4/xbmc_arch.m4 +--- xbmc-16.0-Jarvis.orig/m4/xbmc_arch.m4 2016-02-20 16:21:19.000000000 +0100 ++++ xbmc-16.0-Jarvis/m4/xbmc_arch.m4 2016-03-19 07:37:37.070660659 +0100 @@ -2,10 +2,10 @@ AC_DEFUN([XBMC_SETUP_ARCH_DEFINES],[ # build detection and setup - this is the native arch @@ -104,7 +58,7 @@ # host detection and setup - this is the target arch case $host in - i*86*-linux-gnu*|i*86*-*-linux-uclibc*) -+ i*86*-linux-gnu*|i*86*-*-linux-uclibc|*i*86*-linux-musl*) ++ i*86*-linux-gnu*|i*86*-*-linux-uclibc*|*i*86*-linux-musl*) AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX") ;; - x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*) diff --git a/srcpkgs/kodi/patches/fix-rsxs.patch b/srcpkgs/kodi/patches/fix-rsxs.patch deleted file mode 100644 index ccc7698c73..0000000000 --- a/srcpkgs/kodi/patches/fix-rsxs.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- xbmc-12.3-Frodo/xbmc/screensavers/rsxs-0.9/configure.ac 2014-04-15 10:22:51.025587069 +0000 -+++ xbmc-12.3-Frodo/xbmc/screensavers/rsxs-0.9/configure.ac 2014-04-15 10:21:51.947852111 +0000 -@@ -14,18 +14,13 @@ - - # Checks for programs. - LT_AC_PROG_SED --AC_LANG(C++) --AC_PROG_CXX --#CXXFLAGS=`echo $CXXFLAGS | sed -e s,-O2,-O3,` --AC_PROG_CXXCPP -- --#if test x"$GXX" = x"yes"; then --# CXXFLAGS=`echo $CXXFLAGS -Wall` --#fi - - AC_PROG_CC - AM_PROG_CC_C_O - gl_EARLY -+AC_PROG_CXX -+AC_PROG_CXXCPP -+ - AC_PROG_RANLIB - - # Cut-down version of AC_LIB_LTDL. We don't want the option to install diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template index 6ddaa0ecae..628e70ca18 100644 --- a/srcpkgs/kodi/template +++ b/srcpkgs/kodi/template @@ -1,16 +1,16 @@ # Template file for 'kodi' pkgname=kodi -version=15.2 -revision=4 +version=16.0 +revision=1 patch_args="-Np1" -_codename="Isengard" +_codename="Jarvis" wrksrc="xbmc-${version}-${_codename}" short_desc="A software media player and entertainment hub for digital media" maintainer="Juan RP " homepage="http://www.kodi.tv/" license="GPL-2" distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz" -checksum=dd8aeb942e6de5d1488e243e1346cff3f6597e21b5131a3ba72ff5cc82037110 +checksum=0421ea1337cdee674f8a36d995f54152b5ddc4100e53410b3aeeb3b3f7d53946 lib32disabled=yes only_for_archs="i686 i686-musl x86_64 x86_64-musl" @@ -30,7 +30,7 @@ makedepends=" libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libbluray-devel libnfs-devel ffmpeg-devel giflib-devel libxslt-devel gnutls-devel libssh-devel libmicrohttpd-devel - libcec-devel" + libcec-devel dcadec-devel crossguid" # The following dependencies are dlopen(3)ed. depends="libbluray libmad libvorbis libcurl libflac libmodplug libass libmpeg2 lame librtmp libnfs>=1.9.7 libplist>=1.12" diff --git a/srcpkgs/libcec/template b/srcpkgs/libcec/template index e0e36cb731..456cab9a85 100644 --- a/srcpkgs/libcec/template +++ b/srcpkgs/libcec/template @@ -1,18 +1,18 @@ # Template file for 'libcec' pkgname=libcec -version=3.0.1 -revision=4 +version=3.1.0 +revision=1 wrksrc="${pkgname}-${pkgname}-${version}" build_style=cmake hostmakedepends="cmake pkg-config libtool swig" -makedepends="libudev-devel lockdev-devel platform-devel platform-devel libXrandr-devel +makedepends="libudev-devel lockdev-devel p8-platform-devel libXrandr-devel lockdev-devel python-devel" short_desc="USB CEC Adapter communication Library" maintainer="Juan RP " homepage="https://github.com/Pulse-Eight/libcec" license="GPL-2" distfiles="https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz" -checksum=7e3670c8949a1964d6e5481f56dfff838857da10bdc60b506f6e9b7f117e253e +checksum=09109d21a1b03f42c9e341d12600f2e4c41038d640269fa75408e2d36126f921 build_options="rpi" case "$XBPS_TARGET_MACHINE" in @@ -43,7 +43,7 @@ cec-client_package() { } libcec-devel_package() { short_desc+=" - development files" - depends="libudev-devel platform-devel libcec>=${version}_${revision}" + depends="libudev-devel p8-platform-devel libcec>=${version}_${revision}" pkg_install() { vmove usr/include vmove "usr/lib/*.so" diff --git a/srcpkgs/p8-platform-devel b/srcpkgs/p8-platform-devel new file mode 120000 index 0000000000..88aebf572a --- /dev/null +++ b/srcpkgs/p8-platform-devel @@ -0,0 +1 @@ +p8-platform \ No newline at end of file diff --git a/srcpkgs/p8-platform/template b/srcpkgs/p8-platform/template new file mode 100644 index 0000000000..135e75cd32 --- /dev/null +++ b/srcpkgs/p8-platform/template @@ -0,0 +1,34 @@ +# Template file for 'p8-platform' +pkgname=p8-platform +version=2.0.1 +revision=1 +build_style=cmake +hostmakedepends="cmake" +short_desc="Platform support library used by libCEC (Pulse Eight Edition)" +maintainer="Enno Boland " +license="GPL-2" +homepage="https://github.com/Pulse-Eight/platform" +distfiles="https://github.com/Pulse-Eight/platform/archive/p8-platform-$version.tar.gz" +checksum=e97e45273e90571aa37732cde913b262f5f519c387083645d2557d7189c054cf +configure_args+=" -DBUILD_SHARED_LIBS=1" +wrksrc=platform-$pkgname-$version + +post_install() { + vmkdir usr/lib + if [ -d $DESTDIR/usr/lib64 ]; then + mv $DESTDIR/usr/lib64/* $DESTDIR/usr/lib + fi + sed -i "s#$wrksrc/build/##" $DESTDIR/usr/lib/p8-platform/p8-platform-config.cmake $DESTDIR/usr/lib/pkgconfig/p8-platform.pc + mv $DESTDIR/$wrksrc/build/lib*/* $DESTDIR/usr/lib +} + +p8-platform-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/lib/p8-platform + vmove "usr/lib/*.so" + } +}