Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 144081 Details for
Bug 204057
net-misc/zaptel-1.2.24 new ebuild + OSLEC echo canceller support
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
net-misc/zaptel-1.2.24 ebuild diff with resp. 1.2.23
zaptel-1.2.24.ebuild.diff (text/plain), 4.94 KB, created by
Vieri
on 2008-02-20 11:57:55 UTC
(
hide
)
Description:
net-misc/zaptel-1.2.24 ebuild diff with resp. 1.2.23
Filename:
MIME Type:
Creator:
Vieri
Created:
2008-02-20 11:57:55 UTC
Size:
4.94 KB
patch
obsolete
>--- /usr/portage/net-misc/zaptel/zaptel-1.2.23.ebuild 2008-02-01 12:06:58.000000000 +0100 >+++ zaptel-1.2.24.ebuild 2008-02-20 12:02:14.000000000 +0100 >@@ -1,13 +1,16 @@ > # Copyright 1999-2008 Gentoo Foundation > # Distributed under the terms of the GNU General Public License v2 >-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.23.ebuild,v 1.2 2008/02/01 10:46:12 opfer Exp $ >+# $Header: $ > > inherit toolchain-funcs eutils linux-mod flag-o-matic > > BRI_VERSION="0.3.0-PRE-1y-l" > FLORZ_VERSION="0.3.0-PRE-1y-l_florz-12.1" > >-IUSE="astribank bri ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2 florz >+OSLEC_VERSION="0.1" >+OSLEC_PATCH="oslec-${OSLEC_VERSION}-${P}" >+ >+IUSE="astribank bri ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2 ecoslec florz > rtc watchdog zapras zapnet" > > MY_P="${P/_/-}" >@@ -17,26 +20,29 @@ > SRC_URI="http://downloads.digium.com/pub/zaptel/releases/${MY_P}.tar.gz > bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz ) > florz? ( http://zaphfc.florz.dyndns.org/zaphfc_${FLORZ_VERSION}.diff.gz ) >- " >+ ecoslec? ( http://www.rowetel.com/ucasterisk/downloads/oslec-${OSLEC_VERSION}.tar.gz >+ mirror://gentoo/${OSLEC_PATCH}.diff.gz )" > > S="${WORKDIR}/${MY_P}" > > S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}" >+S_OSLEC="${WORKDIR}/oslec-${OSLEC_VERSION}/kernel" > > SLOT="0" > LICENSE="GPL-2" >-KEYWORDS="~amd64 ~ppc x86" >+KEYWORDS="~amd64 ~x86" > > RDEPEND="virtual/libc > dev-libs/libusb > >=dev-libs/newt-0.50.0 >- astribank? ( dev-lang/perl )" >+ astribank? ( dev-lang/perl ) >+ ecoslec? ( dev-util/dialog )" > > DEPEND="${RDEPEND} virtual/linux-sources" > > # list of echo canceller use flags, > # first active in this list is selected (=order does matter) >-ZAP_EC_FLAGS="ecmark ecmark2 ecmark3 ecsteve ecsteve2 eckb1 ecmg2" >+ZAP_EC_FLAGS="ecmark ecmark2 ecmark3 ecsteve ecsteve2 eckb1 ecmg2 ecoslec" > > ### Begin: Helper functions > >@@ -208,6 +214,24 @@ > cd ${S} > fi > >+ # oslec echo canceller >+ if use ecoslec; then >+ # >+ # meh... bristuff and oslec patch are touching the same place, >+ # apply bristuff first then fixup the oslec patch >+ # ugly, but saves us from creating yet another set of patches >+ # >+ if use bri; then >+ sed -i \ >+ -e "s:^-\(#define ECHO_CAN_KB1\).*:-/* \1 */:" \ >+ -e "s:^.*\(#define ECHO_CAN_MG2\).*: \1:" \ >+ "${WORKDIR}/${OSLEC_PATCH}.diff" || die "Failed to fix oslec patch for bri" >+ fi >+ >+ EPATCH_SINGLE_MSG="Applying ${OSLEC_PATCH} zaptel patch" \ >+ epatch "${WORKDIR}/${OSLEC_PATCH}.diff" >+ fi >+ > ### Configuration changes > local myEC > >@@ -244,6 +268,16 @@ > } > > src_compile() { >+ # build oslec first to avoid warnings about undefined symbols >+ if use ecoslec; then >+ cd "${S_OSLEC}" >+ make KVERS=${KV_FULL} \ >+ KDIR=${KV_DIR} \ >+ ARCH=$(tc-arch-kernel) || die "emake oslec failed" >+ cp Module.symvers ${S}/ || einfo "unable to copy oslec Module.symvers" >+ cd ${S} >+ fi >+ > # build > make KVERS=${KV_FULL} \ > KSRC=${KV_DIR} ARCH=$(tc-arch-kernel) || die >@@ -258,7 +292,7 @@ > for x in cwain qozap zaphfc; do > einfo "Building ${x}..." > make KVERS=${KV_FULL} \ >- KSRC=/usr/src/linux \ >+ KSRC=${KV_DIR} \ > ARCH=$(tc-arch-kernel) \ > -C ${x} || die "make ${x} failed" > done >@@ -271,11 +305,11 @@ > > kernel_is 2 4 && cp /etc/modules.conf ${D}/etc > make DESTDIR=${D} ARCH=$(tc-arch-kernel) \ >- KVERS=${KV_FULL} KSRC=/usr/src/linux devices firmware \ >+ KVERS=${KV_FULL} KSRC=${KV_DIR} devices firmware \ > install-modules install-programs || die > > dodoc ChangeLog README README.udev README.fxsusb zaptel.init >- dodoc zaptel.conf.sample zaptel.sysconfig README.fxotune >+ dodoc zaptel.conf.sample LICENSE zaptel.sysconfig README.fxotune > > # additional tools > dobin ztmonitor ztspeed zttest fxotune >@@ -320,6 +354,19 @@ > cd ${S} > fi > >+ if use ecoslec; then >+ cd "${S_OSLEC}" >+ insinto /lib/modules/${KV_FULL}/misc >+ doins oslec.${KV_OBJ} >+ >+ newsbin oslec-ctrl-panel.sh oslec-ctrl-panel >+ >+ docinto oslec >+ dodoc ../{README.txt,COPYING} >+ >+ cd "${S}" >+ fi >+ > # install init script > newinitd ${FILESDIR}/zaptel.rc6 zaptel > newconfd ${FILESDIR}/zaptel.confd zaptel >@@ -332,7 +379,9 @@ > cd ${S}/xpp/utils > eval `perl '-V:installarchlib'` > make DESTDIR=${D} PERLLIBDIR=${installarchlib} install || die "failed xpp utils install" >- dosbin zt_registration xpp_sync lszaptel >+ dosbin zt_registration xpp_sync xpp_blink lszaptel zapconf zaptel_drivers zaptel_hardware >+ docinto astribank >+ dodoc ../README.Astribank ../README.metering > fi > } > >@@ -360,4 +409,18 @@ > einfo " zapata.conf.octoBRI" > echo > fi >+ >+ if use ecoslec; then >+ einfo "The OSLEC control panel has been installed as:" >+ einfo " \"/usr/sbin/oslec-ctrl-panel\"" >+ echo >+ einfo "Important options in zapata.conf:" >+ einfo " echocancel=yes" >+ einfo " echocancelwhenbridged=no" >+ einfo " ;echotraining=400 (must be disabled)" >+ echo >+ einfo "More information about the OSLEC echo canceller:" >+ einfo " \"http://www.rowetel.com/ucasterisk/oslec.html\"" >+ echo >+ fi > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 204057
:
139867
|
139869
|
139870
|
139871
|
144079
|
144081
|
144082
|
146464
|
146707
|
146709
|
146711