[hamradio-commits] [freedv] 03/05: Packaging for freedv 1.1-1
Maitland Bottoms
bottoms at moszumanska.debian.org
Sun Sep 3 23:26:31 UTC 2017
This is an automated email from the git hooks/post-receive script.
bottoms pushed a commit to branch debian
in repository freedv.
commit 500bc0acd9b97de773d9997dbbdfa4c5ad748411
Author: A. Maitland Bottoms <bottoms at debian.org>
Date: Sat Sep 26 16:23:09 2015 -0400
Packaging for freedv 1.1-1
---
debian/changelog | 7 +++++
debian/control | 2 +-
debian/patches/HID-PTT | 62 ++++++++++++++++++-------------------
debian/patches/link-with-libXxf86vm | 2 +-
debian/watch | 2 ++
5 files changed, 42 insertions(+), 33 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1be6ce6..f9c17c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+freedv (1.1-1) unstable; urgency=medium
+
+ * New upstream release, new Voice Keyer feature
+ * consistent 8000 Hz audio I/O sample rate. (requires codec2 >= 0.5)
+
+ -- A. Maitland Bottoms <bottoms at debian.org> Fri, 25 Sep 2015 23:22:18 -0400
+
freedv (1.0-1) unstable; urgency=low
* New upstream release
diff --git a/debian/control b/debian/control
index bd1a758..426a357 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: A. Maitland Bottoms <bottoms at debian.org>
Build-Depends: cmake,
debhelper (>= 9~),
- libcodec2-dev (>= 0.4-2),
+ libcodec2-dev (>= 0.5),
libhamlib-dev,
libsamplerate-dev,
libsndfile-dev,
diff --git a/debian/patches/HID-PTT b/debian/patches/HID-PTT
index 48dc6a7..5bfd950 100644
--- a/debian/patches/HID-PTT
+++ b/debian/patches/HID-PTT
@@ -16,7 +16,7 @@
#include <samplerate.h>
#include <hamlib.h>
-@@ -164,6 +173,9 @@
+@@ -186,6 +195,9 @@
bool m_boolUseSerialPTT;
wxString m_strRigCtrlPort;
@@ -26,7 +26,7 @@
bool m_boolUseRTS;
bool m_boolRTSPos;
bool m_boolUseDTR;
-@@ -384,6 +396,11 @@
+@@ -406,6 +418,11 @@
txRxThread* m_txRxThread;
bool OpenHamlibRig();
@@ -40,9 +40,9 @@
void SerialPTTRx(void);
--- a/src/dlg_ptt.h
+++ b/src/dlg_ptt.h
-@@ -50,6 +50,13 @@
- wxCheckBox* m_ckHalfDuplex;
- wxCheckBox* m_ckLeftChannelVoxTone;
+@@ -57,6 +57,13 @@
+ wxTextCtrl *m_txtCtrlVoiceKeyerRxPause;
+ wxTextCtrl *m_txtCtrlVoiceKeyerRepeats;
+ /* HID PTT settings.*/
+
@@ -54,18 +54,18 @@
/* Hamlib settings.*/
wxCheckBox *m_ckUseHamlibPTT;
-@@ -80,6 +87,7 @@
+@@ -87,6 +94,7 @@
void populatePortList();
void PTTUseHamLibClicked(wxCommandEvent& event);
+ void PTTUseHIDClicked(wxCommandEvent& event);
void PTTUseSerialClicked(wxCommandEvent& event);
- void OnOK(wxCommandEvent& event);
+ void OnChooseVoiceKeyerWaveFile(wxCommandEvent& event);
--- a/src/dlg_ptt.cpp
+++ b/src/dlg_ptt.cpp
-@@ -55,6 +55,42 @@
- mainSizer->Add(staticBoxSizer28, 0, wxEXPAND, 5);
+@@ -84,6 +84,42 @@
+ mainSizer->Add(staticBoxSizer28a, 0, wxEXPAND, 5);
//----------------------------------------------------------------------
+ // HID PTT
@@ -107,7 +107,7 @@
// Hamlib for CAT PTT
//----------------------------------------------------------------------
-@@ -68,7 +104,7 @@
+@@ -97,7 +133,7 @@
gridSizer100->Add(m_ckUseHamlibPTT, 0, wxALIGN_CENTER_VERTICAL, 0);
/* Hamlib Rig Type combobox. */
@@ -116,7 +116,7 @@
0, wxALIGN_CENTER_VERTICAL | wxLEFT, 20);
m_cbRigName = new wxComboBox(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(250, -1), 0, NULL, wxCB_DROPDOWN);
/* TODO(Joel): this is a hack. At the least, need to gurantee that m_hamLib
-@@ -181,6 +217,7 @@
+@@ -210,6 +246,7 @@
// Connect events
this->Connect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(ComPortsDlg::OnInitDialog), NULL, this);
m_ckUseHamlibPTT->Connect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(ComPortsDlg::PTTUseHamLibClicked), NULL, this);
@@ -124,7 +124,7 @@
m_ckUseSerialPTT->Connect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(ComPortsDlg::PTTUseSerialClicked), NULL, this);
m_buttonOK->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ComPortsDlg::OnOK), NULL, this);
m_buttonCancel->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ComPortsDlg::OnCancel), NULL, this);
-@@ -195,6 +232,7 @@
+@@ -225,6 +262,7 @@
// Disconnect Events
this->Disconnect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(ComPortsDlg::OnInitDialog), NULL, this);
m_ckUseHamlibPTT->Disconnect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(ComPortsDlg::PTTUseHamLibClicked), NULL, this);
@@ -132,7 +132,7 @@
m_ckUseSerialPTT->Disconnect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(ComPortsDlg::PTTUseSerialClicked), NULL, this);
m_buttonOK->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ComPortsDlg::OnOK), NULL, this);
m_buttonCancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ComPortsDlg::OnCancel), NULL, this);
-@@ -307,7 +345,7 @@
+@@ -344,7 +382,7 @@
void ComPortsDlg::ExchangeData(int inout)
{
wxConfigBase *pConfig = wxConfigBase::Get();
@@ -141,29 +141,29 @@
if(inout == EXCHANGE_DATA_IN)
{
-@@ -318,13 +356,21 @@
+@@ -361,13 +399,21 @@
m_cbRigName->SetSelection(wxGetApp().m_intHamlibRig);
m_cbSerialPort->SetValue(wxGetApp().m_strHamlibSerialPort);
-+ m_ckUseHIDPTT->SetValue(wxGetApp().m_boolUseHIDPTT);
-+ hidstr = wxGetApp().m_strRigHidPort;
-+ hidbit = wxGetApp().m_strRigHidBit;
++ m_ckUseHIDPTT->SetValue(wxGetApp().m_boolUseHIDPTT);
++ hidstr = wxGetApp().m_strRigHidPort;
++ hidbit = wxGetApp().m_strRigHidBit;
+
m_ckUseSerialPTT->SetValue(wxGetApp().m_boolUseSerialPTT);
str = wxGetApp().m_strRigCtrlPort;
#ifdef __WXMSW__
m_listCtrlPorts->SetStringSelection(str);
-+ m_listHidPorts->SetStringSelection(hidstr);
-+ m_listHidBit->SetStringSelection(hidbit);
++ m_listHidPorts->SetStringSelection(hidstr);
++ m_listHidBit->SetStringSelection(hidbit);
#endif
- #ifdef __WXGTK__
+ #if defined(__WXOSX__) || defined(__WXGTK__)
m_cbCtlDevicePath->SetValue(str);
-+ m_txtHidDevicePath->SetValue(hidstr);
-+ m_txtHidDeviceBit->SetValue(hidbit);
++ m_txtHidDevicePath->SetValue(hidstr);
++ m_txtHidDeviceBit->SetValue(hidbit);
#endif
m_rbUseRTS->SetValue(wxGetApp().m_boolUseRTS);
m_ckRTSPos->SetValue(wxGetApp().m_boolRTSPos);
-@@ -348,6 +394,21 @@
+@@ -403,6 +449,21 @@
pConfig->Write(wxT("/Hamlib/RigName"), wxGetApp().m_intHamlibRig);
pConfig->Write(wxT("/Hamlib/SerialPort"), wxGetApp().m_strHamlibSerialPort);
@@ -185,7 +185,7 @@
/* Serial settings */
wxGetApp().m_boolUseSerialPTT = m_ckUseSerialPTT->IsChecked();
-@@ -383,6 +444,13 @@
+@@ -438,6 +499,13 @@
}
//-------------------------------------------------------------------------
@@ -201,7 +201,7 @@
void ComPortsDlg::PTTUseSerialClicked(wxCommandEvent& event)
--- a/src/fdmdv2_main.cpp
+++ b/src/fdmdv2_main.cpp
-@@ -354,6 +354,10 @@
+@@ -359,6 +359,10 @@
wxGetApp().m_intHamlibRig = pConfig->ReadLong("/Hamlib/RigName", 0);
wxGetApp().m_strHamlibSerialPort = pConfig->Read("/Hamlib/SerialPort", "");
@@ -212,7 +212,7 @@
wxGetApp().m_boolUseSerialPTT = pConfig->ReadBool(wxT("/Rig/UseSerialPTT"), false);
wxGetApp().m_strRigCtrlPort = pConfig->Read(wxT("/Rig/Port"), wxT(""));
wxGetApp().m_boolUseRTS = pConfig->ReadBool(wxT("/Rig/UseRTS"), true);
-@@ -1458,6 +1462,14 @@
+@@ -1473,6 +1477,14 @@
}
@@ -227,7 +227,7 @@
// reset level gauge
m_maxLevel = 0;
-@@ -1962,6 +1974,9 @@
+@@ -2144,6 +2156,9 @@
OpenHamlibRig();
wxGetApp().m_hamlib->close();
}
@@ -237,7 +237,7 @@
if (wxGetApp().m_boolUseSerialPTT) {
SetupSerialPort();
CloseSerialPort();
-@@ -2239,6 +2254,9 @@
+@@ -2410,6 +2425,9 @@
}
}
@@ -247,9 +247,9 @@
if (wxGetApp().m_boolUseSerialPTT)
CloseSerialPort();
-@@ -3695,3 +3713,84 @@
- void my_freedv_put_error_pattern(void *state, short error_pattern[], int sz_error_pattern) {
- fifo_write(g_error_pattern_fifo, error_pattern, sz_error_pattern);
+@@ -3898,3 +3916,84 @@
+ foff_phase_rect->real /= mag;
+ foff_phase_rect->imag /= mag;
}
+
+//----------------------------------------------------------------
diff --git a/debian/patches/link-with-libXxf86vm b/debian/patches/link-with-libXxf86vm
index 4c59b64..b3d714e 100644
--- a/debian/patches/link-with-libXxf86vm
+++ b/debian/patches/link-with-libXxf86vm
@@ -1,6 +1,6 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -414,6 +414,12 @@
+@@ -416,6 +416,12 @@
if(wxWidgets_FOUND)
include("${wxWidgets_USE_FILE}")
list(APPEND FREEDV_LINK_LIBS ${wxWidgets_LIBRARIES})
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..9dedcd5
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+ https://files.freedv.org/freedv/ freedv-(.+)\.tar\.xz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/freedv.git
More information about the pkg-hamradio-commits
mailing list