Attachment #371968 for bug #477780




  <!-- compile ffmpeg library -->
  <target name="ffmpeg" description="Build ffmpeg shared library" depends="init-native">

    <fail message="ffmpeg repository not set!" unless="ffmpeg" />
    <fail message="x264 repository not set!" unless="x264" />
    <fail message="lame repository not set!" unless="lame" />

    <cc outtype="shared" name="gcc" outfile="${native_install_dir}/jnffmpeg" objdir="${obj}">
      <!-- common compiler flags -->
      <compilerarg value="-D_JNI_IMPLEMENTATION_" />
      <compilerarg value="-D_XOPEN_SOURCE=600" />
      <compilerarg value="-fPIC" />
      <compilerarg value="-I/usr/include" />
      <compilerarg value="-m${arch}" />
      <compilerarg value="-O2" />
      <compilerarg value="-std=c99" />
      <compilerarg value="-Wall" />
      <compilerarg value="-D_JITSI_LIBAV_" if="LIBAV"/>

      <linkerarg value="-L/usr/include/libavcodec" />
      <linkerarg value="-L/usr/include/libavfilter" />
      <linkerarg value="-L/usr/include/libavformat" />
      <linkerarg value="-L/usr/include/libavutil" />
      <linkerarg value="-L/usr/include/libswscale" />
      <!--
        Depending on the way that lame is built, libmp3lame.a may be in
        libmp3lame/ or libmp3lame/.libs/.
      -->
      <linkerarg value="-L/usr/include/libmp3lame" />
      <linkerarg value="-L/usr/include" />
      <linkerarg value="-L${x264}" />
      <linkerarg value="-m${arch}" />
      <linkerarg value="-Wl,-z,relro" if="is.running.debian"/>
      <!--

  <!-- compile jnportaudio library -->
  <target name="portaudio" description="Build jnportaudio shared library" depends="init-native">

    <fail message="portaudio repository not set!" unless="portaudio" />

    <condition property="is.speex.set" value="true">
        <and>
            <isset property="speex"/>
            <not>
                <isset property="speex.dynamic"/>
            </not>
        </and>
    </condition>
    <condition property="is.speex.set" value="true">
        <and>
            <isset property="speex.dynamic"/>
            <not>
                <isset property="speex"/>
            </not>
        </and>
    </condition>

    <condition property="is.speex.dynamic.set" value="true">
        <and>
            <isset property="speex.dynamic"/>
            <isset property="is.running.linux"/>
        </and>
    </condition>

    <fail message="speex repository not set!" unless="is.speex.set" />

    <cc outtype="shared" name="gcc" outfile="${native_install_dir}/jnportaudio" objdir="${obj}">
      <!-- Common flags -->
      <compilerarg value="-m32" if="cross_32" unless="is.running.macos" />

      <compilerarg value="-D_JNI_IMPLEMENTATION_" />
      <compilerarg value="-fPIC" />
      <compilerarg value="-I${portaudio}/include" />
      <compilerarg value="-I/usr/include" />
      <compilerarg value="-I${system.JAVA_HOME}/include" unless="is.running.macos" />
      <compilerarg value="-O2" />
      <compilerarg value="-std=c99" />


      <linkerarg value="-m32" if="cross_32" unless="is.running.macos" />
      <linkerarg value="-m64" if="cross_64" unless="is.running.macos" />
      <linkerarg value="-L${portaudio}/lib/.libs" />
      <linkerarg value="-L${speex}/libspeex/.libs" />

      <!-- Linux-specific flags -->
      <compilerarg value="-I${system.JAVA_HOME}/include/linux" if="is.running.linux" />

      <!-- Static libraries MUST be at the end; otherwise, they will not be
           added to shared library.
      -->
      <linkerarg value="-Wl,-Bstatic" location="end" if="is.running.linux" />
      <linkerarg value="-lportaudio" location="end" if="is.running.linux" />
      <linkerarg value="-lspeexdsp" location="end" if="is.running.linux" unless="speex.dynamic"/>
      <linkerarg value="-Wl,-Bdynamic" location="end" if="is.running.linux" />
      <linkerarg value="-lspeexdsp" location="end"/>
      <linkerarg value="-lrt" location="end" if="is.running.linux" />
      <linkerarg value="-lasound" location="end" if="is.running.linux" />
      <linkerarg value="-lm" location="end" if="is.running.linux" />

  <!-- compile jnspeex library -->
  <target name="speex" description="Build jnspeex shared library" depends="init-native">

    <fail message="speex repository not set!" unless="speex" />

    <cc outtype="shared" name="gcc" outfile="${native_install_dir}/jnspeex" objdir="${obj}">
      <!-- common compiler flags -->
      <compilerarg value="-D_JNI_IMPLEMENTATION_" />
      <compilerarg value="-I/usr/include" />
      <compilerarg value="-O2" />
      <compilerarg value="-std=c99" />
      <compilerarg value="-Wall" />

      <linkerarg value="-L${speex}/libspeex/.libs" />

      <!-- Linux specific flags -->
      <compilerarg value="-m32" if="cross_32" unless="is.running.macos" />
      <compilerarg value="-m64" if="cross_64" unless="is.running.macos" />

      <!-- static libraries MUST be at the end otherwise
      they will not be added to shared library
      -->
      <linkerarg value="-Wl,-Bstatic" location="end" if="is.running.linux" />
      <linkerarg value="-lspeex" location="end" if="is.running.linux" />
      <linkerarg value="-lspeexdsp" location="end" if="is.running.linux" />
      <linkerarg value="-Wl,-Bdynamic" location="end" if="is.running.linux" />

    -->
    <target name="opus" description="Build opus shared library" depends="init-native">

        <fail message="opus repository not set!" unless="opus"/>

        <cc outtype="shared" name="gcc"
            objdir="${obj}"
            outfile="${native_install_dir}/jnopus">

            <compilerarg value="-Wall" />
            <compilerarg value="-fPIC"/>
            <compilerarg value="-O2" />
            <compilerarg value="-I/usr/include/opus" unless="is.running.debian"/>
            <compilerarg value="-I/usr/include/opus" if="is.running.debian"/>
            <compilerarg value="-D_JNI_IMPLEMENTATION_" />

            <linkerarg value="-Wl,-z,relro" if="is.running.debian"/>
            <linkerarg value="-L${opus}/.libs" unless="is.running.debian"/>

            <!-- Unix specific flags -->
            <compilerarg value="-m32" if="cross_32" unless="is.running.macos" />


    <target name="libvpx" description="Build the libvpx shared library" depends="init-native">

        <fail message="libvpx repository not set!" unless="libvpx"/>

        <cc outtype="shared" name="gcc"
            objdir="${obj}"
            outfile="${native_install_dir}/jnvpx">

            <compilerarg value="-I/usr/include/vpx" if="is.running.linux"/>
            <compilerarg value="-D_JNI_IMPLEMENTATION_" />

            <linkerarg value="-L${libvpx}" />

            <!-- Unix specific flags -->
            <compilerarg value="-m32" if="cross_32" unless="is.running.macos" />
            <compilerarg value="-m64" if="cross_64" unless="is.running.macos" />

Return to bug 477780

Lines 299-332 Link Here

(-)src/native/build.xml.orig (-60 / +12 lines)
299	<!-- compile ffmpeg library -->	299	<!-- compile ffmpeg library -->
300	<target name="ffmpeg" description="Build ffmpeg shared library" depends="init-native">	300	<target name="ffmpeg" description="Build ffmpeg shared library" depends="init-native">
301		301
302	<fail message="ffmpeg repository not set!" unless="ffmpeg" />
303	<fail message="x264 repository not set!" unless="x264" />
304	<fail message="lame repository not set!" unless="lame" />
305		302
306	<cc outtype="shared" name="gcc" outfile="${native_install_dir}/jnffmpeg" objdir="${obj}">	303	<cc outtype="shared" name="gcc" outfile="${native_install_dir}/jnffmpeg" objdir="${obj}">
307	<!-- common compiler flags -->	304	<!-- common compiler flags -->
308	<compilerarg value="-D_JNI_IMPLEMENTATION_" />	305	<compilerarg value="-D_JNI_IMPLEMENTATION_" />
309	<compilerarg value="-D_XOPEN_SOURCE=600" />	306	<compilerarg value="-D_XOPEN_SOURCE=600" />
310	<compilerarg value="-fPIC" />	307	<compilerarg value="-fPIC" />
311	<compilerarg value="-I${ffmpeg}" />	308	<compilerarg value="-I/usr/include" />
312	<compilerarg value="-m${arch}" />	309	<compilerarg value="-m${arch}" />
313	<compilerarg value="-O2" />	310	<compilerarg value="-O2" />
314	<compilerarg value="-std=c99" />	311	<compilerarg value="-std=c99" />
315	<compilerarg value="-Wall" />	312	<compilerarg value="-Wall" />
316	<compilerarg value="-D_JITSI_LIBAV_" if="LIBAV"/>	313	<compilerarg value="-D_JITSI_LIBAV_" if="LIBAV"/>
317		314
318	<linkerarg value="-L${ffmpeg}/libavcodec" />	315	<linkerarg value="-L/usr/include/libavcodec" />
319	<linkerarg value="-L${ffmpeg}/libavfilter" />	316	<linkerarg value="-L/usr/include/libavfilter" />
320	<linkerarg value="-L${ffmpeg}/libavformat" />	317	<linkerarg value="-L/usr/include/libavformat" />
321	<linkerarg value="-L${ffmpeg}/libavutil" />	318	<linkerarg value="-L/usr/include/libavutil" />
322	<linkerarg value="-L${ffmpeg}/libswscale" />	319	<linkerarg value="-L/usr/include/libswscale" />
323	<!--	320	<!--
324	Depending on the way that lame is built, libmp3lame.a may be in	321	Depending on the way that lame is built, libmp3lame.a may be in
325	libmp3lame/ or libmp3lame/.libs/.	322	libmp3lame/ or libmp3lame/.libs/.
326	-->	323	-->
327	<linkerarg value="-L${lame}/libmp3lame" />	324	<linkerarg value="-L/usr/include/libmp3lame" />
328	<linkerarg value="-L${lame}/libmp3lame/.libs" />	325	<linkerarg value="-L/usr/include" />
329	<linkerarg value="-L${x264}" />
330	<linkerarg value="-m${arch}" />	326	<linkerarg value="-m${arch}" />
331	<linkerarg value="-Wl,-z,relro" if="is.running.debian"/>	327	<linkerarg value="-Wl,-z,relro" if="is.running.debian"/>
332	<!--	328	<!--
Lines 461-494 Link Here
461	<!-- compile jnportaudio library -->	457	<!-- compile jnportaudio library -->
462	<target name="portaudio" description="Build jnportaudio shared library" depends="init-native">	458	<target name="portaudio" description="Build jnportaudio shared library" depends="init-native">
463		459
464	<fail message="portaudio repository not set!" unless="portaudio" />
465
466	<condition property="is.speex.set" value="true">
467	<and>
468	<isset property="speex"/>
469	<not>
470	<isset property="speex.dynamic"/>
471	</not>
472	</and>
473	</condition>
474	<condition property="is.speex.set" value="true">
475	<and>
476	<isset property="speex.dynamic"/>
477	<not>
478	<isset property="speex"/>
479	</not>
480	</and>
481	</condition>
482
483	<condition property="is.speex.dynamic.set" value="true">
484	<and>
485	<isset property="speex.dynamic"/>
486	<isset property="is.running.linux"/>
487	</and>
488	</condition>
489
490	<fail message="speex repository not set!" unless="is.speex.set" />
491
492	<cc outtype="shared" name="gcc" outfile="${native_install_dir}/jnportaudio" objdir="${obj}">	460	<cc outtype="shared" name="gcc" outfile="${native_install_dir}/jnportaudio" objdir="${obj}">
493	<!-- Common flags -->	461	<!-- Common flags -->
494	<compilerarg value="-m32" if="cross_32" unless="is.running.macos" />	462	<compilerarg value="-m32" if="cross_32" unless="is.running.macos" />
Lines 496-502 Link Here
496	<compilerarg value="-D_JNI_IMPLEMENTATION_" />	464	<compilerarg value="-D_JNI_IMPLEMENTATION_" />
497	<compilerarg value="-fPIC" />	465	<compilerarg value="-fPIC" />
498	<compilerarg value="-I${portaudio}/include" />	466	<compilerarg value="-I${portaudio}/include" />
499	<compilerarg value="-I${speex}/include" />	467	<compilerarg value="-I/usr/include" />
500	<compilerarg value="-I${system.JAVA_HOME}/include" unless="is.running.macos" />	468	<compilerarg value="-I${system.JAVA_HOME}/include" unless="is.running.macos" />
501	<compilerarg value="-O2" />	469	<compilerarg value="-O2" />
502	<compilerarg value="-std=c99" />	470	<compilerarg value="-std=c99" />
Lines 504-511 Link Here
504		472
505	<linkerarg value="-m32" if="cross_32" unless="is.running.macos" />	473	<linkerarg value="-m32" if="cross_32" unless="is.running.macos" />
506	<linkerarg value="-m64" if="cross_64" unless="is.running.macos" />	474	<linkerarg value="-m64" if="cross_64" unless="is.running.macos" />
507	<linkerarg value="-L${portaudio}/lib/.libs" />
508	<linkerarg value="-L${speex}/libspeex/.libs" />
509		475
510	<!-- Linux-specific flags -->	476	<!-- Linux-specific flags -->
511	<compilerarg value="-I${system.JAVA_HOME}/include/linux" if="is.running.linux" />	477	<compilerarg value="-I${system.JAVA_HOME}/include/linux" if="is.running.linux" />
Lines 515-525 Link Here
515	<!-- Static libraries MUST be at the end; otherwise, they will not be	481	<!-- Static libraries MUST be at the end; otherwise, they will not be
516	added to shared library.	482	added to shared library.
517	-->	483	-->
518	<linkerarg value="-Wl,-Bstatic" location="end" if="is.running.linux" />
519	<linkerarg value="-lportaudio" location="end" if="is.running.linux" />	484	<linkerarg value="-lportaudio" location="end" if="is.running.linux" />
520	<linkerarg value="-lspeexdsp" location="end" if="is.running.linux" unless="speex.dynamic"/>
521	<linkerarg value="-Wl,-Bdynamic" location="end" if="is.running.linux" />	485	<linkerarg value="-Wl,-Bdynamic" location="end" if="is.running.linux" />
522	<linkerarg value="-lspeexdsp" location="end" if="is.speex.dynamic.set"/>	486	<linkerarg value="-lspeexdsp" location="end"/>
523	<linkerarg value="-lrt" location="end" if="is.running.linux" />	487	<linkerarg value="-lrt" location="end" if="is.running.linux" />
524	<linkerarg value="-lasound" location="end" if="is.running.linux" />	488	<linkerarg value="-lasound" location="end" if="is.running.linux" />
525	<linkerarg value="-lm" location="end" if="is.running.linux" />	489	<linkerarg value="-lm" location="end" if="is.running.linux" />
Lines 578-595 Link Here
578	<!-- compile jnspeex library -->	542	<!-- compile jnspeex library -->
579	<target name="speex" description="Build jnspeex shared library" depends="init-native">	543	<target name="speex" description="Build jnspeex shared library" depends="init-native">
580		544
581	<fail message="speex repository not set!" unless="speex" />
582
583	<cc outtype="shared" name="gcc" outfile="${native_install_dir}/jnspeex" objdir="${obj}">	545	<cc outtype="shared" name="gcc" outfile="${native_install_dir}/jnspeex" objdir="${obj}">
584	<!-- common compiler flags -->	546	<!-- common compiler flags -->
585	<compilerarg value="-D_JNI_IMPLEMENTATION_" />	547	<compilerarg value="-D_JNI_IMPLEMENTATION_" />
586	<compilerarg value="-I${speex}/include" />	548	<compilerarg value="-I/usr/include" />
587	<compilerarg value="-O2" />	549	<compilerarg value="-O2" />
588	<compilerarg value="-std=c99" />	550	<compilerarg value="-std=c99" />
589	<compilerarg value="-Wall" />	551	<compilerarg value="-Wall" />
590		552
591	<linkerarg value="-L${speex}/libspeex/.libs" />
592
593	<!-- Linux specific flags -->	553	<!-- Linux specific flags -->
594	<compilerarg value="-m32" if="cross_32" unless="is.running.macos" />	554	<compilerarg value="-m32" if="cross_32" unless="is.running.macos" />
595	<compilerarg value="-m64" if="cross_64" unless="is.running.macos" />	555	<compilerarg value="-m64" if="cross_64" unless="is.running.macos" />
Lines 602-608 Link Here
602	<!-- static libraries MUST be at the end otherwise	562	<!-- static libraries MUST be at the end otherwise
603	they will not be added to shared library	563	they will not be added to shared library
604	-->	564	-->
605	<linkerarg value="-Wl,-Bstatic" location="end" if="is.running.linux" />
606	<linkerarg value="-lspeex" location="end" if="is.running.linux" />	565	<linkerarg value="-lspeex" location="end" if="is.running.linux" />
607	<linkerarg value="-lspeexdsp" location="end" if="is.running.linux" />	566	<linkerarg value="-lspeexdsp" location="end" if="is.running.linux" />
608	<linkerarg value="-Wl,-Bdynamic" location="end" if="is.running.linux" />	567	<linkerarg value="-Wl,-Bdynamic" location="end" if="is.running.linux" />
Lines 700-707 Link Here
700	-->	659	-->
701	<target name="opus" description="Build opus shared library" depends="init-native">	660	<target name="opus" description="Build opus shared library" depends="init-native">
702		661
703	<fail message="opus repository not set!" unless="opus"/>
704
705	<cc outtype="shared" name="gcc"	662	<cc outtype="shared" name="gcc"
706	objdir="${obj}"	663	objdir="${obj}"
707	outfile="${native_install_dir}/jnopus">	664	outfile="${native_install_dir}/jnopus">
Lines 710-721 Link Here
710	<compilerarg value="-Wall" />	667	<compilerarg value="-Wall" />
711	<compilerarg value="-fPIC"/>	668	<compilerarg value="-fPIC"/>
712	<compilerarg value="-O2" />	669	<compilerarg value="-O2" />
713	<compilerarg value="-I${opus}/include" unless="is.running.debian"/>	670	<compilerarg value="-I/usr/include/opus" unless="is.running.debian"/>
714	<compilerarg value="-I/usr/include/opus" if="is.running.debian"/>	671	<compilerarg value="-I/usr/include/opus" if="is.running.debian"/>
715	<compilerarg value="-D_JNI_IMPLEMENTATION_" />	672	<compilerarg value="-D_JNI_IMPLEMENTATION_" />
716		673
717	<linkerarg value="-Wl,-z,relro" if="is.running.debian"/>	674	<linkerarg value="-Wl,-z,relro" if="is.running.debian"/>
718	<linkerarg value="-L${opus}/.libs" unless="is.running.debian"/>
719		675
720	<!-- Unix specific flags -->	676	<!-- Unix specific flags -->
721	<compilerarg value="-m32" if="cross_32" unless="is.running.macos" />	677	<compilerarg value="-m32" if="cross_32" unless="is.running.macos" />
Lines 782-789 Link Here
782		738
783	<target name="libvpx" description="Build the libvpx shared library" depends="init-native">	739	<target name="libvpx" description="Build the libvpx shared library" depends="init-native">
784		740
785	<fail message="libvpx repository not set!" unless="libvpx"/>
786
787	<cc outtype="shared" name="gcc"	741	<cc outtype="shared" name="gcc"
788	objdir="${obj}"	742	objdir="${obj}"
789	outfile="${native_install_dir}/jnvpx">	743	outfile="${native_install_dir}/jnvpx">
Lines 796-803 Link Here
796	<compilerarg value="-I/usr/include/vpx" if="is.running.linux"/>	750	<compilerarg value="-I/usr/include/vpx" if="is.running.linux"/>
797	<compilerarg value="-D_JNI_IMPLEMENTATION_" />	751	<compilerarg value="-D_JNI_IMPLEMENTATION_" />
798		752
799	<linkerarg value="-L${libvpx}" />
800
801	<!-- Unix specific flags -->	753	<!-- Unix specific flags -->
802	<compilerarg value="-m32" if="cross_32" unless="is.running.macos" />	754	<compilerarg value="-m32" if="cross_32" unless="is.running.macos" />
803	<compilerarg value="-m64" if="cross_64" unless="is.running.macos" />	755	<compilerarg value="-m64" if="cross_64" unless="is.running.macos" />