Author: mmazur Date: Fri Feb 19 13:30:47 2010 GMT Module: packages Tag: HEAD ---- Log message: - up to 1.2.0; rel1 - added support for opal build-time flags
---- Files affected: packages/t38modem: t38modem.spec (1.12 -> 1.13) , opal_flags_support.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/t38modem/t38modem.spec diff -u packages/t38modem/t38modem.spec:1.12 packages/t38modem/t38modem.spec:1.13 --- packages/t38modem/t38modem.spec:1.12 Wed Sep 9 15:12:50 2009 +++ packages/t38modem/t38modem.spec Fri Feb 19 14:30:42 2010 @@ -3,14 +3,15 @@ Summary: Fax modem to T.38 gateway Summary(pl.UTF-8): Bramka faks modem -> T.38 Name: t38modem -Version: 1.1.0 -Release: 0.1 +Version: 1.2.0 +Release: 1 License: MPL Group: Networking/Daemons -Source0: http://dl.sourceforge.net/t38modem/t38modem-1.1.0.tgz -# Source0-md5: 6a9a6a6e45432aefa065c0436db8b3ac +Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tgz +# Source0-md5: 9239576bac0b57a3c8d90671b0249247 +Patch0: opal_flags_support.patch URL: http://t38modem.sourceforge.net/ -BuildRequires: opal-devel +BuildRequires: opal-devel >= 3.6.6-3 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -25,11 +26,12 @@ %prep %setup -q +%patch0 -p1 %build %{__make} %{?debug:debug}%{!?debug:opt} \ - USE_OPAL=1 OPALDIR=/usr/share/opal \ - OPTCCFLAGS="%{rpmcflags}" + USE_OPAL=1 USE_UNIX98_PTY=1 OPALDIR=/usr/include/opal \ + PTLIBDIR=/usr/share/ptlib OPTCCFLAGS="%{rpmcflags}" %install rm -rf $RPM_BUILD_ROOT @@ -42,7 +44,7 @@ %files %defattr(644,root,root,755) -%doc README +%doc ReadMe.txt %attr(755,root,root) %{_bindir}/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -51,6 +53,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.13 2010/02/19 13:30:42 mmazur +- up to 1.2.0; rel1 +- added support for opal build-time flags + Revision 1.12 2009/09/09 13:12:50 jajcus - Version: 1.1.0 - NFY (doesn't build with current Th version of Opal) ================================================================ Index: packages/t38modem/opal_flags_support.patch diff -u /dev/null packages/t38modem/opal_flags_support.patch:1.1 --- /dev/null Fri Feb 19 14:30:48 2010 +++ packages/t38modem/opal_flags_support.patch Fri Feb 19 14:30:42 2010 @@ -0,0 +1,131 @@ +diff -urN t38modem-1.2.0.orig/Makefile t38modem-1.2.0/Makefile +--- t38modem-1.2.0.orig/Makefile 2009-07-31 19:34:40.000000000 +0200 ++++ t38modem-1.2.0/Makefile 2010-02-19 13:55:36.031537182 +0100 +@@ -116,8 +116,6 @@ + SOURCES += \ + opalutils.cxx \ + modemep.cxx modemstrm.cxx \ +- h323ep.cxx \ +- sipep.cxx \ + manager.cxx + + ifndef OPALDIR +@@ -128,6 +126,18 @@ + STDCCFLAGS += -DUSE_OPAL + +- include $(OPALDIR)/opal_inc.mak ++ include $(OPALDIR)/opal_defs.mak ++ ++ ifeq ($(OPAL_H323),yes) ++ SOURCES += h323ep.cxx ++ STDCCFLAGS += -DOPAL_H323 ++ endif ++ ++ ifeq ($(OPAL_SIP),yes) ++ SOURCES += sipep.cxx ++ STDCCFLAGS += -DOPAL_SIP ++ endif ++ ++ include $(OPALDIR)/opal_inc.mak + else + VPATH_CXX := h323lib + +diff -urN t38modem-1.2.0.orig/opal/manager.cxx t38modem-1.2.0/opal/manager.cxx +--- t38modem-1.2.0.orig/opal/manager.cxx 2009-07-31 19:34:40.000000000 +0200 ++++ t38modem-1.2.0/opal/manager.cxx 2010-02-19 13:59:48.268520117 +0100 +@@ -55,8 +55,12 @@ + #include <opal/buildopts.h> + + #include "../pmutils.h" ++#ifdef OPAL_H323 + #include "h323ep.h" ++#endif ++#ifdef OPAL_SIP + #include "sipep.h" ++#endif + #include "modemep.h" + #include "manager.h" + +@@ -71,8 +75,12 @@ + PString MyManager::ArgSpec() + { + return ++#ifdef OPAL_H323 + MyH323EndPoint::ArgSpec() + ++#endif ++#ifdef OPAL_SIP + MySIPEndPoint::ArgSpec() + ++#endif + ModemEndPoint::ArgSpec() + + "-ports:" + "-route:" +@@ -101,8 +109,12 @@ + ).Lines(); + + PStringArray arr[] = { ++#ifdef OPAL_H323 + MyH323EndPoint::Descriptions(), ++#endif ++#ifdef OPAL_SIP + MySIPEndPoint::Descriptions(), ++#endif + ModemEndPoint::Descriptions(), + }; + +@@ -122,8 +134,12 @@ + PBoolean first = TRUE; + + PStringArray arr[] = { ++#ifdef OPAL_H323 + MyH323EndPoint::Descriptions(args), ++#endif ++#ifdef OPAL_SIP + MySIPEndPoint::Descriptions(args), ++#endif + ModemEndPoint::Descriptions(args), + }; + +@@ -192,11 +208,15 @@ + if (!ModemEndPoint::Create(*this, args)) + return FALSE; + ++#ifdef OPAL_H323 + if (!MyH323EndPoint::Create(*this, args)) + return FALSE; ++#endif + ++#ifdef OPAL_SIP + if (!MySIPEndPoint::Create(*this, args)) + return FALSE; ++#endif + + if (args.HasOption("route")) { + SetRouteTable(args.GetOptionString("route").Tokenise(",\r\n", FALSE)); +@@ -308,6 +328,7 @@ + PSafePtr<OpalConnection> pOtherConn = connection.GetOtherPartyConnection(); + + if (pOtherConn != NULL) { ++#ifdef OPAL_H323 + if (PIsDescendant(&pOtherConn->GetEndPoint(), MyH323EndPoint)) { + if (((MyH323EndPoint &)pOtherConn->GetEndPoint()).RequestModeChange(*pOtherConn, mediaType)) { + myPTRACE(2, "MyManager::RequestModeChange(" << connection << ", " << mediaType << ")" +@@ -316,6 +337,8 @@ + } + } + else ++#endif ++#ifdef OPAL_SIP + if (PIsDescendant(&pOtherConn->GetEndPoint(), MySIPEndPoint)) { + if (((MySIPEndPoint &)pOtherConn->GetEndPoint()).RequestModeChange(*pOtherConn, mediaType)) { + myPTRACE(2, "MyManager::RequestModeChange(" << connection << ", " << mediaType << ")" +@@ -323,7 +346,9 @@ + return PTrue; + } + } +- else { ++ else ++#endif ++ { + myPTRACE(1, "MyManager::RequestModeChange(" << connection << ", " << mediaType << ")" + " RequestModeChange(" << *pOtherConn << ") - not implemented"); + } ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/t38modem/t38modem.spec?r1=1.12&r2=1.13&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
