Adds libjitsi package dependency for debian source package.

fix-message-formatting
Damian Minkov 12 years ago
parent d922f477da
commit a8453f66f1

@ -0,0 +1,42 @@
Manifest-Version: 1.0
Archiver-Version: Plexus Archiver
Created-By: Apache Maven Bundle Plugin
Built-By: hen
Build-Jdk: 1.5.0_22
Implementation-Build: UNKNOWN_BRANCH@r??????; 2011-11-09 22:58:07-0800
Implementation-Title: Commons Lang
Implementation-Vendor: The Apache Software Foundation
Implementation-Vendor-Id: org.apache
Implementation-Version: 3.1
Specification-Title: Commons Lang
Specification-Vendor: The Apache Software Foundation
Specification-Version: 3.1
X-Compile-Source-JDK: 1.5
X-Compile-Target-JDK: 1.5
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Include-Resource: templates/release-notes.vm=src/main/resources/templa
tes/release-notes.vm,META-INF/LICENSE.txt=LICENSE.txt,META-INF/NOTICE
.txt=NOTICE.txt
Bnd-LastModified: 1320908300777
Export-Package: org.apache.commons.lang3.event;version="3.1",org.apach
e.commons.lang3.mutable;version="3.1",org.apache.commons.lang3.tuple;
version="3.1",org.apache.commons.lang3.time;version="3.1",org.apache.
commons.lang3.concurrent;version="3.1",org.apache.commons.lang3.text.
translate;version="3.1",org.apache.commons.lang3.text;version="3.1",o
rg.apache.commons.lang3.math;version="3.1",org.apache.commons.lang3;v
ersion="3.1",org.apache.commons.lang3.exception;version="3.1",org.apa
che.commons.lang3.reflect;version="3.1",org.apache.commons.lang3.buil
der;version="3.1"
Bundle-Version: 3.1.0
Bundle-Name: Commons Lang
Bundle-Description: Commons Lang, a package of Java utility classes fo
r the classes that are in java.lang's hierarchy, or are considered t
o be so standard as to justify existence in java.lang.
Private-Package: templates
Bundle-DocURL: http://commons.apache.org/lang/
Bundle-Vendor: The Apache Software Foundation
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.apache.commons.lang3
Tool: Bnd-1.15.0
Bundle-ClassPath: .,commons-lang.jar

@ -2443,47 +2443,6 @@
<!-- here we suppose jitsi is in the same folder with libjitsi
and libsrc
-->
<!-- Libjitsi -->
<mkdir dir="${debian.src.dir}/lib/src/libjitsi/lib"/>
<copy todir="${debian.src.dir}/lib/src/libjitsi">
<fileset dir="${sc.basedir}/../libjitsi">
<include name="src/**"/>
<include name="build.xml"/>
<exclude name="**/macosx/**"/>
<exclude name="**/windows/**"/>
</fileset>
</copy>
<!-- weupnp -->
<unzip src="${sc.basedir}/../libsrc/weupnp.zip"
dest="${debian.src.dir}/lib/src"/>
<!-- ice4j -->
<unzip src="${sc.basedir}/../libsrc/ice4j.zip"
dest="${debian.src.dir}/lib/src">
<patternset>
<exclude name="**/.svn/**"/>
<exclude name="**/*.jar"/>
</patternset>
</unzip>
<delete dir="${debian.src.dir}/lib/src/ice4j/lib" includes="*"/>
<!-- sdes -->
<unzip src="${sc.basedir}/../libsrc/sdes4j.zip"
dest="${debian.src.dir}/lib/src">
<patternset>
<exclude name="**/.svn"/>
</patternset>
</unzip>
<!-- jsip -->
<unzip src="${sc.basedir}/../libsrc/jsip.zip"
dest="${debian.src.dir}/lib/src/">
<patternset>
<exclude name="**/.svn/**"/>
<exclude name="**/*.jar"/>
</patternset>
</unzip>
<!-- jdic_misc -->
<unzip src="${sc.basedir}/../libsrc/jdic_misc.zip"
@ -2493,22 +2452,6 @@
</patternset>
</unzip>
<!-- fmj -->
<unzip src="${sc.basedir}/../libsrc/fmj.zip"
dest="${debian.src.dir}/lib/src">
<patternset>
<exclude name="**/macosx/**"/>
<exclude name="**/windows/**"/>
<exclude name="**/lib/**"/>
<exclude name="**/*.so"/>
<exclude name="**/*.dll"/>
</patternset>
</unzip>
<!-- zrtp4j -->
<unzip src="${sc.basedir}/../libsrc/zrtp4j-src-3.2.0.zip"
dest="${debian.src.dir}/lib/src"/>
<!-- joscar -->
<unzip src="${sc.basedir}/../libsrc/joscar.zip"
dest="${debian.src.dir}/lib/src">
@ -2522,15 +2465,6 @@
<unzip src="${sc.basedir}/../libsrc/jsocks.zip"
dest="${debian.src.dir}/lib/src"/>
<!-- bccontrib -->
<unzip src="${sc.basedir}/../libsrc/bccontrib.zip"
dest="${debian.src.dir}/lib/src/">
<patternset>
<exclude name="**/*.jar"/>
<exclude name="**/*.class"/>
</patternset>
</unzip>
<!-- OrangeExtensions -->
<unzip src="${sc.basedir}/../libsrc/OrangeExtensions.zip"
dest="${debian.src.dir}/lib/src"/>
@ -2598,23 +2532,6 @@
<mkdir dir="${debian.src.dir}/lib/native/linux"/>
<mkdir dir="${debian.src.dir}/lib/native/linux-64"/>
<!-- portaudio -->
<unzip src="${sc.basedir}/../libsrc/portaudio.zip"
dest="${debian.src.dir}/lib/src/">
<patternset>
<exclude name="**/*.log"/>
<exclude name="**/*.orig"/>
<exclude name="**/bindings/**"/>
<exclude name="**/macosx/**"/>
<exclude name="**/windows/**"/>
</patternset>
</unzip>
<exec dir="${debian.src.dir}/lib/src/portaudio"
executable="make"
failonerror="true">
<arg value="distclean" />
</exec>
<!-- pack as original sources -->
<tar destfile="${debian.dir}/${package.name}_${sip-communicator.version}.orig.tar.gz"
compression="gzip"
@ -2626,31 +2543,6 @@
<target name="clean-debuild" depends="load-properties">
<property name="debian.src.dir" value="." />
<!-- libjitsi clean -->
<ant dir="${debian.src.dir}/lib/src/weupnp"
inheritAll="false"
target="clean"/>
<ant dir="${debian.src.dir}/lib/src/ice4j"
inheritAll="false"
target="clean"/>
<ant dir="${debian.src.dir}/lib/src/sdes4j"
inheritAll="false"
target="clean"/>
<ant dir="${debian.src.dir}/lib/src/jsip"
inheritAll="false"
target="clean"/>
<delete dir="${debian.src.dir}/lib/src/bccontrib/target"
failonerror="false"/>
<ant dir="${debian.src.dir}/lib/src/fmj"
inheritAll="false"
target="clean"/>
<ant dir="${debian.src.dir}/lib/src/zrtp4j"
inheritAll="false"
target="clean"/>
<ant dir="${debian.src.dir}/lib/src/libjitsi"
inheritAll="false"
target="clean"/>
<!-- main build of jitsi -->
<ant dir="${debian.src.dir}/lib/src/swingworker"
inheritAll="false"
@ -2724,209 +2616,16 @@
</target>
<!-- this target is dependent of deb-src-rebuild and
both are normally invoked while building debian source package -->
<target name="deb-src-build-libjitsi" depends="load-properties">
<target name="-pre-deb-src-rebuild" depends="load-properties">
<dirname property="current.basedir" file="${ant.file.jitsi}"/>
<property name="debian.src.dir" value="${current.basedir}" />
<mkdir dir="${debian.src.dir}/lib/src/libjitsi/lib"/>
<!-- weupnp -->
<ant dir="${debian.src.dir}/lib/src/weupnp"
inheritAll="false"
target="jar"/>
<symlink resource="../src/weupnp/weupnp.jar"
overwrite="true"
link="${debian.src.dir}/lib/installer-exclude/weupnp-0.1.2-SNAPSHOT.jar"/>
<symlink resource="../../weupnp/weupnp.jar"
overwrite="true"
link="${debian.src.dir}/lib/src/ice4j/lib/weupnp-0.1.2-SNAPSHOT.jar"/>
<!-- sdes -->
<mkdir dir="${debian.src.dir}/lib/src/sdes4j/lib"/>
<symlink resource="/usr/share/java/commons-codec.jar"
overwrite="true"
link="${debian.src.dir}/lib/src/sdes4j/lib/commons-codec.jar"/>
<ant dir="${debian.src.dir}/lib/src/sdes4j"
inheritAll="false"
target="jar">
</ant>
<symlink resource="../../sdes4j/build/SDES4J-1.0.1.jar"
overwrite="true"
link="${debian.src.dir}/lib/src/libjitsi/lib"/>
<symlink resource="/usr/share/java/org.apache.felix.framework.jar"
overwrite="true"
link="${debian.src.dir}/lib/src/libjitsi/lib/felix.jar"/>
<symlink resource="/usr/share/java/json_simple.jar"
overwrite="true"
link="${debian.src.dir}/lib/src/libjitsi/lib"/>
<symlink resource="/usr/share/java/org.apache.felix.framework.jar"
overwrite="true"
link="${debian.src.dir}/lib/felix.jar"/>
<symlink resource="/usr/share/java/org.apache.felix.main.jar"
overwrite="true"
link="${debian.src.dir}/lib/installer-exclude/"/>
<!-- jsip -->
<symlink resource="/usr/share/java/log4j-1.2.jar"
overwrite="true"
link="${debian.src.dir}/lib/src/jsip/lib/log4j-1.2.15.jar"/>
<ant dir="${debian.src.dir}/lib/src/jsip"
inheritAll="false"
target="dist">
</ant>
<symlink resource="../../jsip/jain-sip-sdp-1.2.159.jar"
overwrite="true"
link="${debian.src.dir}/lib/src/libjitsi/lib/jain-sdp.jar"/>
<symlink resource="../../jsip/jain-sip-sdp-1.2.159.jar"
overwrite="true"
link="${debian.src.dir}/lib/src/ice4j/lib/jain-sdp.jar"/>
<!-- ice4j -->
<ant dir="${debian.src.dir}/lib/src/ice4j"
inheritAll="false"
target="jar">
<property name="src2" value="src"/>
</ant>
<symlink resource="../../ice4j/ice4j.jar"
overwrite="true"
link="${debian.src.dir}/lib/src/libjitsi/lib"/>
<!-- compile and pack bccontrib -->
<mkdir dir="${debian.src.dir}/lib/src/bccontrib/target/classes"/>
<javac debug="false" optimize="true"
destdir="${debian.src.dir}/lib/src/bccontrib/target/classes"
nowarn="false"
source="1.5" target="1.5" fork="true">
<src path="${debian.src.dir}/lib/src/bccontrib/src/main/java"/>
<classpath>
<pathelement location="/usr/share/java/bcprov.jar"/>
</classpath>
</javac>
<jar compress="true"
destfile="${debian.src.dir}/lib/src/bccontrib/target/bccontrib-1.0-SNAPSHOT.jar">
<fileset dir="${debian.src.dir}/lib/src/bccontrib/target/classes"/>
<manifest>
<attribute name="Bundle-Name" value="bccontrib"/>
<attribute name="Bundle-SymbolicName"
value="org.jitsi.bccontrib"/>
<attribute name="Bundle-Version" value="1.0.5.SNAPSHOT"/>
<attribute name="Import-Package"
value="org.bouncycastle.crypto,
org.bouncycastle.crypto.digests,
org.bouncycastle.crypto.engines,
org.bouncycastle.crypto.params,
org.bouncycastle.crypto.prng"/>
<attribute name="Export-Package"
value="org.jitsi.bccontrib.digests,
org.jitsi.bccontrib.engines,
org.jitsi.bccontrib.macs,
org.jitsi.bccontrib.params,
org.jitsi.bccontrib.prng,
org.jitsi.bccontrib.util"/>
</manifest>
</jar>
<symlink resource="../../bccontrib/target/bccontrib-1.0-SNAPSHOT.jar"
overwrite="true"
link="${debian.src.dir}/lib/src/libjitsi/lib"/>
<!-- compile and pack fmj -->
<property name="fmj.src.folder" value="${debian.src.dir}/lib/src/fmj"/>
<mkdir dir="${fmj.src.folder}/build/classes" />
<javac debug="false" optimize="true"
destdir="${fmj.src.folder}/build/classes"
nowarn="false"
source="1.5" target="1.5" fork="true">
<src path="${fmj.src.folder}/src"/>
<src path="${fmj.src.folder}/src.capture"/>
<src path="${fmj.src.folder}/src.ejmf"/>
<src path="${fmj.src.folder}/src.apps"/>
<src path="${fmj.src.folder}/src.ffmpeg-java"/>
<src path="${fmj.src.folder}/src.fmjstudio"/>
<src path="${fmj.src.folder}/src.gst"/>
<src path="${fmj.src.folder}/src.rtp"/>
<src path="${fmj.src.folder}/src.sip-communicator"/>
<src path="${fmj.src.folder}/src.stubs"/>
<src path="${fmj.src.folder}/src.sunibm.base"/>
<src path="${fmj.src.folder}/src.sunibm.replace"/>
<src path="${fmj.src.folder}/src.t4l"/>
<src path="${fmj.src.folder}/src.theora-java"/>
<src path="${fmj.src.folder}/src.utils"/>
<exclude name="**/civil/**" />
<exclude name="net/sf/fmj/media/cdp/GlobalCaptureDevicePlugger.java" />
<exclude name="net/sf/fmj/ejmf/toolkit/gui/**"/>
<exclude name="net/java/**" />
<exclude name="net/sf/fmj/apps/**" />
<exclude name="net/sf/fmj/capture/**" />
<exclude name="net/sf/fmj/ds/**" />
<exclude name="net/sf/fmj/ffmpeg_java/**" />
<exclude name="net/sf/fmj/gst/**" />
<exclude name="net/sf/fmj/gui/**" />
<exclude name="net/sf/fmj/test/**" />
<exclude name="net/sf/fmj/theora_java/**" />
<exclude name="net/sf/fmj/qt/**" />
<exclude name="net/sf/fmj/ui/**" />
<exclude name="net/sf/jdshow/**" />
<exclude name="fi/iki/elonen/nanohttpd/**" />
</javac>
<jar compress="true" destfile="${fmj.src.folder}/fmj.jar">
<fileset dir="${fmj.src.folder}/build/classes">
<exclude name="net/sf/fmj/test/*" />
</fileset>
</jar>
<symlink resource="../../fmj/fmj.jar"
overwrite="true"
link="${debian.src.dir}/lib/src/libjitsi/lib/fmj.jar"/>
<!-- zrtp -->
<mkdir dir="${debian.src.dir}/lib/src/zrtp4j/lib"/>
<symlink resource="../../bccontrib/target/bccontrib-1.0-SNAPSHOT.jar"
overwrite="true"
link="${debian.src.dir}/lib/src/zrtp4j/lib"/>
<symlink resource="/usr/share/java/bcprov.jar"
overwrite="true"
link="${debian.src.dir}/lib/src/zrtp4j/lib/bcprov-jdk15on-148.jar"/>
<!-- its not error zrtp build expects jmf.jar -->
<symlink resource="../../fmj/fmj.jar"
overwrite="true"
link="${debian.src.dir}/lib/src/zrtp4j/lib/jmf.jar"/>
<symlink resource="/usr/share/java/junit.jar"
overwrite="true"
link="${debian.src.dir}/lib/src/zrtp4j/lib/junit.jar"/>
<ant dir="${debian.src.dir}/lib/src/zrtp4j"
inheritAll="false"
target="jar">
</ant>
<!-- libjitsi -->
<symlink resource="../../zrtp4j/dist/zrtp4j-light.jar"
overwrite="true"
link="${debian.src.dir}/lib/src/libjitsi/lib"/>
<symlink resource="../../bccontrib/target/bccontrib-1.0-SNAPSHOT.jar"
overwrite="true"
link="${debian.src.dir}/lib/src/libjitsi/lib"/>
<symlink resource="/usr/share/java/bcprov.jar"
overwrite="true"
link="${debian.src.dir}/lib/src/libjitsi/lib"/>
<symlink resource="/usr/share/java/bcpkix.jar"
overwrite="true"
link="${debian.src.dir}/lib/src/libjitsi/lib"/>
<symlink resource="/usr/share/java/jna.jar"
link="${debian.src.dir}/lib/src/libjitsi/lib"/>
<ant dir="${debian.src.dir}/lib/src/libjitsi"
inheritAll="false"
target="jar">
</ant>
<symlink resource="../src/libjitsi/libjitsi.jar"
<symlink resource="/usr/share/libjitsi/libjitsi.jar"
overwrite="true"
link="${debian.src.dir}/lib/installer-exclude"/>
@ -2937,11 +2636,24 @@ org.jitsi.bccontrib.util"/>
<!-- Normally this target is invoked by debian source package -->
<target name="deb-src-rebuild"
depends="init,deb-src-build-libjitsi,version">
depends="init,-pre-deb-src-rebuild,version">
<property name="debian.src.dir"
value="${debian.tmp.dir}/${package.name}-${sip-communicator.version}" />
<!--TODO-->
<symlink resource="/usr/share/java/libphonenumber.jar"
overwrite="true"
link="${debian.src.dir}/lib/installer-exclude/"/>
<symlink resource="/usr/share/java/org.apache.felix.main.jar"
overwrite="true"
link="${debian.src.dir}/lib/installer-exclude/"/>
<symlink resource="/usr/share/java/weupnp.jar"
overwrite="true"
link="${debian.src.dir}/lib/installer-exclude/weupnp-0.1.2-SNAPSHOT.jar"/>
<!-- swingworker -->
<ant dir="${debian.src.dir}/lib/src/swingworker"
inheritAll="false"
@ -3108,7 +2820,7 @@ org.jitsi.bccontrib.util"/>
tofile="${debian.src.dir}/lib/native/linux/libjdic_misc.so"/>
<!-- json -->
<symlink resource="/usr/share/java/json_simple.jar"
<symlink resource="/usr/share/java/json-simple.jar"
overwrite="true"
link="${debian.src.dir}/lib/installer-exclude/json-simple-1.1.1.jar"/>
@ -3220,9 +2932,9 @@ org.jitsi.bccontrib.util"/>
overwrite="true"
link="${debian.src.dir}/lib/os-specific/mac/"/>
<symlink resource="../src/bccontrib/target/bccontrib-1.0-SNAPSHOT.jar"
<symlink resource="/usr/share/libjitsi/lib/bccontrib.jar"
overwrite="true"
link="${debian.src.dir}/lib/installer-exclude"/>
link="${debian.src.dir}/lib/installer-exclude/bccontrib-1.0-SNAPSHOT.jar"/>
<symlink resource="/usr/share/java/bcprov.jar"
overwrite="true"
link="${debian.src.dir}/lib/installer-exclude/bcprov-jdk15on-150.jar"/>
@ -3330,19 +3042,19 @@ org.jitsi.bccontrib.util"/>
overwrite="true"
link="${debian.src.dir}/lib/installer-exclude/"/>
<!-- ice4j -->
<symlink resource="../src/ice4j/ice4j.jar"
<symlink resource="/usr/share/libjitsi/lib/ice4j.jar"
overwrite="true"
link="${debian.src.dir}/lib/installer-exclude"/>
<!-- fmj -->
<symlink resource="../src/fmj/fmj.jar"
<symlink resource="/usr/share/libjitsi/lib/fmj.jar"
overwrite="true"
link="${debian.src.dir}/lib/installer-exclude"/>
<!-- zrtp -->
<symlink resource="../src/zrtp4j/dist/zrtp4j-light.jar"
<symlink resource="/usr/share/libjitsi/lib/zrtp4j-light.jar"
overwrite="true"
link="${debian.src.dir}/lib/installer-exclude"/>
<!-- sdes -->
<symlink resource="../src/sdes4j/build/SDES4J-1.0.1.jar"
<symlink resource="/usr/share/libjitsi/lib/sdes4j.jar"
overwrite="true"
link="${debian.src.dir}/lib/installer-exclude/sdes4j.jar"/>
@ -3358,13 +3070,13 @@ org.jitsi.bccontrib.util"/>
link="${debian.src.dir}/lib/installer-exclude/httpmime-4.1.2.jar"/>
<!-- jsip -->
<symlink resource="../src/jsip/jain-sdp-1.0.159.jar"
<symlink resource="/usr/share/libjitsi/lib/jain-sdp.jar"
overwrite="true"
link="${debian.src.dir}/lib/installer-exclude/jain-sdp.jar"/>
<symlink resource="../src/jsip/jain-sip-api-1.2.jar"
<symlink resource="/usr/share/libjitsi/lib/jain-sip-api.jar"
overwrite="true"
link="${debian.src.dir}/lib/installer-exclude/jain-sip-api.jar"/>
<symlink resource="../src/jsip/jain-sip-ri-1.2.159.jar"
<symlink resource="/usr/share/libjitsi/lib/jain-sip-ri.jar"
overwrite="true"
link="${debian.src.dir}/lib/installer-exclude/jain-sip-ri.jar"/>
@ -3405,92 +3117,7 @@ org.jitsi.bccontrib.util"/>
<antcall target="unbound"/>
<antcall target="hwaddressretriever"/>
<mkdir dir="${debian.src.dir}/lib/src/libjitsi/lib/installer-exclude"/>
<mkdir dir="${debian.src.dir}/lib/src/libjitsi/lib/native/linux"/>
<mkdir dir="${debian.src.dir}/lib/src/libjitsi/lib/native/linux-64"/>
<symlink resource="/usr/share/java/ant-contrib-cpptasks.jar"
overwrite="true"
link="${debian.src.dir}/lib/src/libjitsi/lib/installer-exclude/cpptasks.jar"/>
<antcall target="g722"/>
<!-- opus -->
<ant dir="${debian.src.dir}/lib/src/libjitsi" inheritAll="false"
target="opus">
<property name="opus" value=""/>
</ant>
<ant dir="${debian.src.dir}/lib/src/libjitsi" inheritAll="false"
target="screencapture"/>
<!-- jnspeex -->
<antcall target="speex">
<param name="speex.dynamic" value="true"/>
</antcall>
<chmod file="${debian.src.dir}/lib/src/portaudio/configure" perm="+x"/>
<exec dir="${debian.src.dir}/lib/src/portaudio"
executable="configure"
resolveexecutable="true"
failonerror="true">
<arg value="--disable-shared" />
<arg value="--enable-static" />
<arg value="--with-pic" />
<arg value="--with-jack=no" />
</exec>
<exec dir="${debian.src.dir}/lib/src/portaudio"
executable="make"
failonerror="true"/>
<ant dir="${debian.src.dir}/lib/src/libjitsi" inheritAll="false"
target="portaudio">
<property name="portaudio" value="${debian.src.dir}/lib/src/portaudio"/>
<property name="speex.dynamic" value="true"/>
</ant>
<!-- ffmpeg -->
<ant dir="${debian.src.dir}/lib/src/libjitsi" inheritAll="false"
target="ffmpeg">
<property name="ffmpeg" value=""/>
<property name="x264" value=""/>
<property name="lame" value=""/>
<property name="libvpx" value=""/>
<property name="LIBAV" value=""/>
</ant>
<!-- video4linux -->
<ant dir="${debian.src.dir}/lib/src/libjitsi" inheritAll="false"
target="video4linux2"/>
<!-- awtrenderer -->
<ant dir="${debian.src.dir}/lib/src/libjitsi" inheritAll="false"
target="jawtrenderer"/>
<!--pulseaudio-->
<ant dir="${debian.src.dir}/lib/src/libjitsi" inheritAll="false"
target="pulseaudio"/>
<!-- now copy the compiled native libs -->
<copy todir="${debian.src.dir}/lib/native/linux">
<fileset dir="${debian.src.dir}/lib/src/libjitsi/lib/native/linux">
<include name="*.so"/>
</fileset>
</copy>
<copy todir="${debian.src.dir}/lib/native/linux-64">
<fileset dir="${debian.src.dir}/lib/src/libjitsi/lib/native/linux-64">
<include name="*.so"/>
</fileset>
</copy>
<!-- clean the native objects (no binaries in src package)-->
<ant dir="${debian.src.dir}/lib/src/libjitsi" inheritAll="false"
target="clean-native"/>
<antcall target="clean-native"/>
<!-- clean portaudio configure logs give warnings -->
<exec dir="${debian.src.dir}/lib/src/portaudio"
executable="make"
failonerror="true">
<arg value="distclean" />
</exec>
</target>
<!-- target to rebuild the jna bundle reusing debian package -->
@ -3538,8 +3165,8 @@ org.jitsi.bccontrib.util"/>
</unzip>
<delete file="${debian.bundles.dest}/json.jar"/>
<mkdir dir="${debian.bundles.dest}/json.jar/META-INF"/>
<symlink resource="../../../../share/java/json_simple.jar"
link="${debian.bundles.dest}/json.jar/json_simple.jar"/>
<symlink resource="../../../../share/java/json-simple.jar"
link="${debian.bundles.dest}/json.jar/json-simple.jar"/>
<manifest
file="${debian.bundles.dest}/json.jar/META-INF/MANIFEST.MF">
<attribute name="Bundle-Name" value="JSON.simple"/>
@ -3551,7 +3178,7 @@ org.jitsi.bccontrib.util"/>
<attribute name="System-Bundle" value="yes"/>
<attribute name="Export-Package"
value="org.json.simple,org.json.simple.parser"/>
<attribute name="Bundle-ClassPath" value=".,json_simple.jar"/>
<attribute name="Bundle-ClassPath" value=".,json-simple.jar"/>
</manifest>
<delete dir="${debian.bundles.dest}/META-INF"/>
</target>
@ -3746,47 +3373,6 @@ org.jitsi.bccontrib.util"/>
fixlastline="true">Bundle-ClassPath: .,swing-ui.jar,mac_widgets.jar,forms.jar&#013;&#010;&#013;&#010;</concat>
</target>
<!-- target to rebuild the httputil bundle reusing debian package -->
<target name="deb-bundle-httputil">
<unzip src="${debian.bundles.dest}/httputil.jar"
dest="${debian.bundles.dest}">
<patternset>
<include name="META-INF/MANIFEST.MF"/>
</patternset>
</unzip>
<delete file="${debian.bundles.dest}/httputil.jar"/>
<mkdir dir="${debian.bundles.dest}/httputil.jar/META-INF"/>
<symlink resource="../../../../share/java/httpclient.jar"
link="${debian.bundles.dest}/httputil.jar/httpclient.jar"/>
<symlink resource="../../../../share/java/httpcore.jar"
link="${debian.bundles.dest}/httputil.jar/httpcore.jar"/>
<symlink resource="../../../../share/java/httpmime.jar"
link="${debian.bundles.dest}/httputil.jar/httpmime.jar"/>
<!-- Create the sys .jar-->
<jar compress="false"
destfile="${debian.bundles.dest}/httputil.jar/httputil.jar">
<zipfileset dir="${dest}/net/java/sip/communicator/service/httputil"
prefix="net/java/sip/communicator/service/httputil"/>
</jar>
<move file="${debian.bundles.dest}/META-INF/MANIFEST.MF"
todir="${debian.bundles.dest}/httputil.jar/META-INF"/>
<delete dir="${debian.bundles.dest}/META-INF"/>
<!-- Removes the last empty line -->
<replaceregexp
file="${debian.bundles.dest}/httputil.jar/META-INF/MANIFEST.MF"
match="^\r\n$"
flags="m"
replace=""/>
<concat
destfile="${debian.bundles.dest}/httputil.jar/META-INF/MANIFEST.MF"
append="true"
eol="crlf"
fixlastline="true">Bundle-ClassPath: .,httputil.jar,httpclient.jar,httpcore.jar,httpmime.&#013;&#010; jar&#013;&#010;&#013;&#010;</concat>
</target>
<!-- target to rebuild the smacklib bundle reusing debian package -->
<target name="deb-bundle-smacklib">
@ -3922,4 +3508,16 @@ org.jitsi.bccontrib.util"/>
fixlastline="true">Bundle-ClassPath: .,accountinfo.jar,jcalendar.jar&#013;&#010;&#013;&#010;</concat>
</target>
<!-- target to rebuild the commons-lang bundle reusing debian package -->
<target name="deb-bundle-commons-lang">
<!-- Creates a bundle containing the commons-lang implementation
in debian dest folder debian.bundles.dest.-->
<delete file="${debian.bundles.dest}/commons-lang.jar" failonerror="false"/>
<mkdir dir="${debian.bundles.dest}/commons-lang.jar/META-INF"/>
<symlink resource="../../../../share/java/commons-lang.jar"
link="${debian.bundles.dest}/commons-lang.jar/commons-lang.jar"/>
<copy file="${lib.noinst}/commons-lang3-3.1.manifest.mf"
tofile="${debian.bundles.dest}/commons-lang.jar/META-INF/MANIFEST.MF"/>
</target>
</project>

@ -7,18 +7,6 @@ Note 2: We have indicated when Jitsi community members are also somehow affiliat
Java DHCP API.
Reason: No Debian package.
- fmj http://fmj-sf.net/
FMJ is an open-source project with the goal of providing an alternative
to Java Media Framework (JMF).
Jitsi team is maintainer of the project.
Reason: No Debian package.
- ice4j http://code.google.com/p/ice4j/
This project provides a Java implementation of the ICE protocol
that would be usable by both SIP and XMPP applications.
The Jitsi community is the maintainer of this project.
Reason: No Debian package.
- jfontchooser http://sourceforge.net/projects/jfontchooser/
This projects tries to provide an easy JFontChooser in the form of the JColorChooser.
Reason: No Debian package.
@ -28,44 +16,21 @@ Jingle Nodes is an XMPP Extension that enable users to share and discover
P2P Media Relays that can be used to enable Voice and Video Chat via Jingle.
Reason: No Debian package.
- jsip http://jsip.java.net/
This project publishes a full implementation of the RFC 3261 Specification
and as well as support for several SIP RFCs.
Emil Ivov from Jitsi team is contributor and has commit right in the project.
Reason: No Debian package.
- jymsg http://jymsg9.sourceforge.net/
This API provides a way for Java applications to connect and
use the Yahoo Instant Messenger protocol.
Damian Minkov from Jitsi team is contributor and has commit right in the project.
Reason: No Debian package.
- libjitsi https://jitsi.org/libjitsi
An advanced Java media library for secure real-time audio/video communication.
Jitsi team is maintainer of the project.
Reason: No Debian package.
- OrangeExtensions http://ymasory.github.com/OrangeExtensions/
A pluggable jar containing stubs for the Apple Java Extensions.
Reason: No Debian package.
- portaudio http://www.portaudio.com/
PortAudio is a free, cross-platform, open-source, audio I/O library.
Reason: A Debian package does exist for port audio however, the Jitsi community is using one of its forks (i.e. the hotplug branch) with a number of additional changes such as:
* further improved device hotplug for windows.
* device hotplug for macosx and linux
* fixes for various problems with device locks.
- smack_src_3_2_2 http://www.igniterealtime.org/projects/smack/
Smack is an Open Source XMPP (Jabber) client library.
Reason: We contributed several patches on version 3.2.2 in order to fix a memory leak, added code that handles some currently unchecked, fixes for discovery info parsing, a pubsub parsing problem and the option to use a custom javax.net.ssl.TrustManager. All of those have been sent to the smack community for integration about a year ago, but havent been integrated since.
And theres no Debian package.
- weupnp http://code.google.com/p/weupnp/
Weupnp is a lightweight Java library implements the UPnP protocol.
Jitsis Sebastien Vincent is contributor and has commit right in the project.
Reason: No Debian package.
- gdata-java-client http://code.google.com/p/gdata-java-client/
The Google Data Java client library.
Using version 1.43.0.
@ -92,12 +57,6 @@ It is a SOCKS server written entirely in Java,
which supports both SOCKS4 and SOCKS5 protocols.
Reason: No Debian package.
- bccontrib https://github.com/jitsi/bccontrib
This project contains the Skein hash function, the Threefish encryption
function and the Fortuna random generator as a Java implementation. The API is
designed to be compatible to BouncyCastle.
Reason: No Debian package.
- misc http://java.net/projects/jdic
Using the desktop window alerter (for windows, mac and linux).
Part in the jdic project svn/trunk/src/incubator/misc.
@ -108,17 +67,6 @@ otr4j is an implementation of the OTR (Off The Record) protocol in java.
Jitsis George Politis (who developed the lib as a GSoC 2009 participant) is current maintainer.
Reason: No Debian package.
- sdes4j http://code.google.com/p/sdes4j/
Implementation of RFC4568: Session Description Protocol (SDP)
Security Descriptions for Media Streams for Java.
Jitsis Ingo Bauersachs is maintainer and owner of the project.
Reason: No Debian package.
- swingworker
Part of jdesktop.org JDNC project.
Reason: No Debian package.
- zrtp4j https://github.com/wernerd/ZRTP4J
Java implementation of ZRTP protocol.
Werner Dittmann from Jitsi team is maintainer and owner of the project.
Reason: No Debian package.

@ -1,6 +1,7 @@
_PACKAGE_NAME_ (_VERSION_) unstable; urgency=low
* Updates upstream.
* Fixes BundleException: Unresolved constraint in bundle propertieseditor. (Closes: #736773)
-- Damian Minkov <damencho@jitsi.org> _DATE_

@ -13,6 +13,8 @@ Build-Depends: debhelper (>= 9), javahelper,
ant-contrib,
maven,
autotools-dev,
libjitsi,
libjitsi-jni,
libavutil-dev,
libavcodec-dev,
libavformat-dev,
@ -39,6 +41,7 @@ Build-Depends: debhelper (>= 9), javahelper,
libhttpmime-java,
libhttpclient-java,
libjson-simple-java,
libphonenumber6-java,
libdbus-java,
libeasymock-java,
libxt-dev,
@ -67,7 +70,9 @@ Standards-Version: 3.9.4
Package: _PACKAGE_NAME_
Architecture: all
Depends: ${misc:Depends},
lib_PACKAGE_NAME_-jni (>= ${source:Version}),
_PACKAGE_NAME_-jni (>= ${source:Version}),
libjitsi,
libjitsi-jni,
default-jre | java6-runtime,
libunixsocket-java,
libhttpcore-java,
@ -98,7 +103,7 @@ Description: VoIP and Instant Messaging client
as well as chat with your friends using some of the most popular instant
messaging protocols such as SIP/SIMPLE, XMPP/Jabber, AIM/ICQ, Yahoo and others.
Package: lib_PACKAGE_NAME_-jni
Package: _PACKAGE_NAME_-jni
Section: libs
Architecture: amd64 i386
Depends: ${misc:Depends}, ${shlibs:Depends}

@ -1,4 +1,7 @@
usr/share/java/commons-codec.jar usr/share/_PACKAGE_NAME_/sc-bundles/commons-codec.jar
usr/share/java/commons-lang3.jar usr/share/_PACKAGE_NAME_/sc-bundles/commons-lang.jar
usr/share/java/log4j-1.2.jar usr/share/_PACKAGE_NAME_/lib/bundle/log4j.jar
usr/share/java/commons-logging.jar usr/share/_PACKAGE_NAME_/lib/bundle/commons-logging.jar
usr/share/java/httpcore.jar usr/share/_PACKAGE_NAME_/sc-bundles/httpcore.jar
usr/share/java/httpclient.jar usr/share/_PACKAGE_NAME_/sc-bundles/httpclient.jar
usr/share/java/guava.jar usr/share/_PACKAGE_NAME_/sc-bundles/guava.jar
usr/share/java/hsqldb.jar usr/share/_PACKAGE_NAME_/sc-bundles/hsqldb.jar

@ -0,0 +1,150 @@
Index: jitsi/src/net/java/sip/communicator/impl/dns/DnsJavaLogger.java
===================================================================
--- jitsi.orig/src/net/java/sip/communicator/impl/dns/DnsJavaLogger.java 2014-06-13 07:08:10.000000000 -0400
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,132 +0,0 @@
-/*
- * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package net.java.sip.communicator.impl.dns;
-
-import net.java.sip.communicator.util.*;
-import org.jitsi.service.packetlogging.*;
-import org.xbill.DNS.*;
-
-import java.net.*;
-
-/**
- * Custom logger that will log packages using packet logging service.
- *
- * @author Damian Minkov
- */
-public class DnsJavaLogger
- implements CustomLogger
-{
- /**
- * The logger.
- */
- private static final Logger logger
- = Logger.getLogger(DnsJavaLogger.class);
-
- /**
- * The packet logging service.
- */
- private PacketLoggingService packetLoggingService = null;
-
- /**
- * Obtain packet logging service.
- * @return
- */
- private PacketLoggingService getPacketLoggingService()
- {
- if(packetLoggingService == null
- && UtilActivator.bundleContext != null)
- {
- packetLoggingService = ServiceUtils.getService(
- UtilActivator.bundleContext,
- PacketLoggingService.class);
- }
-
- return packetLoggingService;
- }
-
- @Override
- public void log(SocketAddress local,
- SocketAddress remote,
- String prefix, byte[] data)
- {
- // make sure that error here will not stop further processing
- try
- {
- logInternal(local, remote, prefix, data);
- }
- catch(Throwable t)
- {
- logger.error("Error saving packet", t);
- }
- }
-
- /**
- * Logs the dns packet, checking its prefix message to distinguish
- * incoming and outgoing messages and the transport used TCP or UDP.
- *
- * @param local the local address
- * @param remote the remote address
- * @param prefix the prefix used by the dns lib
- * @param data the data that is send or received through the wire
- */
- private void logInternal(SocketAddress local,
- SocketAddress remote,
- String prefix, byte[] data)
- {
- if(getPacketLoggingService() == null
- || !(local instanceof InetSocketAddress
- && remote instanceof InetSocketAddress))
- {
- return;
- }
-
- InetSocketAddress localAddress = (InetSocketAddress)local;
- InetSocketAddress remoteAddress = (InetSocketAddress)remote;
-
- PacketLoggingService.TransportName transportName
- = PacketLoggingService.TransportName.UDP;
-
- if(prefix.contains("TCP"))
- transportName = PacketLoggingService.TransportName.TCP;
-
- boolean isSender = true;
- if(prefix.contains("read"))
- isSender = false;
-
- byte[] srcAddr;
- int srcPort;
- byte[] dstAddr;
- int dstPort;
-
- if(isSender)
- {
- srcAddr = localAddress.getAddress().getAddress();
- srcPort = localAddress.getPort();
- dstAddr = remoteAddress.getAddress().getAddress();
- dstPort = remoteAddress.getPort();
- }
- else
- {
- dstAddr = localAddress.getAddress().getAddress();
- dstPort = localAddress.getPort();
- srcAddr = remoteAddress.getAddress().getAddress();
- srcPort = remoteAddress.getPort();
- }
-
- getPacketLoggingService().logPacket(
- PacketLoggingService.ProtocolName.DNS,
- srcAddr,
- srcPort,
- dstAddr,
- dstPort,
- transportName,
- isSender,
- data,
- 0,
- data.length);
- }
-}
Index: debian/src/net/java/sip/communicator/impl/dns/DnsUtilActivator.java
===================================================================
--- jitsi.orig/src/net/java/sip/communicator/impl/dns/DnsUtilActivator.java 2014-06-13 07:08:10.000000000 -0400
+++ jitsi/src/net/java/sip/communicator/impl/dns/DnsUtilActivator.java 2014-06-13 07:21:39.708148000 -0400
@@ -111,7 +111,7 @@
if(Logger.getLogger("org.xbill").isTraceEnabled())
Options.set("verbose", "1");
- Lookup.setCustomLogger(new DnsJavaLogger());
+ //Lookup.setCustomLogger(new DnsJavaLogger());
if(loadDNSProxyForward())
{

@ -1,292 +0,0 @@
Index: jitsi-2.3.4901/lib/src/libjitsi/src/native/ffmpeg/org_jitsi_impl_neomedia_codec_FFmpeg.c
===================================================================
--- jitsi-2.3.4901.orig/lib/src/libjitsi/src/native/ffmpeg/org_jitsi_impl_neomedia_codec_FFmpeg.c 2013-11-11 06:03:23.817608000 -0500
+++ jitsi-2.3.4901/lib/src/libjitsi/src/native/ffmpeg/org_jitsi_impl_neomedia_codec_FFmpeg.c 2013-11-11 06:06:14.037608000 -0500
@@ -454,14 +454,14 @@
DEFINE_AVCODECCONTEXT_I_PROPERTY_SETTER(trellis, trellis)
DEFINE_AVCODECCONTEXT_I_PROPERTY_SETTER(workaround_1bugs, workaround_bugs)
-JNIEXPORT jlong JNICALL
+/*JNIEXPORT jlong JNICALL
Java_org_jitsi_impl_neomedia_codec_FFmpeg_avfilter_1graph_1alloc
(JNIEnv *env, jclass clazz)
{
return (jlong) (intptr_t) avfilter_graph_alloc();
-}
+}*/
-JNIEXPORT jint JNICALL
+/*JNIEXPORT jint JNICALL
Java_org_jitsi_impl_neomedia_codec_FFmpeg_avfilter_1graph_1config
(JNIEnv *env, jclass clazz, jlong graph, jlong log_ctx)
{
@@ -470,18 +470,18 @@
avfilter_graph_config(
(AVFilterGraph *) (intptr_t) graph,
(AVClass *) (intptr_t) log_ctx);
-}
+}*/
-JNIEXPORT void JNICALL
+/*JNIEXPORT void JNICALL
Java_org_jitsi_impl_neomedia_codec_FFmpeg_avfilter_1graph_1free
(JNIEnv *env, jclass clazz, jlong graph)
{
AVFilterGraph *graph_ = (AVFilterGraph *) (intptr_t) graph;
avfilter_graph_free(&graph_);
-}
+}*/
-JNIEXPORT jlong JNICALL
+/*JNIEXPORT jlong JNICALL
Java_org_jitsi_impl_neomedia_codec_FFmpeg_avfilter_1graph_1get_1filter
(JNIEnv *env, jclass clazz, jlong graph, jstring name)
{
@@ -499,23 +499,23 @@
else
filter = NULL;
return (jlong) (intptr_t) filter;
-}
+}*/
-static int
+/*static int
ffsink_end_frame(AVFilterLink *link)
{
if (link->cur_buf)
link->dst->priv = avfilter_ref_buffer(link->cur_buf, ~0);
return 0;
-}
+}*/
-static int
+/*static int
ffsink_query_formats(AVFilterContext *ctx)
{
AVFilterContext *src = ctx;
int err;
- /* Find buffer. */
+ / * Find buffer. * /
#ifdef _JITSI_LIBAV_
while (src && src->input_count && src->inputs)
#else
@@ -530,7 +530,7 @@
break;
}
- /* Make ffsink output in the format in which buffer inputs. */
+ / * Make ffsink output in the format in which buffer inputs. * /
if (src)
{
const int pix_fmts[] = { src->outputs[0]->in_formats->formats[0], -1 };
@@ -557,9 +557,9 @@
ffsink_uninit(AVFilterContext *ctx)
{
ctx->priv = NULL;
-}
+}*/
-JNIEXPORT jint JNICALL
+/*JNIEXPORT jint JNICALL
Java_org_jitsi_impl_neomedia_codec_FFmpeg_avfilter_1graph_1parse
(JNIEnv *env, jclass clazz,
jlong graph, jstring filters, jlong inputs, jlong outputs, jlong log_ctx)
@@ -579,26 +579,26 @@
(AVFilterInOut **) (intptr_t) outputs,
(AVClass *) (intptr_t) log_ctx);
- /*
+ / *
* FIXME The implementation at the time of this writing presumes that
* the first filter is buffer, the last filter is nullsink meant to be
* ffsink and the ffsink is expected to output in the format in which
* the buffer inputs.
- */
+ * /
if (0 == ret)
{
- /* Turn nullsink into ffsink. */
+ / * Turn nullsink into ffsink. * /
unsigned filterCount = graph_->filter_count;
if (filterCount)
{
AVFilterContext *ffsink = graph_->filters[filterCount - 1];
- /*
+ / *
* Make sure query_format of ffsink outputs in the format in
* which buffer inputs. Otherwise, the output format may end up
* different on the C and Java sides.
- */
+ * /
ffsink->filter->uninit = ffsink_uninit;
ffsink->priv = NULL;
ffsink->filter->query_formats = ffsink_query_formats;
@@ -614,7 +614,7 @@
else
ret = AVERROR(ENOMEM);
return (jint) ret;
-}
+}*/
JNIEXPORT void JNICALL
Java_org_jitsi_impl_neomedia_codec_FFmpeg_avfilter_1register_1all
@@ -623,12 +623,13 @@
avfilter_register_all();
}
-JNIEXPORT void JNICALL
+
+/*JNIEXPORT void JNICALL
Java_org_jitsi_impl_neomedia_codec_FFmpeg_avfilter_1unref_1buffer
(JNIEnv *env, jclass clazz, jlong ref)
{
avfilter_unref_buffer((AVFilterBufferRef *) (intptr_t) ref);
-}
+}*/
JNIEXPORT jlong JNICALL
Java_org_jitsi_impl_neomedia_codec_FFmpeg_avframe_1get_1pts
@@ -693,7 +694,7 @@
(int) width, (int) height);
}
-JNIEXPORT jlong JNICALL
+/*JNIEXPORT jlong JNICALL
Java_org_jitsi_impl_neomedia_codec_FFmpeg_get_1filtered_1video_1frame
(JNIEnv *env, jclass clazz,
jlong input, jint width, jint height, jint pixFmt,
@@ -717,12 +718,12 @@
{
AVFrame *output_ = (AVFrame *) (intptr_t) output;
- /*
+ / *
* The data of cur_buf will be returned into output so it needs
* to exist at least while output needs it. So take ownership of
* cur_buf and the user of output will unref it when they are
* done with output.
- */
+ * /
ffsink_->priv = NULL;
memcpy(output_->data, ref->data, sizeof(output_->data));
@@ -736,7 +737,7 @@
}
}
return (jlong) (intptr_t) ref;
-}
+}*/
JNIEXPORT void JNICALL
Java_org_jitsi_impl_neomedia_codec_FFmpeg_memcpy___3IIIJ
Index: jitsi-2.3.4901/lib/src/libjitsi/src/native/ffmpeg/org_jitsi_impl_neomedia_codec_FFmpeg.h
===================================================================
--- jitsi-2.3.4901.orig/lib/src/libjitsi/src/native/ffmpeg/org_jitsi_impl_neomedia_codec_FFmpeg.h 2013-11-11 06:03:23.817608000 -0500
+++ jitsi-2.3.4901/lib/src/libjitsi/src/native/ffmpeg/org_jitsi_impl_neomedia_codec_FFmpeg.h 2013-11-11 06:06:14.037608000 -0500
@@ -435,41 +435,41 @@
* Class: org_jitsi_impl_neomedia_codec_FFmpeg
* Method: avfilter_graph_alloc
* Signature: ()J
- */
+
JNIEXPORT jlong JNICALL Java_org_jitsi_impl_neomedia_codec_FFmpeg_avfilter_1graph_1alloc
- (JNIEnv *, jclass);
+ (JNIEnv *, jclass); */
/*
* Class: org_jitsi_impl_neomedia_codec_FFmpeg
* Method: avfilter_graph_config
* Signature: (JJ)I
- */
+
JNIEXPORT jint JNICALL Java_org_jitsi_impl_neomedia_codec_FFmpeg_avfilter_1graph_1config
- (JNIEnv *, jclass, jlong, jlong);
+ (JNIEnv *, jclass, jlong, jlong); */
/*
* Class: org_jitsi_impl_neomedia_codec_FFmpeg
* Method: avfilter_graph_free
* Signature: (J)V
- */
+
JNIEXPORT void JNICALL Java_org_jitsi_impl_neomedia_codec_FFmpeg_avfilter_1graph_1free
- (JNIEnv *, jclass, jlong);
+ (JNIEnv *, jclass, jlong); */
/*
* Class: org_jitsi_impl_neomedia_codec_FFmpeg
* Method: avfilter_graph_get_filter
* Signature: (JLjava/lang/String;)J
- */
+
JNIEXPORT jlong JNICALL Java_org_jitsi_impl_neomedia_codec_FFmpeg_avfilter_1graph_1get_1filter
- (JNIEnv *, jclass, jlong, jstring);
+ (JNIEnv *, jclass, jlong, jstring); */
/*
* Class: org_jitsi_impl_neomedia_codec_FFmpeg
* Method: avfilter_graph_parse
* Signature: (JLjava/lang/String;JJJ)I
- */
+
JNIEXPORT jint JNICALL Java_org_jitsi_impl_neomedia_codec_FFmpeg_avfilter_1graph_1parse
- (JNIEnv *, jclass, jlong, jstring, jlong, jlong, jlong);
+ (JNIEnv *, jclass, jlong, jstring, jlong, jlong, jlong); */
/*
* Class: org_jitsi_impl_neomedia_codec_FFmpeg
@@ -483,10 +483,10 @@
* Class: org_jitsi_impl_neomedia_codec_FFmpeg
* Method: avfilter_unref_buffer
* Signature: (J)V
- */
+
JNIEXPORT void JNICALL Java_org_jitsi_impl_neomedia_codec_FFmpeg_avfilter_1unref_1buffer
(JNIEnv *, jclass, jlong);
-
+ */
/*
* Class: org_jitsi_impl_neomedia_codec_FFmpeg
* Method: avframe_get_pts
@@ -531,9 +531,9 @@
* Class: org_jitsi_impl_neomedia_codec_FFmpeg
* Method: get_filtered_video_frame
* Signature: (JIIIJJJ)J
- */
+
JNIEXPORT jlong JNICALL Java_org_jitsi_impl_neomedia_codec_FFmpeg_get_1filtered_1video_1frame
- (JNIEnv *, jclass, jlong, jint, jint, jint, jlong, jlong, jlong);
+ (JNIEnv *, jclass, jlong, jint, jint, jint, jlong, jlong, jlong); */
/*
* Class: org_jitsi_impl_neomedia_codec_FFmpeg
Index: jitsi-2.3.4901/lib/src/libjitsi/src/org/jitsi/impl/neomedia/MediaServiceImpl.java
===================================================================
--- jitsi-2.3.4901.orig/lib/src/libjitsi/src/org/jitsi/impl/neomedia/MediaServiceImpl.java 2013-11-11 06:03:23.825608000 -0500
+++ jitsi-2.3.4901/lib/src/libjitsi/src/org/jitsi/impl/neomedia/MediaServiceImpl.java 2013-11-11 06:06:07.029608000 -0500
@@ -1123,7 +1123,7 @@
locator.getProtocol()))
codecs = new Codec[] { scaler };
else
- codecs = new Codec[] { new HFlip(), scaler };
+ codecs = new Codec[] { /*new HFlip(),*/ scaler };
trackControl.setCodecChain(codecs);
break;
Index: jitsi-2.3.4901/lib/src/libjitsi/src/org/jitsi/impl/neomedia/device/VideoMediaDeviceSession.java
===================================================================
--- jitsi-2.3.4901.orig/lib/src/libjitsi/src/org/jitsi/impl/neomedia/device/VideoMediaDeviceSession.java 2013-11-11 06:03:23.861608000 -0500
+++ jitsi-2.3.4901/lib/src/libjitsi/src/org/jitsi/impl/neomedia/device/VideoMediaDeviceSession.java 2013-11-11 06:06:09.557608000 -0500
@@ -513,7 +513,7 @@
{
controllerUpdateForCreateLocalVisualComponent(
ev,
- hflip);
+ false);
}
});
localPlayer.configure();

@ -1,4 +1,3 @@
bcprov-upgrade-1.48
remove-hflip
guava-update
bcprov-backport-1.49
remove-dns-java-logger.patch

@ -21,13 +21,13 @@ override_dh_install-indep:
# make and install the debian specific bundles
# use the prebuild and installed bundles to extract/modify and use the
# exising debian java packages
$(ANT) -file build.xml -Ddebian.bundles.dest=debian/$(PACKAGE_NAME)/usr/share/$(PACKAGE_NAME)/sc-bundles deb-bundle-jna deb-bundle-util deb-bundle-sysactivitynotifications deb-bundle-swing-ui deb-bundle-httputil deb-bundle-json deb-bundle-smacklib deb-bundle-jmdnslib deb-bundle-desktoputil deb-bundle-bouncycastle deb-bundle-plugin-accountinfo
$(ANT) -file build.xml -Ddebian.bundles.dest=debian/$(PACKAGE_NAME)/usr/share/$(PACKAGE_NAME)/sc-bundles deb-bundle-jna deb-bundle-util deb-bundle-sysactivitynotifications deb-bundle-swing-ui deb-bundle-json deb-bundle-smacklib deb-bundle-jmdnslib deb-bundle-desktoputil deb-bundle-bouncycastle deb-bundle-plugin-accountinfo deb-bundle-commons-lang
override_dh_install-arch:
ifeq ($(DEB_HOST_ARCH),amd64)
dh_install -plib$(PACKAGE_NAME)-jni lib/native/linux-64/*.so usr/lib/jni/
dh_install -p$(PACKAGE_NAME)-jni lib/native/linux-64/*.so usr/lib/jni/
else
dh_install -plib$(PACKAGE_NAME)-jni lib/native/linux/*.so usr/lib/jni/
dh_install -p$(PACKAGE_NAME)-jni lib/native/linux/*.so usr/lib/jni/
endif
# we have folders with name *.jar which jh_manifest don't like and fails,

Loading…
Cancel
Save