mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-05 12:16:00 +00:00
chan_oss: Remove deprecated module.
ASTERISK-29593 Change-Id: Ib53a42ad974c63871344b95078c61c188e43da99
This commit is contained in:
@@ -46,7 +46,6 @@ OGG=@PBX_OGG@
|
|||||||
OPUS=@PBX_OPUS@
|
OPUS=@PBX_OPUS@
|
||||||
OPUSFILE=@PBX_OPUSFILE@
|
OPUSFILE=@PBX_OPUSFILE@
|
||||||
OSPTK=@PBX_OSPTK@
|
OSPTK=@PBX_OSPTK@
|
||||||
OSS=@PBX_OSS@
|
|
||||||
PGSQL=@PBX_PGSQL@
|
PGSQL=@PBX_PGSQL@
|
||||||
PJPROJECT=@PBX_PJPROJECT@
|
PJPROJECT=@PBX_PJPROJECT@
|
||||||
POPT=@PBX_POPT@
|
POPT=@PBX_POPT@
|
||||||
|
1529
channels/chan_oss.c
1529
channels/chan_oss.c
File diff suppressed because it is too large
Load Diff
@@ -1,152 +0,0 @@
|
|||||||
;
|
|
||||||
; Automatically generated from ../channels/chan_oss.c
|
|
||||||
;
|
|
||||||
|
|
||||||
[general]
|
|
||||||
; General config options, with default values shown.
|
|
||||||
; You should use one section per device, with [general] being used
|
|
||||||
; for the first device and also as a template for other devices.
|
|
||||||
;
|
|
||||||
; All but 'debug' can go also in the device-specific sections.
|
|
||||||
;
|
|
||||||
; debug = 0x0 ; misc debug flags, default is 0
|
|
||||||
|
|
||||||
; Set the device to use for I/O
|
|
||||||
; device = /dev/dsp
|
|
||||||
|
|
||||||
; Optional mixer command to run upon startup (e.g. to set
|
|
||||||
; volume levels, mutes, etc.
|
|
||||||
; mixer =
|
|
||||||
|
|
||||||
; Software mic volume booster (or attenuator), useful for sound
|
|
||||||
; cards or microphones with poor sensitivity. The volume level
|
|
||||||
; is in dB, ranging from -20.0 to +20.0
|
|
||||||
; boost = n ; mic volume boost in dB
|
|
||||||
|
|
||||||
; Set the callerid for outgoing calls
|
|
||||||
; callerid = John Doe <555-1234>
|
|
||||||
|
|
||||||
; autoanswer = no ; no autoanswer on call
|
|
||||||
; autohangup = yes ; hangup when other party closes
|
|
||||||
; extension = s ; default extension to call
|
|
||||||
; context = default ; default context for outgoing calls
|
|
||||||
; language = "" ; default language
|
|
||||||
|
|
||||||
; If you set overridecontext to 'yes', then the whole dial string
|
|
||||||
; will be interpreted as an extension, which is extremely useful
|
|
||||||
; to dial SIP, IAX and other extensions which use the '@' character.
|
|
||||||
; The default is 'no' just for backward compatibility, but the
|
|
||||||
; suggestion is to change it.
|
|
||||||
; overridecontext = no ; if 'no', the last @ will start the context
|
|
||||||
; if 'yes' the whole string is an extension.
|
|
||||||
|
|
||||||
; low level device parameters in case you have problems with the
|
|
||||||
; device driver on your operating system. You should not touch these
|
|
||||||
; unless you know what you are doing.
|
|
||||||
; queuesize = 10 ; frames in device driver
|
|
||||||
; frags = 8 ; argument to SETFRAGMENT
|
|
||||||
|
|
||||||
; ----------------------------- JITTER BUFFER CONFIGURATION --------------------------
|
|
||||||
; jbenable = yes ; Enables the use of a jitterbuffer on the receiving side of an
|
|
||||||
; OSS channel. Defaults to "no". An enabled jitterbuffer will
|
|
||||||
; be used only if the sending side can create and the receiving
|
|
||||||
; side can not accept jitter. The OSS channel can't accept jitter,
|
|
||||||
; thus an enabled jitterbuffer on the receive OSS side will always
|
|
||||||
; be used if the sending side can create jitter.
|
|
||||||
|
|
||||||
; jbmaxsize = 200 ; Max length of the jitterbuffer in milliseconds.
|
|
||||||
|
|
||||||
; jbresyncthreshold = 1000 ; Jump in the frame timestamps over which the jitterbuffer is
|
|
||||||
; resynchronized. Useful to improve the quality of the voice, with
|
|
||||||
; big jumps in/broken timestamps, usually sent from exotic devices
|
|
||||||
; and programs. Defaults to 1000.
|
|
||||||
|
|
||||||
; jbimpl = fixed ; Jitterbuffer implementation, used on the receiving side of an OSS
|
|
||||||
; channel. Two implementations are currently available - "fixed"
|
|
||||||
; (with size always equals to jbmax-size) and "adaptive" (with
|
|
||||||
; variable size, actually the new jb of IAX2). Defaults to fixed.
|
|
||||||
|
|
||||||
; jbtargetextra = 40 ; This option only affects the jb when 'jbimpl = adaptive' is set.
|
|
||||||
; The option represents the number of milliseconds by which the new
|
|
||||||
; jitter buffer will pad its size. the default is 40, so without
|
|
||||||
; modification, the new jitter buffer will set its size to the jitter
|
|
||||||
; value plus 40 milliseconds. increasing this value may help if your
|
|
||||||
; network normally has low jitter, but occasionally has spikes.
|
|
||||||
|
|
||||||
; jblog = no ; Enables jitterbuffer frame logging. Defaults to "no".
|
|
||||||
; ----------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
; below is an entry for a second console channel
|
|
||||||
; [card1]
|
|
||||||
; device = /dev/dsp1 ; alternate device
|
|
||||||
|
|
||||||
; Below are the settings to support video. You can include them
|
|
||||||
; in your general configuration as [general](+,video)
|
|
||||||
; The parameters are all available through the CLI as "console name value"
|
|
||||||
; Section names used here are only examples.
|
|
||||||
|
|
||||||
[my_video](!) ; you can just include in your config
|
|
||||||
videodevice = /dev/video0 ; uses your V4L webcam as video source
|
|
||||||
videodevice = X11 ; X11 grabber. Dragging on the local display moves the origin.
|
|
||||||
videocodec = h263 ; also h261, h263p, h264, mpeg4, ...
|
|
||||||
|
|
||||||
; video_size is the geometry used by the encoder.
|
|
||||||
; Depending on the codec your choice is restricted.
|
|
||||||
video_size = 352x288 ; the format WIDTHxHEIGHT is also ok
|
|
||||||
video_size = cif ; sqcif, qcif, cif, qvga, vga, ...
|
|
||||||
|
|
||||||
; You can also set the geometry used for the camera, local display and remote display.
|
|
||||||
; The local window is on the right, the remote window is on the left.
|
|
||||||
; Right clicking with the mouse on a video window increases the size,
|
|
||||||
; center-clicking reduces the size.
|
|
||||||
camera_size = cif
|
|
||||||
remote_size = cif
|
|
||||||
local_size = qcif
|
|
||||||
|
|
||||||
bitrate = 60000 ; rate told to ffmpeg.
|
|
||||||
fps = 5 ; frames per second from the source.
|
|
||||||
; qmin = 3 ; quantizer value passed to the encoder.
|
|
||||||
|
|
||||||
; The keypad is made of an image (in any format supported by SDL_image)
|
|
||||||
; and some configuration entries indicating the location and function of buttons.
|
|
||||||
; These entries can also be contained in the comment field of the image,
|
|
||||||
; which is a lot more convenient to manage.
|
|
||||||
; E.g. for jpeg you can write them with wrjpgcom (part of libjpeg).
|
|
||||||
; The format to define keys is
|
|
||||||
; region = <event> <shape> x0 y0 x1 y1 h
|
|
||||||
; where <event> is the event to be generated (a digit, pickup, hangup,...)
|
|
||||||
; <shape> is the shape of the region (currently 'rect' and 'circle' are
|
|
||||||
; supported, the latter is really an ellipse), x0 y0 x1 y1 are the
|
|
||||||
; coordinates of the base of the rectangle or main diameter of the ellipse,
|
|
||||||
; (they can be rotated) while h is the height of the rectangle or the other
|
|
||||||
; diameter of the ellipse.
|
|
||||||
;
|
|
||||||
[my_skin](!)
|
|
||||||
keypad = /tmp/keypad.jpg
|
|
||||||
region = 1 rect 19 18 67 18 28
|
|
||||||
region = 2 rect 84 18 133 18 28
|
|
||||||
region = 3 rect 152 18 201 18 28
|
|
||||||
region = 4 rect 19 60 67 60 28
|
|
||||||
region = 5 rect 84 60 133 60 28
|
|
||||||
region = 6 rect 152 60 201 60 28
|
|
||||||
region = 7 rect 19 103 67 103 28
|
|
||||||
region = 8 rect 84 103 133 103 28
|
|
||||||
region = 9 rect 152 103 201 103 28
|
|
||||||
region = * rect 19 146 67 146 28
|
|
||||||
region = 0 rect 84 146 133 146 28
|
|
||||||
region = # rect 152 146 201 146 28
|
|
||||||
region = pickup rect 229 15 267 15 40
|
|
||||||
region = hangup rect 230 66 270 64 40
|
|
||||||
region = mute circle 232 141 264 141 33
|
|
||||||
region = sendvideo circle 235 185 266 185 33
|
|
||||||
region = autoanswer rect 228 212 275 212 50
|
|
||||||
|
|
||||||
; another skin with entries for the keypad and a small font
|
|
||||||
; to write to the message boards in the skin.
|
|
||||||
[skin2](!)
|
|
||||||
keypad = /tmp/kpad2.jpg
|
|
||||||
keypad_font = /tmp/font.png
|
|
||||||
|
|
||||||
; to add video support, uncomment this and remember to install
|
|
||||||
; the keypad and keypad_font files to the right place
|
|
||||||
; [general](+,my_video,skin2)
|
|
277
configure
vendored
277
configure
vendored
@@ -999,10 +999,6 @@ PBX_PGSQL
|
|||||||
PGSQL_DIR
|
PGSQL_DIR
|
||||||
PGSQL_INCLUDE
|
PGSQL_INCLUDE
|
||||||
PGSQL_LIB
|
PGSQL_LIB
|
||||||
PBX_OSS
|
|
||||||
OSS_DIR
|
|
||||||
OSS_INCLUDE
|
|
||||||
OSS_LIB
|
|
||||||
PBX_OSPTK
|
PBX_OSPTK
|
||||||
OSPTK_DIR
|
OSPTK_DIR
|
||||||
OSPTK_INCLUDE
|
OSPTK_INCLUDE
|
||||||
@@ -1296,7 +1292,6 @@ BUILD_OS
|
|||||||
BUILD_VENDOR
|
BUILD_VENDOR
|
||||||
BUILD_CPU
|
BUILD_CPU
|
||||||
BUILD_PLATFORM
|
BUILD_PLATFORM
|
||||||
astcachedir
|
|
||||||
astvarrundir
|
astvarrundir
|
||||||
astlogdir
|
astlogdir
|
||||||
astspooldir
|
astspooldir
|
||||||
@@ -1309,6 +1304,7 @@ astmoddir
|
|||||||
astlibdir
|
astlibdir
|
||||||
astheaderdir
|
astheaderdir
|
||||||
astetcdir
|
astetcdir
|
||||||
|
astcachedir
|
||||||
astsbindir
|
astsbindir
|
||||||
EGREP
|
EGREP
|
||||||
GREP
|
GREP
|
||||||
@@ -1349,6 +1345,7 @@ infodir
|
|||||||
docdir
|
docdir
|
||||||
oldincludedir
|
oldincludedir
|
||||||
includedir
|
includedir
|
||||||
|
runstatedir
|
||||||
localstatedir
|
localstatedir
|
||||||
sharedstatedir
|
sharedstatedir
|
||||||
sysconfdir
|
sysconfdir
|
||||||
@@ -1425,7 +1422,6 @@ with_openr2
|
|||||||
with_opus
|
with_opus
|
||||||
with_opusfile
|
with_opusfile
|
||||||
with_osptk
|
with_osptk
|
||||||
with_oss
|
|
||||||
with_postgres
|
with_postgres
|
||||||
with_beanstalk
|
with_beanstalk
|
||||||
with_pjproject
|
with_pjproject
|
||||||
@@ -1538,6 +1534,7 @@ datadir='${datarootdir}'
|
|||||||
sysconfdir='${prefix}/etc'
|
sysconfdir='${prefix}/etc'
|
||||||
sharedstatedir='${prefix}/com'
|
sharedstatedir='${prefix}/com'
|
||||||
localstatedir='${prefix}/var'
|
localstatedir='${prefix}/var'
|
||||||
|
runstatedir='${localstatedir}/run'
|
||||||
includedir='${prefix}/include'
|
includedir='${prefix}/include'
|
||||||
oldincludedir='/usr/include'
|
oldincludedir='/usr/include'
|
||||||
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
|
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
|
||||||
@@ -1790,6 +1787,15 @@ do
|
|||||||
| -silent | --silent | --silen | --sile | --sil)
|
| -silent | --silent | --silen | --sile | --sil)
|
||||||
silent=yes ;;
|
silent=yes ;;
|
||||||
|
|
||||||
|
-runstatedir | --runstatedir | --runstatedi | --runstated \
|
||||||
|
| --runstate | --runstat | --runsta | --runst | --runs \
|
||||||
|
| --run | --ru | --r)
|
||||||
|
ac_prev=runstatedir ;;
|
||||||
|
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
|
||||||
|
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
|
||||||
|
| --run=* | --ru=* | --r=*)
|
||||||
|
runstatedir=$ac_optarg ;;
|
||||||
|
|
||||||
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
|
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
|
||||||
ac_prev=sbindir ;;
|
ac_prev=sbindir ;;
|
||||||
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
|
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
|
||||||
@@ -1927,7 +1933,7 @@ fi
|
|||||||
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
||||||
datadir sysconfdir sharedstatedir localstatedir includedir \
|
datadir sysconfdir sharedstatedir localstatedir includedir \
|
||||||
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
||||||
libdir localedir mandir
|
libdir localedir mandir runstatedir
|
||||||
do
|
do
|
||||||
eval ac_val=\$$ac_var
|
eval ac_val=\$$ac_var
|
||||||
# Remove trailing slashes.
|
# Remove trailing slashes.
|
||||||
@@ -2080,6 +2086,7 @@ Fine tuning of the installation directories:
|
|||||||
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
||||||
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
||||||
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
||||||
|
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
|
||||||
--libdir=DIR object code libraries [EPREFIX/lib]
|
--libdir=DIR object code libraries [EPREFIX/lib]
|
||||||
--includedir=DIR C header files [PREFIX/include]
|
--includedir=DIR C header files [PREFIX/include]
|
||||||
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
||||||
@@ -2188,7 +2195,6 @@ Optional Packages:
|
|||||||
--with-opus=PATH use Opus files in PATH
|
--with-opus=PATH use Opus files in PATH
|
||||||
--with-opusfile=PATH use Opusfile files in PATH
|
--with-opusfile=PATH use Opusfile files in PATH
|
||||||
--with-osptk=PATH use OSP Toolkit files in PATH
|
--with-osptk=PATH use OSP Toolkit files in PATH
|
||||||
--with-oss=PATH use Open Sound System files in PATH
|
|
||||||
--with-postgres=PATH use PostgreSQL files in PATH
|
--with-postgres=PATH use PostgreSQL files in PATH
|
||||||
--with-beanstalk=PATH use Beanstalk Job Queue files in PATH
|
--with-beanstalk=PATH use Beanstalk Job Queue files in PATH
|
||||||
--with-pjproject=PATH use PJPROJECT files in PATH
|
--with-pjproject=PATH use PJPROJECT files in PATH
|
||||||
@@ -10848,6 +10854,7 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
MISDN_DESCRIP="mISDN user"
|
MISDN_DESCRIP="mISDN user"
|
||||||
MISDN_OPTION="misdn"
|
MISDN_OPTION="misdn"
|
||||||
PBX_MISDN=0
|
PBX_MISDN=0
|
||||||
@@ -11232,38 +11239,6 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
OSS_DESCRIP="Open Sound System"
|
|
||||||
OSS_OPTION="oss"
|
|
||||||
PBX_OSS=0
|
|
||||||
|
|
||||||
# Check whether --with-oss was given.
|
|
||||||
if test "${with_oss+set}" = set; then :
|
|
||||||
withval=$with_oss;
|
|
||||||
case ${withval} in
|
|
||||||
n|no)
|
|
||||||
USE_OSS=no
|
|
||||||
# -1 is a magic value used by menuselect to know that the package
|
|
||||||
# was disabled, other than 'not found'
|
|
||||||
PBX_OSS=-1
|
|
||||||
;;
|
|
||||||
y|ye|yes)
|
|
||||||
ac_mandatory_list="${ac_mandatory_list} OSS"
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
OSS_DIR="${withval}"
|
|
||||||
ac_mandatory_list="${ac_mandatory_list} OSS"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
PGSQL_DESCRIP="PostgreSQL"
|
PGSQL_DESCRIP="PostgreSQL"
|
||||||
PGSQL_OPTION="postgres"
|
PGSQL_OPTION="postgres"
|
||||||
PBX_PGSQL=0
|
PBX_PGSQL=0
|
||||||
@@ -14688,7 +14663,7 @@ else
|
|||||||
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
||||||
since some C++ compilers masquerading as C compilers
|
since some C++ compilers masquerading as C compilers
|
||||||
incorrectly reject 9223372036854775807. */
|
incorrectly reject 9223372036854775807. */
|
||||||
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
|
||||||
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
||||||
&& LARGE_OFF_T % 2147483647 == 1)
|
&& LARGE_OFF_T % 2147483647 == 1)
|
||||||
? 1 : -1];
|
? 1 : -1];
|
||||||
@@ -14734,7 +14709,7 @@ else
|
|||||||
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
||||||
since some C++ compilers masquerading as C compilers
|
since some C++ compilers masquerading as C compilers
|
||||||
incorrectly reject 9223372036854775807. */
|
incorrectly reject 9223372036854775807. */
|
||||||
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
|
||||||
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
||||||
&& LARGE_OFF_T % 2147483647 == 1)
|
&& LARGE_OFF_T % 2147483647 == 1)
|
||||||
? 1 : -1];
|
? 1 : -1];
|
||||||
@@ -14758,7 +14733,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|||||||
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
||||||
since some C++ compilers masquerading as C compilers
|
since some C++ compilers masquerading as C compilers
|
||||||
incorrectly reject 9223372036854775807. */
|
incorrectly reject 9223372036854775807. */
|
||||||
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
|
||||||
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
||||||
&& LARGE_OFF_T % 2147483647 == 1)
|
&& LARGE_OFF_T % 2147483647 == 1)
|
||||||
? 1 : -1];
|
? 1 : -1];
|
||||||
@@ -14803,7 +14778,7 @@ else
|
|||||||
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
||||||
since some C++ compilers masquerading as C compilers
|
since some C++ compilers masquerading as C compilers
|
||||||
incorrectly reject 9223372036854775807. */
|
incorrectly reject 9223372036854775807. */
|
||||||
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
|
||||||
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
||||||
&& LARGE_OFF_T % 2147483647 == 1)
|
&& LARGE_OFF_T % 2147483647 == 1)
|
||||||
? 1 : -1];
|
? 1 : -1];
|
||||||
@@ -14827,7 +14802,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|||||||
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
||||||
since some C++ compilers masquerading as C compilers
|
since some C++ compilers masquerading as C compilers
|
||||||
incorrectly reject 9223372036854775807. */
|
incorrectly reject 9223372036854775807. */
|
||||||
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
|
||||||
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
||||||
&& LARGE_OFF_T % 2147483647 == 1)
|
&& LARGE_OFF_T % 2147483647 == 1)
|
||||||
? 1 : -1];
|
? 1 : -1];
|
||||||
@@ -16127,6 +16102,8 @@ main ()
|
|||||||
if (*(data + i) != *(data3 + i))
|
if (*(data + i) != *(data3 + i))
|
||||||
return 14;
|
return 14;
|
||||||
close (fd);
|
close (fd);
|
||||||
|
free (data);
|
||||||
|
free (data3);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
_ACEOF
|
_ACEOF
|
||||||
@@ -24215,216 +24192,6 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
# possible places for oss definitions
|
|
||||||
|
|
||||||
if test "x${PBX_OSS}" != "x1" -a "${USE_OSS}" != "no"; then
|
|
||||||
pbxlibdir=""
|
|
||||||
# if --with-OSS=DIR has been specified, use it.
|
|
||||||
if test "x${OSS_DIR}" != "x"; then
|
|
||||||
if test -d ${OSS_DIR}/lib; then
|
|
||||||
pbxlibdir="-L${OSS_DIR}/lib"
|
|
||||||
else
|
|
||||||
pbxlibdir="-L${OSS_DIR}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# empty lib, assume only headers
|
|
||||||
AST_OSS_FOUND=yes
|
|
||||||
|
|
||||||
|
|
||||||
# now check for the header.
|
|
||||||
if test "${AST_OSS_FOUND}" = "yes"; then
|
|
||||||
OSS_LIB="${pbxlibdir} -lossaudio "
|
|
||||||
# if --with-OSS=DIR has been specified, use it.
|
|
||||||
if test "x${OSS_DIR}" != "x"; then
|
|
||||||
OSS_INCLUDE="-I${OSS_DIR}/include"
|
|
||||||
fi
|
|
||||||
OSS_INCLUDE="${OSS_INCLUDE} "
|
|
||||||
|
|
||||||
# check for the header
|
|
||||||
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
|
|
||||||
CPPFLAGS="${CPPFLAGS} ${OSS_INCLUDE}"
|
|
||||||
ac_fn_c_check_header_mongrel "$LINENO" "linux/soundcard.h" "ac_cv_header_linux_soundcard_h" "$ac_includes_default"
|
|
||||||
if test "x$ac_cv_header_linux_soundcard_h" = xyes; then :
|
|
||||||
OSS_HEADER_FOUND=1
|
|
||||||
else
|
|
||||||
OSS_HEADER_FOUND=0
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
|
|
||||||
|
|
||||||
if test "x${OSS_HEADER_FOUND}" = "x0" ; then
|
|
||||||
OSS_LIB=""
|
|
||||||
OSS_INCLUDE=""
|
|
||||||
else
|
|
||||||
|
|
||||||
# only checking headers -> no library
|
|
||||||
OSS_LIB=""
|
|
||||||
|
|
||||||
PBX_OSS=1
|
|
||||||
cat >>confdefs.h <<_ACEOF
|
|
||||||
#define HAVE_OSS 1
|
|
||||||
_ACEOF
|
|
||||||
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if test "x${PBX_OSS}" != "x1" -a "${USE_OSS}" != "no"; then
|
|
||||||
pbxlibdir=""
|
|
||||||
# if --with-OSS=DIR has been specified, use it.
|
|
||||||
if test "x${OSS_DIR}" != "x"; then
|
|
||||||
if test -d ${OSS_DIR}/lib; then
|
|
||||||
pbxlibdir="-L${OSS_DIR}/lib"
|
|
||||||
else
|
|
||||||
pbxlibdir="-L${OSS_DIR}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# empty lib, assume only headers
|
|
||||||
AST_OSS_FOUND=yes
|
|
||||||
|
|
||||||
|
|
||||||
# now check for the header.
|
|
||||||
if test "${AST_OSS_FOUND}" = "yes"; then
|
|
||||||
OSS_LIB="${pbxlibdir} -lossaudio "
|
|
||||||
# if --with-OSS=DIR has been specified, use it.
|
|
||||||
if test "x${OSS_DIR}" != "x"; then
|
|
||||||
OSS_INCLUDE="-I${OSS_DIR}/include"
|
|
||||||
fi
|
|
||||||
OSS_INCLUDE="${OSS_INCLUDE} "
|
|
||||||
|
|
||||||
# check for the header
|
|
||||||
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
|
|
||||||
CPPFLAGS="${CPPFLAGS} ${OSS_INCLUDE}"
|
|
||||||
ac_fn_c_check_header_mongrel "$LINENO" "sys/soundcard.h" "ac_cv_header_sys_soundcard_h" "$ac_includes_default"
|
|
||||||
if test "x$ac_cv_header_sys_soundcard_h" = xyes; then :
|
|
||||||
OSS_HEADER_FOUND=1
|
|
||||||
else
|
|
||||||
OSS_HEADER_FOUND=0
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
|
|
||||||
|
|
||||||
if test "x${OSS_HEADER_FOUND}" = "x0" ; then
|
|
||||||
OSS_LIB=""
|
|
||||||
OSS_INCLUDE=""
|
|
||||||
else
|
|
||||||
|
|
||||||
# only checking headers -> no library
|
|
||||||
OSS_LIB=""
|
|
||||||
|
|
||||||
PBX_OSS=1
|
|
||||||
cat >>confdefs.h <<_ACEOF
|
|
||||||
#define HAVE_OSS 1
|
|
||||||
_ACEOF
|
|
||||||
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if test "x${PBX_OSS}" != "x1" -a "${USE_OSS}" != "no"; then
|
|
||||||
pbxlibdir=""
|
|
||||||
# if --with-OSS=DIR has been specified, use it.
|
|
||||||
if test "x${OSS_DIR}" != "x"; then
|
|
||||||
if test -d ${OSS_DIR}/lib; then
|
|
||||||
pbxlibdir="-L${OSS_DIR}/lib"
|
|
||||||
else
|
|
||||||
pbxlibdir="-L${OSS_DIR}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
|
|
||||||
CFLAGS="${CFLAGS} "
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for oss_ioctl_mixer in -lossaudio" >&5
|
|
||||||
$as_echo_n "checking for oss_ioctl_mixer in -lossaudio... " >&6; }
|
|
||||||
if ${ac_cv_lib_ossaudio_oss_ioctl_mixer+:} false; then :
|
|
||||||
$as_echo_n "(cached) " >&6
|
|
||||||
else
|
|
||||||
ac_check_lib_save_LIBS=$LIBS
|
|
||||||
LIBS="-lossaudio ${pbxlibdir} $LIBS"
|
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
/* end confdefs.h. */
|
|
||||||
|
|
||||||
/* Override any GCC internal prototype to avoid an error.
|
|
||||||
Use char because int might match the return type of a GCC
|
|
||||||
builtin and then its argument prototype would still apply. */
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C"
|
|
||||||
#endif
|
|
||||||
char oss_ioctl_mixer ();
|
|
||||||
int
|
|
||||||
main ()
|
|
||||||
{
|
|
||||||
return oss_ioctl_mixer ();
|
|
||||||
;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
_ACEOF
|
|
||||||
if ac_fn_c_try_link "$LINENO"; then :
|
|
||||||
ac_cv_lib_ossaudio_oss_ioctl_mixer=yes
|
|
||||||
else
|
|
||||||
ac_cv_lib_ossaudio_oss_ioctl_mixer=no
|
|
||||||
fi
|
|
||||||
rm -f core conftest.err conftest.$ac_objext \
|
|
||||||
conftest$ac_exeext conftest.$ac_ext
|
|
||||||
LIBS=$ac_check_lib_save_LIBS
|
|
||||||
fi
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ossaudio_oss_ioctl_mixer" >&5
|
|
||||||
$as_echo "$ac_cv_lib_ossaudio_oss_ioctl_mixer" >&6; }
|
|
||||||
if test "x$ac_cv_lib_ossaudio_oss_ioctl_mixer" = xyes; then :
|
|
||||||
AST_OSS_FOUND=yes
|
|
||||||
else
|
|
||||||
AST_OSS_FOUND=no
|
|
||||||
fi
|
|
||||||
|
|
||||||
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
|
|
||||||
|
|
||||||
|
|
||||||
# now check for the header.
|
|
||||||
if test "${AST_OSS_FOUND}" = "yes"; then
|
|
||||||
OSS_LIB="${pbxlibdir} -lossaudio "
|
|
||||||
# if --with-OSS=DIR has been specified, use it.
|
|
||||||
if test "x${OSS_DIR}" != "x"; then
|
|
||||||
OSS_INCLUDE="-I${OSS_DIR}/include"
|
|
||||||
fi
|
|
||||||
OSS_INCLUDE="${OSS_INCLUDE} "
|
|
||||||
|
|
||||||
# check for the header
|
|
||||||
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
|
|
||||||
CPPFLAGS="${CPPFLAGS} ${OSS_INCLUDE}"
|
|
||||||
ac_fn_c_check_header_mongrel "$LINENO" "soundcard.h" "ac_cv_header_soundcard_h" "$ac_includes_default"
|
|
||||||
if test "x$ac_cv_header_soundcard_h" = xyes; then :
|
|
||||||
OSS_HEADER_FOUND=1
|
|
||||||
else
|
|
||||||
OSS_HEADER_FOUND=0
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
|
|
||||||
|
|
||||||
if test "x${OSS_HEADER_FOUND}" = "x0" ; then
|
|
||||||
OSS_LIB=""
|
|
||||||
OSS_INCLUDE=""
|
|
||||||
else
|
|
||||||
|
|
||||||
PBX_OSS=1
|
|
||||||
cat >>confdefs.h <<_ACEOF
|
|
||||||
#define HAVE_OSS 1
|
|
||||||
_ACEOF
|
|
||||||
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
PG_CONFIG=No
|
PG_CONFIG=No
|
||||||
if test "${USE_PGSQL}" != "no"; then
|
if test "${USE_PGSQL}" != "no"; then
|
||||||
if test "x${PGSQL_DIR}" != "x"; then
|
if test "x${PGSQL_DIR}" != "x"; then
|
||||||
|
@@ -524,7 +524,6 @@ AST_EXT_LIB_SETUP([OPENR2], [MFR2], [openr2])
|
|||||||
AST_EXT_LIB_SETUP([OPUS], [Opus], [opus])
|
AST_EXT_LIB_SETUP([OPUS], [Opus], [opus])
|
||||||
AST_EXT_LIB_SETUP([OPUSFILE], [Opusfile], [opusfile])
|
AST_EXT_LIB_SETUP([OPUSFILE], [Opusfile], [opusfile])
|
||||||
AST_EXT_LIB_SETUP([OSPTK], [OSP Toolkit], [osptk])
|
AST_EXT_LIB_SETUP([OSPTK], [OSP Toolkit], [osptk])
|
||||||
AST_EXT_LIB_SETUP([OSS], [Open Sound System], [oss])
|
|
||||||
AST_EXT_LIB_SETUP([PGSQL], [PostgreSQL], [postgres])
|
AST_EXT_LIB_SETUP([PGSQL], [PostgreSQL], [postgres])
|
||||||
AST_EXT_LIB_SETUP([BEANSTALK], [Beanstalk Job Queue], [beanstalk])
|
AST_EXT_LIB_SETUP([BEANSTALK], [Beanstalk Job Queue], [beanstalk])
|
||||||
|
|
||||||
@@ -2344,11 +2343,6 @@ AST_EXT_LIB_CHECK([BLUETOOTH], [bluetooth], [ba2str], [bluetooth/bluetooth.h])
|
|||||||
|
|
||||||
AST_EXT_LIB_CHECK([BEANSTALK], [beanstalk], [bs_version], [beanstalk.h])
|
AST_EXT_LIB_CHECK([BEANSTALK], [beanstalk], [bs_version], [beanstalk.h])
|
||||||
|
|
||||||
# possible places for oss definitions
|
|
||||||
AST_EXT_LIB_CHECK([OSS], [ossaudio], [], [linux/soundcard.h])
|
|
||||||
AST_EXT_LIB_CHECK([OSS], [ossaudio], [], [sys/soundcard.h])
|
|
||||||
AST_EXT_LIB_CHECK([OSS], [ossaudio], [oss_ioctl_mixer], [soundcard.h])
|
|
||||||
|
|
||||||
PG_CONFIG=No
|
PG_CONFIG=No
|
||||||
if test "${USE_PGSQL}" != "no"; then
|
if test "${USE_PGSQL}" != "no"; then
|
||||||
if test "x${PGSQL_DIR}" != "x"; then
|
if test "x${PGSQL_DIR}" != "x"; then
|
||||||
|
6
doc/UPGRADE-staging/chan_oss_removal.txt
Normal file
6
doc/UPGRADE-staging/chan_oss_removal.txt
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
Subject: chan_oss
|
||||||
|
Master-Only: True
|
||||||
|
|
||||||
|
This module was deprecated in Asterisk 16
|
||||||
|
and is now being removed in accordance with
|
||||||
|
the Asterisk Module Deprecation policy.
|
@@ -603,9 +603,6 @@
|
|||||||
/* Define this to indicate the ${OSPTK_DESCRIP} library */
|
/* Define this to indicate the ${OSPTK_DESCRIP} library */
|
||||||
#undef HAVE_OSPTK
|
#undef HAVE_OSPTK
|
||||||
|
|
||||||
/* Define to 1 if you have the Open Sound System library. */
|
|
||||||
#undef HAVE_OSS
|
|
||||||
|
|
||||||
/* Define to 1 if your system defines the file flag O_EVTONLY in fcntl.h */
|
/* Define to 1 if your system defines the file flag O_EVTONLY in fcntl.h */
|
||||||
#undef HAVE_O_EVTONLY
|
#undef HAVE_O_EVTONLY
|
||||||
|
|
||||||
|
@@ -227,11 +227,6 @@ OPUSFILE_LIB=@OPUSFILE_LIB@
|
|||||||
OSPTK_INCLUDE=@OSPTK_INCLUDE@
|
OSPTK_INCLUDE=@OSPTK_INCLUDE@
|
||||||
OSPTK_LIB=@OSPTK_LIB@
|
OSPTK_LIB=@OSPTK_LIB@
|
||||||
|
|
||||||
# ossaudio can optionally use ffmpeg, x11, sdl and sdl_image.
|
|
||||||
# Because sdl_image in turn depends on sdl, we don't duplicate the include
|
|
||||||
OSS_INCLUDE=@OSS_INCLUDE@ @FFMPEG_INCLUDE@ @SDL_INCLUDE@ @X11_INCLUDE@
|
|
||||||
OSS_LIB=@OSS_LIB@ @FFMPEG_LIB@ @SDL_LIB@ @SDL_IMAGE_LIB@ @X11_LIB@
|
|
||||||
|
|
||||||
PGSQL_INCLUDE=@PGSQL_INCLUDE@
|
PGSQL_INCLUDE=@PGSQL_INCLUDE@
|
||||||
PGSQL_LIB=@PGSQL_LIB@
|
PGSQL_LIB=@PGSQL_LIB@
|
||||||
|
|
||||||
|
14
menuselect/configure
vendored
14
menuselect/configure
vendored
@@ -696,6 +696,7 @@ infodir
|
|||||||
docdir
|
docdir
|
||||||
oldincludedir
|
oldincludedir
|
||||||
includedir
|
includedir
|
||||||
|
runstatedir
|
||||||
localstatedir
|
localstatedir
|
||||||
sharedstatedir
|
sharedstatedir
|
||||||
sysconfdir
|
sysconfdir
|
||||||
@@ -777,6 +778,7 @@ datadir='${datarootdir}'
|
|||||||
sysconfdir='${prefix}/etc'
|
sysconfdir='${prefix}/etc'
|
||||||
sharedstatedir='${prefix}/com'
|
sharedstatedir='${prefix}/com'
|
||||||
localstatedir='${prefix}/var'
|
localstatedir='${prefix}/var'
|
||||||
|
runstatedir='${localstatedir}/run'
|
||||||
includedir='${prefix}/include'
|
includedir='${prefix}/include'
|
||||||
oldincludedir='/usr/include'
|
oldincludedir='/usr/include'
|
||||||
docdir='${datarootdir}/doc/${PACKAGE}'
|
docdir='${datarootdir}/doc/${PACKAGE}'
|
||||||
@@ -1029,6 +1031,15 @@ do
|
|||||||
| -silent | --silent | --silen | --sile | --sil)
|
| -silent | --silent | --silen | --sile | --sil)
|
||||||
silent=yes ;;
|
silent=yes ;;
|
||||||
|
|
||||||
|
-runstatedir | --runstatedir | --runstatedi | --runstated \
|
||||||
|
| --runstate | --runstat | --runsta | --runst | --runs \
|
||||||
|
| --run | --ru | --r)
|
||||||
|
ac_prev=runstatedir ;;
|
||||||
|
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
|
||||||
|
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
|
||||||
|
| --run=* | --ru=* | --r=*)
|
||||||
|
runstatedir=$ac_optarg ;;
|
||||||
|
|
||||||
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
|
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
|
||||||
ac_prev=sbindir ;;
|
ac_prev=sbindir ;;
|
||||||
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
|
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
|
||||||
@@ -1166,7 +1177,7 @@ fi
|
|||||||
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
||||||
datadir sysconfdir sharedstatedir localstatedir includedir \
|
datadir sysconfdir sharedstatedir localstatedir includedir \
|
||||||
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
||||||
libdir localedir mandir
|
libdir localedir mandir runstatedir
|
||||||
do
|
do
|
||||||
eval ac_val=\$$ac_var
|
eval ac_val=\$$ac_var
|
||||||
# Remove trailing slashes.
|
# Remove trailing slashes.
|
||||||
@@ -1319,6 +1330,7 @@ Fine tuning of the installation directories:
|
|||||||
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
||||||
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
||||||
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
||||||
|
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
|
||||||
--libdir=DIR object code libraries [EPREFIX/lib]
|
--libdir=DIR object code libraries [EPREFIX/lib]
|
||||||
--includedir=DIR C header files [PREFIX/include]
|
--includedir=DIR C header files [PREFIX/include]
|
||||||
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
||||||
|
Reference in New Issue
Block a user