Commit ddb8292f authored by Colin Tuckley's avatar Colin Tuckley Committed by Christoph Berg

Import Debian changes 3.3.1-2

unixcw (3.3.1-2) unstable; urgency=medium

  * Fix use of CWCP_OPTIONS environment variable Closes: #758915
    patch from upstream, Kamil Ignacak <acerion@wp.pl>
  * Fix OSS open failure on FreeBSD Closes: #759126
    patch from upstream, Kamil Ignacak <acerion@wp.pl>
parent 5b2c3d1b
unixcw (3.3.1-2) unstable; urgency=medium
* Fix use of CWCP_OPTIONS environment variable Closes: #758915
patch from upstream, Kamil Ignacak <acerion@wp.pl>
* Fix OSS open failure on FreeBSD Closes: #759126
patch from upstream, Kamil Ignacak <acerion@wp.pl>
-- Colin Tuckley <colint@debian.org> Sat, 06 Sep 2014 10:07:30 +0100
unixcw (3.3.1-1) unstable; urgency=medium
[ Kamil Ignacak ]
......
cw_process_argv() should use "combined_argc" and "combined_argv"
variables that contain argc/argv values combined with options from
CWCP_OPTIONS.
Patch from Kamil Ignacak <acerion@wp.pl>
--- a/src/cwcp/cwcp.c
+++ b/src/cwcp/cwcp.c
@@ -1557,7 +1557,7 @@
config->has_practice_time = true;
config->has_outfile = true;
- if (!cw_process_argv(argc, argv, all_options, config)) {
+ if (!cw_process_argv(combined_argc, combined_argv, all_options, config)) {
fprintf(stderr, _("%s: failed to parse command line args\n"), config->program_name);
return EXIT_FAILURE;
}
Fix failure of OSS on FreeBSD
Patch from upstream, Kamil Ignacak <acerion@wp.pl>
--- a/src/libcw/libcw_oss.c
+++ b/src/libcw/libcw_oss.c
@@ -292,12 +292,25 @@
return CW_FAILURE;
}
+#if 0
+ /*
+ This ioctl call failed on FreeBSD 10, which resulted in
+ libcw failing to open OSS device. A bit of digging on the
+ web revealed this:
+
+ OSS4:
+ http://manuals.opensound.com/developer/SNDCTL_DSP_POST.html:
+ "This ioctl call is provided for compatibility with older
+ applications. It has no practical purpose and should in no
+ case be used in new applications."
+ */
parameter = 0; /* ignored */
if (ioctl(*fd, SNDCTL_DSP_POST, &parameter) == -1) {
cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
"cw_oss: ioctl(SNDCTL_DSP_POST): \"%s\"", strerror(errno));
return CW_FAILURE;
}
+#endif
/* Set the audio format to 8-bit unsigned. */
parameter = CW_OSS_SAMPLE_FORMAT;
man-hyphen-fix.patch
cwcp-options.patch
open-OSS-device-FreeBSD.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment