Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Mounir Lamouri (volkmar)" <volkmar@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-libs/opal/files: opal-3.6.2-system-ilbc.patch opal-3.6.2-sbc.patch opal-3.6.2-jdkroot.patch opal-3.6.2-as-needed.patch
Date: Fri, 03 Jul 2009 10:10:00
Message-Id: E1MMfiQ-00085O-2A@stork.gentoo.org
1 volkmar 09/07/03 10:09:58
2
3 Added: opal-3.6.2-system-ilbc.patch opal-3.6.2-sbc.patch
4 opal-3.6.2-jdkroot.patch opal-3.6.2-as-needed.patch
5 Log:
6 version bump to 3.6.2, bug 238610
7 (Portage version: 13756-svn/cvs/Linux i686)
8
9 Revision Changes Path
10 1.1 net-libs/opal/files/opal-3.6.2-system-ilbc.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/opal/files/opal-3.6.2-system-ilbc.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/opal/files/opal-3.6.2-system-ilbc.patch?rev=1.1&content-type=text/plain
14
15 Index: opal-3.6.2-system-ilbc.patch
16 ===================================================================
17 --- opal.m4.old 2009-05-22 19:42:30.000000000 +0200
18 +++ opal.m4 2009-05-22 20:07:45.000000000 +0200
19 @@ -1007,3 +1007,41 @@
20 fi
21 AS_IF([test AS_VAR_GET([opal_java]) = yes], [$1], [$2])[]
22 ])
23 +
24 +dnl OPAL_DETERMINE_ILBC
25 +dnl Determine whether to use the system or internal iLBC (can be forced)
26 +dnl Arguments: none
27 +dnl Return: $ILBC_SYSTEM whether system or internal iLBC shall be used
28 +dnl $ILBC_CFLAGS system iLBC CFLAGS if using system iLBC
29 +dnl $ILBC_LIBS system iLBC LIBS if using system iLBC
30 +AC_DEFUN([OPAL_DETERMINE_ILBC],
31 + [AC_ARG_ENABLE([localilbc],
32 + [AC_HELP_STRING([--enable-localilbc],[Force use local version of iLBC library rather than system version])],
33 + [localilbc=$enableval],
34 + [localilbc=])
35 +
36 + if test "x${localilbc}" = "xyes" ; then
37 + AC_MSG_NOTICE(forcing use of local iLBC sources)
38 + ILBC_SYSTEM=no
39 + else
40 + AC_MSG_NOTICE(checking if iLBC is installed)
41 +
42 + saved_LIBS="$LIBS"
43 + LIBS="$LIBS -lilbc"
44 + AC_CHECK_LIB(ilbc, iLBC_encode, [has_ilbc=yes], [has_ilbc=no])
45 + LIBS=$saved_LIBS
46 +
47 + if test "x${has_ilbc}" = "xyes"; then
48 + AC_CHECK_HEADERS([ilbc/iLBC_decode.h ilbc/iLBC_define.h ilbc/iLBC_encode.h], [has_ilbc=yes], [has_ilbc=no])
49 + fi
50 +
51 + if test "x${has_ilbc}" = "xyes"; then
52 + ILBC_CFLAGS=""
53 + ILBC_LIBS="-lilbc"
54 + ILBC_SYSTEM=yes
55 + else
56 + ILBC_SYSTEM=no
57 + fi
58 + OPAL_MSG_CHECK([System iLBC], [$has_ilbc])
59 + fi
60 + ])
61 --- plugins/audio/iLBC/Makefile.in.old 2009-05-22 19:25:06.000000000 +0200
62 +++ plugins/audio/iLBC/Makefile.in 2009-05-22 20:10:11.000000000 +0200
63 @@ -78,13 +78,26 @@
64 LDFLAGS =@LDFLAGS@
65 EXTRACFLAGS =-I$(PLUGINDIR)
66
67 -SRCS = ilbccodec.c $(SRCDIR)/anaFilter.c $(SRCDIR)/constants.c $(SRCDIR)/createCB.c $(SRCDIR)/doCPLC.c \
68 +ILBC_CFLAGS=@ILBC_CFLAGS@
69 +ILBC_LIBS=@ILBC_LIBS@
70 +ILBC_SYSTEM=@ILBC_SYSTEM@
71 +
72 +SRCS = ilbccodec.c
73 +
74 +ifeq ($(ILBC_SYSTEM),no)
75 +SRCS += $(SRCDIR)/anaFilter.c $(SRCDIR)/constants.c $(SRCDIR)/createCB.c $(SRCDIR)/doCPLC.c \
76 $(SRCDIR)/enhancer.c $(SRCDIR)/filter.c $(SRCDIR)/FrameClassify.c $(SRCDIR)/gainquant.c \
77 $(SRCDIR)/getCBvec.c $(SRCDIR)/helpfun.c $(SRCDIR)/hpInput.c $(SRCDIR)/hpOutput.c \
78 $(SRCDIR)/iCBConstruct.c $(SRCDIR)/iCBSearch.c $(SRCDIR)/iLBC_decode.c $(SRCDIR)/iLBC_encode.c \
79 $(SRCDIR)/LPCdecode.c $(SRCDIR)/LPCencode.c $(SRCDIR)/lsf.c $(SRCDIR)/packing.c \
80 $(SRCDIR)/StateConstructW.c $(SRCDIR)/StateSearchW.c $(SRCDIR)/syntFilter.c
81
82 +EXTRALIBS =
83 +else
84 +EXTRACFLAGS += $(IBLC_CFLAGS)
85 +EXTRALIBS = $(ILBC_LIBS)
86 +endif
87 +
88 OBJDIR = ./obj
89
90 vpath %.o $(OBJDIR)
91 @@ -100,9 +113,9 @@
92
93 $(PLUGIN): $(OBJECTS)
94 ifeq (solaris,$(findstring solaris,$(target_os)))
95 - $(CC) $(LDSO) $@ -o $@ $^
96 + $(CC) $(LDSO) $@ -o $@ $^ $(EXTRALIBS)
97 else
98 - $(CC) $(LDSO) -o $@ $^
99 + $(CC) $(LDSO) -o $@ $^ $(EXTRALIBS)
100 endif
101
102 install:
103 --- plugins/configure.ac.old 2009-05-22 19:39:05.000000000 +0200
104 +++ plugins/configure.ac 2009-05-22 19:41:25.000000000 +0200
105 @@ -181,6 +181,14 @@
106 AC_SUBST(SPEEX_CFLAGS)
107 AC_SUBST(SPEEX_LIBS)
108
109 +dnl ########################
110 +dnl iLBC (system/local)
111 +dnl ########################
112 +OPAL_DETERMINE_ILBC()
113 +AC_SUBST(ILBC_SYSTEM)
114 +AC_SUBST(ILBC_CFLAGS)
115 +AC_SUBST(ILBC_LIBS)
116 +
117 dnl ########################################################################
118 dnl sbc,Bluetooth SBC for telephony with CD quality
119
120 @@ -516,7 +524,12 @@
121 fi
122
123 echo " gsm-amr : yes"
124 -echo " iLBC : yes"
125 +if test "x${ILBC_SYSTEM}" = "xyes" ; then
126 +echo " iLBC : yes (system)"
127 +else
128 +echo " iLBC : yes (internal)"
129 +fi
130 +
131 if test "x${SPEEX_SYSTEM}" = "xyes" ; then
132 echo " Speex : yes (system, version $SPEEX_SYSTEM_VERSION)"
133 else
134
135
136
137 1.1 net-libs/opal/files/opal-3.6.2-sbc.patch
138
139 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/opal/files/opal-3.6.2-sbc.patch?rev=1.1&view=markup
140 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/opal/files/opal-3.6.2-sbc.patch?rev=1.1&content-type=text/plain
141
142 Index: opal-3.6.2-sbc.patch
143 ===================================================================
144 --- plugins/audio/SBC/Makefile.in.old 2009-05-24 13:15:46.000000000 +0200
145 +++ plugins/audio/SBC/Makefile.in 2009-05-24 13:16:18.000000000 +0200
146 @@ -30,7 +30,7 @@
147 SRCDIR = .
148 PLUGINDIR=../..
149 SONAME = sbccodec
150 -SAMPLERATELIB = -Lsamplerate
151 +SAMPLERATE_LIB = -lsamplerate
152
153 CC =@CC@
154 CFLAGS =@CFLAGS@
155
156
157
158 1.1 net-libs/opal/files/opal-3.6.2-jdkroot.patch
159
160 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/opal/files/opal-3.6.2-jdkroot.patch?rev=1.1&view=markup
161 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/opal/files/opal-3.6.2-jdkroot.patch?rev=1.1&content-type=text/plain
162
163 Index: opal-3.6.2-jdkroot.patch
164 ===================================================================
165 Index: opal.m4
166 ===================================================================
167 --- opal.m4 (revision 22933)
168 +++ opal.m4 (working copy)
169 @@ -996,6 +996,10 @@
170 AC_CHECK_HEADERS([jni.h], [opal_java=yes])
171
172 if test "x$opal_java" = "xno" ; then
173 + if test "x${JDK_ROOT}" = "x" ; then
174 + JDK_ROOT=${JDK_HOME}
175 + fi
176 +
177 if test "x${JDK_ROOT}" != "x" ; then
178 AC_CHECK_FILE([${JDK_ROOT}/include/jni.h],
179 [
180
181
182
183 1.1 net-libs/opal/files/opal-3.6.2-as-needed.patch
184
185 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/opal/files/opal-3.6.2-as-needed.patch?rev=1.1&view=markup
186 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/opal/files/opal-3.6.2-as-needed.patch?rev=1.1&content-type=text/plain
187
188 Index: opal-3.6.2-as-needed.patch
189 ===================================================================
190 --- opal.m4.old 2009-05-22 12:44:22.000000000 +0200
191 +++ opal.m4 2009-05-22 13:43:58.000000000 +0200
192 @@ -363,13 +363,13 @@
193 AC_DEFUN([OPAL_CHECK_PTLIB],
194 [
195 old_CXXFLAGS="$CXXFLAGS"
196 - old_LDFLAGS="$LDFLAGS"
197 + old_LIBS="$LIBS"
198
199 CXXFLAGS="$CXXFLAGS $PTLIB_CFLAGS $PTLIB_CXXFLAGS"
200 if test "x${DEBUG_BUILD}" = xyes; then
201 - LDFLAGS="$LDFLAGS $DEBUG_LIBS"
202 + LIBS="$LIBS $DEBUG_LIBS"
203 else
204 - LDFLAGS="$LDFLAGS $RELEASE_LIBS"
205 + LIBS="$LIBS $RELEASE_LIBS"
206 fi
207
208 AC_LANG(C++)
209 @@ -387,34 +387,69 @@
210 [opal_ptlib_option=no])
211
212 CXXFLAGS="$old_CXXFLAGS"
213 - LDFLAGS="$old_LDFLAGS"
214 + LIBS="$old_LIBS"
215
216 OPAL_MSG_CHECK([PTLIB has $1], [$opal_ptlib_option])
217 - if test "x$4" = "x" ; then
218 - if test "x$opal_ptlib_option" = "xno" ; then
219 + $4="$opal_ptlib_option"
220 + AC_SUBST($4)
221 + if test "x$opal_ptlib_option" = "xyes" ; then
222 + AC_DEFINE([$4], [1], [$1])
223 + fi
224 +
225 + ])
226 +
227 +dnl OPAL_CHECK_PTLIB_MANDATORY
228 +dnl Check if ptlib was compiled with a specific mandatory feature
229 +dnl Arguments: $1 Name of feature
230 +dnl $2 ptlib/pasn.h Header file to include
231 +dnl $3 Code to test the feature
232 +AC_DEFUN([OPAL_CHECK_PTLIB_MANDATORY],
233 + [
234 + old_CXXFLAGS="$CXXFLAGS"
235 + old_LIBS="$LIBS"
236 +
237 + CXXFLAGS="$CXXFLAGS $PTLIB_CFLAGS $PTLIB_CXXFLAGS"
238 + if test "x${DEBUG_BUILD}" = xyes; then
239 + LIBS="$LIBS $DEBUG_LIBS"
240 + else
241 + LIBS="$LIBS $RELEASE_LIBS"
242 + fi
243 +
244 + AC_LANG(C++)
245 + AC_LINK_IFELSE([
246 + #include <ptbuildopts.h>
247 + #include <ptlib.h>
248 + #include <$2>
249 +
250 + int main()
251 + {
252 + $3
253 + }
254 + ],
255 + [opal_ptlib_option=yes],
256 + [opal_ptlib_option=no])
257 +
258 + CXXFLAGS="$old_CXXFLAGS"
259 + LIBS="$old_LIBS"
260 +
261 + OPAL_MSG_CHECK([PTLIB has $1], [$opal_ptlib_option])
262 + if test "x$opal_ptlib_option" = "xno" ; then
263 echo " ERROR: compulsory feature from PTLib disabled.";
264 exit 1;
265 - fi
266 - else
267 - $4="$opal_ptlib_option"
268 - AC_SUBST($4)
269 - if test "x$opal_ptlib_option" = "xyes" ; then
270 - AC_DEFINE([$4], [1], [$1])
271 - fi
272 fi
273 -
274 - ])
275 +
276 + ])
277
278 AC_DEFUN([OPAL_CHECK_PTLIB_EXISTS],
279 [
280 old_CXXFLAGS="$CXXFLAGS"
281 - old_LDFLAGS="$LDFLAGS"
282 + old_LIBS="$LIBS"
283
284 CXXFLAGS="$CXXFLAGS $PTLIB_CFLAGS $PTLIB_CXXFLAGS"
285 if test "x${DEBUG_BUILD}" = xyes; then
286 - LDFLAGS="$LDFLAGS $DEBUG_LIBS"
287 + LIBS="$LIBS $DEBUG_LIBS"
288 else
289 - LDFLAGS="$LDFLAGS $RELEASE_LIBS"
290 + LIBS="$LIBS $RELEASE_LIBS"
291 fi
292
293 AC_LANG(C++)
294 @@ -424,7 +459,7 @@
295 [opal_ptlib_exists=no])
296
297 CXXFLAGS="$old_CXXFLAGS"
298 - LDFLAGS="$old_LDFLAGS"
299 + LIBS="$old_LIBS"
300
301
302 if test "x$opal_ptlib_exists" != "xyes" ; then
303 --- configure.ac.old 2009-05-22 12:03:06.000000000 +0200
304 +++ configure.ac 2009-05-22 13:45:18.000000000 +0200
305 @@ -291,8 +291,8 @@
306 OPAL_MSG_CHECK([ptlib version], [$PTLIB_VERSION])
307
308 OPAL_CHECK_PTLIB_EXISTS()
309 -OPAL_CHECK_PTLIB([URL], [ptclib/url.h], [PURL url;], [])
310 -OPAL_CHECK_PTLIB([STUN], [ptclib/pstun.h],[PSTUNClient client;], [])
311 +OPAL_CHECK_PTLIB_MANDATORY([URL], [ptclib/url.h], [PURL url;])
312 +OPAL_CHECK_PTLIB_MANDATORY([STUN], [ptclib/pstun.h],[PSTUNClient client;])
313 OPAL_CHECK_PTLIB([SSL], [ptclib/pssl.h], [PSSLContext ctx;], [OPAL_PTLIB_SSL])
314 OPAL_CHECK_PTLIB([ASN.1], [ptclib/pasn.h], [PASNInteger asnint(5);], [OPAL_PTLIB_ASN])
315 OPAL_CHECK_PTLIB([expat], [ptclib/pxml.h], [PXMLParser parser;], [OPAL_PTLIB_EXPAT])
316 @@ -439,7 +439,7 @@
317 OPAL_SIMPLE_OPTION([h323],[OPAL_H323], [whether to enable H.323 protocol support])
318
319 if test "x$OPAL_H323" = "xyes" ; then
320 - OPAL_CHECK_PTLIB([ASN], [ptclib/asner.h], [PPER_Stream per;], [])
321 + OPAL_CHECK_PTLIB_MANDATORY([ASN], [ptclib/asner.h], [PPER_Stream per;])
322 fi
323
324 dnl MSWIN_DISPLAY iax2,IAX2 support
325 --- plugins/configure.ac.old 2009-05-24 15:24:01.000000000 +0200
326 +++ plugins/configure.ac 2009-05-24 15:29:52.000000000 +0200
327 @@ -230,6 +230,7 @@
328 AC_SUBST(LIBAVCODEC_CFLAGS)
329 AC_SUBST(LIBAVCODEC_LIBS)
330 AC_DEFINE([HAVE_LIBAVCODEC], [1], [ffmpeg])
331 + AC_SUBST(LIBAVCODEC_LIB_NAME)
332 HAVE_LIBAVCODEC=yes
333 OPAL_LIBAVCODEC_HACK
334 case "$target_os" in
335 @@ -240,15 +241,13 @@
336 HAVE_H264_DECODER=yes
337 ;;
338 * )
339 - OPAL_GET_LIBNAME([LIBAVCODEC], [libavcodec], [$LIBAVCODEC_LIBS])
340 - OPAL_CHECK_LIBAVCODEC([h263p_encoder], [HAVE_H263P=yes], [HAVE_H263P=no])
341 - OPAL_CHECK_LIBAVCODEC([mpeg4_encoder], [HAVE_MPEG4=yes], [HAVE_MPEG4=no])
342 - OPAL_CHECK_LIBAVCODEC([h264_decoder], [HAVE_H264_DECODER=yes], [HAVE_H264_DECODER=no])
343 + AC_CHECK_LIB(avcodec, h263p_encoder, [HAVE_H263P=yes], [HAVE_H263P=no])
344 + AC_CHECK_LIB(avcodec, mpeg4_encoder, [HAVE_MPEG4=yes], [HAVE_MPEG4=no])
345 + AC_CHECK_LIB(avcodec, h264_decoder, [HAVE_H264_DECODER=yes], [HAVE_H264_DECODER=no])
346 ;;
347 esac
348 AC_SUBST(HAVE_H263P)
349 AC_SUBST(HAVE_MPEG4)
350 - AC_SUBST(LIBAVCODEC_LIB_NAME)
351 OPAL_LIBAVCODEC_HEADER
352 ],
353 [
Report Message
Find on MARC Find on Google Groups