Bug#545948: ptlib: FTBFS on GNU/kFreeBSD

[Petr Salinger]

Package: ptlib
Version: 2.6.4-1
Severity: important
Tags: patch
User: debian-...@lists.debian.org
Usertags: kfreebsd

Hi,

the current version fails to build on GNU/kFreeBSD.

It needs some tweaks for both source and packaging.
Please find attached patch with tweaks.

It would also be nice if you can ask upstream
to include source changes.

Thanks in advance

                        Petr
diff -u ptlib-2.6.4/debian/control ptlib-2.6.4/debian/control
--- ptlib-2.6.4/debian/control
+++ ptlib-2.6.4/debian/control
@@ -5,7 +5,9 @@
 Uploaders: Mark Purcell <m...@debian.org>, Eugen Dedu <eugen.d...@pu-pm.univ-fcomte.fr>
 Build-Depends: debhelper (>= 7), dpatch, g++ (>= 2.95), autotools-dev, doxygen, pkg-config, bison, flex,
  unixodbc-dev, libssl-dev, libldap2-dev, libsasl2-dev, libkrb5-dev, libexpat1-dev,
- libsdl1.2-dev, libasound2-dev, libdv4-dev, libv4l-dev
+ libsdl1.2-dev, libdv4-dev, 
+ libv4l-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libasound2-dev  [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
 Build-Conflicts:
   libpt2.6.4, libpt2.6.3, libpt2.6.2, libpt2.6.1, libpt2.4.2, libpt2.4.1, libpt2.3-beta1,
   libpt-1.11.2, libpt-1.11.2-ptrace, libpt-1.11.2-develop,
only in patch2:
unchanged:
--- ptlib-2.6.4.orig/configure
+++ ptlib-2.6.4/configure
@@ -3828,7 +3828,7 @@
 
                    ;;
 
-  freebsd* )       OSTYPE=FreeBSD ;
+  freebsd*|kfreebsd* )       OSTYPE=FreeBSD ;
 		   OS_TAG="P_FREEBSD" ;
                    if test "x$OSRELEASE" = "x"; then
                      OSRELEASE="`sysctl -n kern.osreldate`" ;
only in patch2:
unchanged:
--- ptlib-2.6.4.orig/configure.ac
+++ ptlib-2.6.4/configure.ac
@@ -232,7 +232,7 @@
 		   AC_CHECK_FUNC([swab], [AC_DEFINE([USE_SYSTEM_SWAB], [], [Use system swab()] )] )
                    ;;
 
-  freebsd* )       OSTYPE=FreeBSD ;
+  freebsd*|kfreebsd*)       OSTYPE=FreeBSD ;
 		   OS_TAG="P_FREEBSD" ;
                    if test "x$OSRELEASE" = "x"; then
                      OSRELEASE="`sysctl -n kern.osreldate`" ;
only in patch2:
unchanged:
--- ptlib-2.6.4.orig/include/ptlib/unix/ptlib/pmachdep.h
+++ ptlib-2.6.4/include/ptlib/unix/ptlib/pmachdep.h
@@ -92,7 +92,11 @@
 
 #define HAS_IFREQ
 
+#if defined (__GLIBC__)
+#define PSETPGRP()  setpgrp()
+#else
 #define PSETPGRP()  setpgrp(0, 0)
+#endif

 ///////////////////////////////////////////////////////////////////////////////
 #elif defined(P_OPENBSD)
only in patch2:
unchanged:
--- ptlib-2.6.4.orig/include/ptclib/vsdl.h
+++ ptlib-2.6.4/include/ptclib/vsdl.h
@@ -32,7 +32,7 @@
 #if P_SDL
 
 #include <ptlib.h>
-#if defined(P_FREEBSD)
+#if defined(P_FREEBSD) && !defined (__GLIBC__)
 #include <SDL11/SDL.h>
 #else
 #include <SDL/SDL.h>
only in patch2:
unchanged:
--- ptlib-2.6.4.orig/make/unix.mak
+++ ptlib-2.6.4/make/unix.mak
@@ -177,6 +177,11 @@
 P_USE_RANLIB		:= 1
 #STDCCFLAGS      += -DP_USE_PRAGMA		# migrated to configure
 
+ifeq ($(P_SHAREDLIB),1)
+ifndef PROG
+STDCCFLAGS	+= -fPIC -DPIC
+endif # PROG
+endif # P_SHAREDLIB
 
 endif # FreeBSD
 
only in patch2:
unchanged:
--- ptlib-2.6.4.orig/src/ptclib/vsdl.cxx
+++ ptlib-2.6.4/src/ptclib/vsdl.cxx
@@ -43,7 +43,7 @@
 
 extern "C" {
 
-#if defined(P_FREEBSD)
+#if defined(P_FREEBSD) && !defined (__GLIBC__)
 #include <SDL11/SDL.h>
 #else
 #include <SDL/SDL.h>