Major update to h323plus-1.23.0.

2011-10-26 16:59:51 +00:00 · 2011-10-26 16:59:51 +00:00 · d9d235f03e
commit d9d235f03e
parent c5ef1efb1a
12 changed files with 164 additions and 190 deletions
--- a/net/h323plus/Makefile
+++ b/net/h323plus/Makefile
@ -1,17 +1,14 @@
-# $OpenBSD: Makefile,v 1.8 2011/06/27 13:38:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2011/10/26 16:59:51 ajacoutot Exp $

 SHARED_ONLY=	Yes

 COMMENT=	H.323 video conferencing library

-V=		1_21_0
+V=		1_23_0
 DISTNAME=	h323plus-v${V}
 PKGNAME=	h323plus-${V:S/_/./g}
-REVISION=	3
 CATEGORIES=	net devel

-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} plugins-v${V}${EXTRACT_SUFX}
-
 SHARED_LIBS=	h323	3.0    # 1.21.0

 HOMEPAGE=	http://www.h323plus.org/
@ -24,51 +21,58 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes

+WANTLIB += SDL avcodec avutil c crypto expat gsm lber ldap ldap_r
+WANTLIB += m pt pthread sasl2 speex ssl stdc++ x264
+
 MASTER_SITES=	${HOMEPAGE}/source/download/

-WANTLIB += SDL c crypto expat lber ldap ldap_r m sasl2
-WANTLIB += ssl pt>=3 avutil>=6 speex>=4 gsm>=1 stdc++
-
-LIB_DEPENDS=	devel/ptlib \
-		graphics/ffmpeg \
-		audio/speex \
-		audio/gsm
+LIB_DEPENDS=	devel/ptlib>=2.10.3 \
+		graphics/ffmpeg

 WRKDIST=	${WRKDIR}/h323plus

 USE_GMAKE=	Yes
-ALL_TARGET=	opt
+ALL_TARGET=	default
 NO_REGRESS=	Yes

 MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/plugins

 CONFIGURE_STYLE=gnu
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -pthread -lavutil" \
-		PTLIBDIR="`ptlib-config --prefix`/share/ptlib"
+		LDFLAGS="-L${LOCALBASE}/lib -pthread -lavutil"
 CONFIGURE_ARGS=	--disable-localspeex \
 		--disable-localgsm \
-		--enable-gnugk
+		--enable-localilbc \
+		--enable-gnugk \
+		--with-plugin-installdir=h323plus

-MAKE_ENV=	STDCCFLAGS="${STDCCFLAGS} -I${WRKSRC}/include" \
-		CC=${CC} CPLUS=${CXX} BUILDSELF="1"
+# http://www.tandberg.com/collateral/tandberg-ITU-license.pdf
+CONFIGURE_ARGS += --disable-h46018
+
+# H.460.23/.24. Contact consulting@h323plus.org for licensing terms.
+CONFIGURE_ARGS += --disable-h46023
+
+# XXX celtcodec.c:55: error: too many arguments to function 'celt_mode_create'
+CONFIGURE_ARGS += --disable-celt
+
+MAKE_ENV=	CC=${CC} CPLUS=${CXX} OH323_BUILDSELF="1" VERBOSE="1"

 MAKE_FLAGS=	MAJOR_VERSION=${LIBh323_VERSION:R} \
 		MINOR_VERSION=${LIBh323_VERSION:E}

-post-extract:
-	@mv ${WRKDIR}/plugins ${WRKSRC}/plugins
-
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/Makefile.in \
 		${WRKSRC}/plugins/audio/Speex/Makefile.in \
+		${WRKSRC}/plugins/audio/GSM0610/Makefile.in \
 		${WRKSRC}/openh323u.mak.in \
 		${WRKSRC}/plugins/video/H.263-ffmpeg/h263ffmpeg.cxx
-	find ${WRKSRC}/plugins/ -type f -name Makefile.in -exec  \
-		perl -pi -e 's,pwlib,ptlib,g' {} \;
+	perl -pi -e 's,h263p_encoder,ff_h263p_encoder,g;' \
+		-e 's,h264_decoder,ff_h264_decoder,g;' \
+		-e 's,mpeg4_encoder,ff_mpeg4_encoder,g' \
+		${WRKSRC}/plugins/configure

 post-install:
-	@cd ${WRKBUILD}/plugins && \
+	cd ${WRKBUILD}/plugins && \
 		${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${ALL_FAKE_FLAGS} ${INSTALL_TARGET}
 	${INSTALL_DATA} ${WRKSRC}/version.h ${PREFIX}/share/openh323

--- a/net/h323plus/distinfo
+++ b/net/h323plus/distinfo
@ -1,10 +1,5 @@
-MD5 (h323plus-v1_21_0.tar.gz) = NwUy5XVKCSyXVZMMTx9vYQ==
-MD5 (plugins-v1_21_0.tar.gz) = Rm01SA2nvfbLVzehc9Iadw==
-RMD160 (h323plus-v1_21_0.tar.gz) = m3pebXaFDSqvfcANYhRdI0SRhXI=
-RMD160 (plugins-v1_21_0.tar.gz) = MPoAyqVCBs45xt9aN/bf6375VOE=
-SHA1 (h323plus-v1_21_0.tar.gz) = JO/SANjUcTnOV49NWqhfO7GOYcs=
-SHA1 (plugins-v1_21_0.tar.gz) = 3k/wa6WHDnJv3EjcBzVOw2vKCN0=
-SHA256 (h323plus-v1_21_0.tar.gz) = diChfosOzw+Ofss17e220Jcn034BiTX6ut07ULuKnTw=
-SHA256 (plugins-v1_21_0.tar.gz) = WTb4v3n+1+HyvztWKzh2AY2/QprcopW970FwsU0oJSI=
-SIZE (h323plus-v1_21_0.tar.gz) = 2183577
-SIZE (plugins-v1_21_0.tar.gz) = 2254318
+MD5 (h323plus-v1_23_0.tar.gz) = FvlFzP8XKcNvzjsqOhen2Q==
+RMD160 (h323plus-v1_23_0.tar.gz) = GTwDvwige+KIgwaeI3TakFlVzSU=
+SHA1 (h323plus-v1_23_0.tar.gz) = Qsk5HQWbL3tTD6F0C6alp8JNIkQ=
+SHA256 (h323plus-v1_23_0.tar.gz) = y7WQaenHwIX2Ltd0xv5lUr1IfeQxWt7wlAfkDRLwoQI=
+SIZE (h323plus-v1_23_0.tar.gz) = 4217023
--- a/net/h323plus/patches/patch-Makefile_in
+++ b/net/h323plus/patches/patch-Makefile_in
@ -1,7 +1,7 @@
-$OpenBSD: patch-Makefile_in,v 1.1.1.1 2010/03/23 21:11:57 ajacoutot Exp $
--- Makefile.in.orig	Wed Apr  8 16:37:56 2009
-+++ Makefile.in	Tue Jun 23 12:32:29 2009
-@@ -337,6 +337,7 @@ update:
+$OpenBSD: patch-Makefile_in,v 1.2 2011/10/26 16:59:51 ajacoutot Exp $
+--- Makefile.in.orig	Tue Jan 19 14:57:06 2010
+++ Makefile.in	Wed Oct 26 13:23:13 2011
+@@ -340,6 +340,7 @@ update:
 # standard build command
 $(subst tagbuild,,$(STANDARD_TARGETS)) ::
 	$(MAKE) -C src $@
@ -9,7 +9,7 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2010/03/23 21:11:57 ajacoutot Exp $
 
 notrace::
 	$(MAKE) NOTRACE=1
-@@ -347,23 +348,7 @@ docs: 
+@@ -350,23 +351,7 @@ docs: 
 install:
 	mkdir -p $(DESTDIR)$(LIBDIR)
 	rm -f $(DESTDIR)$(LIBDIR)/libh323_*_r.so*
--- a/net/h323plus/patches/patch-openh323u_mak_in
+++ b/net/h323plus/patches/patch-openh323u_mak_in
@ -1,25 +1,13 @@
-$OpenBSD: patch-openh323u_mak_in,v 1.1.1.1 2010/03/23 21:11:57 ajacoutot Exp $
--- openh323u.mak.in.orig	Sat Jul 19 03:12:28 2008
-+++ openh323u.mak.in	Fri Jun 12 12:11:43 2009
-@@ -193,7 +193,11 @@
- #
- 
- PTLIBDIR	= @PTLIBDIR@
-+ifdef BUILDSELF
- OPENH323DIR	= @OPENH323DIR@
-+else
-+OPENH323DIR	= ${PREFIX}/share/openh323
-+endif
- STDCCFLAGS	+= @STDCCFLAGS@
- LDFLAGS		+= @LDFLAGS@
- LDLIBS		+= @LDLIBS@
-@@ -232,11 +236,12 @@ LIBDIRS += $(OPENH323DIR)
+$OpenBSD: patch-openh323u_mak_in,v 1.2 2011/10/26 16:59:51 ajacoutot Exp $
+--- openh323u.mak.in.orig	Sun Jul 17 16:58:23 2011
+++ openh323u.mak.in	Tue Oct 25 15:26:36 2011
+@@ -245,11 +245,12 @@ LIBDIRS += $(OPENH323DIR)
 #OH323_SUPPRESS_H235	= 1
 
 OH323_SRCDIR = $(OPENH323DIR)/src
 -ifdef PREFIX
 -OH323_INCDIR = $(PREFIX)/include/openh323
-+ifndef BUILDSELF
+ifndef OH323_BUILDSELF
 +OH323_INCDIR = ${PREFIX}/include/openh323
 +OH323_LIBDIR = ${PREFIX}/lib
 else
@ -29,13 +17,13 @@ $OpenBSD: patch-openh323u_mak_in,v 1.1.1.1 2010/03/23 21:11:57 ajacoutot Exp $
 
 ifndef OH323_LIBDIR
 OH323_LIBDIR = $(OPENH323DIR)/lib
-@@ -251,8 +256,12 @@ RCFLAGS	   += -DPTRACING
+@@ -266,8 +267,12 @@ endif
 OH323_SUFFIX = $(OBJ_SUFFIX)
 endif # NOTRACE
 
 -OH323_BASE  = h323_$(PLATFORM_TYPE)_$(OH323_SUFFIX)$(LIB_TYPE)
 +OH323_BASE  = h323$(LIB_TYPE)
-+ifdef BUILDSELF
+ifdef OH323_BUILDSELF
 OH323_FILE  = lib$(OH323_BASE).$(LIB_SUFFIX)
 +else
 +OH323_FILE  = lib$(OH323_BASE).$(LIB_SUFFIX).${LIBh323_VERSION}
--- a/net/h323plus/patches/patch-plugins_Makefile_in
+++ b/net/h323plus/patches/patch-plugins_Makefile_in
@ -1,13 +0,0 @@
-$OpenBSD: patch-plugins_Makefile_in,v 1.1.1.1 2010/03/23 21:11:57 ajacoutot Exp $
--- plugins/Makefile.in.orig	Tue Nov 13 13:29:44 2007
-+++ plugins/Makefile.in	Fri Jun  5 00:18:29 2009
-@@ -4,8 +4,7 @@ SUBDIRS = audio/GSM0610 \
- 	  audio/LPC_10 \
- 	  audio/G726 \
- 	  audio/IMA_ADPCM \
-	  audio/gsm-amr \
-	  video/H.261-vic
-+	  audio/gsm-amr
- 
- HAS_H263=@HAS_H263@
- ifeq ($(HAS_H263),1)
--- a/net/h323plus/patches/patch-plugins_audio_GSM0610_Makefile_in
+++ b/net/h323plus/patches/patch-plugins_audio_GSM0610_Makefile_in
@ -1,12 +1,14 @@
-$OpenBSD: patch-plugins_audio_GSM0610_Makefile_in,v 1.1.1.1 2010/03/23 21:11:57 ajacoutot Exp $
--- plugins/audio/GSM0610/Makefile.in.orig	Tue Jun 23 11:29:40 2009
-+++ plugins/audio/GSM0610/Makefile.in	Tue Jun 23 11:30:11 2009
-@@ -117,7 +117,7 @@ EXTRALIBS = 
+$OpenBSD: patch-plugins_audio_GSM0610_Makefile_in,v 1.2 2011/10/26 16:59:51 ajacoutot Exp $
+--- plugins/audio/GSM0610/Makefile.in.orig	Wed Feb 24 03:19:05 2010
+++ plugins/audio/GSM0610/Makefile.in	Tue Oct 25 17:14:46 2011
+@@ -30,8 +30,8 @@ libdir=@libdir@
+ target_os=@target_os@
 
- else
- 
-EXTRALIBS = -lgsm
-+EXTRALIBS = -L${LOCALBASE}/lib -lgsm
- 
- endif
+ GSM_SYSTEM=@GSM_SYSTEM@
+-GSM_LIBS=@GSM_LIBS@
+-GSM_CFLAGS=@GSM_CFLAGS@
+GSM_LIBS=-L${LOCALBASE}/lib @GSM_LIBS@
+GSM_CFLAGS=-I${LOCALBASE}/include
+ SONAME	= gsm0610
+ H323_EMBEDDED_GSM=@H323_EMBEDDED_GSM@
 
--- a/net/h323plus/patches/patch-plugins_audio_Speex_Makefile_in
+++ b/net/h323plus/patches/patch-plugins_audio_Speex_Makefile_in
@ -1,12 +1,12 @@
-$OpenBSD: patch-plugins_audio_Speex_Makefile_in,v 1.1.1.1 2010/03/23 21:11:57 ajacoutot Exp $
--- plugins/audio/Speex/Makefile.in.orig	Mon Oct 22 09:40:54 2007
-+++ plugins/audio/Speex/Makefile.in	Fri Jun  5 00:32:57 2009
-@@ -131,7 +131,7 @@ SRCS   += $(SRCDIR)/bits.c \
+$OpenBSD: patch-plugins_audio_Speex_Makefile_in,v 1.2 2011/10/26 16:59:51 ajacoutot Exp $
+--- plugins/audio/Speex/Makefile.in.orig	Wed Feb 24 03:19:13 2010
+++ plugins/audio/Speex/Makefile.in	Tue Oct 25 17:15:34 2011
+@@ -89,7 +89,7 @@ STDCCFLAGS	=@STDCCFLAGS@
+ LDFLAGS		=@LDFLAGS@
 
- EXTRALIBS =
- else
-EXTRALIBS = -lspeex
-+EXTRALIBS = -L${LOCALBASE}/lib -lspeex
- endif
+ SPEEX_CFLAGS	=@SPEEX_CFLAGS@
+-SPEEX_LIBS	=@SPEEX_LIBS@
+SPEEX_LIBS	=-L${LOCALBASE}/lib @SPEEX_LIBS@
+ 
+ SPEEX_SYSTEM=@SPEEX_SYSTEM@
 
- OBJDIR	= ./obj
--- a/net/h323plus/patches/patch-plugins_configure
+++ b/net/h323plus/patches/patch-plugins_configure
@ -1,65 +1,41 @@
-$OpenBSD: patch-plugins_configure,v 1.3 2010/06/27 01:30:33 ajacoutot Exp $
--- plugins/configure.orig	Mon Oct 22 09:40:39 2007
-+++ plugins/configure	Sun Jun 27 03:22:08 2010
-@@ -3156,7 +3156,7 @@ case "$target_os" in
-           esac
- 	  PLUGINEXT=dylib
-         ;;
-        *)LDSO='-shared -Wl,-soname,$(SONAME)';;
-+        *)LDSO='-shared -fPIC -Wl,-soname,$(SONAME)';;
- esac
- LDSO=${LDSO}
+$OpenBSD: patch-plugins_configure,v 1.4 2011/10/26 16:59:51 ajacoutot Exp $
+--- plugins/configure.orig	Mon Sep 20 11:04:24 2010
+++ plugins/configure	Wed Oct 26 13:08:03 2011
+@@ -2318,6 +2318,10 @@ fi
+                  opal_release_flags="-O3 -DSOLARIS"
+                  opal_debug_flags="-g -D_DEBUG -DSOLARIS"
+                ;;
+               openbsd*)
+                 opal_release_flags=""
+                 opal_debug_flags="-g3 -ggdb -O0 -D_DEBUG"
+               ;;
+                *)
+                  opal_release_flags="-Os"
+                  opal_debug_flags="-g3 -ggdb -O0 -D_DEBUG"
+@@ -6530,7 +6534,7 @@ _ACEOF
 
-@@ -5886,13 +5886,13 @@ echo "${ECHO_T}no" >&6
-   else
-     echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+    echo "$as_me:$LINENO: checking for dlopen" >&5
-+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-+LIBS="$LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -6101,7 +6101,7 @@ fi
-     LIBS=$saved_LIBS
-     if test "x${ffmpeg_libs}" != "xno"; then
+         *)
+           STDCCFLAGS="$STDCCFLAGS -fPIC"
+-          LDSO='-shared -Wl,-soname,$(SONAME)'
+          LDSO='-shared -fPIC -Wl,-soname,$(SONAME)'
+           PLUGINEXT=so
 
-for ac_header in ffmpeg/avcodec.h
-+for ac_header in libavcodec/avcodec.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -6262,7 +6262,7 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
+ 
+@@ -7331,7 +7335,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <ffmpeg/avcodec.h>
-+#include <libavcodec/avcodec.h>
-   	     #ifdef LIBAVCODEC_VERSION_INT
-                #if LIBAVCODEC_VERSION_INT >= ((51<<16)+(11<<8)+0)
-                  yes
-@@ -6321,7 +6321,7 @@ if test "x${enable_x264}" != "xno" ; then
-     enable_x264=yes
 
-     saved_LIBS="$LIBS"
-    LIBS="$LIBS -lm -lz -lpthread"
-+    LIBS="$LIBS -lm -lz -pthread"
-     echo "$as_me:$LINENO: checking for x264_encoder_open in -lx264" >&5
- echo $ECHO_N "checking for x264_encoder_open in -lx264... $ECHO_C" >&6
- if test "${ac_cv_lib_x264_x264_encoder_open+set}" = set; then
-@@ -6621,7 +6621,7 @@ if test "x${enable_theora}" != "xno" ; then
-     enable_theora=yes
+-            #include <gsm/gsm.h>
+            #include <gsm.h>
 
-     saved_LIBS="$LIBS"
-    LIBS="$LIBS -lm -lz -lpthread"
-+    LIBS="$LIBS -lm -lz -pthread"
-     echo "$as_me:$LINENO: checking for theora_encode_init in -ltheora" >&5
- echo $ECHO_N "checking for theora_encode_init in -ltheora... $ECHO_C" >&6
- if test "${ac_cv_lib_theora_theora_encode_init+set}" = set; then
+ int
+ main ()
+@@ -7504,7 +7508,7 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-            #include <gsm/gsm.h>
+            #include <gsm.h>
+ 
+ int
+ main ()
--- a/net/h323plus/patches/patch-plugins_video_H_261-vic_vic_config_h
+++ b/net/h323plus/patches/patch-plugins_video_H_261-vic_vic_config_h
@ -0,0 +1,14 @@
+$OpenBSD: patch-plugins_video_H_261-vic_vic_config_h,v 1.1 2011/10/26 16:59:51 ajacoutot Exp $
+--- plugins/video/H.261-vic/vic/config.h.orig	Wed Oct 26 13:06:46 2011
+++ plugins/video/H.261-vic/vic/config.h	Wed Oct 26 13:07:05 2011
+@@ -73,6 +73,10 @@ typedef unsigned int  u_int;
+ typedef unsigned char BYTE;
+ typedef unsigned long u_long;
+ 
+#ifdef __OpenBSD__
+#include <sys/types.h>
+#endif
+
+ #ifndef _WIN32
+ #include <netinet/in.h>
+ #endif
--- a/net/h323plus/patches/patch-plugins_video_H_263-ffmpeg_h263ffmpeg_cxx
+++ b/net/h323plus/patches/patch-plugins_video_H_263-ffmpeg_h263ffmpeg_cxx
@ -1,35 +1,12 @@
-$OpenBSD: patch-plugins_video_H_263-ffmpeg_h263ffmpeg_cxx,v 1.1.1.1 2010/03/23 21:11:57 ajacoutot Exp $
--- plugins/video/H.263-ffmpeg/h263ffmpeg.cxx.orig	Tue Nov 25 12:25:41 2008
-+++ plugins/video/H.263-ffmpeg/h263ffmpeg.cxx	Fri Jan 29 19:03:14 2010
-@@ -169,7 +169,7 @@ extern "C" {
+$OpenBSD: patch-plugins_video_H_263-ffmpeg_h263ffmpeg_cxx,v 1.2 2011/10/26 16:59:51 ajacoutot Exp $
+--- plugins/video/H.263-ffmpeg/h263ffmpeg.cxx.orig	Wed Feb 24 03:19:43 2010
+++ plugins/video/H.263-ffmpeg/h263ffmpeg.cxx	Tue Oct 25 15:26:36 2011
+@@ -98,7 +98,7 @@ extern "C" {
 #    define DIR_SEPERATOR "\\"
 #    define DIR_TOKENISER ";"
 #  else
 -#    define P_DEFAULT_PLUGIN_DIR "/usr/lib/ptlib:/usr/lib/pwlib"
-+#    define P_DEFAULT_PLUGIN_DIR "${TRUEPREFIX}/lib:${TRUEPREFIX}/lib/ptlib:${TRUEPREFIX}/lib/pwlib"
+#    define P_DEFAULT_PLUGIN_DIR "${TRUEPREFIX}/lib:${TRUEPREFIX}/lib/h323plus:${LOCALBASE}/lib/pwlib"
 #    define DIR_SEPERATOR "/"
 #    define DIR_TOKENISER ":"
 #  endif
-@@ -337,7 +337,7 @@ class DynaLink
-       _hDLL = dlopen((const char *)path, RTLD_NOW);
-       if (_hDLL == NULL) {
-         fprintf(stderr, "error loading %s", path);
-        char * err = dlerror();
-+        const char * err = dlerror();
-         if (err != NULL)
-           fprintf(stderr, " - %s", err);
-         fprintf(stderr, "\n");
-@@ -470,11 +470,11 @@ bool FFMPEGLibrary::Load()
-   if (IsLoaded())
-     return true;
- 
-  if (!DynaLink::Open("avcodec")
-+  if (!DynaLink::Open("libavcodec.so")
- #if defined(WIN32)
-       && !DynaLink::Open("libavcodec")
- #else
-      && !DynaLink::Open("libavcodec.so")
-+      && !DynaLink::Open("avcodec")
- #endif
-     ) {
-     //cerr << "FFLINK\tFailed to load a library, some codecs won't operate correctly;" << endl;
--- a/net/h323plus/patches/patch-plugins_video_H_264_Makefile_in
+++ b/net/h323plus/patches/patch-plugins_video_H_264_Makefile_in
@ -0,0 +1,12 @@
+$OpenBSD: patch-plugins_video_H_264_Makefile_in,v 1.1 2011/10/26 16:59:51 ajacoutot Exp $
+--- plugins/video/H.264/Makefile.in.orig	Tue Oct 25 18:18:26 2011
+++ plugins/video/H.264/Makefile.in	Tue Oct 25 18:18:35 2011
+@@ -86,7 +86,7 @@
+ # Added Linux build for H.261 plug-in.
+ #
+ 
+-VC_PLUGIN_DIR=codecs/video
+VC_PLUGIN_DIR=@VC_PLUGIN_DIR@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
--- a/net/h323plus/pkg/PLIST
+++ b/net/h323plus/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2011/05/11 12:03:19 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.3 2011/10/26 16:59:51 ajacoutot Exp $
@conflict openh323-*
@pkgpath net/openh323
 include/openh323/
@ -63,12 +63,22 @@ include/openh323/h450/h450pdu.h
 include/openh323/h460/
 include/openh323/h460/h460.h
 include/openh323/h460/h4601.h
+include/openh323/h460/h46015.h
+include/openh323/h460/h46017a.h
 include/openh323/h460/h46018.h
+include/openh323/h460/h46018_h225.h
 include/openh323/h460/h46019.h
+include/openh323/h460/h46024b.h
 include/openh323/h460/h4609.h
+include/openh323/h460/h460_oid3.h
+include/openh323/h460/h460_std17.h
+include/openh323/h460/h460_std18.h
+include/openh323/h460/h460_std23.h
+include/openh323/h460/h460_std9.h
 include/openh323/h460/h460p.h
 include/openh323/h460/h460pres.h
 include/openh323/h460/h460tm.h
+include/openh323/h460/upnpcp.h
 include/openh323/h501.h
 include/openh323/h501pdu.h
 include/openh323/jitter.h
@ -78,6 +88,7 @@ include/openh323/opalvxml.h
 include/openh323/opalwavfile.h
 include/openh323/openh323buildopts.h
 include/openh323/peclient.h
+include/openh323/ptlib_extras.h
 include/openh323/q922.h
 include/openh323/q931.h
 include/openh323/rfc2833.h
@ -90,18 +101,26 @@ include/openh323/t38proto.h
 include/openh323/transports.h
 include/openh323/x224.h
 include/openh323/x880.h
+lib/h323plus/
+lib/h323plus/codecs/
+lib/h323plus/codecs/audio/
+lib/h323plus/codecs/audio/g7221_audio_pwplugin.so
+lib/h323plus/codecs/audio/g7222_audio_pwplugin.so
+lib/h323plus/codecs/audio/g722_audio_pwplugin.so
+lib/h323plus/codecs/audio/g726_audio_pwplugin.so
+lib/h323plus/codecs/audio/gsm0610_audio_pwplugin.so
+lib/h323plus/codecs/audio/gsmamrcodec_pwplugin.so
+lib/h323plus/codecs/audio/ilbc_audio_pwplugin.so
+lib/h323plus/codecs/audio/ima_adpcm_audio_pwplugin.so
+lib/h323plus/codecs/audio/lpc10_audio_pwplugin.so
+lib/h323plus/codecs/audio/speex_audio_pwplugin.so
+lib/h323plus/codecs/video/
+lib/h323plus/codecs/video/h261-vic_video_pwplugin.so
+lib/h323plus/codecs/video/h263-1998_video_pwplugin.so
+lib/h323plus/codecs/video/h263-ffmpeg_video_pwplugin.so
+lib/h323plus/codecs/video/h264_video_pwplugin.so
+@bin lib/h323plus/codecs/video/h264_video_pwplugin_helper
@lib lib/libh323.so.${LIBh323_VERSION}
-lib/ptlib/codecs/
-lib/ptlib/codecs/audio/
-lib/ptlib/codecs/audio/g726_audio_pwplugin.so
-lib/ptlib/codecs/audio/gsm0610_audio_pwplugin.so
-lib/ptlib/codecs/audio/gsmamrcodec_pwplugin.so
-lib/ptlib/codecs/audio/ilbc_audio_pwplugin.so
-lib/ptlib/codecs/audio/ima_adpcm_audio_pwplugin.so
-lib/ptlib/codecs/audio/lpc10_audio_pwplugin.so
-lib/ptlib/codecs/audio/speex_audio_pwplugin.so
-lib/ptlib/codecs/video/
-lib/ptlib/codecs/video/h263-ffmpeg_video_pwplugin.so
 share/openh323/
 share/openh323/openh323u.mak
 share/openh323/version.h