pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
jitsi-meet: remove jicofo, jitsi-{meet-prosody,videobridge}
Module Name: pkgsrc-wip
Committed By: Pierre Pronchery <khorben%defora.org@localhost>
Pushed By: khorben
Date: Tue Jan 3 11:34:15 2023 +0100
Changeset: 4d414bacd386406de2b394d4127a19238b792d0a
Modified Files:
Makefile
jitsi-meet/Makefile
Removed Files:
jicofo/DESCR
jicofo/Makefile
jicofo/PLIST
jicofo/distinfo
jicofo/patches/patch-resources_jicofo.sh
jitsi-meet-prosody/DESCR
jitsi-meet-prosody/MESSAGE
jitsi-meet-prosody/Makefile
jitsi-meet-prosody/PLIST
jitsi-meet/Makefile.common
jitsi-videobridge/DESCR
jitsi-videobridge/Makefile
jitsi-videobridge/PLIST
jitsi-videobridge/distinfo
jitsi-videobridge/files/sip-communicator.properties
jitsi-videobridge/patches/patch-jvb_resources_jvb.sh
Log Message:
jitsi-meet: remove jicofo, jitsi-{meet-prosody,videobridge}
All three packages have been imported to pkgsrc.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4d414bacd386406de2b394d4127a19238b792d0a
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 3 -
jicofo/DESCR | 13 --
jicofo/Makefile | 85 ------------
jicofo/PLIST | 97 --------------
jicofo/distinfo | 9 --
jicofo/patches/patch-resources_jicofo.sh | 12 --
jitsi-meet-prosody/DESCR | 12 --
jitsi-meet-prosody/MESSAGE | 10 --
jitsi-meet-prosody/Makefile | 19 ---
jitsi-meet-prosody/PLIST | 54 --------
jitsi-meet/Makefile | 3 +-
jitsi-meet/Makefile.common | 22 ----
jitsi-videobridge/DESCR | 6 -
jitsi-videobridge/Makefile | 103 ---------------
jitsi-videobridge/PLIST | 143 ---------------------
jitsi-videobridge/distinfo | 9 --
.../files/sip-communicator.properties | 1 -
.../patches/patch-jvb_resources_jvb.sh | 12 --
18 files changed, 2 insertions(+), 611 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index b3d4a50cf7..e0ce47683c 100644
--- a/Makefile
+++ b/Makefile
@@ -1889,13 +1889,10 @@ SUBDIR+= jgloss
SUBDIR+= jgraphx
SUBDIR+= jhbuild
SUBDIR+= jibri
-SUBDIR+= jicofo
SUBDIR+= jigasi
SUBDIR+= jira-cli-git
SUBDIR+= jitsi
SUBDIR+= jitsi-meet
-SUBDIR+= jitsi-meet-prosody
-SUBDIR+= jitsi-videobridge
SUBDIR+= jlibtool
SUBDIR+= jmol
SUBDIR+= jmtpfs
diff --git a/jicofo/DESCR b/jicofo/DESCR
deleted file mode 100644
index a0d1cf5fa6..0000000000
--- a/jicofo/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-JItsi COnference FOcus is a server side focus component used in Jitsi Meet
-conferences.
-
-Conference focus is mandatory component of Jitsi Meet conferencing system next
-to the videobridge. It is responsible for managing media sessions between each
-of the participants and the videobridge. Whenever new conference is about to
-start an IQ is sent to the component to allocate new focus instance. After that
-special focus participant joins Multi User Chat room. It will be creating
-Jingle session between Jitsi videobridge and the participant. Although the
-session in terms of XMPP is between focus user and participant the media will
-flow between participant and the videobridge. That's because focus user will
-allocate Colibri channels on the bridge and use them as its own Jingle
-transport.
diff --git a/jicofo/Makefile b/jicofo/Makefile
deleted file mode 100644
index 7bb124ef72..0000000000
--- a/jicofo/Makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-# $NetBSD$
-
-.include "../../wip/jitsi-meet/Makefile.common"
-
-GITHUB_PROJECT= jicofo
-PKGNAME= ${GITHUB_PROJECT}-${JITSI_MEET_VERSION}
-
-HOMEPAGE= https://github.com/jitsi/jicofo/
-COMMENT= Server-side focus component used in Jitsi Meet conferences
-
-DISTINFO_FILE= ${.CURDIR}/../../wip/jicofo/distinfo
-DISTFILES= ${DEFAULT_DISTFILES}
-DISTFILES+= jicofo-java-deps-${JITSI_MEET_VERSION}.tar.gz
-SITES.jicofo-java-deps-${JITSI_MEET_VERSION}.tar.gz= \
- ftp://ftp.NetBSD.org/pub/NetBSD/misc/khorben/
-
-USE_TOOLS+= bash:run pax:build unzip
-
-USE_JAVA2= 17
-
-TOOL_DEPENDS+= apache-maven-[0-9]*:../../devel/apache-maven
-
-MAVEN_FLAGS+= -Duser.home=${FAKEHOMEDIR}
-MAVEN_FLAGS+= -Dmaven.repo.local=${WRKDIR}/deps
-MAVEN_FLAGS+= --offline
-MAVEN_FLAGS+= -DskipTests
-MAVEN_FLAGS+= -Dassembly.skipAssembly=false
-MVN= mvn ${MAVEN_FLAGS}
-
-REPLACE_BASH= resources/collect-dump-logs.sh
-REPLACE_BASH+= resources/jicofo.sh
-
-EGDIR= share/examples/jicofo
-PKG_SYSCONFSUBDIR= jitsi/jicofo
-CONF_FILES+= ${EGDIR}/jicofo.conf \
- ${PKG_SYSCONFDIR}/jicofo.conf
-CONF_FILES+= ${EGDIR}/logging.properties \
- ${PKG_SYSCONFDIR}/logging.properties
-
-SUBST_CLASSES+= java
-SUBST_STAGE.java= post-configure
-SUBST_FILES.java= resources/jicofo.sh
-SUBST_SED.java= -e 's,^exec java,exec ${JAVA_BINPREFIX}-java,'
-
-SUBST_CLASSES+= logging
-SUBST_STAGE.logging= post-configure
-SUBST_FILES.logging= resources/jicofo.sh
-SUBST_SED.logging= -e 's,$$SCRIPT_DIR/lib/logging\.properties,${PKG_SYSCONFDIR}/logging.properties,'
-
-MAKE_JOBS_SAFE= no
-
-INSTALLATION_DIRS+= bin
-INSTALLATION_DIRS+= ${EGDIR} share/jicofo
-
-.PHONY: create-deps-file
-create-deps-file: build
- #XXX disable offline mode for maven before using this rule
- cd ${WRKSRC} && ${MVN} validate
- cd ${WRKDIR} && \
- ${PAX} -wz -f jicofo-java-deps-${JITSI_MEET_VERSION}.tar.gz deps
-
-do-configure:
- cd ${WRKSRC} && ${MVN} versions:set -DnewVersion="${JITSI_MEET_VERSION}"
-
-do-build:
- cd ${WRKSRC} && ${MVN} package
-
-do-install:
- ${RM} -rf ${DESTDIR}${PREFIX}/share/jicofo \
- ${DESTDIR}${PREFIX}/share/jicofo-${JITSI_MEET_VERSION}
- cd ${DESTDIR}${PREFIX}/share && \
- ${UNZIP_CMD} ${WRKSRC}/jicofo/target/jicofo-${JITSI_MEET_VERSION}-archive.zip
- ${MV} ${DESTDIR}${PREFIX}/share/jicofo-${JITSI_MEET_VERSION} \
- ${DESTDIR}${PREFIX}/share/jicofo
- ${LN} -sf ../share/jicofo/jicofo.sh \
- ${DESTDIR}${PREFIX}/bin/jicofo
- ${INSTALL_DATA} ${WRKSRC}/jicofo-selector/src/main/resources/reference.conf \
- ${DESTDIR}${PREFIX}/${EGDIR}/jicofo.conf
- ${INSTALL_DATA} ${WRKSRC}/lib/logging.properties \
- ${DESTDIR}${PREFIX}/${EGDIR}/logging.properties
- ${INSTALL_SCRIPT} ${WRKSRC}/resources/collect-dump-logs.sh \
- ${DESTDIR}${PREFIX}/share/jicofo/collect-dump-logs.sh
-
-.include "../../mk/java-vm.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/jicofo/PLIST b/jicofo/PLIST
deleted file mode 100644
index db38f59196..0000000000
--- a/jicofo/PLIST
+++ /dev/null
@@ -1,97 +0,0 @@
-@comment $NetBSD$
-bin/jicofo
-share/examples/jicofo/jicofo.conf
-share/examples/jicofo/logging.properties
-share/jicofo/collect-dump-logs.sh
-share/jicofo/jicofo.bat
-share/jicofo/jicofo.jar
-share/jicofo/jicofo.sh
-share/jicofo/lib/agafua-syslog-0.4.jar
-share/jicofo/lib/annotations-23.0.0.jar
-share/jicofo/lib/aopalliance-repackaged-3.0.1.jar
-share/jicofo/lib/cglib-nodep-2.2.jar
-share/jicofo/lib/commons-codec-1.11.jar
-share/jicofo/lib/commons-lang3-3.12.0.jar
-share/jicofo/lib/commons-logging-1.2.jar
-share/jicofo/lib/config-1.4.2.jar
-share/jicofo/lib/gson-2.8.5.jar
-share/jicofo/lib/hk2-api-3.0.1.jar
-share/jicofo/lib/hk2-locator-3.0.1.jar
-share/jicofo/lib/hk2-utils-3.0.1.jar
-share/jicofo/lib/httpclient-4.5.13.jar
-share/jicofo/lib/httpcore-4.4.14.jar
-share/jicofo/lib/jackson-annotations-2.13.0.jar
-share/jicofo/lib/jackson-core-2.13.0.jar
-share/jicofo/lib/jackson-databind-2.13.0.jar
-share/jicofo/lib/jackson-module-jakarta-xmlbind-annotations-2.13.0.jar
-share/jicofo/lib/jakarta.activation-2.0.1.jar
-share/jicofo/lib/jakarta.annotation-api-2.0.0.jar
-share/jicofo/lib/jakarta.inject-api-2.0.0.jar
-share/jicofo/lib/jakarta.validation-api-3.0.0.jar
-share/jicofo/lib/jakarta.ws.rs-api-3.0.0.jar
-share/jicofo/lib/jakarta.xml.bind-api-3.0.1.jar
-share/jicofo/lib/javassist-3.28.0-GA.jar
-share/jicofo/lib/jcl-core-2.8.jar
-share/jicofo/lib/jersey-client-3.0.4.jar
-share/jicofo/lib/jersey-common-3.0.4.jar
-share/jicofo/lib/jersey-container-jetty-http-3.0.4.jar
-share/jicofo/lib/jersey-container-servlet-3.0.4.jar
-share/jicofo/lib/jersey-container-servlet-core-3.0.4.jar
-share/jicofo/lib/jersey-entity-filtering-3.0.4.jar
-share/jicofo/lib/jersey-hk2-3.0.4.jar
-share/jicofo/lib/jersey-media-json-jackson-3.0.4.jar
-share/jicofo/lib/jersey-server-3.0.4.jar
-share/jicofo/lib/jetty-alpn-client-11.0.10.jar
-share/jicofo/lib/jetty-client-11.0.10.jar
-share/jicofo/lib/jetty-http-11.0.10.jar
-share/jicofo/lib/jetty-io-11.0.10.jar
-share/jicofo/lib/jetty-jakarta-servlet-api-5.0.2.jar
-share/jicofo/lib/jetty-proxy-11.0.10.jar
-share/jicofo/lib/jetty-security-11.0.10.jar
-share/jicofo/lib/jetty-server-11.0.10.jar
-share/jicofo/lib/jetty-servlet-11.0.10.jar
-share/jicofo/lib/jetty-servlets-11.0.10.jar
-share/jicofo/lib/jetty-util-11.0.10.jar
-share/jicofo/lib/jicoco-1.1-119-gc527d61.jar
-share/jicofo/lib/jicoco-config-1.1-119-gc527d61.jar
-share/jicofo/lib/jicoco-metrics-1.1-119-gc527d61.jar
-share/jicofo/lib/jicofo-common-${PKGVERSION}.jar
-share/jicofo/lib/jicofo-selector-${PKGVERSION}.jar
-share/jicofo/lib/jitsi-metaconfig-1.0-9-g5e1b624.jar
-share/jicofo/lib/jitsi-utils-1.0-119-ga7b23ff.jar
-share/jicofo/lib/jitsi-xmpp-extensions-1.0-59-g76a5c13.jar
-share/jicofo/lib/jna-5.9.0.jar
-share/jicofo/lib/json-simple-1.1.1.jar
-share/jicofo/lib/jsr305-3.0.2.jar
-share/jicofo/lib/jxmpp-core-1.0.3.jar
-share/jicofo/lib/jxmpp-jid-1.0.3.jar
-share/jicofo/lib/jxmpp-util-cache-1.0.3.jar
-share/jicofo/lib/kotlin-reflect-1.6.21.jar
-share/jicofo/lib/kotlin-stdlib-1.6.21.jar
-share/jicofo/lib/kotlin-stdlib-common-1.6.21.jar
-share/jicofo/lib/kotlin-stdlib-jdk7-1.6.21.jar
-share/jicofo/lib/kotlin-stdlib-jdk8-1.6.21.jar
-share/jicofo/lib/minidns-core-1.0.4.jar
-share/jicofo/lib/object-cloner-0.1.jar
-share/jicofo/lib/objenesis-3.2.jar
-share/jicofo/lib/osgi-resource-locator-1.0.3.jar
-share/jicofo/lib/sentry-5.4.0.jar
-share/jicofo/lib/simpleclient-0.16.0.jar
-share/jicofo/lib/simpleclient_common-0.16.0.jar
-share/jicofo/lib/simpleclient_tracer_common-0.16.0.jar
-share/jicofo/lib/simpleclient_tracer_otel-0.16.0.jar
-share/jicofo/lib/simpleclient_tracer_otel_agent-0.16.0.jar
-share/jicofo/lib/slf4j-api-1.7.32.jar
-share/jicofo/lib/slf4j-jdk14-1.7.32.jar
-share/jicofo/lib/smack-core-4.4.6.jar
-share/jicofo/lib/smack-extensions-4.4.6.jar
-share/jicofo/lib/smack-im-4.4.6.jar
-share/jicofo/lib/smack-java8-4.4.6.jar
-share/jicofo/lib/smack-resolver-javax-4.4.6.jar
-share/jicofo/lib/smack-sasl-javax-4.4.6.jar
-share/jicofo/lib/smack-streammanagement-4.4.6.jar
-share/jicofo/lib/smack-tcp-4.4.6.jar
-share/jicofo/lib/smack-xmlparser-4.4.6.jar
-share/jicofo/lib/smack-xmlparser-stax-4.4.6.jar
-share/jicofo/lib/spotbugs-annotations-4.6.0.jar
-@pkgdir share/examples/jicofo
diff --git a/jicofo/distinfo b/jicofo/distinfo
deleted file mode 100644
index 5f10cf75c5..0000000000
--- a/jicofo/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD$
-
-BLAKE2s (jicofo/jicofo-java-deps-2.0.8138.tar.gz) = d06323602159959cb4a87d6d36bc978edb91a02cdc0c249cf254321308d1fa11
-SHA512 (jicofo/jicofo-java-deps-2.0.8138.tar.gz) = 0ebf0fd98dd24c143d301efd154eb1eac65a337125689917eb734d70322769fba2f888aee8e442498814de7c07adbb0a1a1426bfb8ebd4f7c7566900fa826667
-Size (jicofo/jicofo-java-deps-2.0.8138.tar.gz) = 164169960 bytes
-BLAKE2s (jicofo/jitsi-meet_8138.tar.gz) = d0df1114b51a1dbaf7b3049cb17240867501f9a9eac2e133e5ed2d0a09a046d2
-SHA512 (jicofo/jitsi-meet_8138.tar.gz) = 76464feba02c5ecd86e45e02bc703a39d0a70bb2080e539fa7177ab170bd7d84f9489040e2928af79c2b141900dc545db6f1bd47b9e34774b6bde0971296432b
-Size (jicofo/jitsi-meet_8138.tar.gz) = 237910 bytes
-SHA1 (patch-resources_jicofo.sh) = 986445ede72ec0333bb56a52bc3c57030eca8383
diff --git a/jicofo/patches/patch-resources_jicofo.sh b/jicofo/patches/patch-resources_jicofo.sh
deleted file mode 100644
index b9ada75fd4..0000000000
--- a/jicofo/patches/patch-resources_jicofo.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
-Fix quoting for additional command-line parameters
-
---- resources/jicofo.sh.orig 2021-11-10 19:11:46.070570369 +0000
-+++ resources/jicofo.sh
-@@ -29,4 +29,4 @@ fi
-
- if [ -z "$JICOFO_MAX_MEMORY" ]; then JICOFO_MAX_MEMORY=3072m; fi
-
--exec java -Xmx$JICOFO_MAX_MEMORY -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp -Djdk.tls.ephemeralDHKeySize=2048 $LOGGING_CONFIG_PARAM $JAVA_SYS_PROPS -cp $cp $mainClass $@
-+exec java -Xmx$JICOFO_MAX_MEMORY -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp -Djdk.tls.ephemeralDHKeySize=2048 $LOGGING_CONFIG_PARAM $JAVA_SYS_PROPS -cp $cp $mainClass "$@"
diff --git a/jitsi-meet-prosody/DESCR b/jitsi-meet-prosody/DESCR
deleted file mode 100644
index 320206a436..0000000000
--- a/jitsi-meet-prosody/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-Jitsi Meet is an open-source (Apache) WebRTC JavaScript application that uses
-Jitsi Videobridge to provide high quality, secure and scalable video
-conferences. Jitsi Meet in action can be seen at here at the session #482 of
-the VoIP Users Conference.
-
-The Jitsi Meet client runs in your browser, without installing anything else on
-your computer. You can try it out at https://meet.jit.si.
-
-Jitsi Meet allows very efficient collaboration. Users can stream their desktop
-or only some windows. It also supports shared document editing with Etherpad.
-
-This package contains additional modules for prosody.
diff --git a/jitsi-meet-prosody/MESSAGE b/jitsi-meet-prosody/MESSAGE
deleted file mode 100644
index 65c61415fa..0000000000
--- a/jitsi-meet-prosody/MESSAGE
+++ /dev/null
@@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD$
-
-Make sure the focus@auth.<domain> user roster includes the proxy component.
-To do so, run the following command:
-
-$ prosodyctl mod_roster_command subscribe focus.<domain> \
- <jicofo_user>@auth.<domain>
-
-===========================================================================
diff --git a/jitsi-meet-prosody/Makefile b/jitsi-meet-prosody/Makefile
deleted file mode 100644
index fc5c8cf06d..0000000000
--- a/jitsi-meet-prosody/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD$
-
-PKGNAME= ${GITHUB_PROJECT}-prosody-${JITSI_MEET_VERSION}
-
-COMMENT= Additional plug-ins for Prosody from Jitsi Meet
-
-USE_TOOLS= gmake tar
-
-DEPENDS+= prosody-[0-9]*:../../chat/prosody
-
-INSTALLATION_DIRS+= share/jitsi-meet-prosody
-
-NO_BUILD= yes
-
-do-install:
- cd ${WRKSRC}/resources/prosody-plugins && pax -rw -pp . ${DESTDIR}${PREFIX}/share/jitsi-meet-prosody
-
-.include "../../wip/jitsi-meet/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/jitsi-meet-prosody/PLIST b/jitsi-meet-prosody/PLIST
deleted file mode 100644
index 6e5def6fb2..0000000000
--- a/jitsi-meet-prosody/PLIST
+++ /dev/null
@@ -1,54 +0,0 @@
-@comment $NetBSD$
-share/jitsi-meet-prosody/ext_events.lib.lua
-share/jitsi-meet-prosody/luajwtjitsi.lib.lua
-share/jitsi-meet-prosody/mod_auth_jitsi-anonymous.lua
-share/jitsi-meet-prosody/mod_auth_token.lua
-share/jitsi-meet-prosody/mod_av_moderation.lua
-share/jitsi-meet-prosody/mod_av_moderation_component.lua
-share/jitsi-meet-prosody/mod_certs_all.lua
-share/jitsi-meet-prosody/mod_client_proxy.lua
-share/jitsi-meet-prosody/mod_conference_duration.lua
-share/jitsi-meet-prosody/mod_conference_duration_component.lua
-share/jitsi-meet-prosody/mod_end_conference.lua
-share/jitsi-meet-prosody/mod_external_services.lua
-share/jitsi-meet-prosody/mod_filter_iq_jibri.lua
-share/jitsi-meet-prosody/mod_filter_iq_rayo.lua
-share/jitsi-meet-prosody/mod_fmuc.lua
-share/jitsi-meet-prosody/mod_jiconop.lua
-share/jitsi-meet-prosody/mod_jitsi_session.lua
-share/jitsi-meet-prosody/mod_limits_exception.lua
-share/jitsi-meet-prosody/mod_muc_allowners.lua
-share/jitsi-meet-prosody/mod_muc_breakout_rooms.lua
-share/jitsi-meet-prosody/mod_muc_call.lua
-share/jitsi-meet-prosody/mod_muc_census.lua
-share/jitsi-meet-prosody/mod_muc_domain_mapper.lua
-share/jitsi-meet-prosody/mod_muc_lobby_rooms.lua
-share/jitsi-meet-prosody/mod_muc_max_occupants.lua
-share/jitsi-meet-prosody/mod_muc_meeting_id.lua
-share/jitsi-meet-prosody/mod_muc_password_check.lua
-share/jitsi-meet-prosody/mod_muc_password_whitelist.lua
-share/jitsi-meet-prosody/mod_muc_poltergeist.lua
-share/jitsi-meet-prosody/mod_muc_rate_limit.lua
-share/jitsi-meet-prosody/mod_muc_size.lua
-share/jitsi-meet-prosody/mod_muc_transcription_filter.lua
-share/jitsi-meet-prosody/mod_persistent_lobby.lua
-share/jitsi-meet-prosody/mod_polls.lua
-share/jitsi-meet-prosody/mod_poltergeist_component.lua
-share/jitsi-meet-prosody/mod_presence_identity.lua
-share/jitsi-meet-prosody/mod_reservations.lua
-share/jitsi-meet-prosody/mod_room_metadata.lua
-share/jitsi-meet-prosody/mod_room_metadata_component.lua
-share/jitsi-meet-prosody/mod_roster_command.lua
-share/jitsi-meet-prosody/mod_roster_command.patch
-share/jitsi-meet-prosody/mod_smacks.lua
-share/jitsi-meet-prosody/mod_speakerstats.lua
-share/jitsi-meet-prosody/mod_speakerstats_component.lua
-share/jitsi-meet-prosody/mod_token_verification.lua
-share/jitsi-meet-prosody/mod_turncredentials.lua
-share/jitsi-meet-prosody/mod_websocket_session_event.patch
-share/jitsi-meet-prosody/mod_xxl_conference.lua
-share/jitsi-meet-prosody/muc_owner_allow_kick-0.12.patch
-share/jitsi-meet-prosody/muc_owner_allow_kick.patch
-share/jitsi-meet-prosody/poltergeist.lib.lua
-share/jitsi-meet-prosody/token/util.lib.lua
-share/jitsi-meet-prosody/util.lib.lua
diff --git a/jitsi-meet/Makefile b/jitsi-meet/Makefile
index 2c5b0999c5..32eab93050 100644
--- a/jitsi-meet/Makefile
+++ b/jitsi-meet/Makefile
@@ -1,5 +1,7 @@
# $NetBSD$
+.include "../../chat/jitsi-meet/Makefile.common"
+
PKGNAME= ${GITHUB_PROJECT}-${JITSI_MEET_VERSION}
USE_LANGUAGES+= c++
@@ -34,5 +36,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/title.html \
${DESTDIR}${PREFIX}/share/examples/jitsi-meet/title.html
-.include "../../wip/jitsi-meet/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/jitsi-meet/Makefile.common b/jitsi-meet/Makefile.common
deleted file mode 100644
index 7ba81d4882..0000000000
--- a/jitsi-meet/Makefile.common
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD$
-# used by wip/jicofo/Makefile
-# used by wip/jitsi-meet/Makefile
-# used by wip/jitsi-meet-prosody/Makefile
-# used by wip/jitsi-videobridge/Makefile
-
-GITHUB_PROJECT?= jitsi-meet
-GITHUB_TAG?= stable/jitsi-meet_8138
-DISTNAME?= jitsi-meet_8138
-CATEGORIES= chat
-MASTER_SITES= ${MASTER_SITE_GITHUB:=jitsi/}
-DIST_SUBDIR= ${GITHUB_PROJECT}
-JITSI_MEET_VERSION= 2.0.8138
-
-MAINTAINER= khorben%defora.org@localhost
-HOMEPAGE?= https://github.com/jitsi/jitsi-meet/
-COMMENT?= Secure, Simple and Scalable Video Conferences
-LICENSE= apache-2.0
-
-WRKSRC?= ${WRKDIR}/${GITHUB_PROJECT}-stable-${DISTNAME}
-
-DISTINFO_FILE?= ${.CURDIR}/../../wip/jitsi-meet/distinfo
diff --git a/jitsi-videobridge/DESCR b/jitsi-videobridge/DESCR
deleted file mode 100644
index 9e326bd273..0000000000
--- a/jitsi-videobridge/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Jitsi Videobridge is an XMPP server component that allows for multiuser video
-communication. Unlike the expensive dedicated hardware videobridges, Jitsi
-Videobridge does not mix the video channels into a composite video stream, but
-only relays the received video channels to all call participants. Therefore,
-while it does need to run on a server with good network bandwidth, CPU
-horsepower is not that critical for performance.
diff --git a/jitsi-videobridge/Makefile b/jitsi-videobridge/Makefile
deleted file mode 100644
index d8b391b3d9..0000000000
--- a/jitsi-videobridge/Makefile
+++ /dev/null
@@ -1,103 +0,0 @@
-# $NetBSD$
-
-.include "../../wip/jitsi-meet/Makefile.common"
-
-GITHUB_PROJECT= jitsi-videobridge
-PKGNAME= ${GITHUB_PROJECT}-${JITSI_MEET_VERSION}
-
-HOMEPAGE= https://github.com/jitsi/jitsi-videobridge/
-COMMENT= WebRTC compatible video router or SFU
-
-DISTINFO_FILE= ${.CURDIR}/../../wip/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= \
- ftp://ftp.NetBSD.org/pub/NetBSD/misc/khorben/
-
-USE_TOOLS+= bash:run pax:build unzip
-
-USE_JAVA2= 17
-
-TOOL_DEPENDS+= apache-maven-[0-9]*:../../devel/apache-maven
-
-MAVEN_FLAGS+= -Duser.home=${FAKEHOMEDIR}
-MAVEN_FLAGS+= -Dmaven.repo.local=${WRKDIR}/deps
-MAVEN_FLAGS+= --offline
-MAVEN_FLAGS+= -DskipTests
-MAVEN_FLAGS+= -Dassembly.skipAssembly=false
-MVN= mvn ${MAVEN_FLAGS}
-
-REPLACE_BASH= jvb/resources/jvb.sh
-REPLACE_BASH+= resources/collect-dump-logs.sh
-REPLACE_BASH+= resources/graceful_shutdown.sh
-
-EGDIR= share/examples/jitsi-videobridge
-PKG_SYSCONFSUBDIR= jitsi/videobridge
-CONF_FILES+= ${EGDIR}/jvb.conf \
- ${PKG_SYSCONFDIR}/jvb.conf
-CONF_FILES+= ${EGDIR}/logging.properties \
- ${PKG_SYSCONFDIR}/logging.properties
-CONF_FILES+= ${EGDIR}/sip-communicator.properties \
- ${PKG_SYSCONFDIR}/sip-communicator.properties
-CONF_FILES+= ${EGDIR}/videobridge.rc \
- ${PKG_SYSCONFDIR}/videobridge.rc
-
-WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-stable-${DISTNAME}
-
-SUBST_CLASSES+= java
-SUBST_STAGE.java= post-configure
-SUBST_FILES.java= jvb/resources/jvb.sh
-SUBST_SED.java= -e 's,^exec java,exec ${JAVA_BINPREFIX}-java,'
-
-SUBST_CLASSES+= logging
-SUBST_STAGE.logging= post-configure
-SUBST_FILES.logging= jvb/resources/jvb.sh
-SUBST_SED.logging= -e 's,$$SCRIPT_DIR/lib/logging\.properties,${PKG_SYSCONFDIR}/logging.properties,'
-
-SUBST_CLASSES+= rc
-SUBST_STAGE.rc= post-configure
-SUBST_FILES.rc= jvb/resources/jvb.sh
-SUBST_SED.rc= -e 's,$$SCRIPT_DIR/lib/videobridge\.rc,${PKG_SYSCONFDIR}/videobridge.rc,'
-
-MAKE_JOBS_SAFE= no
-
-INSTALLATION_DIRS+= bin
-INSTALLATION_DIRS+= ${EGDIR} share/jitsi-videobridge
-
-.PHONY: create-deps-file
-create-deps-file: build
- #XXX disable offline mode for maven before using this rule
- cd ${WRKSRC} && ${MVN} validate
- cd ${WRKDIR} && \
- ${PAX} -wz -f jitsi-videobridge-java-deps-${JITSI_MEET_VERSION}.tar.gz deps
-
-do-configure:
- cd ${WRKSRC} && ${MVN} versions:set -DnewVersion="${JITSI_MEET_VERSION}"
-
-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
- ${LN} -sf ../share/jitsi-videobridge/jvb.sh \
- ${DESTDIR}${PREFIX}/bin/jvb
- ${INSTALL_DATA} ${WRKSRC}/jvb/src/main/resources/reference.conf \
- ${DESTDIR}${PREFIX}/${EGDIR}/jvb.conf
- ${INSTALL_DATA} ${WRKSRC}/jvb/lib/logging.properties \
- ${DESTDIR}${PREFIX}/${EGDIR}/logging.properties
- ${INSTALL_DATA} ${FILESDIR}/sip-communicator.properties \
- ${DESTDIR}${PREFIX}/${EGDIR}/sip-communicator.properties
- ${INSTALL_DATA} ${WRKSRC}/jvb/lib/videobridge.rc \
- ${DESTDIR}${PREFIX}/${EGDIR}/videobridge.rc
- ${INSTALL_SCRIPT} ${WRKSRC}/resources/collect-dump-logs.sh \
- ${DESTDIR}${PREFIX}/share/jitsi-videobridge/collect-dump-logs.sh
- ${INSTALL_SCRIPT} ${WRKSRC}/resources/graceful_shutdown.sh \
- ${DESTDIR}${PREFIX}/share/jitsi-videobridge/graceful_shutdown.sh
-
-.include "../../mk/java-vm.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/jitsi-videobridge/PLIST b/jitsi-videobridge/PLIST
deleted file mode 100644
index bcda1394a0..0000000000
--- a/jitsi-videobridge/PLIST
+++ /dev/null
@@ -1,143 +0,0 @@
-@comment $NetBSD$
-bin/jvb
-share/examples/jitsi-videobridge/jvb.conf
-share/examples/jitsi-videobridge/logging.properties
-share/examples/jitsi-videobridge/sip-communicator.properties
-share/examples/jitsi-videobridge/videobridge.rc
-share/jitsi-videobridge/collect-dump-logs.sh
-share/jitsi-videobridge/graceful_shutdown.sh
-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-119-gc527d61.jar
-share/jitsi-videobridge/lib/jicoco-config-1.1-119-gc527d61.jar
-share/jitsi-videobridge/lib/jicoco-metrics-1.1-119-gc527d61.jar
-share/jitsi-videobridge/lib/jitsi-media-transform-${PKGVERSION}.jar
-share/jitsi-videobridge/lib/jitsi-metaconfig-1.0-9-g5e1b624.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
diff --git a/jitsi-videobridge/distinfo b/jitsi-videobridge/distinfo
deleted file mode 100644
index d7473aef68..0000000000
--- a/jitsi-videobridge/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD$
-
-BLAKE2s (jitsi-videobridge/jitsi-meet_8138.tar.gz) = 23e125bae071dd96b8ef66429139e1a1cbefcdff7220f8a3aa0368c72f203640
-SHA512 (jitsi-videobridge/jitsi-meet_8138.tar.gz) = 75b617fa44701a40a8ec609f03130e939e9d9127b56b16412f51b5adf00597db3bac562bb8751261e9ce31a7c8b15283ab45bf0ece7337d26c65dd7be133f2a8
-Size (jitsi-videobridge/jitsi-meet_8138.tar.gz) = 62336666 bytes
-BLAKE2s (jitsi-videobridge/jitsi-videobridge-java-deps-2.0.8138.tar.gz) = b45b3aa0caff93aa80311b5210dbfae17e7f570550aee619d0158f4047326b33
-SHA512 (jitsi-videobridge/jitsi-videobridge-java-deps-2.0.8138.tar.gz) = ad1d31295171056815fcf67be1700716d558275fe6f0f7da187bcdb239a0cbf6f9b1ba2ca554f55e076ee9903c5c9ce540938a9cddc2e9cfcec214bd2ddefeb6
-Size (jitsi-videobridge/jitsi-videobridge-java-deps-2.0.8138.tar.gz) = 263397624 bytes
-SHA1 (patch-jvb_resources_jvb.sh) = 35a514a615d07f96357934ab901ca027f76bbcb8
diff --git a/jitsi-videobridge/files/sip-communicator.properties b/jitsi-videobridge/files/sip-communicator.properties
deleted file mode 100644
index 893b43377a..0000000000
--- a/jitsi-videobridge/files/sip-communicator.properties
+++ /dev/null
@@ -1 +0,0 @@
-org.ice4j.ice.harvest.DISABLE_AWS_HARVESTER=true
diff --git a/jitsi-videobridge/patches/patch-jvb_resources_jvb.sh b/jitsi-videobridge/patches/patch-jvb_resources_jvb.sh
deleted file mode 100644
index dcf3731598..0000000000
--- a/jitsi-videobridge/patches/patch-jvb_resources_jvb.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
-Fix quoting for additional command-line parameters
-
---- jvb/resources/jvb.sh.orig 2023-01-03 07:37:20.457556984 +0000
-+++ jvb/resources/jvb.sh
-@@ -19,4 +19,4 @@ fi
- if [ -z "$VIDEOBRIDGE_MAX_MEMORY" ]; then VIDEOBRIDGE_MAX_MEMORY=3072m; fi
- if [ -z "$VIDEOBRIDGE_GC_TYPE" ]; then VIDEOBRIDGE_GC_TYPE=G1GC; fi
-
--exec java -Xmx$VIDEOBRIDGE_MAX_MEMORY $VIDEOBRIDGE_DEBUG_OPTIONS -XX:+Use$VIDEOBRIDGE_GC_TYPE -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp -Djdk.tls.ephemeralDHKeySize=2048 $LOGGING_CONFIG_PARAM $JAVA_SYS_PROPS -cp $cp $mainClass $@
-+exec java -Xmx$VIDEOBRIDGE_MAX_MEMORY $VIDEOBRIDGE_DEBUG_OPTIONS -XX:+Use$VIDEOBRIDGE_GC_TYPE -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp -Djdk.tls.ephemeralDHKeySize=2048 $LOGGING_CONFIG_PARAM $JAVA_SYS_PROPS -cp $cp $mainClass "$@"
Home |
Main Index |
Thread Index |
Old Index