[Pkg-voip-commits] r3706 - opal/trunk/debian/patches

[kilian at alioth.debian.org]

Author: kilian
Date: 2007-07-03 19:46:33 +0000 (Tue, 03 Jul 2007)
New Revision: 3706

Added:
   opal/trunk/debian/patches/speexcodec.dpatch
Modified:
   opal/trunk/debian/patches/00list
Log:
Fix compilation with system supplied speex.


Modified: opal/trunk/debian/patches/00list
===================================================================
--- opal/trunk/debian/patches/00list	2007-07-03 18:31:06 UTC (rev 3705)
+++ opal/trunk/debian/patches/00list	2007-07-03 19:46:33 UTC (rev 3706)
@@ -1,3 +1,4 @@
 libname
 notrace
 remove_ilbc
+speexcodec

Added: opal/trunk/debian/patches/speexcodec.dpatch
===================================================================
--- opal/trunk/debian/patches/speexcodec.dpatch	                        (rev 0)
+++ opal/trunk/debian/patches/speexcodec.dpatch	2007-07-03 19:46:33 UTC (rev 3706)
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## speexcodec.dpatch by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Import patch from http://openh323.cvs.sourceforge.net/openh323/opal/Makefile.in?r1=1.56&r2=1.57
+## DP: and http://openh323.cvs.sourceforge.net/openh323/opal/opal_inc.mak.in?r1=1.15&r2=1.6.2.1&view=patch&pathrev=Phobos
+
+ at DPATCH@
+diff -urNad opal-2.2.8~dfsg~pre1~/Makefile.in opal-2.2.8~dfsg~pre1/Makefile.in
+--- opal-2.2.8~dfsg~pre1~/Makefile.in	2007-07-03 21:04:35.000000000 +0200
++++ opal-2.2.8~dfsg~pre1/Makefile.in	2007-07-03 21:04:35.000000000 +0200
+@@ -529,11 +529,8 @@
+ 
+ SOURCES 	+= $(OPAL_SRCDIR)/codec/speexcodec.cxx 
+ 
+-ifdef OPAL_SYSTEM_SPEEX
+-
+-ENDLDLIBS    	:= -lspeex $(ENDLDLIBS)
+ 
+-else
++ifndef OPAL_SYSTEM_SPEEX
+ 
+ SPEEX_INCDIR    = $(SPEEX_DIR)/libspeex
+ SPEEX_SRCDIR    = $(SPEEX_DIR)/libspeex
+diff -urNad opal-2.2.8~dfsg~pre1~/opal_inc.mak.in opal-2.2.8~dfsg~pre1/opal_inc.mak.in
+--- opal-2.2.8~dfsg~pre1~/opal_inc.mak.in	2007-07-03 21:04:35.000000000 +0200
++++ opal-2.2.8~dfsg~pre1/opal_inc.mak.in	2007-07-03 21:05:06.000000000 +0200
+@@ -111,7 +111,9 @@
+ 
+ STDCCFLAGS  += -I$(OPAL_INCDIR)
+ 
+-
++ifeq ($(OPAL_SYSTEM_SPEEX), 1)
++ENDLDLIBS       := -lspeex $(ENDLDLIBS)
++endif
+ $(TARGET) :	$(OPAL_LIBDIR)/$(OPAL_FILE)
+ 
+ ifndef LIBRARY_MAKEFILE


Property changes on: opal/trunk/debian/patches/speexcodec.dpatch
___________________________________________________________________
Name: svn:executable
   + *