mobeigi
/
filebot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to libmediainfo 0.7.88

This commit is contained in:
Reinhard Pointner 2016-09-23 23:57:47 +08:00
parent 9e37149508
commit 5e3cce10f4
12 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.xml
View File

@ -624,12 +624,11 @@
<property name="jnidispatch" location="${dir.lib}/native/win32-${arch}/jnidispatch.dll" /> <property name="jnidispatch" location="${dir.lib}/native/win32-${arch}/jnidispatch.dll" />
<property name="mediainfo" location="${dir.lib}/native/win32-${arch}/MediaInfo.dll" /> <property name="mediainfo" location="${dir.lib}/native/win32-${arch}/MediaInfo.dll" />
<property name="lib7z_binding" location="${dir.lib}/native/win32-${arch}/7-Zip-JBinding.dll" /> <property name="lib7z_binding" location="${dir.lib}/native/win32-${arch}/7-Zip-JBinding.dll" />
<property name="libgcc_path" location="${dir.lib}/native/win32-${arch}/gcc_s_seh-1.dll" />
<property name="fpcalc_path" location="${dir.lib}/native/win32-${arch}/fpcalc.exe" /> <property name="fpcalc_path" location="${dir.lib}/native/win32-${arch}/fpcalc.exe" />
<property name="installer" location="${dir.dist}/${title}_${version}_${arch}.msi" /> <property name="installer" location="${dir.dist}/${title}_${version}_${arch}.msi" />
<exec executable="candle" dir="${dir.installer}/msi" failonerror="true"> <exec executable="candle" dir="${dir.installer}/msi" failonerror="true">
<arg line="filebot-wix.xml -out ${dir.dist}/msi.wixobj -darch=${arch} -dreleaseversion=${version} -dfatjar=${path.fatjar} -djnidispatch=${jnidispatch} -dmediainfo=${mediainfo} -dlib7z_binding=${lib7z_binding} -dlibgcc_name=${libgcc_name} -dlibgcc_path=${libgcc_path} -dfpcalc_path=${fpcalc_path}" /> <arg line="filebot-wix.xml -out ${dir.dist}/msi.wixobj -darch=${arch} -dreleaseversion=${version} -dfatjar=${path.fatjar} -djnidispatch=${jnidispatch} -dmediainfo=${mediainfo} -dlib7z_binding=${lib7z_binding} -dfpcalc_path=${fpcalc_path}" />
</exec> </exec>
<exec executable="light" dir="${dir.installer}/msi" failonerror="true"> <exec executable="light" dir="${dir.installer}/msi" failonerror="true">
<arg line="${dir.dist}/msi.wixobj -sval -ext WixUIExtension -out ${installer}" /> <arg line="${dir.dist}/msi.wixobj -sval -ext WixUIExtension -out ${installer}" />

1
installer/msi/filebot-wix.xml
View File

@ -61,7 +61,6 @@
<File Id='jnidispatch.dll' Name='jnidispatch.dll' Source='$(var.jnidispatch)' /> <File Id='jnidispatch.dll' Name='jnidispatch.dll' Source='$(var.jnidispatch)' />
<File Id='MediaInfo.dll' Name='MediaInfo.dll' Source='$(var.mediainfo)' /> <File Id='MediaInfo.dll' Name='MediaInfo.dll' Source='$(var.mediainfo)' />
<File Id='lib7_Zip_JBinding.dll' Name='7-Zip-JBinding.dll' Source='$(var.lib7z_binding)' /> <File Id='lib7_Zip_JBinding.dll' Name='7-Zip-JBinding.dll' Source='$(var.lib7z_binding)' />
<File Id='libgcc.dll' Name='$(var.libgcc_name)' Source='$(var.libgcc_path)' />
<File Id='fpcalc.exe' Name='fpcalc.exe' Source='$(var.fpcalc_path)' /> <File Id='fpcalc.exe' Name='fpcalc.exe' Source='$(var.fpcalc_path)' />
</Component> </Component>
</Directory> </Directory>

BIN
lib/native/linux-amd64/libmediainfo.so
View File

Binary file not shown.

BIN
lib/native/linux-amd64/libzen.so
View File

Binary file not shown.

BIN
lib/native/linux-i686/libmediainfo.so
View File

Binary file not shown.

BIN
lib/native/linux-i686/libzen.so
View File

Binary file not shown.

BIN
lib/native/mac-x86_64/libmediainfo.dylib
View File

Binary file not shown.

BIN
lib/native/win32-x64/MediaInfo.dll
View File

Binary file not shown.

BIN
lib/native/win32-x64/gcc_s_seh-1.dll
View File

Binary file not shown.

BIN
lib/native/win32-x86/MediaInfo.dll
View File

Binary file not shown.

0
lib/native/win32-x86/gcc_s_seh-1.dll
View File

11
source/net/filebot/archive/SevenZipLoader.java
View File

@ -1,6 +1,5 @@
package net.filebot.archive; package net.filebot.archive;
import static net.filebot.Logging.*;
import net.sf.sevenzipjbinding.IArchiveOpenCallback; import net.sf.sevenzipjbinding.IArchiveOpenCallback;
import net.sf.sevenzipjbinding.IInArchive; import net.sf.sevenzipjbinding.IInArchive;
import net.sf.sevenzipjbinding.IInStream; import net.sf.sevenzipjbinding.IInStream;
@ -8,8 +7,6 @@ import net.sf.sevenzipjbinding.SevenZip;
import net.sf.sevenzipjbinding.SevenZipException; import net.sf.sevenzipjbinding.SevenZipException;
import net.sf.sevenzipjbinding.SevenZipNativeInitializationException; import net.sf.sevenzipjbinding.SevenZipNativeInitializationException;
import com.sun.jna.Platform;
public class SevenZipLoader { public class SevenZipLoader {
private static boolean nativeLibrariesLoaded = false; private static boolean nativeLibrariesLoaded = false;
@ -21,14 +18,6 @@ public class SevenZipLoader {
// initialize 7z-JBinding native libs // initialize 7z-JBinding native libs
try { try {
try {
if (Platform.isWindows() && Platform.is64Bit()) {
System.loadLibrary("gcc_s_seh-1");
}
} catch (Throwable e) {
debug.warning("Failed to preload library: " + e);
}
System.loadLibrary("7-Zip-JBinding"); System.loadLibrary("7-Zip-JBinding");
SevenZip.initLoadedLibraries(); // NATIVE LIBS MUST BE LOADED WITH SYSTEM CLASSLOADER SevenZip.initLoadedLibraries(); // NATIVE LIBS MUST BE LOADED WITH SYSTEM CLASSLOADER
nativeLibrariesLoaded = true; nativeLibrariesLoaded = true;