[Pkg-voip-commits] r5389 - in /openh323/trunk/debian: changelog patches/backport-vpb-fix.dpatch

[paravoid at alioth.debian.org]

Author: paravoid
Date: Fri Mar 28 03:48:11 2008
New Revision: 5389

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5389
Log:
* Backport openh323u.mak changes fix from titan that disable unnecessary
  linking against libvpb.

Added:
    openh323/trunk/debian/patches/backport-vpb-fix.dpatch   (with props)
Modified:
    openh323/trunk/debian/changelog

Modified: openh323/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/changelog?rev=5389&op=diff
==============================================================================
--- openh323/trunk/debian/changelog (original)
+++ openh323/trunk/debian/changelog Fri Mar 28 03:48:11 2008
@@ -1,10 +1,14 @@
 openh323 (1.18.0.dfsg-8) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  [ Kilian Krause ]
   * Fix debian/watch to use sf.net (Closes: #453578)
   * Remove symlinks to unused compatibility versions.
 
- -- Kilian Krause <kilian at debian.org>  Sat,  1 Dec 2007 13:12:03 +0100
+  [ Faidon Liambotis ]
+  * Backport openh323u.mak changes fix from titan that disable unnecessary
+    linking against libvpb.
+
+ -- Faidon Liambotis <paravoid at debian.org>  Fri, 28 Mar 2008 05:46:43 +0200
 
 openh323 (1.18.0.dfsg-7) unstable; urgency=high
 

Added: openh323/trunk/debian/patches/backport-vpb-fix.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/patches/backport-vpb-fix.dpatch?rev=5389&op=file
==============================================================================
--- openh323/trunk/debian/patches/backport-vpb-fix.dpatch (added)
+++ openh323/trunk/debian/patches/backport-vpb-fix.dpatch Fri Mar 28 03:48:11 2008
@@ -1,0 +1,73 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## backport-vpb-fix.dpatch by Faidon Liambotis <paravoid at debian.org>
+##
+## DP: Backport Makefile changes fix from titan that disable unnecessary
+## DP: linking against libvpb.
+
+ at DPATCH@
+--- atlas/openh323u.mak.in
++++ titan/openh323u.mak.in
+@@ -22,6 +22,15 @@
+ # Contributor(s): ______________________________________.
+ #
+ # $Log: openh323u.mak.in,v $
++# Revision 1.17  2006/06/23 07:06:03  csoutheren
++# Fixed linux compile
++#
++# Revision 1.16  2006/06/23 03:18:22  shorne
++# Backport FECC (H.224) from Opal
++#
++# Revision 1.15  2006/05/30 11:09:24  hfriederich
++# Allow to enable/disable H.460 in configure
++#
+ # Revision 1.14  2005/01/03 06:25:51  csoutheren
+ # Added extensive support for disabling code modules at compile time
+ #
+@@ -180,8 +189,11 @@
+ H323_T120	     = @H323_T120@
+ H323_H248	     = @H323_H248@
+ H323_H450	     = @H323_H450@
++H323_H460        = @H323_H460@
+ H323_H501	     = @H323_H501@
+ H323_IXJ	     = @H323_IXJ@
++H323_VPB	     = @H323_VPB@
++OPAL_H224	     = @OPAL_H224@
+ 
+ ifdef LIBRARY_MAKEFILE
+ include $(PWLIBDIR)/make/unix.mak
+@@ -237,32 +249,9 @@
+ STDCCFLAGS += -DNO_SPEEX
+ endif
+ 
+-VPB_LIB := vpb
+-ifneq (,$(wildcard $(SYSLIBDIR)/lib$(VPB_LIB).a))
+-VPB_LIB_PATH=$(SYSLIBDIR)
+-else
+-ifneq (,$(wildcard /usr/local/lib/lib$(VPB_LIB).a))
+-VPB_LIB_PATH=/usr/local/lib
+-else
+-ifeq ($(OSTYPE),linux)
+-ifneq (,$(wildcard $(OH323_SRCDIR)/lib$(VPB_LIB).a))
+-VPB_LIB_PATH=$(OH323_SRCDIR)
+-else
+-ifneq (,$(wildcard ./lib$(VPB_LIB).a))
+-VPB_LIB_PATH=.
+-endif # current directory
+-endif # openhrer/src
+-endif # linux
+-endif # /usr/local/lib
+-endif # /usr/lib
+-
+-ifdef VPB_LIB_PATH
+-HAS_VPB    := 1
+-STDCCFLAGS += -DHAS_VPB
+-LDFLAGS	   += -L$(VPB_LIB_PATH)
+-LDLIBS	   += -l$(VPB_LIB)
+-endif # VPB_LIB_PATH
+-
++ifeq ($(H323_VPB),1)
++LDLIBS	   += -lvpb
++endif
+ 
+ ifdef H323_VICH263
+ LDFLAGS    += -L/usr/local/lib

Propchange: openh323/trunk/debian/patches/backport-vpb-fix.dpatch
------------------------------------------------------------------------------
    svn:executable = *