Merge pull request #2032 from blshkv/master

jitsi: remove
This commit is contained in:
github-actions[bot] 2024-07-17 00:16:34 +00:00 committed by GitHub
commit 3ede894cb7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 0 additions and 248 deletions

View file

@ -1 +0,0 @@
DIST jitsi-videobridge-src-1132.zip 33254316 BLAKE2B eca5d7676735291c50bad892818f741b5991458aa65cd0023b86d087557fc1f3125cfe7dc1d4907aa81741ebdd49bd3efe048644211967e7a2a3c391f3ebd573 SHA512 256ccfb4721f85b49508278b1b746328956350e673c5cd28822a17ffbe8d4b35259b16882c562f650af0290fd38099a4b6e9edc55e43e337b1e57dc86e54dd28

View file

@ -1,37 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit java-pkg-2 java-ant-2
DESCRIPTION="https://github.com/jitsi/jitsi-videobridge"
HOMEPAGE="https://jitsi.org/ https://github.com/jitsi/jitsi-videobridge"
SRC_URI="https://download.jitsi.org/jitsi-videobridge/src/${PN}-src-${PV}.zip"
LICENSE="Apache-2.0"
SLOT="0"
#WIP
#KEYWORDS="~amd64 ~x86"
IUSE=""
CDEPEND="
sys-apps/dbus
x11-libs/libX11
x11-libs/gtk+:*
x11-libs/libXScrnSaver"
DEPEND="virtual/jdk:1.8
${CDEPEND}"
RDEPEND="${DEPEND}
${CDEPEND}
!net-im/jitsi-bin
virtual/jre"
#EANT_BUILD_TARGET="rebuild"
S="${WORKDIR}/${PN}-src-${PV}"
#src_prepare() {
# cp lib/accounts.properties.template lib/accounts.properties
# eapply_user
#}

View file

@ -1,3 +0,0 @@
AUX autorecording.patch 4579 BLAKE2B 2ea533ad541e54013b1416124bb6919ae3b2baf21724aaf47296cc13cfe9c8f0c628653c51cc201ab61c9eef89571b07994a8f852f77809b93d265edd20c6a02 SHA512 4b51c4882de7480460eae9f859a766bb73999fdefad1b7cb9a016c92c5a5455d6229193c3087e84aea9ee4fc12012e07766a146c89f9de683487027781231172
DIST jitsi-2.11.5633.tar.gz 57295986 BLAKE2B b58964462059cbbf038210b0434534042bf0acdd97f9eb695d4c5a76768fd31cbc2cc14b20f158c461a4dd575cba2bc9ac7afeeef986e7954794259698efc46c SHA512 55b4fe74e3e953900ecfc1a4e230a2577676a63597d2afed02dad2f1a0ac9c2211d5769f425b4cf90ca77473d5d8715dd462de02c41b98857c1fcf4a4bf41503
EBUILD jitsi-2.11.5633.ebuild 2278 BLAKE2B 839be0f4790c22887dcdf4f1e4024d2dbafb48d8694c42016c7fc00945610df4d09a2b4ed00f62fed12e87c027eec28585e326a15be4dedf5f42db3a88a74333 SHA512 34fcd06f0685ba192da2668b38cbedeebe0ae793592a84744068c085a842cc8910f2211e1ef8e1a57723d8b8af07cb7243786a4bb93675b7e2dfe3525f04a9d4

View file

@ -1,111 +0,0 @@
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/RecordButton.java b/src/net/java/sip/communicator/impl/gui/main/call/RecordButton.java
index d83b769ae..5544dd13a 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/RecordButton.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/RecordButton.java
@@ -69,7 +69,7 @@ public class RecordButton
/**
* Maximum allowed file name length.
*/
- private static final int MAX_FILENAME_LENGTH = 64;
+ private static final int MAX_FILENAME_LENGTH = 255;
/**
* The full filename of the saved call on the file system.
@@ -125,6 +125,12 @@ public RecordButton(Call call, boolean selected)
if ((saveDir != null) && (saveDir.length() != 0))
toolTip += " (" + saveDir + ")";
setToolTipText(toolTip);
+
+ if(configuration.getString(
+ "net.java.sip.communicator.impl.neomedia.AUTORECORD", "false").
+ equals("true")) {
+ this.doClick();
+ }
}
/**
@@ -244,12 +250,13 @@ private String getCallPeerName(int maxLength)
List<CallPeer> callPeers = call.getConference().getCallPeers();
CallPeer callPeer = null;
String peerName = "";
+
if (!callPeers.isEmpty())
{
callPeer = callPeers.get(0);
if (callPeer != null)
{
- peerName = callPeer.getDisplayName();
+ peerName = "" + callPeer.getAddress() + "-" + callPeer.getDisplayName();
peerName = peerName.replaceAll("[^\\da-zA-Z\\_\\-@\\.]","");
if(peerName.length() > maxLength)
{
diff --git a/src/net/java/sip/communicator/impl/neomedia/CallRecordingConfigForm.java b/src/net/java/sip/communicator/impl/neomedia/CallRecordingConfigForm.java
index bb34246a9..412e94359 100644
--- a/src/net/java/sip/communicator/impl/neomedia/CallRecordingConfigForm.java
+++ b/src/net/java/sip/communicator/impl/neomedia/CallRecordingConfigForm.java
@@ -74,6 +74,7 @@ public class CallRecordingConfigForm
private final SipCommFileChooser dirChooser;
private JComboBox formatsComboBox;
private JCheckBox saveCallsToCheckBox;
+ private JCheckBox autoRecordCheckBox;
/**
* Directory where calls are stored. Default is SC_HOME/calls.
*/
@@ -109,6 +110,16 @@ public CallRecordingConfigForm()
public void actionPerformed(ActionEvent e)
{
Object source = e.getSource();
+ if (source == autoRecordCheckBox) {
+ boolean selected = autoRecordCheckBox.isSelected();
+
+ NeomediaActivator
+ .getConfigurationService()
+ .setProperty(
+ "net.java.sip.communicator.impl.neomedia.AUTORECORD",
+ selected);
+
+ }
if (source == saveCallsToCheckBox)
{
boolean selected = saveCallsToCheckBox.isSelected();
@@ -239,6 +250,14 @@ private void initComponents()
labelsPanel.add(formatsLabel);
labelsPanel.add(saveCallsToCheckBox);
+ JPanel autoRecordPanel = new TransparentPanel(new GridLayout(1, 1));
+
+ autoRecordCheckBox
+ = new SIPCommCheckBox("Enble Autorecording");
+ autoRecordCheckBox.addActionListener(this);
+
+ autoRecordPanel.add(autoRecordCheckBox);
+
// saved calls directory panel
JPanel callDirPanel = new TransparentPanel(new BorderLayout());
@@ -266,6 +285,7 @@ private void initComponents()
mainPanel.add(labelsPanel, BorderLayout.WEST);
mainPanel.add(valuesPanel, BorderLayout.CENTER);
+ mainPanel.add(autoRecordPanel, BorderLayout.PAGE_END);
this.add(mainPanel, BorderLayout.NORTH);
}
@@ -293,6 +313,9 @@ private void loadValues()
= NeomediaActivator.getConfigurationService();
String format = configuration.getString(Recorder.FORMAT);
+ boolean autoRecord =
+ configuration.getString("net.java.sip.communicator.impl.neomedia.AUTORECORD", "false").equals("true");
+
formatsComboBox.setSelectedItem(
(format == null)
? SoundFileUtils.DEFAULT_CALL_RECORDING_FORMAT
@@ -304,6 +327,7 @@ private void loadValues()
callDirTextField.setEnabled(saveCallsToCheckBox.isSelected());
callDirTextField.getDocument().addDocumentListener(this);
callDirChooseButton.setEnabled(saveCallsToCheckBox.isSelected());
+ autoRecordCheckBox.setSelected(autoRecord);
}
/**

View file

@ -1,89 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
#upstream smoked something here
MY_PV=$(ver_cut 3)
inherit java-pkg-2 java-ant-2
#FIXME: rename to jitsi-desktop?
DESCRIPTION="Secure IM communicator that supports SIP, XMPP, AIM/ICQ, Windows Live, Yahoo"
HOMEPAGE="https://desktop.jitsi.org/"
SRC_URI="https://github.com/jitsi/jitsi/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="autorecording"
CDEPEND="
sys-apps/dbus
x11-libs/libX11
x11-libs/gtk+:*
x11-libs/libXScrnSaver"
DEPEND="virtual/jdk:1.8
${CDEPEND}"
RDEPEND="${DEPEND}
${CDEPEND}
!net-im/jitsi-bin
virtual/jre"
QA_PREBUILT="usr/share/jitsi/lib/native/linux.*"
QA_TEXTRELS="usr/share/jitsi/lib/native/linux.*"
EANT_BUILD_TARGET="rebuild"
S="${WORKDIR}/${PN}-${MY_PV}"
PATCHES=(
"${FILESDIR}"/autorecording.patch
)
src_prepare() {
if use autorecording; then
eapply "${FILESDIR}"/autorecording.patch
fi
cp lib/accounts.properties.template lib/accounts.properties
#Patch debian files
sed -e "s/_PACKAGE_NAME_/jitsi/" -e "s/_APP_NAME_/jitsi/" "./resources/install/debian/jitsi.menu.tmpl" > "./jitsi.menu"
sed -e "s/_PACKAGE_NAME_/jitsi/" -e "s/_APP_NAME_/jitsi/" "./resources/install/debian/jitsi.1.tmpl" > "./jitsi.1"
sed -e "s/_PACKAGE_NAME_/jitsi/" -e "s/_APP_NAME_/jitsi/" "./resources/install/debian/jitsi.desktop.tmpl" "./jitsi.desktop" > "./jitsi.desktop"
eapply_user
}
src_install() {
#cleanup
rm -r lib/{installer-exclude,native/freebsd*,native/mac,native/windows*,os-specific/mac}
#resources/install/generic/installer-generic.xml
insinto "/usr/share/${PN}"
doins -r {lib,sc-bundles}
doins ./resources/install/generic/run.sh
fperms +x /usr/share/${PN}/run.sh
#Install menu
insinto "/usr/share/menu"
doins "./jitsi.menu"
#Install icons
insinto "/usr/share/pixmaps"
doins "./resources/install/debian/jitsi-16.xpm" "./resources/install/debian/jitsi-32.xpm" "./resources/install/debian/jitsi.svg"
#Install man page
doman "./jitsi.1"
#Install desktop entry
insinto "/usr/share/applications"
doins "./jitsi.desktop"
newbin - ${PN} <<-EOF
#!/bin/sh
cd /usr/share/jitsi
export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on'
./run.sh >/dev/null 2>&1 &
EOF
}

View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<use>
<flag name="autorecording">Add option to automatically record calls</flag>
</use>
</pkgmetadata>