File ptlib-2.4.2.diff of Package libpt2
Index: configure.ac
===================================================================
--- configure.ac.orig
+++ configure.ac
@@ -218,6 +218,7 @@ case "$target_os" in
OS_TAG="P_LINUX" ;
need_pragma=yes ;
AC_DEFINE(P_PTHREADS, 1, "PThreads found")
+ AC_DEFINE([P_LINUX], [${OSRELEASE}], [is linux])
AC_CHECK_FUNC([swab], [AC_DEFINE([USE_SYSTEM_SWAB], [], [Use system swab()] )] )
;;
@@ -256,7 +257,7 @@ case "$target_os" in
AC_DEFINE(P_PTHREADS, 1, "PThreads found")
dnl According to Andre Schulze <as8@rncmm2.urz.tu-dresden.de>
dnl Solaris swab should not be used
- PTLIB_CHECK_UPAD128( [AC_DEFINE(P_HAS_UPAD128_T)] )
+ PTLIB_CHECK_UPAD128( [AC_DEFINE(P_HAS_UPAD128_T, 1, [UPAD128])] )
PTLIB_CHECK_FDSIZE()
;;
@@ -374,7 +375,7 @@ AC_SUBST(OSTYPE, $OSTYPE)
AC_SUBST(OSRELEASE, $OSRELEASE)
AC_SUBST(TARGETDIR, $TARGETDIR)
-AC_DEFINE_UNQUOTED($OS_TAG, $OSRELEASE)
+AC_DEFINE_UNQUOTED($OS_TAG, $OSRELEASE, [os release])
if test "x$P_64BIT" != "x" ; then
AC_DEFINE([P_64BIT], [1], [64bit architecture])
@@ -611,7 +612,7 @@ else
AC_MSG_RESULT(no)
fi
fi
-AC_DEFINE_UNQUOTED(P_HAS_POSIX_READDIR_R, ${P_HAS_POSIX_READDIR_R})
+AC_DEFINE_UNQUOTED(P_HAS_POSIX_READDIR_R, ${P_HAS_POSIX_READDIR_R}, [posix redir])
@@ -642,7 +643,7 @@ AC_ARG_ENABLE(ansi-bool,
if test "${enable_ansi_bool}x" = "x" ; then
AC_MSG_NOTICE(Using ANSI C++ bool for PBoolean: (PFalse=false PTrue=true))
- AC_DEFINE(P_USE_STANDARD_CXX_BOOL)
+ AC_DEFINE(P_USE_STANDARD_CXX_BOOL, 1, [Using ANSI C++ bool for PBoolean])
else
AC_MSG_NOTICE(Using Windows-like integer BOOL for PBoolean: (PFalse=0 PTrue=1))
fi
@@ -659,7 +660,7 @@ AC_TRY_COMPILE([#include <sys/types.h>
[int t = SOL_IP; t = IP_PKTINFO; struct msghdr *msg; recvmsg(0, msg, 0);], P_HAS_RECVMSG=1)
if test "${P_HAS_RECVMSG}" = "1" ; then
AC_MSG_RESULT(yes)
- AC_DEFINE(P_HAS_RECVMSG, 1)
+ AC_DEFINE(P_HAS_RECVMSG, 1, [HAS_RECVMSG])
else
AC_MSG_RESULT(no)
fi
@@ -676,7 +677,7 @@ if test "${P_HAS_STL_STREAMS}" = 1 ; the
else
AC_MSG_RESULT(no)
fi
-AC_DEFINE_UNQUOTED(P_HAS_STL_STREAMS, ${P_HAS_STL_STREAMS})
+AC_DEFINE_UNQUOTED(P_HAS_STL_STREAMS, ${P_HAS_STL_STREAMS}, [has streams])
dnl ########################################################################
dnl see if using GNU glibc++, because then we have atomic integer operations
@@ -718,8 +719,8 @@ else
fi
fi
-AC_DEFINE_UNQUOTED(P_HAS_ATOMIC_INT, ${P_HAS_ATOMIC_INT})
-AC_DEFINE_UNQUOTED(P_NEEDS_GNU_CXX_NAMESPACE, ${P_NEEDS_GNU_CXX_NAMESPACE})
+AC_DEFINE_UNQUOTED(P_HAS_ATOMIC_INT, ${P_HAS_ATOMIC_INT}, [has atomic int])
+AC_DEFINE_UNQUOTED(P_NEEDS_GNU_CXX_NAMESPACE, ${P_NEEDS_GNU_CXX_NAMESPACE}, [needs gnu cxx namespace])
dnl ########################################################################
dnl check for Unix semaphores
@@ -730,7 +731,7 @@ if test ${OSTYPE} != Darwin ; then
[sem_t *s; sem_init(s, 0, 0);], P_HAS_SEMAPHORES=1)
AC_MSG_CHECKING(if Unix semaphores are available)
if test "${P_HAS_SEMAPHORES}x" != "x" ; then
- AC_DEFINE(P_HAS_SEMAPHORES)
+ AC_DEFINE(P_HAS_SEMAPHORES, 1, [Unix semaphores are available])
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
@@ -744,7 +745,7 @@ if test "${P_HAS_SEMAPHORES}x" = "x" ; t
P_HAS_NAMED_SEMAPHORES=1 )
AC_MSG_CHECKING(if named semaphores are available)
if test "${P_HAS_NAMED_SEMAPHORES}x" != "x"; then
- AC_DEFINE(P_HAS_NAMED_SEMAPHORES)
+ AC_DEFINE(P_HAS_NAMED_SEMAPHORES, 1, [named semaphores are available])
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
@@ -826,7 +827,7 @@ else
AC_MSG_RESULT(no)
fi
fi
-AC_DEFINE_UNQUOTED(P_HAS_RECURSIVE_MUTEX, ${P_HAS_RECURSIVE_MUTEX})
+AC_DEFINE_UNQUOTED(P_HAS_RECURSIVE_MUTEX, ${P_HAS_RECURSIVE_MUTEX}, [recursive mutex])
dnl ########################################################################
@@ -939,7 +940,7 @@ else
if test "x${HAS_RESOLVER}" = "x1" ; then
AC_DEFINE(P_DNS, 1, "resolver libraries found")
if test "${HAS_RES_NINIT}z" != "z" ; then
- AC_DEFINE(P_HAS_RES_NINIT)
+ AC_DEFINE(P_HAS_RES_NINIT, 1, [HAS_RES_NINIT])
fi
fi
fi
@@ -976,7 +977,7 @@ else
PTLIB_CHECK_SASL_INCLUDE([
if test "x${SASL_HEADER}" = "xsasl" ; then
- AC_DEFINE(P_HAS_SASL_SASL_H)
+ AC_DEFINE(P_HAS_SASL_SASL_H, 1, [sasl header])
fi
],
[
@@ -986,10 +987,10 @@ else
if test "x${HAS_SASL2}" = "x1" ; then
ENDLDLIBS="$ENDLDLIBS -lsasl2"
- AC_DEFINE(P_SASL2)
+ AC_DEFINE(P_SASL2, 1, [sasl2])
elif test "x${HAS_SASL}" = "x1" ; then
ENDLDLIBS="$ENDLDLIBS -lsasl"
- AC_DEFINE(P_SASL)
+ AC_DEFINE(P_SASL, 1, [sasl])
fi
fi dnl disable_Sasl
AC_SUBST(HAS_SASL2)
@@ -1002,7 +1003,7 @@ dnl check for mediaLib library
HAS_MEDIALIB=no
AC_CHECK_LIB(mlib, mlib_VideoColorJFIFYCC2RGB420_Nearest, HAS_MEDIALIB=yes, HAS_MEDIALIB=no)
if test $HAS_MEDIALIB = yes; then
- AC_DEFINE(P_MEDIALIB)
+ AC_DEFINE(P_MEDIALIB, 1, [MEDIALIB])
ENDLDLIBS="-lmlib $ENDLDLIBS"
fi
@@ -1131,7 +1132,7 @@ else
PTLIB_FIND_EXPAT([HAS_EXPAT=1], [HAS_EXPAT=])
if test "x${HAS_EXPAT}" = "x1" ; then
- AC_DEFINE(P_OEXPAT, 1, "expat found")
+ AC_DEFINE(P_EXPAT, 1, "expat found")
STDCCFLAGS="$STDCCFLAGS $EXPAT_CFLAGS"
ENDLDLIBS="$ENDLDLIBS $EXPAT_LIBS"
fi
@@ -1192,7 +1193,7 @@ AC_TRY_COMPILE([#include <sys/types.h>
if test $HAS_INET_NTOP = no ; then
AC_MSG_RESULT(no)
else
- AC_DEFINE(P_HAS_INET_NTOP, 1)
+ AC_DEFINE(P_HAS_INET_NTOP, 1, [INET_NTOP])
AC_MSG_RESULT(yes)
fi
@@ -1477,9 +1478,9 @@ if test "x${HAS_VIDEO}" = "x1" ; then
STDCCFLAGS="$STDCCFLAGS ${DIRECTX_INCLUDES}"
HAS_DIRECTSHOW=1
HAS_DIRECTSOUND=1
- AC_DEFINE(P_DIRECTSHOW, 1)
- AC_DEFINE(P_DIRECTX, 1)
- AC_DEFINE(P_DIRECTSOUND, 1)
+ AC_DEFINE(P_DIRECTSHOW, 1, [DIRECTSHOW])
+ AC_DEFINE(P_DIRECTX, 1, [DIRECTX])
+ AC_DEFINE(P_DIRECTSOUND, 1, [DIRECTSOUND])
])
;;
* )
@@ -1555,7 +1556,7 @@ AC_ARG_ENABLE(memcheck,
memcheck=$enableval)
if test "$memcheck" = "yes" ; then
- AC_DEFINE(PMEMORY_CHECK, 1)
+ AC_DEFINE(PMEMORY_CHECK, 1, "Memory checking enabled")
AC_MSG_NOTICE(Memory checking enabled)
fi
Index: src/ptlib/unix/shmvideo.cxx
===================================================================
--- src/ptlib/unix/shmvideo.cxx.orig
+++ src/ptlib/unix/shmvideo.cxx
@@ -19,6 +19,7 @@
#define P_FORCE_STATIC_PLUGIN
+#include <fcntl.h>
#include <ptlib.h>
#include <ptlib/videoio.h>
#include <ptlib/vconvert.h>
