cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to ptlib-2.12.9.

Browse Source 
Drop support for v4l2, our implementation is seriously lacking behind.
This commit is contained in:
ajacoutot 2014-04-25 11:17:26 +00:00
parent bbca5c012d
commit fc85f823df
23 changed files with 199 additions and 455 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
devel/ptlib/Makefile
View File

@ -1,16 +1,15 @@
# $OpenBSD: Makefile,v 1.22 2013/10/31 21:12:13 sthen Exp $
# $OpenBSD: Makefile,v 1.23 2014/04/25 11:17:26 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= portable tools library
V= 2.10.11
V= 2.12.9
DISTNAME= ptlib-${V}
REVISION= 0
EXTRACT_SUFX= .tar.bz2
SUBST_VARS= V
SHARED_LIBS= pt 5.2 # 2.10.11
SHARED_LIBS= pt 7.0
CATEGORIES= devel telephony
@ -35,49 +34,35 @@ ALL_TARGET= default #${WRKSRC}/Makefile
USE_GMAKE= Yes
NO_TEST= Yes
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/plugins
CONFIGURE_STYLE=gnu
# needed because it gets appended to STDCCFLAGS in unix.mak
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --enable-plugins \
--enable-sndio \
--disable-esd \
--disable-lua \
--disable-oss \
--disable-pulse
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--disable-static \
--disable-pulse \
--enable-sndio
# XXX error: 'struct v4l2_frmsizeenum' has no member named 'discrete'
CONFIGURE_ARGS+=--disable-v4l2
# XXX needs /proc/net/if_inet6
CONFIGURE_ARGS+=--disable-ipv6
# see pre-configure
AUTOCONF_VERSION= 2.68
AUTOMAKE_VERSION= 1.10
BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
# XXX our libpcap is too old
CONFIGURE_ARGS+=--disable-pcap
MAKE_ENV= VERBOSE=1
MAKE_FLAGS= MAJOR_VERSION=${LIBpt_VERSION:R} \
MINOR_VERSION=${LIBpt_VERSION:E} \
LIB_SONAME=libpt.so.${LIBpt_VERSION} \
DEBUG_SONAME=libpt_d.so.${LIBpt_VERSION}
post-extract:
@mkdir ${WRKSRC}/plugins/sound_sndio
@cp ${FILESDIR}/{Makefile,sound_sndio.*} ${WRKSRC}/plugins/sound_sndio
MINOR_VERSION=${LIBpt_VERSION:E}
pre-configure:
${SUBST_CMD} ${WRKSRC}/make/common.mak \
${WRKSRC}/make/unix.mak \
${WRKSRC}/src/ptlib/common/pluginmgr.cxx
cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} aclocal
cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} autoconf
cd ${WRKSRC}/plugins && env AUTOCONF_VERSION=${AUTOCONF_VERSION} autoconf
mkdir ${WRKSRC}/plugins/sound_sndio
cp ${FILESDIR}/{Makefile,sound_sndio.*} ${WRKSRC}/plugins/sound_sndio
${SUBST_CMD} ${WRKSRC}/make/unix.mak
post-install:
${INSTALL_DATA} ${WRKSRC}/version.h ${PREFIX}/share/ptlib
rm ${PREFIX}/lib/libpt_s.a
.include <bsd.port.mk>

4
devel/ptlib/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (ptlib-2.10.11.tar.bz2) = J6i6H9FHGVwLMQiX+B0m9zmWt3sYFH5YdjhETPrNaBo=
SIZE (ptlib-2.10.11.tar.bz2) = 3736259
SHA256 (ptlib-2.12.9.tar.bz2) = 440xokpBVGt6hGc/nEL/q2Dr2DcnJUz1vfuF2kZWWt8=
SIZE (ptlib-2.12.9.tar.bz2) = 4134345

19
devel/ptlib/patches/patch-Makefile_in
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.2 2011/10/26 16:59:09 ajacoutot Exp $
--- Makefile.in.orig Wed Oct 26 10:24:43 2011
+++ Makefile.in Wed Oct 26 10:25:11 2011
@@ -119,6 +119,7 @@ install:
$(INSTALL) -m 444 $$lib $(DESTDIR)$(LIBDIR); \
fi ) \
done )
+ifneq ($(OSTYPE),OpenBSD)
( if test -e $(PT_LIBDIR)/$(LIB_SONAME); then \
(cd $(DESTDIR)$(LIBDIR) ; \
rm -f $(PTLIB_FILE) ; \
@@ -131,6 +132,7 @@ install:
ln -sf $(DEBUG_SONAME) $(PTLIB_DEBUG_FILE) \
) \
fi )
+endif
ifeq (1, $(HAS_PLUGINS))
if test -e $(PT_LIBDIR)/device/; then \
cd $(PT_LIBDIR)/device/; \

98
devel/ptlib/patches/patch-configure Normal file
View File

@ -0,0 +1,98 @@
$OpenBSD: patch-configure,v 1.1 2014/04/25 11:17:26 ajacoutot Exp $
Cannot use autoconf: http://sourceforge.net/p/opalvoip/feature-requests/18/
--- configure.orig Mon Feb 17 03:14:21 2014
+++ configure Sat Apr 19 20:07:46 2014
@@ -640,6 +640,7 @@ HAS_V4L
HAS_AUDIOSHM
HAS_SUNAUDIO
HAS_PULSE
+HAS_SNDIO
HAS_OSS
HAS_ESD
HAS_ALSA
@@ -904,6 +905,7 @@ with_plugin_installdir
enable_alsa
enable_esd
enable_oss
+enable_sndio
enable_pulse
enable_sunaudio
enable_shmaudio
@@ -1617,6 +1619,7 @@ Optional Features:
--disable-alsa disable ALSA audio support
--disable-esd disable ESD audio support
--disable-oss disable OSS audio support
+ --disable-sndio disable SNDIO audio support
--disable-pulse disable Pulse audio support
--disable-sunaudio disable Sun audio support
--disable-shmaudio disable shm audio support
@@ -5225,7 +5228,8 @@ case "$target_os" in
OpenBSD )
OS_TAG="P_OPENBSD"
- ENDLDLIBS="-lossaudio"
+ ENDLDLIBS=""
+ LDSOFLAGS="-shared"
need_pragma=yes
;;
@@ -8079,6 +8083,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
$as_echo_n "checking if <sasl/sasl.h> works... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+ #include <stdlib.h> /* size_t */
#include <sasl/sasl.h>
int
main ()
@@ -12185,7 +12190,7 @@ $as_echo "no" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
case "$target_os" in
- freebsd*|openbsd*|netbsd*|darwin*|beos*)
+ FreeBSD*|OpenBSD*|NetBSD*|Darwin*|beos*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lc" >&5
$as_echo_n "checking for dlopen in -lc... " >&6; }
if ${ac_cv_lib_c_dlopen+:} false; then :
@@ -12479,6 +12484,32 @@ fi
fi
+ # Check whether --enable-sndio was given.
+if test "${enable_sndio+set}" = set; then :
+ enableval=$enable_sndio;
+else
+ enable_sndio=no
+fi
+
+ PTLIB_SNDIO=no
+ if test "x${enable_sndio}" = "xno" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: SNDIO audio disabled by user" >&5
+$as_echo "$as_me: SNDIO audio disabled by user" >&6;}
+ else
+ ac_fn_c_check_header_mongrel "$LINENO" "sndio.h" "ac_cv_header_sndio_h" "$ac_includes_default"
+if test "x$ac_cv_header_sndio_h" = xyes; then :
+
+ HAS_SNDIO=1
+
+ PTLIB_SNDIO=yes
+
+
+fi
+
+
+ fi
+
+
# Check whether --enable-pulse was given.
if test "${enable_pulse+set}" = set; then :
enableval=$enable_pulse;
@@ -14345,6 +14376,7 @@ echo " Audio : ${PTLIB_AUD
echo " ALSA : ${PTLIB_ALSA}"
echo " ESD : ${PTLIB_ESD}"
echo " OSS : ${PTLIB_OSS}"
+echo " SNDIO : ${PTLIB_SNDIO}"
echo " Pulse : ${PTLIB_PULSE}"
echo " Sun : ${PTLIB_SUNAUDIO}"
echo " shm : ${PTLIB_AUDIOSHM}"

53
devel/ptlib/patches/patch-configure_ac
View File

@ -1,53 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.6 2012/08/25 13:15:23 ajacoutot Exp $
--- configure.ac.orig Thu Aug 23 04:13:11 2012
+++ configure.ac Fri Aug 24 07:59:24 2012
@@ -207,7 +207,7 @@ case "$target_os" in
openbsd* ) OSTYPE=OpenBSD ;
OS_TAG="P_OPENBSD" ;
OSRELEASE="`sysctl -n kern.osrevision`" ;
- ENDLDLIBS="-lossaudio" ;
+ ENDLDLIBS="" ;
need_pragma=yes ;
AC_DEFINE(P_PTHREADS, 1, "PThreads found")
AC_CHECK_FUNC([swab], [AC_DEFINE([USE_SYSTEM_SWAB], [], [Use system swab()] )] )
@@ -314,8 +314,12 @@ case "$target_cpu" in
LIB64=1
;;
- sparc | sparc64 )
+ sparc )
MACHTYPE=sparc
+ ;;
+
+ sparc64 )
+ MACHTYPE=sparc
P_64BIT=1
LIB64=1
;;
@@ -1285,7 +1289,8 @@ else
if test $HAS_IPV6 = no ; then
AC_MSG_RESULT(no)
else
- AC_TRY_COMPILE([#include <sys/socket.h>
+ AC_TRY_COMPILE([#include <sys/types.h>
+ #include <sys/socket.h>
#include <netdb.h>],
[getnameinfo(0, 0, 0, 0, 0, 0, 0);], HAS_IPV6=yes, HAS_IPV6=no)
if test $HAS_IPV6 = no ; then
@@ -1577,7 +1582,7 @@ dnl ##################################################
dnl check for video capture support.
dnl videodev.h on linux
dnl machine/ioctl_meteor on FreeBSD
-dnl i386/ioctl_meteor on OpenBSD
+dnl dev/ic/bt8xx (bktr) and sys/videoio (v4l2) on OpenBSD
dnl dev/ic/bt8xx on NetBSD
HAS_VIDEO_CAPTURE=
@@ -1623,6 +1628,7 @@ if test "x${HAS_AUDIO}" = "x1" ; then
dnl these are needed to pass through to the plugin configure program
AC_ARG_ENABLE(alsa, [ --enable-alsa enable ALSA audio support],enable_alsa=$enableval)
AC_ARG_ENABLE(oss, [ --enable-oss enable OSS audio support],enable_oss=$enableval)
+ AC_ARG_ENABLE(sndio,[ --enable-sndio enable sndio audio support],enable_sndio=$enableval)
AC_ARG_ENABLE(pulse, [ --enable-pulse enable PULSE audio support],enable_pulse=$enableval)
fi

16
devel/ptlib/patches/patch-include_ptlib_unix_ptlib_contain_h
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-include_ptlib_unix_ptlib_contain_h,v 1.2 2011/10/30 12:49:49 ajacoutot Exp $
contain.h:81: error: 'intptr_t' does not name a type
--- include/ptlib/unix/ptlib/contain.h.orig Fri Oct 14 08:54:58 2011
+++ include/ptlib/unix/ptlib/contain.h Sun Oct 30 13:27:57 2011
@@ -32,6 +32,9 @@
*/
#include "pmachdep.h"
+#ifdef P_OPENBSD
+#include <stdint.h>
+#endif
#include <unistd.h>
#include <ctype.h>
#include <limits.h>

16
devel/ptlib/patches/patch-include_ptlib_unix_ptlib_platform_h Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-include_ptlib_unix_ptlib_platform_h,v 1.1 2014/04/25 11:17:27 ajacoutot Exp $
include/ptlib/unix/ptlib/platform.h:601: error: 'intptr_t' does not name a type
include/ptlib/unix/ptlib/platform.h:602: error: 'uintptr_t' does not name a type
include/ptlib/thread.h:344: error: 'INT' has not been declared
--- include/ptlib/unix/ptlib/platform.h.orig Sat Apr 19 20:18:19 2014
+++ include/ptlib/unix/ptlib/platform.h Sat Apr 19 20:18:57 2014
@@ -119,6 +119,7 @@ typedef int socklen_t;
#include <paths.h>
#include <dlfcn.h>
+#include <stdint.h>
#include <termios.h>
#include <sys/fcntl.h>
#include <sys/filio.h>

12
devel/ptlib/patches/patch-make_common_mak
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-make_common_mak,v 1.3 2013/10/02 10:45:25 ajacoutot Exp $
--- make/common.mak.orig Thu Aug 15 01:20:27 2013
+++ make/common.mak Tue Oct 1 20:05:32 2013
@@ -164,7 +164,7 @@ TARGET_LIBS = $(PTLIBDIR)/lib_$(PLATFORM_TYPE)/$(PTLIB
# distinguish betweek building and using pwlib
ifeq (,$(wildcard $(PTLIBDIR)/src))
-TARGET_LIBS = $(SYSLIBDIR)/$(PTLIB_FILE)
+TARGET_LIBS = $(SYSLIBDIR)/$(PTLIB_FILE).${LIBpt_VERSION}
endif
$(TARGET): $(OBJS) $(TARGET_LIBS)

36
devel/ptlib/patches/patch-make_lib_mak
View File

@ -1,36 +0,0 @@
$OpenBSD: patch-make_lib_mak,v 1.10 2013/10/02 10:45:25 ajacoutot Exp $
--- make/lib.mak.orig Thu Aug 15 01:20:27 2013
+++ make/lib.mak Tue Oct 1 17:33:44 2013
@@ -28,6 +28,13 @@
# $Date: 2013/10/02 10:45:25 $
#
+ifeq ($(OSTYPE),OpenBSD)
+ ifeq ($(BUILD_TYPE),.)
+ LIBNAME_PAT = $(LIB_FILENAME).$(MAJOR_VERSION).$(MINOR_VERSION)
+ else
+ LIBNAME_PAT = $(LIB_FILENAME).$(MAJOR_VERSION).$(MINOR_VERSION)-$(BUILD_TYPE)
+ endif
+else
ifeq (,$(findstring $(OSTYPE),Darwin cygwin mingw))
ifeq ($(BUILD_TYPE),.)
LIBNAME_PAT = $(LIB_FILENAME).$(MAJOR_VERSION).$(MINOR_VERSION).$(BUILD_NUMBER)
@@ -41,6 +48,7 @@ else
LIBNAME_PAT = $(subst .$(LIB_SUFFIX),.$(MAJOR_VERSION).$(MINOR_VERSION)-$(BUILD_TYPE)$(BUILD_NUMBER).$(LIB_SUFFIX),$(LIB_FILENAME))
endif
endif
+endif
LIB_SONAME = $(LIBNAME_PAT)
@@ -101,6 +109,10 @@ ifeq ($(P_SHAREDLIB),1)
LDSOOPTS += -Wl,-soname,$(LIB_SONAME)
endif
endif
+ endif
+
+ ifeq ($(OSTYPE),OpenBSD)
+ LDSOOPTS += -fPIC
endif
$(LIBDIR)/$(LIB_FILENAME): $(LIBDIR)/$(LIBNAME_PAT)

26
devel/ptlib/patches/patch-make_toplevel_mak Normal file
View File

@ -0,0 +1,26 @@
$OpenBSD: patch-make_toplevel_mak,v 1.1 2014/04/25 11:17:27 ajacoutot Exp $
We only use versioned libraries (.so.X.Y versus .so).
(PTLIB_FILE = PTLIB_SONAME)
--- make/toplevel.mak.orig Mon Feb 17 03:14:37 2014
+++ make/toplevel.mak Sat Apr 19 20:07:46 2014
@@ -166,18 +166,6 @@ install:
$(INSTALL) -m 755 $$lib $(DESTDIR)$(libdir); \
fi ) \
done )
- ( if test -e $(PTLIB_LIBDIR)/$(PTLIB_SONAME); then \
- (cd $(DESTDIR)$(libdir) ; \
- rm -f $(PTLIB_FILE) ; \
- ln -sf $(PTLIB_SONAME) $(PTLIB_FILE) \
- ) \
- fi )
- ( if test -e $(PTLIB_LIBDIR)/$(PTLIB_DEBUG_SONAME); then \
- (cd $(DESTDIR)$(libdir) ; \
- rm -f $(PTLIB_DEBUG_FILE) ; \
- ln -sf $(PTLIB_DEBUG_SONAME) $(PTLIB_DEBUG_FILE) \
- ) \
- fi )
ifeq (1, $(HAS_PLUGINS))
if test -e $(PTLIB_LIBDIR)/device/; then \
cd $(PTLIB_LIBDIR)/device/; \

45
devel/ptlib/patches/patch-make_unix_mak
View File

@ -1,8 +1,12 @@
$OpenBSD: patch-make_unix_mak,v 1.4 2012/08/25 13:15:24 ajacoutot Exp $
--- make/unix.mak.orig Thu Aug 23 04:12:44 2012
+++ make/unix.mak Fri Aug 24 07:59:24 2012
@@ -235,11 +235,19 @@ ifeq ($(MACHTYPE),x86)
#STDCCFLAGS += -m486
$OpenBSD: patch-make_unix_mak,v 1.5 2014/04/25 11:17:27 ajacoutot Exp $
Make sure _SONAME is versioned (.so.X.Y versus .so).
(overriding PTLIB_FILE will drop the _s.a static lib but we don't use it)
--- make/unix.mak.orig Mon Feb 17 03:14:37 2014
+++ make/unix.mak Mon Apr 21 21:49:55 2014
@@ -192,11 +192,18 @@ ifeq ($(target_cpu),x86)
#PTLIB_CFLAGS += -m486
endif
-LDLIBS += -lossaudio
@ -11,25 +15,26 @@ $OpenBSD: patch-make_unix_mak,v 1.4 2012/08/25 13:15:24 ajacoutot Exp $
+endif
+ifeq ($(MACHTYPE),sparc64)
+STDCCFLAGS += -DP_64BIT
+STDCCFLAGS += -DP_64BIT
+endif
+
P_USE_RANLIB := 1
#STDCCFLAGS += -DP_USE_PRAGMA # migrated to configure
+STDCCFLAGS += -fPIC -DPIC
#PTLIB_CFLAGS += -DP_USE_PRAGMA # migrated to configure
+SYSLIBDIR := $(shell $(PTLIBDIR)/make/ptlib-config --libdir)
+STDCCFLAGS += -fPIC -DPIC
endif # OpenBSD
@@ -693,7 +701,9 @@ ifneq ($(OSTYPE),Darwin)
STDCCFLAGS += -xO3
endif
else
- STDCCFLAGS += -Os
+ ifneq ($(OSTYPE),OpenBSD)
+ STDCCFLAGS += -Os
+ endif
endif
else
STDCCFLAGS += -O2
@@ -571,6 +578,12 @@ else
PTLIB_DEBUG_SONAME = $(subst .$(LIB_SUFFIX),.$(MAJOR_VERSION).$(MINOR_VERSION)$(BUILD_TYPE)$(BUILD_NUMBER).$(LIB_SUFFIX),$(PTLIB_DEBUG_FILE))
endif
+ifeq ($(target_os),OpenBSD)
+ PTLIB_FILE = lib$(PTLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX).${LIBpt_VERSION}
+ PTLIB_DEBUG_FILE= lib$(PTLIB_BASE)_d$(LIB_TYPE).$(LIB_SUFFIX).${LIBpt_VERSION}
+ PTLIB_SONAME = $(PTLIB_FILE)
+ PTLIB_DEBUG_SONAME = $(PTLIB_DEBUG_FILE)
+endif
###############################################################################
#

8
devel/ptlib/patches/patch-plugins_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-plugins_Makefile_in,v 1.2 2011/10/26 16:59:09 ajacoutot Exp $
--- plugins/Makefile.in.orig Fri May 7 06:42:24 2010
+++ plugins/Makefile.in Sat Jun 26 16:45:04 2010
@@ -51,6 +51,16 @@ DEFAULT_SOUND = sound_esd
$OpenBSD: patch-plugins_Makefile_in,v 1.3 2014/04/25 11:17:27 ajacoutot Exp $
--- plugins/Makefile.in.orig Tue Sep 3 04:33:24 2013
+++ plugins/Makefile.in Mon Sep 23 08:29:16 2013
@@ -50,6 +50,16 @@ DEFAULT_SOUND = sound_esd
endif
endif

36
devel/ptlib/patches/patch-plugins_configure_in
View File

@ -1,36 +0,0 @@
$OpenBSD: patch-plugins_configure_in,v 1.3 2011/10/28 12:15:36 ajacoutot Exp $
--- plugins/configure.in.orig Fri Oct 14 08:54:54 2011
+++ plugins/configure.in Fri Oct 28 12:21:46 2011
@@ -107,6 +107,23 @@ if test "${enable_pulse}z" = "yesz" ; then
fi
dnl #########################################################################
+dnl check for sndio sound support
+dnl ########################################################################
+
+AC_ARG_ENABLE(sndio, [ --enable-sndio enable sndio audio support],,enable_sndio=no)
+
+if test "${enable_sndio}z" = "yesz" ; then
+ AC_CHECK_HEADER(sndio.h, SNDCARDHDR=1)
+ AC_MSG_CHECKING(for sndio sound support)
+ if test "${SNDCARDHDR}z" != "z"; then
+ AC_SUBST(HAS_SNDIO, 1)
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ fi
+fi
+
+dnl #########################################################################
dnl check for sunaudio sound support
dnl ########################################################################
@@ -176,7 +193,7 @@ AC_ARG_ENABLE(v4l2, [ --enable-v4l2 enable
if test "${enable_v4l2}z" = "yesz" ; then
case "$target_os" in
solaris* | sunos* ) V4L2_HEADER="sys/videodev2.h" ; ;;
- netbsd* ) V4L2_HEADER="sys/videoio.h" ; ;;
+ netbsd* | openbsd*) V4L2_HEADER="sys/videoio.h" ; ;;
* ) V4L2_HEADER="linux/videodev2.h" ; ;;
esac

13
devel/ptlib/patches/patch-plugins_vidinput_bsd_vidinput_bsd_h
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-plugins_vidinput_bsd_vidinput_bsd_h,v 1.2 2011/10/26 16:59:09 ajacoutot Exp $
--- plugins/vidinput_bsd/vidinput_bsd.h.orig Fri Oct 14 08:54:54 2011
+++ plugins/vidinput_bsd/vidinput_bsd.h Wed Oct 26 10:28:10 2011
@@ -6,6 +6,9 @@
#pragma interface
#endif
+#ifdef P_OPENBSD
+#include <sys/types.h>
+#endif
#include <sys/mman.h>
#include <ptlib.h>

12
devel/ptlib/patches/patch-plugins_vidinput_v4l2_vidinput_names_cxx
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-plugins_vidinput_v4l2_vidinput_names_cxx,v 1.1.1.1 2010/03/23 21:10:17 ajacoutot Exp $
--- plugins/vidinput_v4l2/vidinput_names.cxx.orig Wed Jan 27 14:28:18 2010
+++ plugins/vidinput_v4l2/vidinput_names.cxx Wed Jan 27 14:28:05 2010
@@ -36,7 +36,7 @@ void V4LXNames::ReadDeviceDirectory(PDirectory devdir
if (!devdir.Open())
return;
-#if defined (P_SOLARIS) || defined (P_NETBSD)
+#if defined (P_SOLARIS) || defined (P_NETBSD) || defined (P_OPENBSD)
int devnum = 0;
do {
PString filename = devdir.GetEntryName();

25
devel/ptlib/patches/patch-ptlib_m4
View File

@ -1,25 +0,0 @@
$OpenBSD: patch-ptlib_m4,v 1.4 2013/10/02 10:45:26 ajacoutot Exp $
--- ptlib.m4.orig Thu Aug 15 01:20:33 2013
+++ ptlib.m4 Tue Oct 1 17:57:17 2013
@@ -332,7 +332,8 @@ AC_DEFUN([PTLIB_CHECK_SASL_INCLUDE],
if test "x${HAS_INCLUDE_SASL_H}" != "xyes" ; then
AC_MSG_CHECKING([if <sasl/sasl.h> works])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <sasl/sasl.h> ]],
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <stdlib.h>
+ #include <sasl/sasl.h> ]],
[[ int v = SASL_LOG_PASS; ]])],
[
AC_MSG_RESULT(yes)
@@ -368,7 +369,10 @@ AC_DEFUN([PTLIB_FIND_OPENLDAP],
dnl posix4 is required by libldap_r on Solaris
ptlib_openldap_libs="-lposix4"
;;
- * )
+ openbsd*)
+ ptlib_openldap_libs="-llber -lldap_r -pthread"
+ ;;
+ * )
ptlib_openldap_libs="-llber -lldap_r"
esac

13
devel/ptlib/patches/patch-src_ptlib_common_osutils_cxx
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-src_ptlib_common_osutils_cxx,v 1.3 2012/03/02 09:03:52 ajacoutot Exp $
--- src/ptlib/common/osutils.cxx.orig Tue Feb 21 23:57:00 2012
+++ src/ptlib/common/osutils.cxx Fri Mar 2 08:37:53 2012
@@ -36,6 +36,9 @@
#include <map>
#include <fstream>
#include <algorithm>
+#ifdef P_OPENBSD
+#include <stdint.h>
+#endif
#include <ctype.h>
#include <ptlib/pfactory.h>

12
devel/ptlib/patches/patch-src_ptlib_common_pluginmgr_cxx
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_ptlib_common_pluginmgr_cxx,v 1.2 2011/10/26 16:59:09 ajacoutot Exp $
--- src/ptlib/common/pluginmgr.cxx.orig Fri Jan 29 13:42:56 2010
+++ src/ptlib/common/pluginmgr.cxx Fri Jan 29 13:43:47 2010
@@ -26,7 +26,7 @@
# elif defined (_WIN32)
# define P_DEFAULT_PLUGIN_DIR ".;C:\\Program Files\\PTLib Plug Ins;C:\\PTLIB_PLUGINS;C:\\PWLIB_PLUGINS"
# else
-# define P_DEFAULT_PLUGIN_DIR ".:/usr/lib/ptlib:/usr/lib/pwlib"
+# define P_DEFAULT_PLUGIN_DIR ".:${TRUEPREFIX}/lib/ptlib:${LOCALBASE}/lib/pwlib"
# endif
#endif

2
devel/ptlib/patches/patch-src_ptlib_unix_osutil_cxx
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_ptlib_unix_osutil_cxx,v 1.1 2013/12/06 08:03:57 ajacoutot Exp $
$OpenBSD: patch-src_ptlib_unix_osutil_cxx,v 1.2 2014/04/25 11:17:27 ajacoutot Exp $
Remove prehistorical header which is not even used.

111
devel/ptlib/patches/patch-src_ptlib_unix_socket_cxx
View File

@ -1,111 +0,0 @@
$OpenBSD: patch-src_ptlib_unix_socket_cxx,v 1.2 2011/10/26 16:59:09 ajacoutot Exp $
--- src/ptlib/unix/socket.cxx.orig Fri Oct 14 08:54:51 2011
+++ src/ptlib/unix/socket.cxx Sat Oct 22 12:41:24 2011
@@ -69,7 +69,7 @@
#include <netinet/if_ether.h>
#endif
-#if defined(P_NETBSD)
+#if defined(P_NETBSD) || defined(P_OPENBSD)
#include <ifaddrs.h>
#endif
@@ -484,9 +484,11 @@ PBoolean PIPSocket::IsLocalHost(const PString & hostna
PUDPSocket sock;
PBYTEArray buffer;
+#if !defined(P_NETBSD) && !defined(P_OPENBSD)
struct ifconf ifConf;
+#endif
-#if defined(P_NETBSD)
+#if defined(P_NETBSD) || defined(P_OPENBSD)
struct ifaddrs *ifap, *ifa;
PAssert(getifaddrs(&ifap) == 0, "getifaddrs failed");
@@ -509,7 +511,7 @@ PBoolean PIPSocket::IsLocalHost(const PString & hostna
while (ifName < ifEndList) {
#endif
struct ifreq ifReq;
-#if !defined(P_NETBSD)
+#if !defined(P_NETBSD) && !defined(P_OPENBSD)
memcpy(&ifReq, ifName, sizeof(ifreq));
#else
memset(&ifReq, 0, sizeof(ifReq));
@@ -526,14 +528,14 @@ PBoolean PIPSocket::IsLocalHost(const PString & hostna
}
}
-#if defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_MACOSX) || defined(P_VXWORKS) || defined(P_RTEMS) || defined(P_QNX)
+#if defined(P_FREEBSD) || defined(P_MACOSX) || defined(P_VXWORKS) || defined(P_RTEMS) || defined(P_QNX)
// move the ifName pointer along to the next ifreq entry
ifName = (struct ifreq *)((char *)ifName + _SIZEOF_ADDR_IFREQ(*ifName));
-#elif !defined(P_NETBSD)
+#elif !defined(P_NETBSD) && !defined(P_OPENBSD)
ifName++;
#endif
}
-#if !defined(P_NETBSD)
+#if !defined(P_NETBSD) && !defined(P_OPENBSD)
}
#endif
@@ -1875,9 +1877,11 @@ PBoolean PIPSocket::GetInterfaceTable(InterfaceTable &
PUDPSocket sock;
PBYTEArray buffer;
+#if !defined(P_NETBSD) && !defined(P_OPENBSD)
struct ifconf ifConf;
+#endif
-#if defined(P_NETBSD)
+#if defined(P_NETBSD) || defined(P_OPENBSD)
struct ifaddrs *ifap, *ifa;
PAssert(getifaddrs(&ifap) == 0, "getifaddrs failed");
@@ -1901,7 +1905,7 @@ PBoolean PIPSocket::GetInterfaceTable(InterfaceTable &
while (ifName < ifEndList) {
#endif
struct ifreq ifReq;
-#if !defined(P_NETBSD)
+#if !defined(P_NETBSD) && !defined(P_OPENBSD)
memcpy(&ifReq, ifName, sizeof(ifreq));
#else
memset(&ifReq, 0, sizeof(ifReq));
@@ -1920,7 +1924,7 @@ PBoolean PIPSocket::GetInterfaceTable(InterfaceTable &
macAddr = PEthSocket::Address((BYTE *)ifReq.ifr_macaddr);
#endif
-#if !defined(P_NETBSD)
+#if !defined(P_NETBSD) && !defined(P_OPENBSD)
memcpy(&ifReq, ifName, sizeof(ifreq));
#else
memset(&ifReq, 0, sizeof(ifReq));
@@ -1932,7 +1936,7 @@ PBoolean PIPSocket::GetInterfaceTable(InterfaceTable &
sockaddr_in * sin = (sockaddr_in *)&ifReq.ifr_addr;
PIPSocket::Address addr = sin->sin_addr;
-#if !defined(P_NETBSD)
+#if !defined(P_NETBSD) && !defined(P_OPENBSD)
memcpy(&ifReq, ifName, sizeof(ifreq));
#else
memset(&ifReq, 0, sizeof(ifReq));
@@ -1966,15 +1970,15 @@ PBoolean PIPSocket::GetInterfaceTable(InterfaceTable &
}
}
-#if defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_MACOSX) || defined(P_VXWORKS) || defined(P_RTEMS) || defined(P_QNX)
+#if defined(P_FREEBSD) || defined(P_MACOSX) || defined(P_VXWORKS) || defined(P_RTEMS) || defined(P_QNX)
// move the ifName pointer along to the next ifreq entry
ifName = (struct ifreq *)((char *)ifName + _SIZEOF_ADDR_IFREQ(*ifName));
-#elif !defined(P_NETBSD)
+#elif !defined(P_NETBSD) && !defined(P_OPENBSD)
ifName++;
#endif
}
-#if !defined(P_NETBSD)
+#if !defined(P_NETBSD) && !defined(P_OPENBSD)
}
#endif

14
devel/ptlib/patches/patch-src_ptlib_unix_svcproc_cxx
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_ptlib_unix_svcproc_cxx,v 1.1.1.1 2010/03/23 21:10:17 ajacoutot Exp $
--- src/ptlib/unix/svcproc.cxx.orig Thu Jun 4 05:56:25 2009
+++ src/ptlib/unix/svcproc.cxx Thu Jun 4 05:57:23 2009
@@ -66,6 +66,10 @@
#include <sys/resource.h>
#endif
+#ifdef P_OPENBSD
+#include <sys/stdint.h>
+#endif
+
#define new PNEW
extern void PXSignalHandler(int);

14
devel/ptlib/patches/patch-src_ptlib_unix_tlib_cxx
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_ptlib_unix_tlib_cxx,v 1.2 2012/08/25 13:15:24 ajacoutot Exp $
--- src/ptlib/unix/tlib.cxx.orig Thu Aug 23 04:12:27 2012
+++ src/ptlib/unix/tlib.cxx Fri Aug 24 08:00:15 2012
@@ -70,6 +70,10 @@
#include <sys/mman.h>
#endif
+#ifdef P_OPENBSD
+#include <sys/stdint.h>
+#endif
+
#if defined(P_LINUX) || defined(P_SUN4) || defined(P_SOLARIS) || defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD) || defined(P_MACOSX) || defined(P_MACOS) || defined (P_AIX) || defined(P_BEOS) || defined(P_IRIX) || defined(P_QNX) || defined(P_GNU_HURD)
#include <sys/utsname.h>
#define HAS_UNAME

20
devel/ptlib/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2013/10/02 10:45:26 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.4 2014/04/25 11:17:27 ajacoutot Exp $
@conflict pwlib-*
@pkgpath devel/pwlib
@pkgpath devel/pwlib,ldap
@ -7,7 +7,6 @@
@pkgpath devel/pwlib,sasl
@pkgpath devel/pwlib,sasl,sdl
@pkgpath devel/pwlib,sdl
bin/ptlib-config
include/ptbuildopts.h
include/ptclib/
include/ptclib/asnber.h
@ -28,6 +27,7 @@ include/ptclib/httpsvc.h
include/ptclib/inetmail.h
include/ptclib/inetprot.h
include/ptclib/ipacl.h
include/ptclib/jscript.h
include/ptclib/lua.h
include/ptclib/memfile.h
include/ptclib/mime.h
@ -46,6 +46,7 @@ include/ptclib/psoap.h
include/ptclib/psockbun.h
include/ptclib/pssl.h
include/ptclib/pstun.h
include/ptclib/pstunsrvr.h
include/ptclib/ptts.h
include/ptclib/pvfiledev.h
include/ptclib/pvidfile.h
@ -57,12 +58,16 @@ include/ptclib/pxmlrpcs.h
include/ptclib/qchannel.h
include/ptclib/random.h
include/ptclib/rfc1155.h
include/ptclib/script.h
include/ptclib/shttpsvc.h
include/ptclib/snmp.h
include/ptclib/socks.h
include/ptclib/spooldir.h
include/ptclib/ssdp.h
include/ptclib/telnet.h
include/ptclib/threadpool.h
include/ptclib/url.h
include/ptclib/vartype.h
include/ptclib/vcard.h
include/ptclib/vsdl.h
include/ptclib/vxml.h
@ -72,9 +77,9 @@ include/ptclib/xmpp_muc.h
include/ptclib/xmpp_roster.h
include/ptlib/
include/ptlib.h
include/ptlib/MacMainIf.h
include/ptlib/args.h
include/ptlib/array.h
include/ptlib/bitwise_enum.h
include/ptlib/channel.h
include/ptlib/conchan.h
include/ptlib/config.h
@ -108,7 +113,6 @@ include/ptlib/psharedptr.h
include/ptlib/pstring.h
include/ptlib/psync.h
include/ptlib/ptime.h
include/ptlib/qos.h
include/ptlib/remconn.h
include/ptlib/safecoll.h
include/ptlib/semaphor.h
@ -135,7 +139,6 @@ include/ptlib/unix/ptlib/bevideo.h
include/ptlib/unix/ptlib/channel.h
include/ptlib/unix/ptlib/conchan.h
include/ptlib/unix/ptlib/config.h
include/ptlib/unix/ptlib/contain.h
include/ptlib/unix/ptlib/critsec.h
include/ptlib/unix/ptlib/dynalink.h
include/ptlib/unix/ptlib/ethsock.h
@ -149,7 +152,7 @@ include/ptlib/unix/ptlib/mail.h
include/ptlib/unix/ptlib/mutex.h
include/ptlib/unix/ptlib/pdirect.h
include/ptlib/unix/ptlib/pipechan.h
include/ptlib/unix/ptlib/pmachdep.h
include/ptlib/unix/ptlib/platform.h
include/ptlib/unix/ptlib/pprocess.h
include/ptlib/unix/ptlib/ptime.h
include/ptlib/unix/ptlib/ptlib.inl
@ -176,7 +179,6 @@ include/ptlib/videoio.h
include/ptlib/videoio1394dc.h
include/ptlib/wxstring.h
@lib lib/libpt.so.${LIBpt_VERSION}
lib/pkgconfig/
lib/pkgconfig/ptlib.pc
lib/ptlib-${V}/
lib/ptlib-${V}/devices/
@ -184,14 +186,12 @@ lib/ptlib-${V}/devices/sound/
lib/ptlib-${V}/devices/sound/sndio_pwplugin.so
lib/ptlib-${V}/devices/videoinput/
lib/ptlib-${V}/devices/videoinput/bsdvideo_pwplugin.so
lib/ptlib-${V}/devices/videoinput/v4l2_pwplugin.so
share/ptlib/
share/ptlib/make/
share/ptlib/make/common.mak
share/ptlib/make/lib.mak
share/ptlib/make/plugins.mak
share/ptlib/make/ptbuildopts.mak
share/ptlib/make/ptlib-config
share/ptlib/make/ptlib.mak
share/ptlib/make/toplevel.mak
share/ptlib/make/unix.mak
share/ptlib/version.h