diff options
Diffstat (limited to 'devel/pwlib152/files')
| -rw-r--r-- | devel/pwlib152/files/patch-configurein | 26 | ||||
| -rw-r--r-- | devel/pwlib152/files/patch-makefile | 14 | ||||
| -rw-r--r-- | devel/pwlib152/files/patch-src::ptclib::asner.cxx | 58 | ||||
| -rw-r--r-- | devel/pwlib152/files/patch-unix | 70 | ||||
| -rw-r--r-- | devel/pwlib152/files/patch-videoio | 26 |
5 files changed, 0 insertions, 194 deletions
diff --git a/devel/pwlib152/files/patch-configurein b/devel/pwlib152/files/patch-configurein deleted file mode 100644 index 80c8ec813e73..000000000000 --- a/devel/pwlib152/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/pwlib152/files/patch-makefile b/devel/pwlib152/files/patch-makefile deleted file mode 100644 index 1f7ea0dfcc56..000000000000 --- a/devel/pwlib152/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/pwlib152/files/patch-src::ptclib::asner.cxx b/devel/pwlib152/files/patch-src::ptclib::asner.cxx deleted file mode 100644 index 4776c3cab7f4..000000000000 --- a/devel/pwlib152/files/patch-src::ptclib::asner.cxx +++ /dev/null @@ -1,58 +0,0 @@ - -$FreeBSD$ - ---- src/ptclib/asner.cxx 2004/06/03 14:44:43 1.1 -+++ src/ptclib/asner.cxx 2004/06/03 14:50:35 -@@ -4926,6 +4926,11 @@ - return -1; - - value += lower; -+ -+ // clamp value to upper limit -+ if (value > upper) -+ value = upper; -+ - return 0; - } - -@@ -4970,7 +4975,13 @@ - 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 -@@ -4981,13 +4992,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/pwlib152/files/patch-unix b/devel/pwlib152/files/patch-unix deleted file mode 100644 index 205bd870e479..000000000000 --- a/devel/pwlib152/files/patch-unix +++ /dev/null @@ -1,70 +0,0 @@ -*** make/unix.mak.orig Thu Aug 28 08:39:18 2003 ---- make/unix.mak Thu Aug 28 08:42:30 2003 -*************** endif # linux -*** 338,348 **** - - ifeq ($(OSTYPE),FreeBSD) - -! ifeq ($(MACHTYPE),x86) -! ifdef CPUTYPE -! STDCCFLAGS += -mcpu=$(CPUTYPE) -! endif -! endif - - ifndef OSRELEASE - OSRELEASE := $(shell sysctl -n kern.osreldate) ---- 338,348 ---- - - ifeq ($(OSTYPE),FreeBSD) - -! #ifeq ($(MACHTYPE),x86) -! #ifdef CPUTYPE -! #STDCCFLAGS += -mcpu=$(CPUTYPE) -! #endif -! #endif - - ifndef OSRELEASE - OSRELEASE := $(shell sysctl -n kern.osreldate) -*************** SHELL := /bin/sh -*** 871,881 **** - - # 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 ---- 871,881 ---- - - # 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 -*************** LDFLAGS += $(DEBLDFLAGS) -*** 912,918 **** - else - - ifneq ($(OSTYPE),Darwin) -! OPTCCFLAGS += -O3 -DNDEBUG - else - OPTCCFLAGS += -O2 -DNDEBUG - endif ---- 912,919 ---- - else - - ifneq ($(OSTYPE),Darwin) -! # OPTCCFLAGS += -O3 -DNDEBUG -! OPTCCFLAGS += -DNDEBUG - else - OPTCCFLAGS += -O2 -DNDEBUG - endif diff --git a/devel/pwlib152/files/patch-videoio b/devel/pwlib152/files/patch-videoio deleted file mode 100644 index 7e86b99f5bca..000000000000 --- a/devel/pwlib152/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 */ |
