sswf/sswf.patch

Sat, 24 Mar 2012 21:40:49 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Sat, 24 Mar 2012 21:40:49 +0100
changeset 414
fd611cde817f
parent 110
b70af19a3465
permissions
-rw-r--r--

Introduce many changes to the buildconf and source code including:
(01) clean up, update, and partially update default config files,
(02) seems that Melware is unable to perform release engineering so
update chan_capi to new daily snapshot to solve echo problems,
(03) correct Asterisk inadequate hard coded gmime version check,
(04) force postgresql pthreads linkage to solve build problem,
(05) remove buggy hard coded LibXML configure definitions,
(06) remove local architecture specification to allow GCC
internal logic to determine proper CPU type instead,
(07) remove vendor sound install target causing uncontrolled
downloads and non RPM managed file installation,
(08) solve long outstanding bug in tcptls causing Asterisk
to ignore any intermediate CA certificate signatures,
(09) back out Digium engineering team's bright idea of replacing the
very portable and pervasive POSIX rand(1) with ast_random(), and
then not even implementing it causing all references to fail in
platforms not providing the very new POSIX.1-2008 mkdtemp(3)
function only distributed by BSD and some Linux,
(10) withdraw advanced linker symbol manipulations from SVR5 builds
until either Binutils supports hybrid versioned and anonymous
linker scripts or GCC stops hard coding versioned linker scripts,
(11) correct missing library linkage, some tailored to a specific OS,
(12) remove outdated logic for the no longer distributed gmime-config(1),
(13) remove local gmime buildconf hacks now that Asterisk has corrected
their own build configuration to almost portably support gmime,
(14) solve build problems relating to undetected LibXML paths,
(15) correct erroneous out of tree include definitions,
(16) improve some variable and comment naming,
(17) simplify sound language path hierarchy creation,
and correct australian english installation logic.

     1 Index: include/sswf/libsswf.h
     2 --- include/sswf/libsswf.h.orig	2008-06-23 07:51:47 +0200
     3 +++ include/sswf/libsswf.h	2008-06-23 18:10:33 +0200
     4 @@ -71,12 +71,14 @@
     5  /* wint_t is an "equivalent" to wchar_t without being limited to 16 bits as on MS-Windows */
     6  #ifndef _MSVC
     7  #ifndef __APPLE_CC__
     8 +#ifndef __FreeBSD__
     9  #ifndef _WINT_T
    10  #define _WINT_T
    11  typedef unsigned int	wint_t;
    12  #endif
    13  #endif
    14  #endif
    15 +#endif
    17  #ifndef	M_PI
    18  #define	M_PI		3.14159265358979323846
    19 @@ -88,7 +90,7 @@
    20  #define	rint(x)		((double) (long) floor(x + 0.5))
    21  #endif
    23 -#ifdef _LIBICONV_H
    24 +#if defined(_LIBICONV_H) && !defined(__FreeBSD__)
    25  #define	ICONV_INPUT_CAST
    26  #else
    27  /* older versions of iconv() were broken in regard to the
    28 Index: include/sswf/libsswf_c.h
    29 --- include/sswf/libsswf_c.h.orig	2008-06-23 07:51:47 +0200
    30 +++ include/sswf/libsswf_c.h	2008-06-23 18:10:33 +0200
    31 @@ -38,7 +38,7 @@
    33  #include <stdlib.h>
    34  #include <stdarg.h>
    35 -#if IRIX
    36 +#if IRIX || defined(__FreeBSD__)
    37  #include <inttypes.h>
    38  #endif
    39  #include <sswf/libsswf-config.h>
    40 Index: src/lib/libsswf_tag_header.c++
    41 --- src/lib/libsswf_tag_header.c++.orig	2009-02-25 11:44:25.018888440 +0100
    42 +++ src/lib/libsswf_tag_header.c++	2009-02-25 12:03:04.998881702 +0100
    43 @@ -745,7 +745,7 @@
    44  }
    45  #endif
    47 -	r = (int) iconv(f_iconvertor, ICONV_INPUT_CAST &string, &in, &p, &out);
    48 +	r = (int) iconv(f_iconvertor, ICONV_INPUT_CAST const_cast<char **>(&string), &in, &p, &out);
    49  	if(r < 0) {
    50  		if(s != buf) {
    51  			MemFree(s);
    52 Index: src/lib/sswf_lexical.c++
    53 --- src/sswf/sswf_lexical.c++.orig	2008-06-23 07:51:47.000000000 +0200
    54 +++ src/sswf/sswf_lexical.c++	2009-02-25 12:06:36.214881561 +0100
    55 @@ -2026,7 +2026,7 @@
    56  		out = sizeof(outchar);
    57  		output = (char *) &outchar;
    58  		b = (int) f_mb_count;
    59 -		a = (int) iconv(f_iconvertor, ICONV_INPUT_CAST &input, &f_mb_count, &output, &out);
    60 +		a = (int) iconv(f_iconvertor, ICONV_INPUT_CAST const_cast<char **>(&input), &f_mb_count, &output, &out);
    61  		// the output buffer will usually be full before the
    62  		// input is fully emptied!
    63  		if(a < 0 && errno == E2BIG && out == 0 && b != (int) f_mb_count) {

mercurial