summaryrefslogtreecommitdiff
path: root/devel/pwlib/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/pwlib/files')
-rw-r--r--devel/pwlib/files/patch-configureac154
-rw-r--r--devel/pwlib/files/patch-configurein26
-rw-r--r--devel/pwlib/files/patch-make-common.mak19
-rw-r--r--devel/pwlib/files/patch-makefile14
-rw-r--r--devel/pwlib/files/patch-src-ptclib-ansper.cxx56
-rw-r--r--devel/pwlib/files/patch-src_ptlib_common_getdate.y7
-rw-r--r--devel/pwlib/files/patch-unix70
-rw-r--r--devel/pwlib/files/patch-videoio26
8 files changed, 154 insertions, 218 deletions
diff --git a/devel/pwlib/files/patch-configureac b/devel/pwlib/files/patch-configureac
new file mode 100644
index 000000000000..d923f281db17
--- /dev/null
+++ b/devel/pwlib/files/patch-configureac
@@ -0,0 +1,154 @@
+--- configure.ac.orig Wed Feb 1 14:52:36 2006
++++ configure.ac Wed Feb 1 15:04:55 2006
+@@ -136,7 +136,7 @@
+ x86 | i686 | i586 | i486 | i386 ) MACHTYPE=x86
+ ;;
+
+- x86_64) MACHTYPE=x86_64 ;
++ x86_64|amd64) MACHTYPE=x86_64 ;
+ P_64BIT=1 ;
+ LIB64=1 ;
+ ;;
+@@ -276,7 +276,7 @@
+
+ AC_MSG_CHECKING(if linker accepts -Wreorder)
+ AC_LANG_CONFTEST([[int main(int ac,char **av) { return 0; }]])
+-$STDCXX $CXXFLAGS -Wreorder conftest.cc > /dev/null 2>&1
++$CXX $CXXFLAGS -Wreorder conftest.cc > /dev/null 2>&1
+ if test $? = 0 ; then
+ AC_MSG_RESULT(yes)
+ STDCXXFLAGS="$STDCXXFLAGS -Wreorder"
+@@ -289,7 +289,7 @@
+ # $CXX $CFLAGS -Woverloaded-virtual conftest.cc > /dev/null 2>&1
+ # if test $? = 0 ; then
+ # AC_MSG_RESULT(yes)
+-# STDCCFLAGS="$STDCCFLAGS -Woverloaded-virtual"
++# STDCXXFLAGS="$STDCCFLAGS -Woverloaded-virtual"
+ # else
+ # AC_MSG_RESULT(no)
+ # fi
+@@ -318,7 +318,7 @@
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+- STDCXXFLAGS="$STDCCFLAGS -rtti"
++ STDCXXFLAGS="$STDCXXFLAGS -rtti"
+ fi
+
+ GCSECTIONS=0
+@@ -339,7 +339,7 @@
+ $CXX $CFLAGS -ffunction-sections -c conftest.cc > /dev/null 2>&1
+ if test $? = 0 ; then
+ AC_MSG_RESULT(yes)
+- STDCCFLAGS="$STDCCFLAGS -ffunction-sections"
++ STDCXXFLAGS="$STDCXXFLAGS -ffunction-sections"
+ GCSECTIONS=1
+ else
+ AC_MSG_RESULT(no)
+@@ -355,7 +355,7 @@
+ dnl $CXX $CFLAGS -fdata-sections -c conftest.cc > /dev/null 2>&1
+ dnl if test $? = 0 ; then
+ dnl AC_MSG_RESULT(yes)
+- dnl STDCCFLAGS="$STDCCFLAGS -fdata-sections"
++ dnl STDCXXFLAGS="$STDCXXFLAGS -fdata-sections"
+ dnl GCSECTIONS=1
+ dnl else
+ dnl AC_MSG_RESULT(no)
+@@ -368,7 +368,7 @@
+ dnl $CXX $CFLAGS -fvtable-gc -c conftest.cc > /dev/null 2>&1
+ dnl if test $? = 0 ; then
+ dnl AC_MSG_RESULT(yes)
+- dnl STDCCFLAGS="$STDCCFLAGS -fvtable-gc"
++ dnl STDCXXFLAGS="$STDCXXFLAGS -fvtable-gc"
+ dnl GCSECTIONS=1
+ dnl else
+ dnl AC_MSG_RESULT(no)
+@@ -687,18 +687,18 @@
+ dnl MSWIN_DISPLAY semaphore,Semaphore Support
+ dnl MSWIN_DEFINE semaphore,P_HAS_SEMAPHORES
+
+-dnl Linux, Mac OS X use libpthread and -lpthread
+-dnl FreeBSD uses the -pthread compiler option and uses libc_r
++dnl FreeBSD >= 5.x, Linux, Mac OS X use libpthread and -lpthread
++dnl FreeBSD < 5.x uses the -pthread compiler option and uses libc_r
+
+ AC_CHECK_LIB(pthread, pthread_create, HAS_PTHREADS=yes, HAS_PTHREADS=no)
+ if test ${HAS_PTHREADS} = yes ; then
+- ENDLDLIBS="$ENDLDLIBS -lpthread"
+- STDCCFLAGS="$STDCCFLAGS -D_REENTRANT"
++ ENDLDLIBS="$ENDLDLIBS ${PTHREAD_LIBS}"
++ STDCCFLAGS="$STDCCFLAGS -D_REENTRANT ${PTHREAD_LIBS}"
+ else
+ if test ${OSTYPE} = FreeBSD ; then
+ HAS_PTHREADS=yes
+- ENDLDLIBS="$ENDLDLIBS -pthread"
+- STDCCFLAGS="$STDCCFLAGS -D_REENTRANT -pthread"
++ ENDLDLIBS="$ENDLDLIBS ${PTHREAD_LIBS}"
++ STDCCFLAGS="$STDCCFLAGS -D_REENTRANT ${PTHREAD_LIBS}"
+ fi
+ fi
+
+@@ -1251,7 +1251,7 @@
+ else
+ AC_CHECK_HEADERS(expat.h, HAS_EXPAT=1)
+ if test "${HAS_EXPAT:-unset}" != "unset" ; then
+- AC_CHECK_LIB(expat, XML_ParserCreate, HAS_EXPAT=1, HAS_EXPAT=)
++ AC_SEARCH_LIBS(XML_ParserCreate, expat, HAS_EXPAT=1, HAS_EXPAT=)
+ else
+ AC_CHECK_FILE(/usr/local/include/expat.h, HAS_EXPAT=1)
+ if test "${HAS_EXPAT:-unset}" != "unset" ; then
+@@ -1426,7 +1426,8 @@
+ if test $HAS_IPV6 = no ; then
+ AC_MSG_RESULT(no)
+ else
+- AC_TRY_COMPILE([#include <sys/socket.h>
++ AC_TRY_COMPILE([#include <stddef.h>
++ #include <sys/socket.h>
+ #include <netdb.h>],
+ [getnameinfo(NULL, 0, NULL, 0, NULL, 0, 0);], HAS_IPV6=yes, HAS_IPV6=no)
+ if test $HAS_IPV6 = no ; then
+@@ -1499,9 +1500,9 @@
+ AC_CHECK_LIB(SDL, SDL_CreateYUVOverlay, HAS_SDL=1, HAS_SDL=, -L${X11LIBDIR} -lpthread -lX11 -lXext -laa)
+ fi
+
+- dnl freeBSD SDL check
++ dnl FreeBSD SDL check
+ if test "${HAS_SDL:-unset}" = "unset" ; then
+- AC_CHECK_FILE(/usr/local/include/SDL11/SDL.h, HAS_SDL=1)
++ AC_CHECK_FILE(SDL11/SDL.h, HAS_SDL=1)
+ if test "${HAS_SDL:-unset}" != "unset" ; then
+ SDLLIB=SDL-1.1
+ fi
+@@ -1525,7 +1526,7 @@
+ dnl ########################################################################
+ dnl check for video capture support.
+ dnl videodev.h on linux
+-dnl machine/ioctl_meteor on FreeBSD
++dnl machine/ioctl_meteor or dev/bktr/ioctl_meteor.h on FreeBSD
+ dnl i386/ioctl_meteor on OpenBSD
+ dnl dev/ic/bt8xx on NetBSD
+
+@@ -1551,9 +1552,10 @@
+ HAS_VIDEO_CAPTURE=1
+ else
+ AC_CHECK_HEADER(linux/videodev.h, HAS_VIDEO_CAPTURE=1)
+- dnl AC_CHECK_HEADER(machine/ioctl_meteor.h, HAS_VIDEO_CAPTURE=1)
+- dnl AC_CHECK_HEADER(i386/ioctl_meteor.h, HAS_VIDEO_CAPTURE=1)
+- dnl AC_CHECK_HEADER(dev/ic/bt8xx.h, HAS_VIDEO_CAPTURE=1)
++ AC_CHECK_HEADER(machine/ioctl_meteor.h, HAS_VIDEO_CAPTURE=1)
++ AC_CHECK_HEADER(dev/bktr/ioctl_meteor.h, HAS_VIDEO_CAPTURE=1)
++ AC_CHECK_HEADER(i386/ioctl_meteor.h, HAS_VIDEO_CAPTURE=1)
++ AC_CHECK_HEADER(dev/ic/bt8xx.h, HAS_VIDEO_CAPTURE=1)
+ if test "${HAS_VIDEO_CAPTURE}z" = "z" ; then
+ AC_MSG_NOTICE(No Video Capture support)
+ AC_DEFINE([NO_VIDEO_CAPTURE], [], [No video capture])
+@@ -2044,6 +2046,9 @@
+ AC_MSG_NOTICE(C++ exceptions enabled)
+ STDCCFLAGS="$STDCCFLAGS -fno-exceptions"
+ fi
++
++STDCCFLAGS="$CPPFLAGS $STDCCFLAGS"
++STDCXXFLAGS="$CPPFLAGS $STDCXXFLAGS"
+
+ dnl ########################################################################
+ dnl final declarations
diff --git a/devel/pwlib/files/patch-configurein b/devel/pwlib/files/patch-configurein
deleted file mode 100644
index 80c8ec813e73..000000000000
--- a/devel/pwlib/files/patch-configurein
+++ /dev/null
@@ -1,26 +0,0 @@
---- configure.in.orig Thu May 22 05:19:16 2003
-+++ configure.in Sun Feb 15 23:57:20 2004
-@@ -39,7 +39,7 @@
- STDCCFLAGS="-DP_LINUX=$OSRELEASE" ;;
-
- freebsd* ) OSTYPE=FreeBSD ;
-- OSRELEASE=`sysctl -n kern.osreldate` ;
-+## use enviroment variable OSRELEASE=`sysctl -n kern.osreldate` ;
- STDCCFLAGS="-DP_FREEBSD=$OSRELEASE" ;;
-
- openbsd* ) OSTYPE=OpenBSD ;
-@@ -452,12 +452,13 @@
- dnl ########################################################################
- dnl check for video capture support.
- dnl videodev.h on linux
--dnl machine/ioctl_meteor on FreeBSD
-+dnl dev/bktr/ioctl_meteor or machine/ioctl_meteor on FreeBSD
- dnl i386/ioctl_meteor on OpenBSD
- dnl dev/ic/bt8xx on NetBSD
-
- HAS_VIDEO_CAPTURE=no
- AC_CHECK_HEADER(linux/videodev.h, HAS_VIDEO_CAPTURE=yes)
-+AC_CHECK_HEADER(dev/bktr/ioctl_meteor.h, HAS_VIDEO_CAPTURE=yes)
- AC_CHECK_HEADER(machine/ioctl_meteor.h, HAS_VIDEO_CAPTURE=yes)
- AC_CHECK_HEADER(i386/ioctl_meteor.h, HAS_VIDEO_CAPTURE=yes)
- AC_CHECK_HEADER(dev/ic/bt8xx.h, HAS_VIDEO_CAPTURE=yes)
diff --git a/devel/pwlib/files/patch-make-common.mak b/devel/pwlib/files/patch-make-common.mak
deleted file mode 100644
index 44f8b75a64d4..000000000000
--- a/devel/pwlib/files/patch-make-common.mak
+++ /dev/null
@@ -1,19 +0,0 @@
-*** make/common.mak.orig Tue Jul 29 11:25:23 2003
---- make/common.mak Wed Jun 8 16:50:19 2005
-***************
-*** 262,268 ****
- endif
-
- ifneq ($(P_SHAREDLIB),1)
-! LDFLAGS += -static
- endif
-
- # clean whitespace out of source file list
---- 262,268 ----
- endif
-
- ifneq ($(P_SHAREDLIB),1)
-! #LDFLAGS += -static
- endif
-
- # clean whitespace out of source file list
diff --git a/devel/pwlib/files/patch-makefile b/devel/pwlib/files/patch-makefile
deleted file mode 100644
index 1f7ea0dfcc56..000000000000
--- a/devel/pwlib/files/patch-makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-*** src/ptlib/unix/Makefile.orig Tue Dec 2 11:15:55 2003
---- src/ptlib/unix/Makefile Tue Dec 2 11:16:39 2003
-*************** VIDEO_CAPTURE_SOURCE = video4linux.cxx
-*** 422,428 ****
---- 422,430 ----
- endif
-
- ifeq ($(OSTYPE),FreeBSD)
-+ ifneq (,$(wildcard $(SYSINCDIR)/dev/bktr/ioctl_meteor.h $(SYSINCDIR)/machine/ioctl_meteor.h))
- VIDEO_CAPTURE_SOURCE = video4bsd.cxx
-+ endif
- endif
-
- ifeq ($(OSTYPE),OpenBSD)
diff --git a/devel/pwlib/files/patch-src-ptclib-ansper.cxx b/devel/pwlib/files/patch-src-ptclib-ansper.cxx
deleted file mode 100644
index 27f09e7b8870..000000000000
--- a/devel/pwlib/files/patch-src-ptclib-ansper.cxx
+++ /dev/null
@@ -1,56 +0,0 @@
---- src/ptclib/asnper.cxx Fri Aug 1 02:11:38 2003
-+++ src/ptclib/asnper.cxx Fri Jun 3 14:32:55 2005
-@@ -1224,6 +1224,11 @@
- return -1;
-
- value += lower;
-+
-+ // clamp value to upper limit
-+ if (value > upper)
-+ value = upper;
-+
- return 0;
- }
-
-@@ -1268,7 +1273,14 @@
- unsigned base;
- if (!MultiBitDecode(CountBits(upper - lower + 1), base))
- return -1;
-- return lower + base; // 10.9.4.1
-+ len = lower + base; // 10.9.4.1
-+
-+ // clamp value to upper limit
-+ if (len > upper)
-+ len = upper;
-+
-+ return len;
-+
- }
-
- if (upper < 65536) // 10.9.3.3
-@@ -1279,13 +1291,20 @@
- if (IsAtEnd())
- return -1;
-
-- if (SingleBitDecode() == 0)
-- return MultiBitDecode(7, len) ? 0 : -1; // 10.9.3.6
-+ if (SingleBitDecode() == 0) {
-+ if (!MultiBitDecode(7, len)) // 10.9.3.6
-+ return -1; // 10.9.3.8 unsupported
-+ }
-+ else if (SingleBitDecode() == 0) {
-+ if (!MultiBitDecode(14, len)) // 10.9.3.7
-+ return -1; // 10.9.3.8 unsupported
-+ }
-
-- if (SingleBitDecode() == 0)
-- return MultiBitDecode(14, len) ? 0 : -1; // 10.9.3.7
-+ // clamp value to upper limit
-+ if (len > upper)
-+ len = upper;
-
-- return -1; // 10.9.3.8 unsupported
-+ return 0;
- }
-
-
diff --git a/devel/pwlib/files/patch-src_ptlib_common_getdate.y b/devel/pwlib/files/patch-src_ptlib_common_getdate.y
deleted file mode 100644
index b4cd1ac38b9b..000000000000
--- a/devel/pwlib/files/patch-src_ptlib_common_getdate.y
+++ /dev/null
@@ -1,7 +0,0 @@
---- src/ptlib/common/getdate.y.orig Fri Jan 24 21:21:06 2003
-+++ src/ptlib/common/getdate.y Sun May 15 14:41:11 2005
-@@ -1,3 +1,4 @@
-+%pure-parser
- %{
- /*
- ** Originally written by Steven M. Bellovin <smb@research.att.com> while
diff --git a/devel/pwlib/files/patch-unix b/devel/pwlib/files/patch-unix
deleted file mode 100644
index 945ad223fb83..000000000000
--- a/devel/pwlib/files/patch-unix
+++ /dev/null
@@ -1,70 +0,0 @@
-*** make/unix.mak.orig Thu Jul 24 22:01:42 2003
---- make/unix.mak Fri Jun 3 15:13:47 2005
-***************
-*** 358,368 ****
-
- ifeq ($(OSTYPE),FreeBSD)
-
-! ifeq ($(MACHTYPE),x86)
-! ifdef CPUTYPE
-! STDCCFLAGS += -mcpu=$(CPUTYPE)
-! endif
-! endif
-
- ifndef OSRELEASE
- OSRELEASE := $(shell sysctl -n kern.osreldate)
---- 358,368 ----
-
- ifeq ($(OSTYPE),FreeBSD)
-
-! #ifeq ($(MACHTYPE),x86)
-! #ifdef CPUTYPE
-! #STDCCFLAGS += -mcpu=$(CPUTYPE)
-! #endif
-! #endif
-
- ifndef OSRELEASE
- OSRELEASE := $(shell sysctl -n kern.osreldate)
-***************
-*** 891,901 ****
-
- # Directories
-
-! ifdef PREFIX
-! UNIX_INC_DIR = $(PREFIX)/include/ptlib/unix
-! else
- UNIX_INC_DIR = $(PWLIBDIR)/include/ptlib/unix
-! endif
-
- ifndef UNIX_SRC_DIR
- UNIX_SRC_DIR = $(PWLIBDIR)/src/ptlib/unix
---- 891,901 ----
-
- # Directories
-
-! ##ifdef PREFIX
-! ##UNIX_INC_DIR = $(PREFIX)/include/ptlib/unix
-! ##else
- UNIX_INC_DIR = $(PWLIBDIR)/include/ptlib/unix
-! ##endif
-
- ifndef UNIX_SRC_DIR
- UNIX_SRC_DIR = $(PWLIBDIR)/src/ptlib/unix
-***************
-*** 932,938 ****
- else
-
- ifneq ($(OSTYPE),Darwin)
-! OPTCCFLAGS += -Os -DNDEBUG
- else
- OPTCCFLAGS += -O2 -DNDEBUG
- endif
---- 932,939 ----
- else
-
- ifneq ($(OSTYPE),Darwin)
-! # OPTCCFLAGS += -Os -DNDEBUG
-! OPTCCFLAGS += -DNDEBUG
- else
- OPTCCFLAGS += -O2 -DNDEBUG
- endif
diff --git a/devel/pwlib/files/patch-videoio b/devel/pwlib/files/patch-videoio
deleted file mode 100644
index 7e86b99f5bca..000000000000
--- a/devel/pwlib/files/patch-videoio
+++ /dev/null
@@ -1,26 +0,0 @@
---- include/ptlib/unix/ptlib/videoio.h.orig Mon Jan 6 10:41:08 2003
-+++ include/ptlib/unix/ptlib/videoio.h Sun Feb 15 23:42:39 2004
-@@ -106,9 +106,13 @@
- #include <linux/videodev.h> /* change this to "videodev2.h" for v4l2 */
- #endif
-
--#if defined(P_FREEBSD)
-+#if defined(P_FREEBSD) && !defined(NO_VIDEO_CAPTURE)
-+#if P_FREEBSD >= 502101
-+#include <dev/bktr/ioctl_meteor.h>
-+#else
- #include <machine/ioctl_meteor.h>
- #endif
-+#endif
-
- #if defined(P_OPENBSD) || defined(P_NETBSD)
- #if P_OPENBSD >= 200105
-@@ -186,7 +190,7 @@
- struct video_mmap frameBuffer[2];
- #endif
-
--#if defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD)
-+#if (defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD)) && !defined(NO_VIDEO_CAPTURE)
- struct video_capability
- {
- int channels; /* Num channels */
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-23 15:08:29 +0000