From nobody Tue Apr 18 09:09:33 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0ymF6HyPz44nCF; Tue, 18 Apr 2023 09:09:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q0ymF5nRnz4Hj5; Tue, 18 Apr 2023 09:09:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681808973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6BYkykadRae5I21eK8p3cs+W7454mryOWXYOCF6SjrY=; b=aHvJNDhXQWm7RI670jxKdYJLDusfmRpqmsLZ4/FKt4epPmOGVT/XMFjxNKosvzIcYbbM3B FdwxltppTIUc7LscCqIrGhAK+anOQeXMkz4Qmptstgv5bqO2jDcsC/q5HvQ75YKs2UjFB5 hAlOgslIbDPotBQ+dYf7hNib7C915YvbpLnaiO3LemJHgUA+Y3VbLjKWdZGPH4Nz14lR9G uhjTYtPLgdHzlEUe8R1uev0AuEfC6yRPNJfw/1YHjzjfGgI9ex4+TR3KeC4xxumTobbODQ LxCjOAIHsy6PZYp9yNHhiNIC+A4Ku8NFOoaqJBjnfwk2GbmZ3LybeuqakP5zWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681808973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6BYkykadRae5I21eK8p3cs+W7454mryOWXYOCF6SjrY=; b=PoTyjjG5BXSMhd+cViCwgKp3h1Q5Gt8KTHLtGTVFBgi9vKa7Yhi07klSc7akUEVvoSPDUP ddeyXhVEVKAjMGhTetnzLygtQd65NRBxUxsg8m0U7cXMyAb00CL08F9ieh22yGG5qIvdCe DKvg5k7Mq8/ZGiih+BS3Ac6Kxxbgz3pY/QlHDsTEIE7WidbSKo/3ITEcHvH4GJOYSJy9mW X7zWpvzTURpkuDgg/xMTXXcYUuYn0gMfc4nrtN+4NgfmLA3zgh1+j3rnfDtyfKVLYwc7ee PM4UtVlGASZk+NFEfjlKx977pLdLCqsMrscrqTK59z2sRFYhKrxLT+PXs2MxZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681808973; a=rsa-sha256; cv=none; b=YqjQHeXBt/mUC4neek0eTqKQ4cPAmKzQzYR7vXrZzedLJz8zrgI6ki3kFqhcyjIiFh3QFt f7ccNrZBtThe7rGUXKAlNCLpc67njTvDNSM8KiF8XfGjb7U8R3yFGVnQyZiRqBMrXvNuvG uXrDNgqEtv2cWBI7RC1RV0Ey6pBbTzQi81NwEFjREoBwuroWJhsFqYKIzoRhjPsr8bmVjX CiREnrRIe+hbti47uDndmL2zoJ4t43kedMRx8R+IA0FuCk20C5mS8cN25MeulerlpARZxC 4MXR0zfzCy5Ksv6DyAS4fbtc2HFLulSMnjM6QS+u1lNnXlgH4lpSL0A6ocMRTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0ymF4rD1z15Qv; Tue, 18 Apr 2023 09:09:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33I99XAB086108; Tue, 18 Apr 2023 09:09:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33I99Xa6086107; Tue, 18 Apr 2023 09:09:33 GMT (envelope-from git) Date: Tue, 18 Apr 2023 09:09:33 GMT Message-Id: <202304180909.33I99Xa6086107@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernhard Froehlich Subject: git: f980c6e72107 - main - multimedia/kodi-addon-inputstream.adaptive: Unbreak using forked Bento4 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: decke X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f980c6e721077a79af0bcfe4d8e5b9548400785c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by decke: URL: https://cgit.FreeBSD.org/ports/commit/?id=f980c6e721077a79af0bcfe4d8e5b9548400785c commit f980c6e721077a79af0bcfe4d8e5b9548400785c Author: Lars Herschke AuthorDate: 2023-04-18 09:08:09 +0000 Commit: Bernhard Froehlich CommitDate: 2023-04-18 09:09:11 +0000 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(-) 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)