diff options
author | jmcneill <jmcneill> | 2008-09-22 23:36:54 +0000 |
---|---|---|
committer | jmcneill <jmcneill> | 2008-09-22 23:36:54 +0000 |
commit | 891b3bd0a6cc39c67c81ba0c3a07e4e9e2dd5d3a (patch) | |
tree | a97c13c6d48a4d4c5e002e39349320ee26a66b38 /devel/ptlib | |
parent | 85750eca5b70c1dc03de427115e3cae8e344c191 (diff) | |
download | pkgsrc-891b3bd0a6cc39c67c81ba0c3a07e4e9e2dd5d3a.tar.gz |
Update to stable release 2.4.1.
Diffstat (limited to 'devel/ptlib')
-rw-r--r-- | devel/ptlib/Makefile | 9 | ||||
-rw-r--r-- | devel/ptlib/PLIST | 18 | ||||
-rw-r--r-- | devel/ptlib/buildlink3.mk | 6 | ||||
-rw-r--r-- | devel/ptlib/distinfo | 15 | ||||
-rw-r--r-- | devel/ptlib/patches/patch-aa | 18 | ||||
-rw-r--r-- | devel/ptlib/patches/patch-ab | 16 | ||||
-rw-r--r-- | devel/ptlib/patches/patch-ag | 13 | ||||
-rw-r--r-- | devel/ptlib/patches/patch-ba | 30 | ||||
-rw-r--r-- | devel/ptlib/patches/patch-bb | 13 | ||||
-rw-r--r-- | devel/ptlib/patches/patch-bc | 13 | ||||
-rw-r--r-- | devel/ptlib/patches/patch-configure | 12 |
11 files changed, 20 insertions, 143 deletions
diff --git a/devel/ptlib/Makefile b/devel/ptlib/Makefile index 6be8818494d..21d2f5dfa19 100644 --- a/devel/ptlib/Makefile +++ b/devel/ptlib/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2008/09/13 18:09:06 jmcneill Exp $ +# $NetBSD: Makefile,v 1.3 2008/09/22 23:36:54 jmcneill Exp $ -DISTNAME= ptlib-snapshot-20080912 -PKGNAME= ptlib-2.3.0.20080912 +DISTNAME= ptlib-2.4.1 CATEGORIES= devel -MASTER_SITES= http://snapshots.ekiga.net/snapshots/sources/archives/ +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/ptlib/2.4/} +EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.ekiga.net/ @@ -13,7 +13,6 @@ CONFLICTS+= pwlib-[0-9]* BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison -WRKSRC= ${WRKDIR}/ptlib USE_TOOLS+= gmake tar pkg-config BUILD_TARGET= optshared USE_LANGUAGES= c c++ diff --git a/devel/ptlib/PLIST b/devel/ptlib/PLIST index 3349db51d8e..0df24d264d4 100644 --- a/devel/ptlib/PLIST +++ b/devel/ptlib/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2008/09/13 18:09:06 jmcneill Exp $ +@comment $NetBSD: PLIST,v 1.3 2008/09/22 23:36:54 jmcneill Exp $ bin/ptlib-config include/ptbuildopts.h include/ptclib/asnber.h @@ -162,12 +162,12 @@ include/ptlib/videoio.h include/ptlib/videoio1394dc.h lib/libpt.so lib/libpt.so.2 -lib/libpt.so.2.3 -lib/libpt.so.2.3-beta1 +lib/libpt.so.2.4 +lib/libpt.so.2.4.1 lib/libpt_s.a lib/pkgconfig/ptlib.pc -lib/ptlib-2.3.1/devices/sound/oss_pwplugin.so -lib/ptlib-2.3.1/devices/videoinput/v4l2_pwplugin.so +lib/ptlib-2.4.1/devices/sound/oss_pwplugin.so +lib/ptlib-2.4.1/devices/videoinput/v4l2_pwplugin.so share/ptlib/make/common.mak share/ptlib/make/lib.mak share/ptlib/make/plugins.mak @@ -178,10 +178,10 @@ share/ptlib/make/unix.mak share/ptlib/version.h @dirrm share/ptlib/make @dirrm share/ptlib -@dirrm lib/ptlib-2.3.1/devices/videoinput -@dirrm lib/ptlib-2.3.1/devices/sound -@dirrm lib/ptlib-2.3.1/devices -@dirrm lib/ptlib-2.3.1 +@dirrm lib/ptlib-2.4.1/devices/videoinput +@dirrm lib/ptlib-2.4.1/devices/sound +@dirrm lib/ptlib-2.4.1/devices +@dirrm lib/ptlib-2.4.1 @dirrm include/ptlib/unix/ptlib @dirrm include/ptlib/unix @dirrm include/ptlib diff --git a/devel/ptlib/buildlink3.mk b/devel/ptlib/buildlink3.mk index 109a1f286f1..ec5a31bdd3f 100644 --- a/devel/ptlib/buildlink3.mk +++ b/devel/ptlib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/09/13 18:09:06 jmcneill Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2008/09/22 23:36:54 jmcneill Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PTLIB_BUILDLINK3_MK:= ${PTLIB_BUILDLINK3_MK}+ @@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+= ptlib BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ptlib .if !empty(PTLIB_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.ptlib+= ptlib>=2.3.0 -BUILDLINK_ABI_DEPENDS.ptlib?= ptlib>=2.3.0 +BUILDLINK_API_DEPENDS.ptlib+= ptlib>=2.4.1 +BUILDLINK_ABI_DEPENDS.ptlib?= ptlib>=2.4.1 BUILDLINK_PKGSRCDIR.ptlib?= ../../devel/ptlib .endif # PTLIB_BUILDLINK3_MK diff --git a/devel/ptlib/distinfo b/devel/ptlib/distinfo index b4668fe1468..fb575750026 100644 --- a/devel/ptlib/distinfo +++ b/devel/ptlib/distinfo @@ -1,18 +1,11 @@ -$NetBSD: distinfo,v 1.3 2008/09/13 18:09:06 jmcneill Exp $ +$NetBSD: distinfo,v 1.4 2008/09/22 23:36:54 jmcneill Exp $ -SHA1 (ptlib-snapshot-20080912.tar.gz) = cf77a1b7f3c3e25ae092e381d01cbb4b9275ccc3 -RMD160 (ptlib-snapshot-20080912.tar.gz) = 3b8b2dfdf87a6978f2590bebde8bbd0e0c7e2a1c -Size (ptlib-snapshot-20080912.tar.gz) = 9630039 bytes -SHA1 (patch-aa) = 9fb1f106554314eb5e27a961bc1318945afe6318 -SHA1 (patch-ab) = 379e578421a6d302a700bddd02f6cbb588c425e1 +SHA1 (ptlib-2.4.1.tar.bz2) = f4c0e922730e70db53692f2c79ad9e08a0508070 +RMD160 (ptlib-2.4.1.tar.bz2) = c507414762a677c059b4b005866c3885a7118247 +Size (ptlib-2.4.1.tar.bz2) = 5085930 bytes SHA1 (patch-ac) = b0cb79c86fb0cf3182d08a33ad48a3f9becc9c20 SHA1 (patch-ad) = 04504e7549709f4936dc2c791b0fbcc425781c08 SHA1 (patch-ae) = 92d140bd9536837186a03a3d3230bbb207df0ae4 SHA1 (patch-af) = 837cf090245e924397118132bd9529bfc394e0b3 -SHA1 (patch-ag) = 1590773a7cf8448e4e3f5dde1e9853195de75163 SHA1 (patch-ah) = e2612c09f253af3fe9a66d0624a7524e95f7e2d9 SHA1 (patch-ai) = 47a7d53e52f5a28b0f25baaf1782a4152e6c6927 -SHA1 (patch-ba) = 056a69dc2358eab34a3e5913a535cf02ce832974 -SHA1 (patch-bb) = 14d6237ffb5003e0e8fde4ad71f0062f2e546720 -SHA1 (patch-bc) = 503faaf484d310d2bed51b211182245eb9542a83 -SHA1 (patch-configure) = 77b513242cf0834d3d3d6fca744404a4c1206d78 diff --git a/devel/ptlib/patches/patch-aa b/devel/ptlib/patches/patch-aa deleted file mode 100644 index cd4d1f97b44..00000000000 --- a/devel/ptlib/patches/patch-aa +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2008/09/12 13:18:26 jmcneill Exp $ - ---- plugins/configure.orig 2008-09-02 17:00:35.000000000 -0400 -+++ plugins/configure 2008-09-08 15:29:37.000000000 -0400 -@@ -4449,10 +4449,13 @@ - enable_v4l2=yes - fi - -+OSTYPE="$(uname -s)" - - if test "${enable_v4l2}z" = "yesz" ; then - if test "${OSTYPE}z" = "solaris2.11z"; then - VIDEODEV="sys/videodev2.h" -+ elif test "${OSTYPE}z" = "NetBSDz"; then -+ VIDEODEV="sys/videoio.h" - else - VIDEODEV="linux/videodev2.h" - fi diff --git a/devel/ptlib/patches/patch-ab b/devel/ptlib/patches/patch-ab deleted file mode 100644 index 20405001649..00000000000 --- a/devel/ptlib/patches/patch-ab +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2008/09/12 13:18:26 jmcneill Exp $ - ---- src/ptlib/unix/osutil.cxx.orig 2008-09-08 15:33:05.000000000 -0400 -+++ src/ptlib/unix/osutil.cxx 2008-09-08 15:33:59.000000000 -0400 -@@ -85,6 +85,11 @@ - #include <sys/param.h> - #include <sys/mount.h> - -+#if defined(P_NETBSD) -+#include <sys/statvfs.h> -+#define statfs statvfs -+#endif -+ - #elif defined(P_HPUX9) - #define P_USE_LANGINFO - diff --git a/devel/ptlib/patches/patch-ag b/devel/ptlib/patches/patch-ag deleted file mode 100644 index 109b6e917a4..00000000000 --- a/devel/ptlib/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.1.1.1 2008/09/12 13:18:26 jmcneill Exp $ - ---- src/ptlib/common/pvidchan.cxx.orig 2008-09-08 15:45:54.000000000 -0400 -+++ src/ptlib/common/pvidchan.cxx 2008-09-08 15:46:09.000000000 -0400 -@@ -70,7 +70,7 @@ - - PString PVideoChannel::GetDefaultDevice(Directions /*dir*/) - { --#if defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD) -+#if defined(P_FREEBSD) || defined(P_OPENBSD) - return "/dev/bktr0"; - #endif - diff --git a/devel/ptlib/patches/patch-ba b/devel/ptlib/patches/patch-ba deleted file mode 100644 index 82e1cb88eea..00000000000 --- a/devel/ptlib/patches/patch-ba +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-ba,v 1.1.1.1 2008/09/12 13:18:26 jmcneill Exp $ - ---- plugins/vidinput_v4l2/vidinput_v4l2.h.orig 2008-06-04 17:00:30.000000000 -0400 -+++ plugins/vidinput_v4l2/vidinput_v4l2.h 2008-09-08 15:43:23.000000000 -0400 -@@ -31,7 +31,6 @@ - #define _PVIDEOIOV4L2 - - --#include <sys/mman.h> - #include <sys/time.h> - - #include <ptlib.h> -@@ -39,12 +38,16 @@ - #include <ptlib/vconvert.h> - #include <ptclib/delaychan.h> - --#ifdef SOLARIS -+#if defined(SOLARIS) - #include <sys/videodev2.h> -+#elif defined(__OpenBSD__) || defined(__NetBSD__) -+#include <sys/videoio.h> - #else - #include <linux/videodev.h> - #endif - -+#include <sys/mman.h> -+ - #ifndef V4L2_PIX_FMT_SBGGR8 - #define V4L2_PIX_FMT_SBGGR8 v4l2_fourcc('B','A','8','1') /* 8 BGBG.. GRGR.. */ - #endif diff --git a/devel/ptlib/patches/patch-bb b/devel/ptlib/patches/patch-bb deleted file mode 100644 index 4b64484f628..00000000000 --- a/devel/ptlib/patches/patch-bb +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bb,v 1.1.1.1 2008/09/12 13:18:26 jmcneill Exp $ - ---- plugins/vidinput_v4l2/vidinput_names.cxx.orig 2008-09-08 17:55:13.000000000 -0400 -+++ plugins/vidinput_v4l2/vidinput_names.cxx 2008-09-08 17:55:33.000000000 -0400 -@@ -36,7 +36,7 @@ - if (!devdir.Open()) - return; - --#ifdef SOLARIS -+#if defined(SOLARIS) || defined(__NetBSD__) - int devnum = 0; - do { - PString filename = devdir.GetEntryName(); diff --git a/devel/ptlib/patches/patch-bc b/devel/ptlib/patches/patch-bc deleted file mode 100644 index c1abe536682..00000000000 --- a/devel/ptlib/patches/patch-bc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bc,v 1.1.1.1 2008/09/12 13:18:26 jmcneill Exp $ - ---- plugins/sound_oss/sound_oss.cxx.orig 2008-09-08 18:02:28.000000000 -0400 -+++ plugins/sound_oss/sound_oss.cxx 2008-09-08 18:03:34.000000000 -0400 -@@ -145,7 +145,7 @@ - // When adding these to the 'dsp' string array, only the first one - // found is used. - --#if !defined P_NETBSD || !defined P_OPENBSD -+#if !defined P_NETBSD && !defined P_OPENBSD - // Look for dsp - if (filename == "dsp") { - dsp.SetAt(0, devname); diff --git a/devel/ptlib/patches/patch-configure b/devel/ptlib/patches/patch-configure deleted file mode 100644 index bacdeefbf2b..00000000000 --- a/devel/ptlib/patches/patch-configure +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-configure,v 1.1 2008/09/12 20:46:29 sborrill Exp $ ---- configure.orig 2008-09-12 21:43:29.000000000 +0100 -+++ configure 2008-09-12 21:44:03.000000000 +0100 -@@ -7154,7 +7154,7 @@ - fi - fi - --if test "${P_HAS_SEMAPHORES}x" == "x" ; then -+if test "${P_HAS_SEMAPHORES}x" = "x" ; then - - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ |