jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #2078 from Gottox/kodi-15.0

Browse source 
Kodi 15.0
This commit is contained in:
Enno Boland 2015-07-24 23:56:30 +02:00
commit 26156a6b96
11 changed files with 116 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/shlibs
View file

@ -1180,7 +1180,7 @@ libmmal_core.so rpi-firmware-20150206_1
libmmal_util.so rpi-firmware-20150206_1
libOpenVG.so rpi-firmware-20150206_1
liblockdev.so.1 lockdev-1.0.3_1
libcec.so.2 libcec-2.1.1_1
libcec.so.3.0 libcec-3.0.1_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
@ -2095,3 +2095,4 @@ libtbbmalloc_debug.so.2 tbb-4.3_1
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.1.0 platform-1.0.10_1

24
srcpkgs/kodi-rpi/patches/cross-fix.patch Normal file
View file

@ -0,0 +1,24 @@
--- configure.ac.orig 2015-07-23 23:49:37.887069973 +0200
+++ configure.ac 2015-07-23 23:51:40.074074325 +0200
@@ -2170,15 +2170,12 @@ else
final_message="$final_message\n Bluray:\tNo"
fi
-# we don't compile with default upstream squish, so we use our own one
-# even on non unified deps platforms
-if test "$cross_compiling" != "yes"; then
- make -C ${abs_top_srcdir}/tools/depends/native/libsquish-native CXX=${CXX}
- export PKG_CONFIG_PATH="${abs_top_srcdir}/tools/depends/native/libsquish-native/squish-install/lib/pkgconfig:$PKG_CONFIG_PATH"
-fi
-PKG_CHECK_MODULES([SQUISH], [squish],
- [INCLUDES="$INCLUDES $SQUISH_CFLAGS" LIBS="$LIBS $SQUISH_LIBS"],
- AC_MSG_ERROR("squish not found"))
+make -C ${abs_top_srcdir}/tools/depends/native/libsquish-native CXX=${CXX}
+SQUISH_CFLAGS="-I${abs_top_srcdir}/tools/depends/native/libsquish-native/squish-install/include "
+SQUISH_LIBS="-L${abs_top_srcdir}/tools/depends/native/libsquish-native/squish-install/lib -lsquish "
+INCLUDES="$INCLUDES $SQUISH_CFLAGS"
+LIBS="$LIBS $SQUISH_LIBS"
+
if test "x$use_texturepacker" != "xno"; then
AC_PATH_PROG([TEXTUREPACKER], [TexturePacker], ["none"],

16
srcpkgs/kodi-rpi/patches/dvddemux-ffmpeg.patch
View file

@ -1,16 +0,0 @@
origin:
http://cvs.rpmfusion.org/viewvc/rpms/kodi/devel/kodi-14.0-dvddemux-ffmpeg.patch?revision=1.1&root=free&view=markup
--- xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp.orig 2014-08-01 11:18:24.000000000 -0500
+++ xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2014-08-24 15:36:34.844966866 -0500
@@ -519,10 +519,6 @@
void CDVDDemuxFFmpeg::Flush()
{
- // naughty usage of an internal ffmpeg function
- if (m_pFormatContext)
- av_read_frame_flush(m_pFormatContext);
-
m_currentPts = DVD_NOPTS_VALUE;
m_pkt.result = -1;

17
srcpkgs/kodi-rpi/template
View file

@ -1,26 +1,22 @@
# Template file for 'kodi-rpi'
pkgname=kodi-rpi
version=14.2
version=15.0
revision=1
wrksrc="xbmc-${version}-Helix"
_codename="Isengard"
wrksrc="xbmc-${version}-${_codename}"
short_desc="A software media player and entertainment hub for digital media (RPi)"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.kodi.tv"
license="GPL-2"
distfiles="https://github.com/xbmc/xbmc/archive/${version}-Helix.tar.gz"
checksum=d9cb8590430a925fb789a5beb4da2695cdcd2d2500dd31126f3b77b31aa267f4
distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
checksum=27dba173cfe74b323f4dbaa72ae2bfe5961f76c27bddcd5210253be91cae0dff
only_for_archs="armv6l armv7l"
# Due to bootstrap requiring java, it's only possible currently to cross
# compile it from x86.
if [ "$XBPS_MACHINE" != "i686" -a "$XBPS_MACHINE" != "x86_64" ]; then
msg_error "${pkgname}-${version}: can only be cross built on x86."
fi
hostmakedepends="
automake libtool pkg-config gperf cmake zip unzip nasm yasm
swig gettext-devel libltdl-devel python-devel libmysqlclient-devel
SDL_image-devel lzo-devel openjdk-jre"
SDL2_image-devel lzo-devel openjdk-jre"
makedepends="
libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel
avahi-libs-devel alsa-lib-devel samba-devel tiff-devel libmysqlclient-devel
@ -92,7 +88,6 @@ do_configure() {
--with-ffmpeg=shared
sed -e "s,\$(DVDREAD_CFLAGS),,g;s,AR=ar,AR=$AR,g;s,LD=ld,LD=$LD,g;s,RANLIB=ranlib,RANLIB=$RANLIB,g" -i lib/libdvd/libdvd{nav,read}/Makefile
sed -e 's,-L/usr/lib,,g' -i lib/cmyth/Makefile
}
do_build() {
make ${makejobs}

11
srcpkgs/kodi/template
View file

@ -1,14 +1,14 @@
# Template file for 'kodi'
pkgname=kodi
version=15.0
revision=1
_codename="-Isengard"
wrksrc="xbmc-${version}${_codename}"
revision=2
_codename="Isengard"
wrksrc="xbmc-${version}-${_codename}"
short_desc="A software media player and entertainment hub for digital media"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.kodi.tv/"
license="GPL-2"
distfiles="https://github.com/xbmc/xbmc/archive/${version}${_codename}.tar.gz"
distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
checksum=27dba173cfe74b323f4dbaa72ae2bfe5961f76c27bddcd5210253be91cae0dff
lib32disabled=yes
@ -32,7 +32,8 @@ makedepends="
enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
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"
giflib-devel libxslt-devel gnutls-devel libssh-devel libmicrohttpd-devel
libcec-devel"
# 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"

11
srcpkgs/libcec/patches/no-fqdn.patch Normal file
View file

@ -0,0 +1,11 @@
--- src/libcec/cmake/SetBuildInfo.cmake.orig 2015-07-22 12:50:52.632027301 +0200
+++ src/libcec/cmake/SetBuildInfo.cmake 2015-07-22 12:51:05.703027767 +0200
@@ -45,7 +45,7 @@ else()
# add host on which this was built to compile info
find_program(HAVE_HOSTNAME_BIN hostname /bin /usr/bin /usr/local/bin)
if(HAVE_HOSTNAME_BIN)
- exec_program(hostname ARGS -f OUTPUT_VARIABLE BUILD_HOST)
+ exec_program(hostname ARGS OUTPUT_VARIABLE BUILD_HOST)
set(LIB_INFO "${LIB_INFO}@${BUILD_HOST}")
endif()

33
srcpkgs/libcec/template
View file

@ -1,32 +1,38 @@
# Template file for 'libcec'
pkgname=libcec
version=2.2.0
revision=2
version=3.0.1
revision=1
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=gnu-configure
hostmakedepends="automake pkg-config libtool"
makedepends="libudev-devel lockdev-devel"
build_style=cmake
hostmakedepends="cmake pkg-config libtool swig"
makedepends="libudev-devel lockdev-devel platform-devel platform-devel libXrandr-devel
lockdev-devel python-devel"
short_desc="USB CEC Adapter communication Library"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="https://github.com/Pulse-Eight/libcec"
license="GPL-2"
distfiles="https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz"
checksum=fd4f47a18d6e0f4b9e6f5831280207ee2b2a5fc2741ae32ae09ad12a8aa52917
checksum=7e3670c8949a1964d6e5481f56dfff838857da10bdc60b506f6e9b7f117e253e
build_options="rpi"
LDFLAGS+=" -L${XBPS_CROSS_BASE}/usr/lib"
if [ "$XBPS_TARGET_MACHINE" = "armv6l" -o "$XBPS_TARGET_MACHINE" = "armv7l" ]; then
build_options_default="rpi"
fi
if [ "$build_option_rpi" ]; then
configure_args+=" --enable-rpi"
configure_args+=" --with-rpi-include-path=${XBPS_CROSS_BASE}/opt/vc/include"
configure_args+=" --with-rpi-lib-path=${XBPS_CROSS_BASE}/opt/vc/lib"
configure_args+=" LDFLAGS="
configure_args+=" -DRPI_INCLUDE_DIR=${XBPS_CROSS_BASE}/opt/vc/include"
configure_args+=" -DRPI_LIB_DIR=${XBPS_CROSS_BASE}/opt/vc/lib"
makedepends+=" rpi-firmware"
fi
pre_configure() {
autoreconf -fi
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/pkgconfig/libcec.pc
mv $DESTDIR/$wrksrc/build/lib*/* $DESTDIR/usr/lib
}
cec-client_package() {
@ -39,10 +45,9 @@ cec-client_package() {
libcec-devel_package() {
short_desc+=" - development files"
depends="libudev-devel libcec>=${version}_${revision}"
depends="libudev-devel platform-devel libcec>=${version}_${revision}"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
}

1
srcpkgs/platform-devel Symbolic link
View file

@ -0,0 +1 @@
platform

33
srcpkgs/platform/template Normal file
View file

@ -0,0 +1,33 @@
# Template file for 'platform'
pkgname=platform
version=1.0.10
revision=1
build_style=cmake
hostmakedepends="cmake"
short_desc="Platform support library used by libCEC and binary add-ons for Kodi"
maintainer="Enno Boland <gottox@voidlinux.eu>"
license="GPL-2"
homepage="https://github.com/Pulse-Eight/platform"
distfiles="https://github.com/Pulse-Eight/platform/archive/$version.tar.gz"
checksum=6ba3239cb1c0a5341efcf9488f4d3dfad8c26d6b2994b2b2247e5a61568ab5cd
configure_args+=" -DBUILD_SHARED_LIBS=1"
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/platform/platform-config.cmake $DESTDIR/usr/lib/pkgconfig/platform.pc
mv $DESTDIR/$wrksrc/build/lib*/* $DESTDIR/usr/lib
}
platform-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/lib/platform
vmove "usr/lib/*.so"
}
}

10
srcpkgs/tinyxml/files/tinyxml.pc.in Normal file
View file

@ -0,0 +1,10 @@
prefix=/usr
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include
Name: TinyXml
Description: simple, small, C++ XML parser
Version: @VERSION@
Libs: -L${libdir} -ltinyxml
Cflags: -I${includedir}

7
srcpkgs/tinyxml/template
View file

@ -1,9 +1,9 @@
# Template file for 'tinyxml'
pkgname=tinyxml
version=2.6.2
revision=5
revision=6
wrksrc="${pkgname}"
short_desc="A simple, small, C++ XML parser that can be easily integrated into other programs"
short_desc="A simple, small, C++ XML parser"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.grinninglizard.com/tinyxml/"
license="zlib"
@ -22,7 +22,8 @@ do_build() {
}
do_install() {
install -dm 0755 ${DESTDIR}/usr/{lib,include}
install -dm 0755 ${DESTDIR}/usr/{lib,lib/pkgconfig,include}
sed "s/@VERSION@/$version/" ${FILESDIR}/tinyxml.pc.in > $DESTDIR/usr/lib/pkgconfig/tinyxml.pc
install -m0755 lib${sourcepkg}.so.0.${version} ${DESTDIR}/usr/lib
install -m0644 ${sourcepkg}.h tinystr.h ${DESTDIR}/usr/include