diff options
Diffstat (limited to 'net/openh323-112/files')
| -rw-r--r-- | net/openh323-112/files/patch-configurein | 50 | ||||
| -rw-r--r-- | net/openh323-112/files/patch-include+h263codec.h | 19 | ||||
| -rw-r--r-- | net/openh323-112/files/patch-include::gkserver.h | 10 | ||||
| -rw-r--r-- | net/openh323-112/files/patch-ixjlid | 21 | ||||
| -rw-r--r-- | net/openh323-112/files/patch-openh323uin | 53 | ||||
| -rw-r--r-- | net/openh323-112/files/patch-src+OpenH323.dtf | 11 | ||||
| -rw-r--r-- | net/openh323-112/files/patch-src+OpenH323d.dtf | 11 | ||||
| -rw-r--r-- | net/openh323-112/files/patch-src+OpenH323n.dtf | 11 | ||||
| -rw-r--r-- | net/openh323-112/files/patch-src::h263codec.cxx | 20 |
9 files changed, 0 insertions, 206 deletions
diff --git a/net/openh323-112/files/patch-configurein b/net/openh323-112/files/patch-configurein deleted file mode 100644 index edff8fef174b..000000000000 --- a/net/openh323-112/files/patch-configurein +++ /dev/null @@ -1,50 +0,0 @@ -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 -*************** -*** 73,85 **** - - 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 ---- - - 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 --git a/net/openh323-112/files/patch-include+h263codec.h b/net/openh323-112/files/patch-include+h263codec.h deleted file mode 100644 index 171efe102701..000000000000 --- a/net/openh323-112/files/patch-include+h263codec.h +++ /dev/null @@ -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 --git a/net/openh323-112/files/patch-include::gkserver.h b/net/openh323-112/files/patch-include::gkserver.h deleted file mode 100644 index cdc0ba88ce08..000000000000 --- a/net/openh323-112/files/patch-include::gkserver.h +++ /dev/null @@ -1,10 +0,0 @@ ---- include/gkserver.h 2004/08/28 17:16:13 1.1 -+++ include/gkserver.h 2004/08/28 17:16:24 -@@ -404,7 +404,6 @@ - H225_RegistrationConfirm & rcf; - H225_RegistrationReject & rrj; - -- protected: - virtual Response OnHandlePDU(); - }; - diff --git a/net/openh323-112/files/patch-ixjlid b/net/openh323-112/files/patch-ixjlid deleted file mode 100644 index faec5f30ea6b..000000000000 --- a/net/openh323-112/files/patch-ixjlid +++ /dev/null @@ -1,21 +0,0 @@ -*** include/ixjlid.h.orig Tue Sep 2 17:32:20 2003 ---- include/ixjlid.h Tue Sep 2 17:32:37 2003 -*************** -*** 253,260 **** - #include <linux/ixjuser.h> - #endif - #ifdef P_FREEBSD -! #include <sys/telephony.h> -! #include <sys/ixjuser.h> - #endif - #endif - ---- 253,260 ---- - #include <linux/ixjuser.h> - #endif - #ifdef P_FREEBSD -! #include "sys/telephony.h" -! #include "sys/ixjuser.h" - #endif - #endif - diff --git a/net/openh323-112/files/patch-openh323uin b/net/openh323-112/files/patch-openh323uin deleted file mode 100644 index 4613a12f810e..000000000000 --- a/net/openh323-112/files/patch-openh323uin +++ /dev/null @@ -1,53 +0,0 @@ -*** openh323u.mak.in.orig Wed May 14 20:52:44 2003 ---- openh323u.mak.in Sun Aug 31 21:26:51 2003 -*************** LIBDIRS += $(OPENH323DIR) -*** 142,152 **** - - - OH323_SRCDIR = $(OPENH323DIR)/src -! ifdef PREFIX -! OH323_INCDIR = $(PREFIX)/include/openh323 -! else - OH323_INCDIR = $(OPENH323DIR)/include -! endif - OH323_LIBDIR = $(OPENH323DIR)/lib - - ---- 142,152 ---- - - - OH323_SRCDIR = $(OPENH323DIR)/src -! #ifdef PREFIX -! #OH323_INCDIR = $(PREFIX)/include/openh323 -! #else - OH323_INCDIR = $(OPENH323DIR)/include -! #endif - OH323_LIBDIR = $(OPENH323DIR)/lib - - -*************** ifdef OH323_SUPPRESS_H235 -*** 184,189 **** ---- 184,190 ---- - STDCCFLAGS += -DOH323_SUPPRESS_H235 - endif - -+ # Check for the ixj/telephony header files on the system. - ifneq (,$(wildcard $(SYSINCDIR)/linux/telephony.h)) - HAS_IXJ = 1 - STDCCFLAGS += -DHAS_IXJ -*************** endif -*** 197,202 **** ---- 198,210 ---- - ifneq (,$(wildcard /usr/local/include/sys/telephony.h)) - HAS_IXJ = 1 - STDCCFLAGS += -DHAS_IXJ -I/usr/local/include -+ endif -+ -+ # In the FreeBSD port, we make a local copy of the ixj header files from -+ # the ixj driver in openh323/include/sys -+ ifneq (,$(wildcard $(OPENH323DIR)/include/sys/telephony.h)) -+ HAS_IXJ = 1 -+ STDCCFLAGS += -DHAS_IXJ - endif - - #Check if we have an OSS soundcard.h diff --git a/net/openh323-112/files/patch-src+OpenH323.dtf b/net/openh323-112/files/patch-src+OpenH323.dtf deleted file mode 100644 index fe407773f4ef..000000000000 --- a/net/openh323-112/files/patch-src+OpenH323.dtf +++ /dev/null @@ -1,11 +0,0 @@ ---- src/OpenH323.dtf.orig Sat Feb 19 11:23:59 2005 -+++ src/OpenH323.dtf Sat Feb 19 11:25:00 2005 -@@ -23073,7 +23073,7 @@ - ?RingLine@OpalLineInterfaceDevice@@UAEHIK@Z @12182 NONAME ;public: virtual int __thiscall OpalLineInterfaceDevice::RingLine(unsigned int,unsigned long) - ?RingLine@OpalVoipBlasterDevice@@UAEHIK@Z @20048 NONAME ;public: virtual int __thiscall OpalVoipBlasterDevice::RingLine(unsigned int,unsigned long) - ?ROWZAG@@3QBEB @12183 NONAME ;unsigned char const * const ROWZAG -- ?RtpCallback@H323_H263Codec@@SAXPAXHH@Z @26507 NONAME ;public: static void __cdecl H323_H263Codec::RtpCallback(void *,int,int) -+ ?RtpCallback@H323_H263Codec@@SAXPAXHH@Z @26507 NONAME ;public: static void __cdecl H323_H263Codec::RtpCallback(AVCodecContext *,void *,int,int) - ?saveblks@Pre_Vid_Coder@@IAEXPAE@Z @12184 NONAME ;protected: void __thiscall Pre_Vid_Coder::saveblks(unsigned char *) - ?SelectDefaultLogicalChannel@H323Connection@@UAEXI@Z @12185 NONAME ;public: virtual void __thiscall H323Connection::SelectDefaultLogicalChannel(unsigned int) - ?SelectFastStartChannels@H323Connection@@UAEXIHH@Z @12791 NONAME ;public: virtual void __thiscall H323Connection::SelectFastStartChannels(unsigned int,int,int) diff --git a/net/openh323-112/files/patch-src+OpenH323d.dtf b/net/openh323-112/files/patch-src+OpenH323d.dtf deleted file mode 100644 index 4979aea3f4e1..000000000000 --- a/net/openh323-112/files/patch-src+OpenH323d.dtf +++ /dev/null @@ -1,11 +0,0 @@ ---- src/OpenH323d.dtf.orig Sat Feb 19 11:25:40 2005 -+++ src/OpenH323d.dtf Sat Feb 19 11:26:27 2005 -@@ -29709,7 +29709,7 @@ - ?RingLine@OpalLineInterfaceDevice@@UAEHIK@Z @16774 NONAME ;public: virtual int __thiscall OpalLineInterfaceDevice::RingLine(unsigned int,unsigned long) - ?RingLine@OpalVoipBlasterDevice@@UAEHIK@Z @29808 NONAME ;public: virtual int __thiscall OpalVoipBlasterDevice::RingLine(unsigned int,unsigned long) - ?ROWZAG@@3QBEB @16775 NONAME ;unsigned char const * const ROWZAG -- ?RtpCallback@H323_H263Codec@@SAXPAXHH@Z @38109 NONAME ;public: static void __cdecl H323_H263Codec::RtpCallback(void *,int,int) -+ ?RtpCallback@H323_H263Codec@@SAXPAXHH@Z @38109 NONAME ;public: static void __cdecl H323_H263Codec::RtpCallback(AVCodecContext *,void *,int,int) - ?SameSize@Encoder@@IAEHPBVVideoFrame@@@Z @16776 NONAME ;protected: int __thiscall Encoder::SameSize(class VideoFrame const *) - ?save@Pre_Vid_Coder@@IAEXPAE0H@Z @16777 NONAME ;protected: void __thiscall Pre_Vid_Coder::save(unsigned char *,unsigned char *,int) - ?saveblks@Pre_Vid_Coder@@IAEXPAE@Z @16778 NONAME ;protected: void __thiscall Pre_Vid_Coder::saveblks(unsigned char *) diff --git a/net/openh323-112/files/patch-src+OpenH323n.dtf b/net/openh323-112/files/patch-src+OpenH323n.dtf deleted file mode 100644 index fa2bdab7f14a..000000000000 --- a/net/openh323-112/files/patch-src+OpenH323n.dtf +++ /dev/null @@ -1,11 +0,0 @@ ---- src/OpenH323n.dtf.orig Sat Feb 19 11:25:47 2005 -+++ src/OpenH323n.dtf Sat Feb 19 11:26:53 2005 -@@ -15904,7 +15904,7 @@ - ?RingLine@OpalLineInterfaceDevice@@UAEHIK@Z @8723 NONAME ;public: virtual int __thiscall OpalLineInterfaceDevice::RingLine(unsigned int,unsigned long) - ?RingLine@OpalVoipBlasterDevice@@UAEHIK@Z @13722 NONAME ;public: virtual int __thiscall OpalVoipBlasterDevice::RingLine(unsigned int,unsigned long) - ?ROWZAG@@3QBEB @8724 NONAME ;unsigned char const * const ROWZAG -- ?RtpCallback@H323_H263Codec@@SAXPAXHH@Z @18805 NONAME ;public: static void __cdecl H323_H263Codec::RtpCallback(void *,int,int) -+ ?RtpCallback@H323_H263Codec@@SAXPAXHH@Z @18805 NONAME ;public: static void __cdecl H323_H263Codec::RtpCallback(AVCodecContext *,void *,int,int) - ?saveblks@Pre_Vid_Coder@@IAEXPAE@Z @8725 NONAME ;protected: void __thiscall Pre_Vid_Coder::saveblks(unsigned char *) - ?SelectDefaultLogicalChannel@H323Connection@@UAEXI@Z @8726 NONAME ;public: virtual void __thiscall H323Connection::SelectDefaultLogicalChannel(unsigned int) - ?SelectFastStartChannels@H323Connection@@UAEXIHH@Z @9303 NONAME ;public: virtual void __thiscall H323Connection::SelectFastStartChannels(unsigned int,int,int) diff --git a/net/openh323-112/files/patch-src::h263codec.cxx b/net/openh323-112/files/patch-src::h263codec.cxx deleted file mode 100644 index dee9c412d539..000000000000 --- a/net/openh323-112/files/patch-src::h263codec.cxx +++ /dev/null @@ -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); - } |