From d48b47a9ea5ce7b6434bc470fbe7deb7f116b5a2 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 22 Jul 2015 11:08:13 +0200 Subject: [PATCH 1/5] New package: platform-1.0.10 --- common/shlibs | 1 + srcpkgs/platform-devel | 1 + srcpkgs/platform/template | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 120000 srcpkgs/platform-devel create mode 100644 srcpkgs/platform/template diff --git a/common/shlibs b/common/shlibs index b547bf60dac..2d6194918f8 100644 --- a/common/shlibs +++ b/common/shlibs @@ -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 diff --git a/srcpkgs/platform-devel b/srcpkgs/platform-devel new file mode 120000 index 00000000000..fdf623f16aa --- /dev/null +++ b/srcpkgs/platform-devel @@ -0,0 +1 @@ +platform \ No newline at end of file diff --git a/srcpkgs/platform/template b/srcpkgs/platform/template new file mode 100644 index 00000000000..ef6cd32dd70 --- /dev/null +++ b/srcpkgs/platform/template @@ -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 " +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" + } +} From 890772ecbef9b82560364ee96b2dee5cc1501e52 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 22 Jul 2015 12:59:22 +0200 Subject: [PATCH 2/5] libcec: update to 3.0.1. --- common/shlibs | 2 +- srcpkgs/libcec/patches/no-fqdn.patch | 11 ++++++++++ srcpkgs/libcec/template | 33 ++++++++++++++++------------ 3 files changed, 31 insertions(+), 15 deletions(-) create mode 100644 srcpkgs/libcec/patches/no-fqdn.patch diff --git a/common/shlibs b/common/shlibs index 2d6194918f8..cb7dba58b38 100644 --- a/common/shlibs +++ b/common/shlibs @@ -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 diff --git a/srcpkgs/libcec/patches/no-fqdn.patch b/srcpkgs/libcec/patches/no-fqdn.patch new file mode 100644 index 00000000000..03017bb32bc --- /dev/null +++ b/srcpkgs/libcec/patches/no-fqdn.patch @@ -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() + diff --git a/srcpkgs/libcec/template b/srcpkgs/libcec/template index 00b0df79df6..21f6223f3f1 100644 --- a/srcpkgs/libcec/template +++ b/srcpkgs/libcec/template @@ -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 " 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 } From 9426c1edce65ee25a160b2e45a55b41318611649 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 22 Jul 2015 17:27:05 +0200 Subject: [PATCH 3/5] tinyxml: add .pc-file; shorter description --- srcpkgs/tinyxml/files/tinyxml.pc.in | 10 ++++++++++ srcpkgs/tinyxml/template | 7 ++++--- 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/tinyxml/files/tinyxml.pc.in diff --git a/srcpkgs/tinyxml/files/tinyxml.pc.in b/srcpkgs/tinyxml/files/tinyxml.pc.in new file mode 100644 index 00000000000..7dda7f58fd5 --- /dev/null +++ b/srcpkgs/tinyxml/files/tinyxml.pc.in @@ -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} diff --git a/srcpkgs/tinyxml/template b/srcpkgs/tinyxml/template index 9614f818815..de162e2b6e6 100644 --- a/srcpkgs/tinyxml/template +++ b/srcpkgs/tinyxml/template @@ -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 " 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 From 978bc322d3532c5b52b5d2209acedf5795afe996 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 23 Jul 2015 22:07:45 +0200 Subject: [PATCH 4/5] kodi: small style changes; add libcec. --- srcpkgs/kodi/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template index bb7bed3b7d5..44118379f10 100644 --- a/srcpkgs/kodi/template +++ b/srcpkgs/kodi/template @@ -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 " 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" From d37605daf76c0f8d00b703b355750885a2e6f15b Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 23 Jul 2015 22:07:57 +0200 Subject: [PATCH 5/5] kodi-rpi: update to 15.0. --- srcpkgs/kodi-rpi/patches/cross-fix.patch | 24 +++++++++++++++++++ .../kodi-rpi/patches/dvddemux-ffmpeg.patch | 16 ------------- srcpkgs/kodi-rpi/template | 17 +++++-------- 3 files changed, 30 insertions(+), 27 deletions(-) create mode 100644 srcpkgs/kodi-rpi/patches/cross-fix.patch delete mode 100644 srcpkgs/kodi-rpi/patches/dvddemux-ffmpeg.patch diff --git a/srcpkgs/kodi-rpi/patches/cross-fix.patch b/srcpkgs/kodi-rpi/patches/cross-fix.patch new file mode 100644 index 00000000000..1c2cb7ad402 --- /dev/null +++ b/srcpkgs/kodi-rpi/patches/cross-fix.patch @@ -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"], diff --git a/srcpkgs/kodi-rpi/patches/dvddemux-ffmpeg.patch b/srcpkgs/kodi-rpi/patches/dvddemux-ffmpeg.patch deleted file mode 100644 index f3818990768..00000000000 --- a/srcpkgs/kodi-rpi/patches/dvddemux-ffmpeg.patch +++ /dev/null @@ -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; diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template index 10e446d0bb5..04e976a3127 100644 --- a/srcpkgs/kodi-rpi/template +++ b/srcpkgs/kodi-rpi/template @@ -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 " 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}