Date: Fri, 10 Jun 2005 15:54:39 -0500 From: Steve Ames <steve@energistic.com> To: Pav Lucistnik <pav@FreeBSD.org> Cc: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/82086: openh323 and pwlib very out of date Message-ID: <20050610205439.GA88215@energistic.com> In-Reply-To: <1118436235.7847.7.camel@hood.oook.cz> References: <200506101930.j5AJUQcO071359@freefall.freebsd.org> <20050610204200.GA526@energistic.com> <1118436235.7847.7.camel@hood.oook.cz>
next in thread | previous in thread | raw e-mail | index | archive | help
--45Z9DzgjV8m4Oswq Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, Jun 10, 2005 at 10:43:55PM +0200, Pav Lucistnik wrote: > Steve Ames p??e v p? 10. 06. 2005 v 15:42 -0500: > > On Fri, Jun 10, 2005 at 07:30:26PM +0000, Pav Lucistnik wrote: > > > Synopsis: openh323 and pwlib very out of date > > > > > > State-Changed-From-To: open->feedback > > > State-Changed-By: pav > > > State-Changed-When: Fri Jun 10 19:29:52 GMT 2005 > > > State-Changed-Why: > > > Could you create an unified diffs between existing and your ports and send it > > > to me? > > > > See attached diffs. > > Please, diff -ruN (unified, and include new and deleted files). Sorry about that. New diffs attached. > > I would also like to create ports for the newer versions > > of pwlib and openh323 but perhaps in a different port such as > > > > pwlib-janus > > pwlib-pandora > > openh323-janus > > openh323-pandora > > How does these relate to existing pwlib and openh323? Are they API > incompatible, or are they forks, or...? http://www.voxgratia.org/docs/faq.html#3_8 They are the continuation of the project. Not forks. API is a bit questionable. The current ports layout doesn't install pwlib or openh323 it just builds them and then applications statically link in what they need. I believe the API is mostly OK but having seperate portnames would help to eliminate possible errors in that direction. Some ports specifically call for certain versions. net/asterisk wants 1.5.2 and 1.12.2 (the versions in these diffs). but does have some code in its Makefile to support (maybe?) the Janus release. net/gatekeeper needs at least that but suggests the Pandora release (pwlib 1.7.5.2 and openh323 1.14.4.2). gnomemeeting (at lest a current version unlike the old one in the ports tree) will use the latest pwlib/openh323 etc... -steve --45Z9DzgjV8m4Oswq Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="pwlib.diff" diff -ruN pwlib.old/Makefile pwlib/Makefile --- pwlib.old/Makefile Tue Dec 7 08:52:35 2004 +++ pwlib/Makefile Fri Jun 3 14:18:07 2005 @@ -6,9 +6,9 @@ # PORTNAME= pwlib -PORTVERSION= 1.5.0 -PORTREVISION= 5 -PORTEPOCH= 1 +PORTVERSION= 1.5.2 +#PORTREVISION= 5 +#PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= http://www.openh323.org/bin/ \ http://www.de.openh323.org/bin/ \ diff -ruN pwlib.old/distinfo pwlib/distinfo --- pwlib.old/distinfo Wed Mar 31 03:07:25 2004 +++ pwlib/distinfo Fri Jun 3 16:22:12 2005 @@ -1,2 +1,2 @@ -MD5 (pwlib_1.5.0.tar.gz) = e6bcdd121a85687c040f4871f24b7352 -SIZE (pwlib_1.5.0.tar.gz) = 1074311 +MD5 (pwlib_1.5.2.tar.gz) = 0fa33ba1b32b254abe0b731a52c0f2f9 +SIZE (pwlib_1.5.2.tar.gz) = 1085203 diff -ruN pwlib.old/files/patch-make::common.mak pwlib/files/patch-make::common.mak --- pwlib.old/files/patch-make::common.mak Thu Jan 1 00:00:00 1970 +++ pwlib/files/patch-make::common.mak Wed Jun 8 16:51:15 2005 @@ -0,0 +1,19 @@ +*** 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 -ruN pwlib.old/files/patch-src::ptclib::asner.cxx pwlib/files/patch-src::ptclib::asner.cxx --- pwlib.old/files/patch-src::ptclib::asner.cxx Tue Jun 8 06:27:43 2004 +++ pwlib/files/patch-src::ptclib::asner.cxx Thu Jan 1 00:00:00 1970 @@ -1,58 +0,0 @@ - -$FreeBSD: ports/devel/pwlib/files/patch-src::ptclib::asner.cxx,v 1.1 2004/06/08 06:27:43 sobomax Exp $ - ---- 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 -ruN pwlib.old/files/patch-src::ptclib::asnper.cxx pwlib/files/patch-src::ptclib::asnper.cxx --- pwlib.old/files/patch-src::ptclib::asnper.cxx Thu Jan 1 00:00:00 1970 +++ pwlib/files/patch-src::ptclib::asnper.cxx Fri Jun 3 15:01:03 2005 @@ -0,0 +1,56 @@ +--- 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 -ruN pwlib.old/files/patch-unix pwlib/files/patch-unix --- pwlib.old/files/patch-unix Thu Aug 28 07:58:51 2003 +++ pwlib/files/patch-unix Fri Jun 3 15:18:33 2005 @@ -1,7 +1,7 @@ -*** 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 **** +*** 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) @@ -13,7 +13,7 @@ ifndef OSRELEASE OSRELEASE := $(shell sysctl -n kern.osreldate) ---- 338,348 ---- +--- 358,368 ---- ifeq ($(OSTYPE),FreeBSD) @@ -25,8 +25,8 @@ ifndef OSRELEASE OSRELEASE := $(shell sysctl -n kern.osreldate) -*************** SHELL := /bin/sh -*** 871,881 **** +*************** +*** 891,901 **** # Directories @@ -38,7 +38,7 @@ ifndef UNIX_SRC_DIR UNIX_SRC_DIR = $(PWLIBDIR)/src/ptlib/unix ---- 871,881 ---- +--- 891,901 ---- # Directories @@ -50,20 +50,20 @@ ifndef UNIX_SRC_DIR UNIX_SRC_DIR = $(PWLIBDIR)/src/ptlib/unix -*************** LDFLAGS += $(DEBLDFLAGS) -*** 912,918 **** +*************** +*** 932,938 **** else ifneq ($(OSTYPE),Darwin) -! OPTCCFLAGS += -O3 -DNDEBUG +! OPTCCFLAGS += -Os -DNDEBUG else OPTCCFLAGS += -O2 -DNDEBUG endif ---- 912,919 ---- +--- 932,939 ---- else ifneq ($(OSTYPE),Darwin) -! # OPTCCFLAGS += -O3 -DNDEBUG +! # OPTCCFLAGS += -Os -DNDEBUG ! OPTCCFLAGS += -DNDEBUG else OPTCCFLAGS += -O2 -DNDEBUG --45Z9DzgjV8m4Oswq Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="openh323.diff" diff -ruN openh323.old/Makefile openh323/Makefile --- openh323.old/Makefile Mon May 16 02:45:09 2005 +++ openh323/Makefile Wed Jun 8 10:16:17 2005 @@ -6,8 +6,8 @@ # PORTNAME= openh323 -PORTVERSION= 1.12.0 -PORTREVISION= 5 +PORTVERSION= 1.12.2 +#PORTREVISION= 5 CATEGORIES= net MASTER_SITES= http://www.openh323.org/bin/ \ http://www.de.openh323.org/bin/ \ @@ -40,7 +40,7 @@ USE_GMAKE= yes USE_OPENLDAP= yes -USE_AUTOCONF_VER= 253 +USE_AUTOCONF_VER= 259 GNU_CONFIGURE= yes PWLIBDIR!= cd ${PORTSDIR}/devel/pwlib && make -V WRKSRC CONFIGURE_ENV= PWLIBDIR=${PWLIBDIR} OPENH323DIR=${WRKSRC} diff -ruN openh323.old/distinfo openh323/distinfo --- openh323.old/distinfo Wed Mar 31 03:10:07 2004 +++ openh323/distinfo Mon Jun 6 14:31:29 2005 @@ -1,2 +1,2 @@ -MD5 (openh323_1.12.0.tar.gz) = f7932f0a17d6afafc7332036a4b5d392 -SIZE (openh323_1.12.0.tar.gz) = 2325128 +MD5 (openh323_1.12.2.tar.gz) = 15f0b12b60769d03eca9e498050776f3 +SIZE (openh323_1.12.2.tar.gz) = 2343354 diff -ruN openh323.old/files/patch-configurein openh323/files/patch-configurein --- openh323.old/files/patch-configurein Wed May 26 10:12:14 2004 +++ openh323/files/patch-configurein Mon Jun 6 14:42:11 2005 @@ -1,50 +1,19 @@ -Index: configure.in -diff -c configure.in.orig configure.in -*** configure.in.orig Thu May 22 21:25:00 2003 ---- configure.in Sun Nov 23 22:51:33 2003 +*** configure.in.orig Mon Jun 6 14:34:14 2005 +--- configure.in Mon Jun 6 14:41:03 2005 *************** -*** 73,85 **** +*** 109,115 **** + if test "${H323_AVCODEC:-unset}" != "unset" ; then + AC_SUBST(H323_AVCODEC, 1) + AC_DEFINE(H323_AVCODEC, 1, "ffmpeg based avodec found") +! AVCODECINCLUDEDIR=/usr/local/include/ffmpeg + AVCODECLIBDIR=/usr/local/lib + STDCCFLAGS="$STDCCFLAGS -I${AVCODECINCLUDEDIR}" - dnl ######################################################################## - dnl get pwlib directory -! if test "${PWLIBDIR:-unset}" == "unset" ; then - PWLIBDIR=`ptlib-config --prefix` - fi -! if test "x$PWLIBDIR" == "x/usr" -o "x$PWLIBDIR" == "x/usr/"; then - PWLIBDIR="/usr/share/pwlib/" - fi -! if test "xPWLIBDIR" == "x/usr/local" -o "x$PWLIBDIR" == "x/usr/"; then - PWLIBDIR="/usr/local/share/pwlib/" - fi - echo "PWLib prefix set to.... $PWLIBDIR" ---- 73,85 ---- +--- 109,115 ---- + if test "${H323_AVCODEC:-unset}" != "unset" ; then + AC_SUBST(H323_AVCODEC, 1) + AC_DEFINE(H323_AVCODEC, 1, "ffmpeg based avodec found") +! AVCODECINCLUDEDIR=/usr/local/include + AVCODECLIBDIR=/usr/local/lib + STDCCFLAGS="$STDCCFLAGS -I${AVCODECINCLUDEDIR}" - dnl ######################################################################## - dnl get pwlib directory -! if test "${PWLIBDIR:-unset}" = "unset" ; then - PWLIBDIR=`ptlib-config --prefix` - fi -! if test "x$PWLIBDIR" = "x/usr" -o "x$PWLIBDIR" = "x/usr/"; then - PWLIBDIR="/usr/share/pwlib/" - fi -! if test "xPWLIBDIR" = "x/usr/local" -o "x$PWLIBDIR" = "x/usr/"; then - PWLIBDIR="/usr/local/share/pwlib/" - fi - echo "PWLib prefix set to.... $PWLIBDIR" -*************** -*** 96,102 **** - else - AC_CHECK_FILE(/usr/local/include/ffmpeg/avcodec.h, H323_AVCODEC=1) - if test "${H323_AVCODEC:-unset}" != "unset" ; then -! AVCODECINCLUDEDIR=/usr/local/include/ffmpeg - AVCODECLIBDIR=/usr/local/lib - fi - fi ---- 96,102 ---- - else - AC_CHECK_FILE(/usr/local/include/ffmpeg/avcodec.h, H323_AVCODEC=1) - if test "${H323_AVCODEC:-unset}" != "unset" ; then -! AVCODECINCLUDEDIR=/usr/local/include - AVCODECLIBDIR=/usr/local/lib - fi - fi diff -ruN openh323.old/files/patch-include+h263codec.h openh323/files/patch-include+h263codec.h --- openh323.old/files/patch-include+h263codec.h Tue Mar 8 14:14:10 2005 +++ openh323/files/patch-include+h263codec.h Thu Jan 1 00:00:00 1970 @@ -1,19 +0,0 @@ ---- include/h263codec.h.orig Sat Feb 19 11:29:15 2005 -+++ include/h263codec.h Sat Feb 19 11:38:52 2005 -@@ -92,6 +92,7 @@ - struct AVCodec; - struct AVCodecContext; - struct AVFrame; -+struct AVCodecParserContext; - - /////////////////////////////////////////////////////////////////////////////// - -@@ -478,7 +479,7 @@ - send. Note that for every encode thread, this 1 method is called. Consequently, - code is required to separate out packets from different encode threads. - */ -- static void RtpCallback(void *data, int size, int packetNumber); -+ static void RtpCallback(AVCodecContext *s, void *data, int size, int packetNumber); - - protected: - BOOL Resize(int width, int height); diff -ruN openh323.old/files/patch-include::ffh263codec.h openh323/files/patch-include::ffh263codec.h --- openh323.old/files/patch-include::ffh263codec.h Thu Jan 1 00:00:00 1970 +++ openh323/files/patch-include::ffh263codec.h Mon Jun 6 14:55:03 2005 @@ -0,0 +1,12 @@ +*** include/ffh263codec.h.orig Mon Aug 4 00:03:16 2003 +--- include/ffh263codec.h Mon Jun 6 14:54:31 2005 +*************** +*** 96,101 **** +--- 96,102 ---- + struct AVCodec; + struct AVCodecContext; + struct AVFrame; ++ struct AVCodecParserContext; + + /////////////////////////////////////////////////////////////////////////////// + diff -ruN openh323.old/files/patch-include::h263codec.h openh323/files/patch-include::h263codec.h --- openh323.old/files/patch-include::h263codec.h Thu Jan 1 00:00:00 1970 +++ openh323/files/patch-include::h263codec.h Mon Jun 6 15:36:38 2005 @@ -0,0 +1,19 @@ +*** include/h263codec.h.orig Mon Aug 4 00:03:22 2003 +--- include/h263codec.h Mon Jun 6 14:57:16 2005 +*************** +*** 426,432 **** + send. Note that for every encode thread, this 1 method is called. Consequently, + code is required to separate out packets from different encode threads. + */ +! static void RtpCallback(void *data, int size, int packetNumber); + + protected: + BOOL Resize(int width, int height); +--- 426,432 ---- + send. Note that for every encode thread, this 1 method is called. Consequently, + code is required to separate out packets from different encode threads. + */ +! static void RtpCallback(AVCodecContext *s, void *data, int size, int packet Number); + + protected: + BOOL Resize(int width, int height); diff -ruN openh323.old/files/patch-src::ffh263codec.cxx openh323/files/patch-src::ffh263codec.cxx --- openh323.old/files/patch-src::ffh263codec.cxx Thu Jan 1 00:00:00 1970 +++ openh323/files/patch-src::ffh263codec.cxx Mon Jun 6 15:29:34 2005 @@ -0,0 +1,19 @@ +*** src/ffh263codec.cxx.orig Fri Aug 8 01:52:14 2003 +--- src/ffh263codec.cxx Mon Jun 6 15:28:05 2005 +*************** +*** 140,146 **** + #define MSVC_OPENH323 1 + + extern "C" { +! #include <avcodec.h> + }; + + +--- 140,146 ---- + #define MSVC_OPENH323 1 + + extern "C" { +! #include <ffmpeg/avcodec.h> + }; + + diff -ruN openh323.old/files/patch-src::h263codec.cxx openh323/files/patch-src::h263codec.cxx --- openh323.old/files/patch-src::h263codec.cxx Tue Mar 8 14:14:10 2005 +++ openh323/files/patch-src::h263codec.cxx Thu Jan 1 00:00:00 1970 @@ -1,20 +0,0 @@ ---- src/h263codec.cxx.orig Fri Jun 6 08:32:08 2003 -+++ src/h263codec.cxx Sat Feb 19 11:19:36 2005 -@@ -109,7 +109,7 @@ - #include "rtp.h" - - extern "C" { --#include <avcodec.h> -+#include <ffmpeg/avcodec.h> - }; - - -@@ -836,7 +836,7 @@ - } - - --void H323_H263Codec::RtpCallback(void *data, int size, int /*packetNumber*/) -+void H323_H263Codec::RtpCallback(AVCodecContext* /*s*/, void *data, int size, int /*packetNumber*/) - { - encodedPackets.AppendH263Packet(data, size); - } --45Z9DzgjV8m4Oswq--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050610205439.GA88215>