Date: Tue, 17 Dec 2019 06:14:49 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r520306 - in head/multimedia: kodi-addon-inputstream.adaptive-devel kodi-addon-peripheral.joystick-devel kodi-addon-vfs.libarchive-devel kodi-devel kodi-devel/files Message-ID: <201912170614.xBH6Enb8004432@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Tue Dec 17 06:14:49 2019 New Revision: 520306 URL: https://svnweb.freebsd.org/changeset/ports/520306 Log: multimedia/kodi-devel: Update to newer snapshot - Switch to upstreamed patches - Add patches for improved CPUInfo support [1] [1] https://github.com/xbmc/xbmc/pull/16779 Submitted by: rozhuk.im@gmail.com [1] Deleted: head/multimedia/kodi-devel/files/patch-cmake_modules_FindEpollShim.cmake head/multimedia/kodi-devel/files/patch-cmake_platform_freebsd_gbm.cmake head/multimedia/kodi-devel/files/patch-xbmc_addons_kodi-addon-dev-kit_include_kodi_AddonBase.h head/multimedia/kodi-devel/files/patch-xbmc_platform_linux_input_LibInputHandler.cpp Modified: head/multimedia/kodi-addon-inputstream.adaptive-devel/Makefile head/multimedia/kodi-addon-peripheral.joystick-devel/Makefile head/multimedia/kodi-addon-vfs.libarchive-devel/Makefile head/multimedia/kodi-devel/Makefile head/multimedia/kodi-devel/distinfo head/multimedia/kodi-devel/pkg-plist Modified: head/multimedia/kodi-addon-inputstream.adaptive-devel/Makefile ============================================================================== --- head/multimedia/kodi-addon-inputstream.adaptive-devel/Makefile Tue Dec 17 06:07:09 2019 (r520305) +++ head/multimedia/kodi-addon-inputstream.adaptive-devel/Makefile Tue Dec 17 06:14:49 2019 (r520306) @@ -3,6 +3,7 @@ PORTNAME= inputstream.adaptive DISTVERSION= 2.5.3 DISTVERSIONSUFFIX= -Matrix +PORTREVISION= 1 CATEGORIES= multimedia PKGNAMEPREFIX= kodi-addon- PKGNAMESUFFIX= -devel @@ -13,9 +14,9 @@ COMMENT= Adaptive stream support for Kodi LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.GPL -BUILD_DEPENDS= kodi-devel>=19.0.a20191112:multimedia/kodi-devel +BUILD_DEPENDS= kodi-devel>=19.0.a20191216:multimedia/kodi-devel LIB_DEPENDS= libexpat.so:textproc/expat2 -RUN_DEPENDS= kodi-devel>=19.0.a20191112:multimedia/kodi-devel +RUN_DEPENDS= kodi-devel>=19.0.a20191216:multimedia/kodi-devel USES= cmake USE_GITHUB= yes Modified: head/multimedia/kodi-addon-peripheral.joystick-devel/Makefile ============================================================================== --- head/multimedia/kodi-addon-peripheral.joystick-devel/Makefile Tue Dec 17 06:07:09 2019 (r520305) +++ head/multimedia/kodi-addon-peripheral.joystick-devel/Makefile Tue Dec 17 06:14:49 2019 (r520306) @@ -4,6 +4,7 @@ PORTNAME= peripheral.joystick PORTVERSION= 1.4.8 DISTVERSIONSUFFIX= -Leia +PORTREVISION= 1 CATEGORIES= multimedia PKGNAMEPREFIX= kodi-addon- PKGNAMESUFFIX= -devel @@ -14,10 +15,10 @@ COMMENT= Joystick support for Kodi LICENSE= GPLv2+ BUILD_DEPENDS= ${LOCALBASE}/include/linux/joystick.h:devel/evdev-proto \ - kodi-devel>=19.0.a20191112:multimedia/kodi-devel + kodi-devel>=19.0.a20191216:multimedia/kodi-devel LIB_DEPENDS= libtinyxml.so:textproc/tinyxml \ libudev.so:devel/libudev-devd -RUN_DEPENDS= kodi-devel>=19.0.a20191112:multimedia/kodi-devel +RUN_DEPENDS= kodi-devel>=19.0.a20191216:multimedia/kodi-devel USES= cmake localbase USE_GITHUB= yes Modified: head/multimedia/kodi-addon-vfs.libarchive-devel/Makefile ============================================================================== --- head/multimedia/kodi-addon-vfs.libarchive-devel/Makefile Tue Dec 17 06:07:09 2019 (r520305) +++ head/multimedia/kodi-addon-vfs.libarchive-devel/Makefile Tue Dec 17 06:14:49 2019 (r520306) @@ -3,7 +3,7 @@ PORTNAME= vfs.libarchive DISTVERSION= 1.0.5 DISTVERSIONSUFFIX= -Leia -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia PKGNAMEPREFIX= kodi-addon- PKGNAMESUFFIX= -devel @@ -13,10 +13,10 @@ COMMENT= VFS addon for Kodi to access archives directl LICENSE= GPLv2+ -BUILD_DEPENDS= kodi-devel>=19.0.a20191112:multimedia/kodi-devel +BUILD_DEPENDS= kodi-devel>=19.0.a20191216:multimedia/kodi-devel LIB_DEPENDS= liblz4.so:archivers/liblz4 \ liblzo2.so:archivers/lzo2 -RUN_DEPENDS= kodi-devel>=19.0.a20191112:multimedia/kodi-devel +RUN_DEPENDS= kodi-devel>=19.0.a20191216:multimedia/kodi-devel USES= cmake libarchive ssl USE_GITHUB= yes Modified: head/multimedia/kodi-devel/Makefile ============================================================================== --- head/multimedia/kodi-devel/Makefile Tue Dec 17 06:07:09 2019 (r520305) +++ head/multimedia/kodi-devel/Makefile Tue Dec 17 06:14:49 2019 (r520306) @@ -1,14 +1,14 @@ # $FreeBSD$ PORTNAME= kodi -DISTVERSION= 19.0.a20191112 -PORTREVISION= 5 +DISTVERSION= 19.0.a20191216 CATEGORIES= multimedia PKGNAMESUFFIX= -devel PATCH_SITES= https://github.com/xbmc/xbmc/commit/ -PATCHFILES= d2922c8e4bb6fcaf5a2b3041da9b6303dd1225d4.patch:-p1 \ - 3bbb9f22e4c1a2a37b7d8e73b55361ca0a660a59.patch:-p1 +PATCHFILES= 6a3cbd22fbf72d592cc1a8ccb58782f494ada826.patch:-p1 \ + 91afd99709d8fb6a496f7dc451bae5bba75fa717.patch:-p1 \ + ae804ecd9a9e9281b28918d0d21033ea1f285b81.patch:-p1 MAINTAINER= tobik@FreeBSD.org COMMENT= Award winning media center application @@ -61,7 +61,7 @@ USES= autoreconf:build cmake:noninja compiler:c++11-l USE_GITHUB= yes GH_ACCOUNT= xbmc GH_PROJECT= xbmc -GH_TAGNAME= f6311e3c5559ced201fb8ff91846fe4b9b668a9a +GH_TAGNAME= c35b70cc2c5618f114ebea905aaacfe96eb15951 USE_GL= egl gl glu USE_GNOME= libxml2 libxslt USE_JAVA= yes @@ -184,10 +184,14 @@ post-patch: # (see CMAKE_ARGS). @${REINPLACE_CMD} 's@KODI_DEPENDSBUILD@true@' \ ${WRKSRC}/cmake/modules/FindLibDvd.cmake -# Make sure freebsd.xml is in sync with linux.xml since the -# upstream devs do not sync them - @${CP} ${WRKSRC}/system/settings/linux.xml \ - ${WRKSRC}/system/settings/freebsd.xml +# Abort build if freebsd.xml and linux.xml differ again. The +# upstream devs forget to sync them. When that happens it might +# be time to file a PR again. + @cd ${WRKSRC}/system/settings && \ + if ! /usr/bin/cmp -s freebsd.xml linux.xml; then \ + ${ECHO_MSG} "=> freebsd.xml out of sync with linux.xml again"; \ + ${FALSE}; \ + fi # Make sure Kodi can find keyboard layouts from xkeyboard-config @${REINPLACE_CMD} 's,/usr/share/X11/xkb/rules/,${LOCALBASE}/share/X11/xkb/rules/,g' \ ${WRKSRC}/xbmc/platform/linux/input/LibInputSettings.cpp Modified: head/multimedia/kodi-devel/distinfo ============================================================================== --- head/multimedia/kodi-devel/distinfo Tue Dec 17 06:07:09 2019 (r520305) +++ head/multimedia/kodi-devel/distinfo Tue Dec 17 06:14:49 2019 (r520306) @@ -1,7 +1,9 @@ -TIMESTAMP = 1575674484 -SHA256 (xbmc-xbmc-19.0.a20191112-f6311e3c5559ced201fb8ff91846fe4b9b668a9a_GH0.tar.gz) = 74c80deeb040ba009f6b27e41ef95ae5cf37ff23c2b7c1390cfd9a1eb5c27864 -SIZE (xbmc-xbmc-19.0.a20191112-f6311e3c5559ced201fb8ff91846fe4b9b668a9a_GH0.tar.gz) = 78500747 -SHA256 (d2922c8e4bb6fcaf5a2b3041da9b6303dd1225d4.patch) = 1a16f26a5168579e4532c036f609bd15a4de57780af5369c598b34f5dacc414b -SIZE (d2922c8e4bb6fcaf5a2b3041da9b6303dd1225d4.patch) = 1678 -SHA256 (3bbb9f22e4c1a2a37b7d8e73b55361ca0a660a59.patch) = adfae7aa272c7759bf3bcf2b9a07dbeacaf4c9af88cf3c881379f5f456e07d95 -SIZE (3bbb9f22e4c1a2a37b7d8e73b55361ca0a660a59.patch) = 7367 +TIMESTAMP = 1576509765 +SHA256 (xbmc-xbmc-19.0.a20191216-c35b70cc2c5618f114ebea905aaacfe96eb15951_GH0.tar.gz) = f58d01f123f9d11e406f2e5c666a2eb4a79f9354a3aafc9bef81ad8ddf01f28f +SIZE (xbmc-xbmc-19.0.a20191216-c35b70cc2c5618f114ebea905aaacfe96eb15951_GH0.tar.gz) = 50045433 +SHA256 (6a3cbd22fbf72d592cc1a8ccb58782f494ada826.patch) = 6c908d10e9140e44430b6b22102d5abe059ca604ea42670c9b0d7a40017315aa +SIZE (6a3cbd22fbf72d592cc1a8ccb58782f494ada826.patch) = 6345 +SHA256 (91afd99709d8fb6a496f7dc451bae5bba75fa717.patch) = 76222da0e5fdf5f1853b212eb897370ed2526e2b336352ab6c1ef797b3cf0ff4 +SIZE (91afd99709d8fb6a496f7dc451bae5bba75fa717.patch) = 1958 +SHA256 (ae804ecd9a9e9281b28918d0d21033ea1f285b81.patch) = f4a3db6005be2396efc697b60eb406b8aa79df8e44cd18ec62204f1b14269980 +SIZE (ae804ecd9a9e9281b28918d0d21033ea1f285b81.patch) = 1017 Modified: head/multimedia/kodi-devel/pkg-plist ============================================================================== --- head/multimedia/kodi-devel/pkg-plist Tue Dec 17 06:07:09 2019 (r520305) +++ head/multimedia/kodi-devel/pkg-plist Tue Dec 17 06:14:49 2019 (r520306) @@ -10,6 +10,7 @@ include/kodi/DemuxPacket.h include/kodi/Filesystem.h include/kodi/General.h include/kodi/IFileTypes.h +include/kodi/InputStreamConstants.h include/kodi/Network.h include/kodi/StreamCodec.h include/kodi/StreamCrypto.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912170614.xBH6Enb8004432>