[patch] patch the build.xml

libjitsi-build.patch (text/plain), 7.82 KB, created by Guillaume Horel on 2014-03-07 19:01:10 UTC

--- src/native/build.xml.orig	2014-03-03 20:47:59.183153864 -0500
+++ src/native/build.xml	2014-03-03 20:58:14.650761619 -0500
@@ -299,34 +299,30 @@
   <!-- 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${ffmpeg}" />
+      <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${ffmpeg}/libavcodec" />
-      <linkerarg value="-L${ffmpeg}/libavfilter" />
-      <linkerarg value="-L${ffmpeg}/libavformat" />
-      <linkerarg value="-L${ffmpeg}/libavutil" />
-      <linkerarg value="-L${ffmpeg}/libswscale" />
+      <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${lame}/libmp3lame" />
-      <linkerarg value="-L${lame}/libmp3lame/.libs" />
-      <linkerarg value="-L${x264}" />
+      <linkerarg value="-L/usr/include/libmp3lame" />
+      <linkerarg value="-L/usr/include" />
       <linkerarg value="-m${arch}" />
       <linkerarg value="-Wl,-z,relro" if="is.running.debian"/>
       <!--
@@ -461,34 +457,6 @@
   <!-- 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" />
@@ -496,7 +464,7 @@
       <compilerarg value="-D_JNI_IMPLEMENTATION_" />
       <compilerarg value="-fPIC" />
       <compilerarg value="-I${portaudio}/include" />
-      <compilerarg value="-I${speex}/include" />
+      <compilerarg value="-I/usr/include" />
       <compilerarg value="-I${system.JAVA_HOME}/include" unless="is.running.macos" />
       <compilerarg value="-O2" />
       <compilerarg value="-std=c99" />
@@ -504,8 +472,6 @@
 
       <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" />
@@ -515,11 +481,9 @@
       <!-- 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" if="is.speex.dynamic.set"/>
+      <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" />
@@ -578,18 +542,14 @@
   <!-- 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${speex}/include" />
+      <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" />
@@ -602,7 +562,6 @@
       <!-- 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" />
@@ -700,8 +659,6 @@
     -->
     <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">
@@ -710,12 +667,11 @@
             <compilerarg value="-Wall" />
             <compilerarg value="-fPIC"/>
             <compilerarg value="-O2" />
-            <compilerarg value="-I${opus}/include" unless="is.running.debian"/>
+            <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" />
@@ -782,8 +738,6 @@
 
     <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">
@@ -796,8 +750,6 @@
             <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" />