Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

some fixes

  • Loading branch information...
commit 12648eaebcc2697b4776d92fb7afbc5e61f7b7d7 1 parent e2c64fe
Vadim A. Misbakh-Soloviov msva authored
32 net-libs/opal/opal-9999.ebuild
@@ -14,7 +14,7 @@ ESVN_REPO_URI="https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/opal/trunk"
14 14 LICENSE="MPL-1.0"
15 15 SLOT="0"
16 16 KEYWORDS=""
17   -IUSE="+audio capi celt debug dtmf examples fax ffmpeg h224 h281 h323 iax
  17 +IUSE="+audio capi celt debug doc dtmf examples fax ffmpeg h224 h281 h323 iax
18 18 ilbc ipv6 ivr ixj java ldap lid +plugins sbc sip sipim srtp ssl static-libs
19 19 stats swig theora +video vpb vxml wav x264 x264-static xml"
20 20
@@ -42,6 +42,7 @@ RDEPEND=">=net-libs/ptlib-2.6.6[stun,debug=,audio?,dtmf?,ipv6?,ldap?,ssl?,video?
42 42 vxml? ( net-libs/ptlib[http,vxml] )"
43 43 DEPEND="${RDEPEND}
44 44 virtual/pkgconfig
  45 + doc? ( app-doc/doxygen )
45 46 >=sys-devel/gcc-3
46 47 java? ( swig? ( dev-lang/swig )
47 48 >=virtual/jdk-1.4 )"
@@ -57,6 +58,16 @@ DEPEND="${RDEPEND}
57 58 # OPALDIR should not be used anymore but if a package still need it, create it
58 59
59 60 pkg_setup() {
  61 + if use debug && ! built_with_use net-libs/ptlib debug; then
  62 + eerror "You need to build net-libs/ptlib with USE=debug enabled."
  63 + die "net-libs/ptlib has to be built with USE=debug"
  64 + fi
  65 +
  66 + if ! use debug && built_with_use net-libs/ptlib debug; then
  67 + eerror "You need to build net-libs/ptlib without USE=debug."
  68 + die "net-libs/ptlib has not to be built with USE=debug"
  69 + fi
  70 +
60 71 # need >=gcc-3
61 72 if [[ $(gcc-major-version) -lt 3 ]]; then
62 73 eerror "You need to use gcc-3 at least."
@@ -67,6 +78,14 @@ pkg_setup() {
67 78 java-pkg-opt-2_pkg_setup
68 79 }
69 80
  81 +src_unpack() {
  82 + subversion_src_unpack
  83 + cd "${S}"
  84 +
  85 + # recreate configure etc.
  86 + eautoreconf
  87 +}
  88 +
70 89 src_prepare() {
71 90 # remove visual studio related files from samples/
72 91 if use examples; then
@@ -76,8 +95,8 @@ src_prepare() {
76 95 rm -f samples/*/*.dsw
77 96 fi
78 97
79   - # Temporary (?) fix of gsm/gsm/gsm.h in plugins/configure
80   - sed -i -e "s:gsm/gsm.h:gsm.h:g" make/opal.m4 || die "failed to fix plugins"
  98 +# # Temporary (?) fix of gsm/gsm/gsm.h in plugins/configure
  99 +# sed -i -e "s:gsm/gsm.h:gsm.h:g" make/opal.m4 || die "failed to fix plugins"
81 100
82 101 # h224 really needs h323 ?
83 102 # TODO: get a confirmation in ml
@@ -212,10 +231,11 @@ src_compile() {
212 231 use debug && makeopts="debug"
213 232
214 233 emake ${makeopts} || die "emake failed"
  234 + use doc && emake doc
215 235 }
216 236
217 237 src_install() {
218   - emake DESTDIR="${D}" install || die "emake install failed"
  238 + emake PREFIX=/usr DESTDIR="${D}" install || die "emake install failed"
219 239
220 240 # Get rid of static libraries if not requested
221 241 # There seems to be no easy way to disable this in the build system
@@ -247,6 +267,10 @@ src_install() {
247 267 insinto "/usr/share/doc/${PF}/"
248 268 doins version.h || die "doins failed"
249 269 fi
  270 +
  271 + if use doc; then
  272 + dohtml -r html/* docs/* || die "documentation installation failed"
  273 + fi
250 274 }
251 275
252 276 pkg_postinst() {
74 net-voip/freeswitch/freeswitch-9999.ebuild
@@ -4,7 +4,7 @@
4 4
5 5 EAPI="4"
6 6
7   -inherit eutils flag-o-matic python
  7 +inherit eutils flag-o-matic python java-utils-2
8 8
9 9 DESCRIPTION="FreeSWITCH telephony platform"
10 10 HOMEPAGE="http://www.freeswitch.org/"
@@ -106,18 +106,7 @@ FM="
106 106 ${FM_XML}
107 107 "
108 108
109   -FM_BROKEN="
110   - esl_php
111   - esl_ruby
112   - esl_java
113   - esl_managed
114   - freeswitch_modules_http_cache
115   -"
116   -#- http_cache -> error in "for" declaration, ask for -std=c99
117   -#- esl_php -> #ESL-70
118   -#- esl_ruby -> #ESL-71
119   -#- esl_managed -> TODO
120   -#- esl_java -> TODO
  109 +FM_BROKEN=""
121 110
122 111 #? mp4 -> want mp4.h
123 112
@@ -135,9 +124,13 @@ REQUIRED_USE="
135 124
136 125 RDEPEND="virtual/libc
137 126 odbc? ( dev-db/unixODBC )
138   - esl_lua? ( || ( dev-lang/lua dev-lang/luajit:2 ) )
139   - esl_perl? ( dev-lang/perl )
140   - esl_python? ( dev-lang/python:2.7 )
  127 + esl_lua? ( || ( =dev-lang/lua-5.1* dev-lang/luajit:2 ) dev-lang/swig )
  128 + esl_perl? ( dev-lang/perl dev-lang/swig )
  129 + esl_php? ( dev-lang/php dev-lang/swig )
  130 + esl_python? ( dev-lang/python:2.7 dev-lang/swig )
  131 + esl_ruby? ( dev-lang/ruby dev-lang/swig )
  132 + esl_java? ( >=virtual/jdk-1.5 dev-lang/swig )
  133 + esl_managed? ( >=dev-lang/mono-1.9 dev-lang/swig )
141 134 freeswitch_modules_alsa? ( media-libs/alsa-lib )
142 135 freeswitch_modules_radius_cdr? ( net-dialup/freeradius-client )
143 136 freeswitch_modules_xml_curl? ( net-misc/curl )
@@ -171,15 +164,12 @@ RDEPEND="virtual/libc
171 164 )
172 165 "
173 166 # freeswitch_modules_mp4? ( media-libs/libmp4v2 )
174   -# esl_ruby? ( dev-lang/ruby )
175   -# esl_php? ( dev-lang/php )
176   -# esl_java? ( >=virtual/jdk-1.5 )
177   -# esl_managed? ( >=dev-lang/mono-1.9 )
178 167
179 168 DEPEND="${RDEPEND}
180 169 >=sys-devel/autoconf-2.60
181 170 >=sys-devel/automake-1.10
182   - sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )"
  171 + sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
  172 + virtual/pkgconfig"
183 173
184 174 PDEPEND="media-sound/freeswitch-sounds
185 175 media-sound/freeswitch-sounds-music
@@ -490,7 +480,7 @@ esl_dopymod() {
490 480
491 481 esl_doluamod() {
492 482 (
493   - insinto /usr/$(get_libdir)/lua/$(${LUA:-/usr/bin/lua} -e 'print(_VERSION:match("%d.%d"))')
  483 + insinto $(pkg-config lua --variable INSTALL_CMOD)
494 484 insopts -m755
495 485 doins "$@"
496 486 ) || die "failed to install $@"
@@ -599,11 +589,10 @@ src_configure() {
599 589
600 590 src_compile() {
601 591 local esl_lang
602   -# filter-ldflags -Wl,--as-needed
603 592
604   - # breaks freetdm:
605   - filter-flags -fvisibility-inlines-hidden
606 593 if use freeswitch_modules_freetdm; then
  594 +# # breaks freetdm:
  595 +# filter-flags -fvisibility-inlines-hidden
607 596 einfo "Building FreeTDM..."
608 597 emake -C libs/freetdm || die "failed to build FreeTDM"
609 598 fi
@@ -615,6 +604,7 @@ src_compile() {
615 604 esl_lang="${esl_lang#*_}"
616 605
617 606 einfo "Building esl module for ${esl_lang}..."
  607 + emake -C libs/esl/"${esl_lang}" reswig || die "Failed to reswig esl module for language \"${esl_lang}\""
618 608 emake -C libs/esl "$(esl_modname ${esl_lang})" || die "Failed to build esl module for language \"${esl_lang}\""
619 609 done
620 610 if use esl; then
@@ -649,10 +639,10 @@ src_install() {
649 639
650 640 find "${ED}" -name "*.la" -delete || die "Failed to cleanup .la files"
651 641
652   -# if use esl_ruby; then
653   -# einfo "Installing esl module for ruby..."
654   -# esl_dorubymod libs/esl/ruby/ESL.so
655   -# fi
  642 + if use esl_ruby; then
  643 + einfo "Installing esl module for ruby..."
  644 + esl_dorubymod libs/esl/ruby/ESL.so
  645 + fi
656 646
657 647 if use esl_python; then
658 648 einfo "Installing esl module for python..."
@@ -664,25 +654,27 @@ src_install() {
664 654 esl_doluamod libs/esl/lua/ESL.so
665 655 fi
666 656
667   -# if use esl_php; then
668   -# einfo "Installing esl module for php..."
669   -# emake DESTDIR="${D}" -C libs/esl phpmod-install || die "Failed to install esl module for php"
670   -# fi
  657 + if use esl_php; then
  658 + einfo "Installing esl module for php..."
  659 + emake DESTDIR="${D}" -C libs/esl phpmod-install || die "Failed to install esl module for php"
  660 + fi
671 661
672 662 if use esl_perl; then
673 663 einfo "Installing esl module for perl..."
674 664 esl_doperlmod libs/esl/perl/{ESL,ESL.so,ESL.pm}
675 665 fi
676 666
677   -# if use esl_java; then
678   -# #einfo "Installing esl module for java..."
679   -# # TODO
680   -# fi
  667 + if use esl_java; then
  668 + einfo "Installing esl module for java..."
  669 + java-pkg_dojar libs/esl/java/esl.jar
  670 + java-pkg_doso libs/esl/java/libesljni.so
  671 + fi
681 672
682   -# if use esl_managed; then
683   -# #einfo "Installing esl module for managed (mono, .NET)..."
684   -# # TODO
685   -# fi
  673 + if use esl_managed; then
  674 + einfo "Installing esl module for managed (mono, .NET)..."
  675 + insinto /usr/$(get_libdir)/ESL
  676 + doins libs/esl/managed/ESL.so
  677 + fi
686 678
687 679 if use esl; then
688 680 einfo "Installing libesl..."

0 comments on commit 12648ea

Please sign in to comment.
Something went wrong with that request. Please try again.