From f980c6e721077a79af0bcfe4d8e5b9548400785c Mon Sep 17 00:00:00 2001 From: Lars Herschke Date: Tue, 18 Apr 2023 09:08:09 +0000 Subject: [PATCH] multimedia/kodi-addon-inputstream.adaptive: Unbreak using forked Bento4 PR: 270794 --- multimedia/kodi-addon-inputstream.adaptive/Makefile | 11 +++++++---- multimedia/kodi-addon-inputstream.adaptive/distinfo | 8 +++++--- .../files/patch-FindBento4.cmake | 12 ++++++++++++ 3 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 multimedia/kodi-addon-inputstream.adaptive/files/patch-FindBento4.cmake diff --git a/multimedia/kodi-addon-inputstream.adaptive/Makefile b/multimedia/kodi-addon-inputstream.adaptive/Makefile index afbe08f5a6fe..98b866ce72d6 100644 --- a/multimedia/kodi-addon-inputstream.adaptive/Makefile +++ b/multimedia/kodi-addon-inputstream.adaptive/Makefile @@ -1,7 +1,8 @@ PORTNAME= inputstream.adaptive -DISTVERSION= 20.3.2 +DISTVERSION= 20.3.6 DISTVERSIONSUFFIX= -Nexus CATEGORIES= multimedia +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= decke@FreeBSD.org COMMENT= Adaptive stream support for Kodi @@ -10,13 +11,15 @@ WWW= https://github.com/peak3d/inputstream.adaptive LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.md -BROKEN= required headers missing in multimedia/Bento4 - BUILD_DEPENDS= googletest>0:devel/googletest LIB_DEPENDS= libexpat.so:textproc/expat2 USES= cmake compiler:c++14-lang kodi USE_GITHUB= yes -GH_ACCOUNT= peak3d +GH_ACCOUNT= peak3d xbmc:bento4 +GH_PROJECT= Bento4:bento4 +GH_TAGNAME= 1.6.0-639-5-Nexus:bento4 + +CMAKE_ARGS+= -DENABLE_INTERNAL_BENTO4:BOOL=ON -DBENTO4_URL=${DISTDIR}/${DISTFILE_bento4} .include diff --git a/multimedia/kodi-addon-inputstream.adaptive/distinfo b/multimedia/kodi-addon-inputstream.adaptive/distinfo index 98eb4919e9a3..aa6518f128aa 100644 --- a/multimedia/kodi-addon-inputstream.adaptive/distinfo +++ b/multimedia/kodi-addon-inputstream.adaptive/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1675166953 -SHA256 (peak3d-inputstream.adaptive-20.3.2-Nexus_GH0.tar.gz) = 75db361c65d5c9bad842ce7bfffd75c7ec7aca89b5ce107deb49f19e2c670a07 -SIZE (peak3d-inputstream.adaptive-20.3.2-Nexus_GH0.tar.gz) = 744528 +TIMESTAMP = 1681727103 +SHA256 (peak3d-inputstream.adaptive-20.3.6-Nexus_GH0.tar.gz) = 907915228335eeb9217e6f069cbb210fffce01095a6326908015cd89165a0328 +SIZE (peak3d-inputstream.adaptive-20.3.6-Nexus_GH0.tar.gz) = 770375 +SHA256 (xbmc-Bento4-1.6.0-639-5-Nexus_GH0.tar.gz) = 3efc43c8146d6a89c4f80208f0e24b1c26ecfc84a2887135b10891612366c373 +SIZE (xbmc-Bento4-1.6.0-639-5-Nexus_GH0.tar.gz) = 5481733 diff --git a/multimedia/kodi-addon-inputstream.adaptive/files/patch-FindBento4.cmake b/multimedia/kodi-addon-inputstream.adaptive/files/patch-FindBento4.cmake new file mode 100644 index 000000000000..1683b6930422 --- /dev/null +++ b/multimedia/kodi-addon-inputstream.adaptive/files/patch-FindBento4.cmake @@ -0,0 +1,12 @@ +--- FindBento4.cmake.orig 2023-01-11 21:37:47 UTC ++++ FindBento4.cmake +@@ -49,7 +49,8 @@ if(ENABLE_INTERNAL_BENTO4) + -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} + -DBUILD_APPS=OFF +- BUILD_BYPRODUCTS ${BENTO4_LIBRARY}) ++ BUILD_BYPRODUCTS ${BENTO4_LIBRARY} ++ INSTALL_COMMAND DESTDIR= ${CMAKE_MAKE_PROGRAM} install) + else() + if(PKG_CONFIG_FOUND) + pkg_check_modules(PC_BENTO4 REQUIRED)