aboutsummaryrefslogtreecommitdiff
path: root/devel/pwlib
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2006-12-08 07:47:27 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2006-12-08 07:47:27 +0000
commit65e6d3fbc9bcd81b7d57f8d3d040442e6cac2603 (patch)
tree7b3120f1f0008ed13d94b41d13a027909ea71c7b /devel/pwlib
parenteb39e87dbd5c375df5c55c477ae79d1017ee9494 (diff)
downloadports-65e6d3fbc9bcd81b7d57f8d3d040442e6cac2603.tar.gz
ports-65e6d3fbc9bcd81b7d57f8d3d040442e6cac2603.zip
Notes
Diffstat (limited to 'devel/pwlib')
-rw-r--r--devel/pwlib/Makefile16
-rw-r--r--devel/pwlib/distinfo6
-rw-r--r--devel/pwlib/files/patch-configureac41
-rw-r--r--devel/pwlib/pkg-plist1
4 files changed, 42 insertions, 22 deletions
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index b8c4f16abcb3..3a74e5ef97c4 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= pwlib
-PORTVERSION= 1.10.1
-PORTREVISION= 2
+PORTVERSION= 1.10.2
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= http://www.voxgratia.org/releases/
@@ -19,11 +18,12 @@ COMMENT= A cross platform C++ library, used by OpenH323
LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
-WRKSRC= ${WRKDIR}/pwlib_Phobos_release2/
+WRKSRC= ${WRKDIR}/${PORTNAME}_v${PORTVERSION:S/./_/g}
USE_BISON= yes
USE_GMAKE= yes
USE_AUTOTOOLS= autoconf:259
+USE_GNOME= gnometarget
WANT_GNOME= yes
WANT_SDL= yes
USE_OPENSSL= yes
@@ -125,6 +125,16 @@ PLIST_SUB+= BSDVIDEO=""
PLIST_SUB+= BSDVIDEO="@comment "
.endif
+.if defined(WITH_V4L) || ( exists(${LOCALBASE}/include/linux/videodev.h) && \
+ !defined(WITHOUT_V4L) )
+CONFIGURE_ARGS+=--enable-v4l
+PLIST_SUB+= V4L=""
+BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev.h
+.else
+CONFIGURE_ARGS+=--disable-v4l
+PLIST_SUB+= V$L="@comment "
+.endif
+
post-patch:
.if ${ARCH} == sparc64 && ${OSVERSION} <= 700003
@${REINPLACE_CMD} -e 's|P_PTHREADS_XPG6|0|' \
diff --git a/devel/pwlib/distinfo b/devel/pwlib/distinfo
index 22ad328f5d77..7a140cdb3cf9 100644
--- a/devel/pwlib/distinfo
+++ b/devel/pwlib/distinfo
@@ -1,3 +1,3 @@
-MD5 (pwlib-v1_10_1-src-tar.gz) = 1d0ae5543db30588a49465138e6f3406
-SHA256 (pwlib-v1_10_1-src-tar.gz) = d7c18b8490be748fd05042a8d8ac135379fe9f9b56d44439eec3b24951cfe954
-SIZE (pwlib-v1_10_1-src-tar.gz) = 2078624
+MD5 (pwlib-v1_10_2-src-tar.gz) = e2ca39ab7a6d0d90be6746211d9d0dc0
+SHA256 (pwlib-v1_10_2-src-tar.gz) = e7e3a3c7cc4edc466069381aefd3a5384353cfe23e365299508384c9499765d2
+SIZE (pwlib-v1_10_2-src-tar.gz) = 1994752
diff --git a/devel/pwlib/files/patch-configureac b/devel/pwlib/files/patch-configureac
index b1d797ed3621..1bb7dcfdc78a 100644
--- a/devel/pwlib/files/patch-configureac
+++ b/devel/pwlib/files/patch-configureac
@@ -1,6 +1,6 @@
--- configure.ac.orig Wed Feb 22 06:53:28 2006
-+++ configure.ac Thu Sep 21 01:33:15 2006
-@@ -136,7 +136,7 @@
++++ configure.ac Thu Dec 7 02:09:59 2006
+@@ -136,7 +136,7 @@ case "$target_cpu" in
x86 | i686 | i586 | i486 | i386 ) MACHTYPE=x86
;;
@@ -9,7 +9,7 @@
P_64BIT=1 ;
LIB64=1 ;
;;
-@@ -278,7 +278,7 @@
+@@ -278,7 +278,7 @@ fi
AC_MSG_CHECKING(if linker accepts -Wreorder)
AC_LANG_CONFTEST([[int main(int ac,char **av) { return 0; }]])
@@ -18,7 +18,7 @@
if test $? = 0 ; then
AC_MSG_RESULT(yes)
STDCXXFLAGS="$STDCXXFLAGS -Wreorder"
-@@ -291,7 +291,7 @@
+@@ -291,7 +291,7 @@ fi
# $CXX $CFLAGS -Woverloaded-virtual conftest.cc > /dev/null 2>&1
# if test $? = 0 ; then
# AC_MSG_RESULT(yes)
@@ -27,7 +27,7 @@
# else
# AC_MSG_RESULT(no)
# fi
-@@ -320,7 +320,7 @@
+@@ -320,7 +320,7 @@ if test "$DEFAULT_RTTI" = "1" ; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
@@ -36,7 +36,7 @@
fi
GCSECTIONS=0
-@@ -341,7 +341,7 @@
+@@ -341,7 +341,7 @@ if test 0 = 1 ; then
$CXX $CFLAGS -ffunction-sections -c conftest.cc > /dev/null 2>&1
if test $? = 0 ; then
AC_MSG_RESULT(yes)
@@ -45,7 +45,7 @@
GCSECTIONS=1
else
AC_MSG_RESULT(no)
-@@ -357,7 +357,7 @@
+@@ -357,7 +357,7 @@ if test 0 = 1 ; then
dnl $CXX $CFLAGS -fdata-sections -c conftest.cc > /dev/null 2>&1
dnl if test $? = 0 ; then
dnl AC_MSG_RESULT(yes)
@@ -54,7 +54,7 @@
dnl GCSECTIONS=1
dnl else
dnl AC_MSG_RESULT(no)
-@@ -370,7 +370,7 @@
+@@ -370,7 +370,7 @@ if test 0 = 1 ; then
dnl $CXX $CFLAGS -fvtable-gc -c conftest.cc > /dev/null 2>&1
dnl if test $? = 0 ; then
dnl AC_MSG_RESULT(yes)
@@ -63,7 +63,7 @@
dnl GCSECTIONS=1
dnl else
dnl AC_MSG_RESULT(no)
-@@ -689,18 +689,18 @@
+@@ -689,18 +689,18 @@ dnl check for pthreads library
dnl MSWIN_DISPLAY semaphore,Semaphore Support
dnl MSWIN_DEFINE semaphore,P_HAS_SEMAPHORES
@@ -88,7 +88,16 @@
fi
fi
-@@ -1253,7 +1253,7 @@
+@@ -847,7 +847,7 @@ fi
+ AC_SUBST(HAS_PLUGINS)
+
+ if test "x$LIB64" != "x" ; then
+- AC_DEFINE_UNQUOTED([P_DEFAULT_PLUGIN_DIR], ["${INSTALLPREFIX}/lib64/pwlib"], [Default plugin directory])
++ AC_DEFINE_UNQUOTED([P_DEFAULT_PLUGIN_DIR], ["${INSTALLPREFIX}/lib/pwlib"], [Default plugin directory])
+ else
+ AC_DEFINE_UNQUOTED([P_DEFAULT_PLUGIN_DIR], ["${INSTALLPREFIX}/lib/pwlib"], [Default plugin directory])
+ fi
+@@ -1253,7 +1253,7 @@ if test "$enable_expat" = "no" ; then
else
AC_CHECK_HEADERS(expat.h, HAS_EXPAT=1)
if test "${HAS_EXPAT:-unset}" != "unset" ; then
@@ -97,7 +106,7 @@
else
AC_CHECK_FILE(/usr/local/include/expat.h, HAS_EXPAT=1)
if test "${HAS_EXPAT:-unset}" != "unset" ; then
-@@ -1428,7 +1428,8 @@
+@@ -1428,7 +1428,8 @@ else
if test $HAS_IPV6 = no ; then
AC_MSG_RESULT(no)
else
@@ -107,7 +116,7 @@
#include <netdb.h>],
[getnameinfo(NULL, 0, NULL, 0, NULL, 0, 0);], HAS_IPV6=yes, HAS_IPV6=no)
if test $HAS_IPV6 = no ; then
-@@ -1485,7 +1486,7 @@
+@@ -1485,7 +1486,7 @@ fi
HAS_SDL=
if test "$enable_sdl" = "no" ; then
AC_MSG_NOTICE(SDL disabled)
@@ -116,7 +125,7 @@
else
dnl SDL checks
if test "${SDLLIB:-unset}" = "unset" ; then
-@@ -1501,11 +1502,11 @@
+@@ -1501,11 +1502,11 @@ else
AC_CHECK_LIB(SDL, SDL_CreateYUVOverlay, HAS_SDL=1, HAS_SDL=, -L${X11LIBDIR} -lpthread -lX11 -lXext)
fi
@@ -131,7 +140,7 @@
fi
fi
-@@ -1527,7 +1528,7 @@
+@@ -1527,7 +1528,7 @@ AC_SUBST(HAS_SDL)
dnl ########################################################################
dnl check for video capture support.
dnl videodev.h on linux
@@ -140,7 +149,7 @@
dnl i386/ioctl_meteor on OpenBSD
dnl dev/ic/bt8xx on NetBSD
-@@ -1553,9 +1554,10 @@
+@@ -1553,9 +1554,10 @@ else
HAS_VIDEO_CAPTURE=1
else
AC_CHECK_HEADER(linux/videodev.h, HAS_VIDEO_CAPTURE=1)
@@ -154,7 +163,7 @@
if test "${HAS_VIDEO_CAPTURE}z" = "z" ; then
AC_MSG_NOTICE(No Video Capture support)
AC_DEFINE([NO_VIDEO_CAPTURE], [], [No video capture])
-@@ -2046,6 +2048,9 @@
+@@ -2046,6 +2048,9 @@ if test "${enable_exceptions}z" = "yesz"
AC_MSG_NOTICE(C++ exceptions enabled)
STDCCFLAGS="$STDCCFLAGS -fno-exceptions"
fi
diff --git a/devel/pwlib/pkg-plist b/devel/pwlib/pkg-plist
index 21a56d2cb8bf..a334bb13dd10 100644
--- a/devel/pwlib/pkg-plist
+++ b/devel/pwlib/pkg-plist
@@ -160,6 +160,7 @@ lib/pwlib/devices/sound/oss_pwplugin.so
%%AVC1394%%lib/pwlib/devices/videoinput/avc_pwplugin.so
%%BSDVIDEO%%lib/pwlib/devices/videoinput/bsdvideo_pwplugin.so
%%DC1394%%lib/pwlib/devices/videoinput/dc_pwplugin.so
+%%V4L%%lib/pwlib/devices/videoinput/v4l_pwplugin.so
@dirrm lib/pwlib/devices/sound
@dirrm lib/pwlib/devices/videoinput
@dirrm lib/pwlib/devices