[Pkg-voip-commits] r8818 - in /dahdi-linux/trunk/debian: changelog patches/oslec_auto patches/series

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Mon Mar  7 10:45:54 2011
New Revision: 8818

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8818
Log:
* Patch oslec_auto: Makes adding OSLEC less painful.
  - But for now it requires manually editing patch dahdi_linux_extra.

Added:
    dahdi-linux/trunk/debian/patches/oslec_auto
Modified:
    dahdi-linux/trunk/debian/changelog
    dahdi-linux/trunk/debian/patches/series

Modified: dahdi-linux/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/changelog?rev=8818&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/changelog (original)
+++ dahdi-linux/trunk/debian/changelog Mon Mar  7 10:45:54 2011
@@ -5,6 +5,8 @@
     - Patch oslec_include_2634 dropped: merged upstream. 
     - Patch xpp_usb_buffer_2635 dropped: merged upstream.
     - Patch voicebus_sem_h_2635 dropped: merged upstream.
+  * Patch oslec_auto: Makes adding OSLEC less painful.
+    - But for now it requires manually editing patch dahdi_linux_extra.
 
  -- Tzafrir Cohen <tzafrir at debian.org>  Mon, 07 Mar 2011 12:01:55 +0200
 

Added: dahdi-linux/trunk/debian/patches/oslec_auto
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/oslec_auto?rev=8818&op=file
==============================================================================
--- dahdi-linux/trunk/debian/patches/oslec_auto (added)
+++ dahdi-linux/trunk/debian/patches/oslec_auto Mon Mar  7 10:45:54 2011
@@ -1,0 +1,20 @@
+Origin: https://issues.asterisk.org/view.php?id=15251
+Author: biohumanoid
+
+diff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild
+index 1c2d1e3..60b997d 100644
+--- a/drivers/dahdi/Kbuild
++++ b/drivers/dahdi/Kbuild
+@@ -37,7 +37,11 @@ obj-m += $(DAHDI_MODULES_EXTRA)
+ # A quick and dirty way to build OSLEC, if you happened to place it
+ # yourself in the dahdi source tree. This is experimental. See README
+ # regarding OSLEC.
+-#obj-m += ../staging/echo/
++
++ifneq (,$(wildcard $(src)/../staging/echo/echo.c))
++obj-m += dahdi_echocan_oslec.o
++obj-m += ../staging/echo/
++endif
+ 
+ CFLAGS_MODULE += -I$(DAHDI_INCLUDE) -I$(src)
+ 

Modified: dahdi-linux/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/series?rev=8818&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/series (original)
+++ dahdi-linux/trunk/debian/patches/series Mon Mar  7 10:45:54 2011
@@ -1,3 +1,4 @@
+oslec_auto
 # Mega-patch of extra drivers:
 dahdi_linux_extra
 no_firmware_download