diff options
| author | Lyubomir Marinov <lyubomir.marinov@jitsi.org> | 2015-05-27 23:12:03 +0300 |
|---|---|---|
| committer | Lyubomir Marinov <lyubomir.marinov@jitsi.org> | 2015-05-27 23:12:03 +0300 |
| commit | 6e17c33e661e6e47af18c5a5efe296e13b03ff11 (patch) | |
| tree | ac808b9e7a720d7729f8fb2adbfd95fa024148ca | |
| parent | 1316ccd46e18aac5618004bfb10b7101d4917dc8 (diff) | |
| download | jitsi-6e17c33e661e6e47af18c5a5efe296e13b03ff11.zip jitsi-6e17c33e661e6e47af18c5a5efe296e13b03ff11.tar.gz jitsi-6e17c33e661e6e47af18c5a5efe296e13b03ff11.tar.bz2 | |
Moves the FFmpeg and G722 JNI libraries from libjitsi to jitsi-lgpl-dependencies because they statically link to LGPL objects.
| -rw-r--r-- | build.xml | 1 | ||||
| -rw-r--r-- | lib/installer-exclude/jitsi-lgpl-dependencies.jar | bin | 0 -> 4803 bytes | |||
| -rw-r--r-- | lib/installer-exclude/libjitsi.jar | bin | 1859284 -> 1855828 bytes | |||
| -rw-r--r-- | resources/install/build.xml | 8 |
4 files changed, 8 insertions, 1 deletions
@@ -1320,6 +1320,7 @@ <zipfileset src="${lib.noinst}/bcpkix-jdk15on-151.jar" prefix="" excludes="META-INF/BCKEY.*"/> <zipfileset src="${lib.noinst}/fmj.jar" prefix=""/> + <zipfileset src="${lib.noinst}/jitsi-lgpl-dependencies.jar" prefix=""/> <zipfileset src="${lib.noinst}/libjitsi.jar" prefix=""/> </jar> </target> diff --git a/lib/installer-exclude/jitsi-lgpl-dependencies.jar b/lib/installer-exclude/jitsi-lgpl-dependencies.jar Binary files differnew file mode 100644 index 0000000..003ae78 --- /dev/null +++ b/lib/installer-exclude/jitsi-lgpl-dependencies.jar diff --git a/lib/installer-exclude/libjitsi.jar b/lib/installer-exclude/libjitsi.jar Binary files differindex f27d725..732ffad 100644 --- a/lib/installer-exclude/libjitsi.jar +++ b/lib/installer-exclude/libjitsi.jar diff --git a/resources/install/build.xml b/resources/install/build.xml index 0e3f010..b7d6c64 100644 --- a/resources/install/build.xml +++ b/resources/install/build.xml @@ -3250,6 +3250,10 @@ com.ircclouds.irc.api.domain.messages.interfaces";version="1.0.0" <symlink resource="/usr/share/libjitsi/lib/ice4j.jar" overwrite="true" link="${debian.src.dir}/lib/installer-exclude"/> + <!-- jitsi-lgpl-dependencies --> + <symlink resource="/usr/share/libjitsi/lib/jitsi-lgpl-dependencies.jar" + overwrite="true" + link="${debian.src.dir}/lib/installer-exclude/"/> <!-- fmj --> <symlink resource="/usr/share/libjitsi/lib/fmj.jar" overwrite="true" @@ -3767,6 +3771,8 @@ com.ircclouds.irc.api.domain.messages.interfaces";version="1.0.0" link="${debian.bundles.common.dest}/libjitsi.jar/"/> <symlink resource="/usr/share/libjitsi/libjitsi.jar" link="${debian.bundles.common.dest}/libjitsi.jar/"/> + <symlink resource="/usr/share/libjitsi/lib/jitsi-lgpl-dependencies.jar" + link="${debian.bundles.common.dest}/libjitsi.jar/"/> <symlink resource="/usr/share/libjitsi/lib/fmj.jar" link="${debian.bundles.common.dest}/libjitsi.jar/"/> @@ -3791,7 +3797,7 @@ com.ircclouds.irc.api.domain.messages.interfaces";version="1.0.0" destfile="${debian.bundles.common.dest}/libjitsi.jar/META-INF/MANIFEST.MF" append="true" eol="crlf" - fixlastline="true">Bundle-ClassPath: .,libjitsi-impl.jar,fmj.jar,libjitsi.jar,bcpkix.jar

</concat> + fixlastline="true">Bundle-ClassPath: .,libjitsi-impl.jar,fmj.jar,jitsi-lgpl-dependencies.jar,libjitsi.jar,bcpkix.jar

</concat> <replace file="${debian.bundles.dest}/../lib/felix.client.run.properties" token="reference:file:sc-bundles/libjitsi.jar"> <replacevalue>reference:file:/usr/share/jitsi-common/libjitsi.jar</replacevalue> |