CVS commit: pkgsrc/chat/jitsi-videobridge

["Pierre Pronchery" <khorben%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   khorben
Date:           Thu Feb 16 10:33:08 UTC 2023

Modified Files:
        pkgsrc/chat/jitsi-videobridge: Makefile PLIST distinfo

Log Message:
jitsi-videobridge: register dependency on jitsi-srtp

While there, ship jitsi-videobridge as a single JAR file.

Tested on NetBSD/amd64.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/chat/jitsi-videobridge/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/chat/jitsi-videobridge/PLIST \
    pkgsrc/chat/jitsi-videobridge/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/chat/jitsi-videobridge/Makefile
diff -u pkgsrc/chat/jitsi-videobridge/Makefile:1.1 pkgsrc/chat/jitsi-videobridge/Makefile:1.2
--- pkgsrc/chat/jitsi-videobridge/Makefile:1.1  Tue Jan  3 10:29:35 2023
+++ pkgsrc/chat/jitsi-videobridge/Makefile      Thu Feb 16 10:33:08 2023
@@ -1,19 +1,22 @@
-# $NetBSD: Makefile,v 1.1 2023/01/03 10:29:35 khorben Exp $
+# $NetBSD: Makefile,v 1.2 2023/02/16 10:33:08 khorben Exp $
 
 .include "../../chat/jitsi-meet/Makefile.common"
 
 GITHUB_PROJECT=        jitsi-videobridge
 PKGNAME=       ${GITHUB_PROJECT}-${JITSI_MEET_VERSION}
+PKGREVISION=   1
 
 HOMEPAGE=      https://github.com/jitsi/jitsi-videobridge/
 COMMENT=       WebRTC compatible video router or SFU
 
 DISTINFO_FILE= ${.CURDIR}/../../chat/jitsi-videobridge/distinfo
 DISTFILES=     ${DEFAULT_DISTFILES}
-DISTFILES+=    jitsi-videobridge-java-deps-${JITSI_MEET_VERSION}.tar.gz
-SITES.jitsi-videobridge-java-deps-${JITSI_MEET_VERSION}.tar.gz= \
+DISTFILES+=    jitsi-videobridge-java-deps-${JITSI_MEET_VERSION}nb1.tar.gz
+SITES.jitsi-videobridge-java-deps-${JITSI_MEET_VERSION}nb1.tar.gz= \
                ftp://ftp.NetBSD.org/pub/NetBSD/misc/khorben/
 
+DEPENDS+=      jitsi-srtp-[0-9]*:../../chat/jitsi-srtp
+
 USE_TOOLS+=    bash:run pax:build unzip
 
 USE_JAVA2=     17
@@ -23,9 +26,10 @@ TOOL_DEPENDS+=       apache-maven-[0-9]*:../..
 MAVEN_FLAGS+=  -Duser.home=${FAKEHOMEDIR}
 MAVEN_FLAGS+=  -Dmaven.repo.local=${WRKDIR}/deps
 MAVEN_FLAGS+=  --offline
+MAVEN_FLAGS+=  -PbuildFatJar
 MAVEN_FLAGS+=  -DskipTests
 MAVEN_FLAGS+=  -Dassembly.skipAssembly=false
-MVN=           mvn ${MAVEN_FLAGS}
+MVN=           ${PKGSRC_SETENV} ${MAKE_ENV} mvn ${MAVEN_FLAGS}
 
 REPLACE_BASH=  jvb/resources/jvb.sh
 REPLACE_BASH+= resources/collect-dump-logs.sh
@@ -76,12 +80,8 @@ do-build:
        cd ${WRKSRC} && ${MVN} package
 
 do-install:
-       ${RM} -rf ${DESTDIR}${PREFIX}/share/jitsi-videobridge-${JITSI_MEET_VERSION} \
-               ${DESTDIR}${PREFIX}/share/jitsi-videobridge
-       cd ${DESTDIR}${PREFIX}/share && \
-               ${UNZIP_CMD} ${WRKSRC}/jvb/target/jitsi-videobridge-${JITSI_MEET_VERSION}-archive.zip
-       ${MV} ${DESTDIR}${PREFIX}/share/jitsi-videobridge-${JITSI_MEET_VERSION} \
-               ${DESTDIR}${PREFIX}/share/jitsi-videobridge
+       ${INSTALL_DATA} ${WRKSRC}/jvb/target/jitsi-videobridge-${JITSI_MEET_VERSION}-jar-with-dependencies.jar \
+               ${DESTDIR}${PREFIX}/share/jitsi-videobridge/jitsi-videobridge.jar
        ${LN} -sf ../share/jitsi-videobridge/jvb.sh \
                ${DESTDIR}${PREFIX}/bin/jvb
        ${INSTALL_DATA} ${WRKSRC}/jvb/src/main/resources/reference.conf \
@@ -96,6 +96,10 @@ do-install:
                ${DESTDIR}${PREFIX}/share/jitsi-videobridge/collect-dump-logs.sh
        ${INSTALL_SCRIPT} ${WRKSRC}/resources/graceful_shutdown.sh \
                ${DESTDIR}${PREFIX}/share/jitsi-videobridge/graceful_shutdown.sh
+       ${INSTALL_DATA} ${WRKSRC}/jvb/resources/jvb.bat \
+               ${DESTDIR}${PREFIX}/share/jitsi-videobridge/jvb.bat
+       ${INSTALL_SCRIPT} ${WRKSRC}/jvb/resources/jvb.sh \
+               ${DESTDIR}${PREFIX}/share/jitsi-videobridge/jvb.sh
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/chat/jitsi-videobridge/PLIST
diff -u pkgsrc/chat/jitsi-videobridge/PLIST:1.2 pkgsrc/chat/jitsi-videobridge/PLIST:1.3
--- pkgsrc/chat/jitsi-videobridge/PLIST:1.2     Fri Feb 10 12:50:13 2023
+++ pkgsrc/chat/jitsi-videobridge/PLIST Thu Feb 16 10:33:08 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2023/02/10 12:50:13 khorben Exp $
+@comment $NetBSD: PLIST,v 1.3 2023/02/16 10:33:08 khorben Exp $
 bin/jvb
 share/examples/jitsi-videobridge/jvb.conf
 share/examples/jitsi-videobridge/logging.properties
@@ -9,135 +9,3 @@ share/jitsi-videobridge/graceful_shutdow
 share/jitsi-videobridge/jitsi-videobridge.jar
 share/jitsi-videobridge/jvb.bat
 share/jitsi-videobridge/jvb.sh
-share/jitsi-videobridge/lib/agafua-syslog-0.4.jar
-share/jitsi-videobridge/lib/annotations-23.0.0.jar
-share/jitsi-videobridge/lib/aopalliance-repackaged-3.0.1.jar
-share/jitsi-videobridge/lib/asm-9.3.jar
-share/jitsi-videobridge/lib/asm-analysis-9.3.jar
-share/jitsi-videobridge/lib/asm-commons-9.3.jar
-share/jitsi-videobridge/lib/asm-tree-9.3.jar
-share/jitsi-videobridge/lib/bcpkix-jdk15on-1.70.jar
-share/jitsi-videobridge/lib/bcprov-jdk15on-1.70.jar
-share/jitsi-videobridge/lib/bctls-jdk15on-1.70.jar
-share/jitsi-videobridge/lib/bcutil-jdk15on-1.70.jar
-share/jitsi-videobridge/lib/cglib-nodep-2.2.jar
-share/jitsi-videobridge/lib/checker-qual-3.12.0.jar
-share/jitsi-videobridge/lib/commons-lang3-3.12.0.jar
-share/jitsi-videobridge/lib/config-1.4.2.jar
-share/jitsi-videobridge/lib/error_prone_annotations-2.7.1.jar
-share/jitsi-videobridge/lib/failureaccess-1.0.1.jar
-share/jitsi-videobridge/lib/gson-2.8.5.jar
-share/jitsi-videobridge/lib/guava-31.0.1-jre.jar
-share/jitsi-videobridge/lib/hk2-api-3.0.1.jar
-share/jitsi-videobridge/lib/hk2-locator-3.0.1.jar
-share/jitsi-videobridge/lib/hk2-utils-3.0.1.jar
-share/jitsi-videobridge/lib/ice4j-3.0-58-gf41542d.jar
-share/jitsi-videobridge/lib/j2objc-annotations-1.3.jar
-share/jitsi-videobridge/lib/jackson-annotations-2.13.0.jar
-share/jitsi-videobridge/lib/jackson-core-2.13.0.jar
-share/jitsi-videobridge/lib/jackson-databind-2.13.0.jar
-share/jitsi-videobridge/lib/jackson-module-jakarta-xmlbind-annotations-2.13.0.jar
-share/jitsi-videobridge/lib/jackson-module-kotlin-2.12.4.jar
-share/jitsi-videobridge/lib/jain-sip-ri-ossonly-1.2.279-jitsi-oss1.jar
-share/jitsi-videobridge/lib/jakarta.activation-2.0.1.jar
-share/jitsi-videobridge/lib/jakarta.annotation-api-2.1.0.jar
-share/jitsi-videobridge/lib/jakarta.inject-api-2.0.0.jar
-share/jitsi-videobridge/lib/jakarta.servlet-api-5.0.0.jar
-share/jitsi-videobridge/lib/jakarta.transaction-api-2.0.0.jar
-share/jitsi-videobridge/lib/jakarta.validation-api-3.0.0.jar
-share/jitsi-videobridge/lib/jakarta.ws.rs-api-3.0.0.jar
-share/jitsi-videobridge/lib/jakarta.xml.bind-api-3.0.1.jar
-share/jitsi-videobridge/lib/java-sdp-nist-bridge-1.2.jar
-share/jitsi-videobridge/lib/javassist-3.28.0-GA.jar
-share/jitsi-videobridge/lib/jcl-core-2.8.jar
-share/jitsi-videobridge/lib/jersey-client-3.0.4.jar
-share/jitsi-videobridge/lib/jersey-common-3.0.4.jar
-share/jitsi-videobridge/lib/jersey-container-jetty-http-3.0.4.jar
-share/jitsi-videobridge/lib/jersey-container-servlet-3.0.4.jar
-share/jitsi-videobridge/lib/jersey-container-servlet-core-3.0.4.jar
-share/jitsi-videobridge/lib/jersey-entity-filtering-3.0.4.jar
-share/jitsi-videobridge/lib/jersey-hk2-3.0.4.jar
-share/jitsi-videobridge/lib/jersey-media-jaxb-3.0.4.jar
-share/jitsi-videobridge/lib/jersey-media-json-jackson-3.0.4.jar
-share/jitsi-videobridge/lib/jersey-server-3.0.4.jar
-share/jitsi-videobridge/lib/jersey-test-framework-core-3.0.4.jar
-share/jitsi-videobridge/lib/jetty-alpn-client-11.0.10.jar
-share/jitsi-videobridge/lib/jetty-annotations-11.0.10.jar
-share/jitsi-videobridge/lib/jetty-client-11.0.10.jar
-share/jitsi-videobridge/lib/jetty-http-11.0.10.jar
-share/jitsi-videobridge/lib/jetty-io-11.0.10.jar
-share/jitsi-videobridge/lib/jetty-jakarta-servlet-api-5.0.2.jar
-share/jitsi-videobridge/lib/jetty-jndi-11.0.10.jar
-share/jitsi-videobridge/lib/jetty-plus-11.0.10.jar
-share/jitsi-videobridge/lib/jetty-proxy-11.0.10.jar
-share/jitsi-videobridge/lib/jetty-rewrite-11.0.10.jar
-share/jitsi-videobridge/lib/jetty-security-11.0.10.jar
-share/jitsi-videobridge/lib/jetty-server-11.0.10.jar
-share/jitsi-videobridge/lib/jetty-servlet-11.0.10.jar
-share/jitsi-videobridge/lib/jetty-servlets-11.0.10.jar
-share/jitsi-videobridge/lib/jetty-util-11.0.10.jar
-share/jitsi-videobridge/lib/jetty-webapp-11.0.10.jar
-share/jitsi-videobridge/lib/jetty-xml-11.0.10.jar
-share/jitsi-videobridge/lib/jicoco-1.1-121-gbaa7d30.jar
-share/jitsi-videobridge/lib/jicoco-config-1.1-121-gbaa7d30.jar
-share/jitsi-videobridge/lib/jicoco-metrics-1.1-121-gbaa7d30.jar
-share/jitsi-videobridge/lib/jitsi-media-transform-${PKGVERSION}.jar
-share/jitsi-videobridge/lib/jitsi-metaconfig-1.0-11-g8cf950e.jar
-share/jitsi-videobridge/lib/jitsi-srtp-1.1-7-gd8d1435.jar
-share/jitsi-videobridge/lib/jitsi-utils-1.0-124-ge57838f.jar
-share/jitsi-videobridge/lib/jitsi-xmpp-extensions-1.0-59-g76a5c13.jar
-share/jitsi-videobridge/lib/jna-5.9.0.jar
-share/jitsi-videobridge/lib/jnilib-1.0-9-g45bf9f2.jar
-share/jitsi-videobridge/lib/jniwrapper-java-1.0-9-g45bf9f2.jar
-share/jitsi-videobridge/lib/jniwrapper-native-1.0-9-g45bf9f2.jar
-share/jitsi-videobridge/lib/json-simple-1.1.1.jar
-share/jitsi-videobridge/lib/jsr305-3.0.2.jar
-share/jitsi-videobridge/lib/jxmpp-core-1.0.3.jar
-share/jitsi-videobridge/lib/jxmpp-jid-1.0.3.jar
-share/jitsi-videobridge/lib/jxmpp-util-cache-1.0.3.jar
-share/jitsi-videobridge/lib/kotlin-reflect-1.6.21.jar
-share/jitsi-videobridge/lib/kotlin-stdlib-1.6.21.jar
-share/jitsi-videobridge/lib/kotlin-stdlib-common-1.6.21.jar
-share/jitsi-videobridge/lib/kotlin-stdlib-jdk7-1.6.21.jar
-share/jitsi-videobridge/lib/kotlin-stdlib-jdk8-1.6.21.jar
-share/jitsi-videobridge/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
-share/jitsi-videobridge/lib/logging.properties
-share/jitsi-videobridge/lib/minidns-core-1.0.4.jar
-share/jitsi-videobridge/lib/object-cloner-0.1.jar
-share/jitsi-videobridge/lib/objenesis-2.1.jar
-share/jitsi-videobridge/lib/osgi-resource-locator-1.0.3.jar
-share/jitsi-videobridge/lib/pcap4j-core-1.8.2.jar
-share/jitsi-videobridge/lib/pcap4j-packetfactory-static-1.8.2.jar
-share/jitsi-videobridge/lib/reflections-0.9.11.jar
-share/jitsi-videobridge/lib/rtp-${PKGVERSION}.jar
-share/jitsi-videobridge/lib/sctp-1.0-9-g45bf9f2.jar
-share/jitsi-videobridge/lib/sdp-api-1.0.jar
-share/jitsi-videobridge/lib/sentry-5.3.0.jar
-share/jitsi-videobridge/lib/simpleclient-0.16.0.jar
-share/jitsi-videobridge/lib/simpleclient_common-0.16.0.jar
-share/jitsi-videobridge/lib/simpleclient_tracer_common-0.16.0.jar
-share/jitsi-videobridge/lib/simpleclient_tracer_otel-0.16.0.jar
-share/jitsi-videobridge/lib/simpleclient_tracer_otel_agent-0.16.0.jar
-share/jitsi-videobridge/lib/slf4j-api-1.7.32.jar
-share/jitsi-videobridge/lib/slf4j-jdk14-1.7.32.jar
-share/jitsi-videobridge/lib/smack-core-4.4.6.jar
-share/jitsi-videobridge/lib/smack-extensions-4.4.6.jar
-share/jitsi-videobridge/lib/smack-im-4.4.6.jar
-share/jitsi-videobridge/lib/smack-java8-4.4.6.jar
-share/jitsi-videobridge/lib/smack-resolver-javax-4.4.6.jar
-share/jitsi-videobridge/lib/smack-sasl-javax-4.4.6.jar
-share/jitsi-videobridge/lib/smack-streammanagement-4.4.6.jar
-share/jitsi-videobridge/lib/smack-tcp-4.4.6.jar
-share/jitsi-videobridge/lib/smack-xmlparser-4.4.6.jar
-share/jitsi-videobridge/lib/smack-xmlparser-stax-4.4.6.jar
-share/jitsi-videobridge/lib/spotbugs-annotations-4.6.0.jar
-share/jitsi-videobridge/lib/videobridge.rc
-share/jitsi-videobridge/lib/websocket-core-client-11.0.10.jar
-share/jitsi-videobridge/lib/websocket-core-common-11.0.10.jar
-share/jitsi-videobridge/lib/websocket-core-server-11.0.10.jar
-share/jitsi-videobridge/lib/websocket-jetty-api-11.0.10.jar
-share/jitsi-videobridge/lib/websocket-jetty-client-11.0.10.jar
-share/jitsi-videobridge/lib/websocket-jetty-common-11.0.10.jar
-share/jitsi-videobridge/lib/websocket-jetty-server-11.0.10.jar
-share/jitsi-videobridge/lib/websocket-servlet-11.0.10.jar
-share/jitsi-videobridge/lib/weupnp-0.1.4.jar
Index: pkgsrc/chat/jitsi-videobridge/distinfo
diff -u pkgsrc/chat/jitsi-videobridge/distinfo:1.2 pkgsrc/chat/jitsi-videobridge/distinfo:1.3
--- pkgsrc/chat/jitsi-videobridge/distinfo:1.2  Fri Feb 10 12:50:13 2023
+++ pkgsrc/chat/jitsi-videobridge/distinfo      Thu Feb 16 10:33:08 2023
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.2 2023/02/10 12:50:13 khorben Exp $
+$NetBSD: distinfo,v 1.3 2023/02/16 10:33:08 khorben Exp $
 
 BLAKE2s (jitsi-videobridge/jitsi-meet_8252.tar.gz) = 48e5632391354d29b1540f3be570d3218f9fe7d7474ff28588660c59f957ac97
 SHA512 (jitsi-videobridge/jitsi-meet_8252.tar.gz) = 6c66b81b073386f2aac86d12174de0b511113fe97108fa97d9d57374ed56e54787878463c28942bab1d89abdc575392cfbf4cbde215722599d2f83e7519030d2
 Size (jitsi-videobridge/jitsi-meet_8252.tar.gz) = 62326089 bytes
-BLAKE2s (jitsi-videobridge/jitsi-videobridge-java-deps-2.0.8252.tar.gz) = c255d056867d2809bc488064e1575dee291c4ad4aaaebf0fef60d90533d1388b
-SHA512 (jitsi-videobridge/jitsi-videobridge-java-deps-2.0.8252.tar.gz) = 
11260b7b5c39337b4c3202190677f7af82b404e2cd75950d77c087a2e3c6d7c1c13635dc185e3f94807b92284c4eecdf0b1cb52ec1d03041584c111a526af80e
-Size (jitsi-videobridge/jitsi-videobridge-java-deps-2.0.8252.tar.gz) = 263322397 bytes
+BLAKE2s (jitsi-videobridge/jitsi-videobridge-java-deps-2.0.8252nb1.tar.gz) = f97c686d0bb734b12c2b445f08e9e70151288f92b2f8e69355d4468f2cd775ea
+SHA512 (jitsi-videobridge/jitsi-videobridge-java-deps-2.0.8252nb1.tar.gz) = 
0d4ba2485142a99137dcc7f8ff8cf381ac6410f07db6e601ebbef21642fafbc74e76cdb24c9114ddd81244e9fd3f4c2629e84ff6ac22cecf86e6660caa83ce59
+Size (jitsi-videobridge/jitsi-videobridge-java-deps-2.0.8252nb1.tar.gz) = 266481125 bytes
 SHA1 (patch-jvb_resources_jvb.sh) = 35a514a615d07f96357934ab901ca027f76bbcb8
+SHA1 (patch-pom.xml) = e096e21460272b08ac0d0d3480d23e1de12cb50f