diff --git a/libs/_autotools/libvpx/libvpx.py b/libs/_autotools/libvpx/libvpx.py index 3688e0bb..081470a7 100644 --- a/libs/_autotools/libvpx/libvpx.py +++ b/libs/_autotools/libvpx/libvpx.py @@ -1,25 +1,25 @@ import info class subinfo(info.infoclass): def setTargets(self): for ver in ["1.7.0"]: self.targets[ver] = f"https://chromium.googlesource.com/webm/libvpx/+archive/v{ver}.tar.gz" - self.targetDigests['1.7.0'] = (['542cb556dabff1f2caea1643aa6f528ded0d55261aef71702dad761af7fbeac0'], CraftHash.HashAlgorithm.SHA256) + self.targetDigests['1.7.0'] = (['9ec6e5265fdcdae07bb723768cf4fee87012bde98c188170849562d2722dc458'], CraftHash.HashAlgorithm.SHA256) self.description = "VP8 and VP9 video codec" self.defaultTarget = '1.7.0' def setDependencies(self): self.runtimeDependencies["libs/pthreads"] = None self.buildDependencies["dev-utils/nasm"] = None from Package.AutoToolsPackageBase import * class Package(AutoToolsPackageBase): def __init__(self, **args): AutoToolsPackageBase.__init__(self) self.subinfo.options.configure.noDataRootDir = True self.platform = "" self.subinfo.options.configure.args += "--disable-examples --disable-install-docs" if CraftCore.compiler.isLinux: self.subinfo.options.configure.args += " --enable-shared" diff --git a/libs/libsndfile/libsndfile.py b/libs/libsndfile/libsndfile.py index 0a4d77ac..502c21da 100644 --- a/libs/libsndfile/libsndfile.py +++ b/libs/libsndfile/libsndfile.py @@ -1,24 +1,34 @@ import info from Package.CMakePackageBase import * +from Package.AutoToolsPackageBase import * class subinfo(info.infoclass): def setTargets(self): - self.targets['1.0.24'] = 'http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.24.tar.gz' - self.targetInstSrc['1.0.24'] = 'libsndfile-1.0.24' - self.patchToApply['1.0.24'] = [('libsndfile-1.0.24-20131003.diff', 1)] + for ver in ['1.0.24', '1.0.28']: + self.targets[ver] = 'http://www.mega-nerd.com/libsndfile/files/libsndfile-' + ver + '.tar.gz' + self.targetInstSrc[ver] = 'libsndfile-' + ver + if not CraftCore.compiler.isGCCLike(): + self.patchToApply[ver] = [('libsndfile-1.0.24-20131003.diff', 1)] self.targetDigests['1.0.24'] = 'ade2dad272b52f61bb58aca3a4004b28549ee0f8' + self.targetDigests['1.0.28'] = (['1ff33929f042fa333aed1e8923aa628c3ee9e1eb85512686c55092d1e5a9dfa9'], CraftHash.HashAlgorithm.SHA256) self.description = "a C library for reading and writing files containing sampled sound" - self.defaultTarget = '1.0.24' + self.defaultTarget = '1.0.28' def setDependencies(self): self.buildDependencies["virtual/base"] = None self.runtimeDependencies["libs/libogg"] = None self.runtimeDependencies["libs/libvorbis"] = None -class Package(CMakePackageBase): - def __init__(self): - CMakePackageBase.__init__(self) +if CraftCore.compiler.isGCCLike(): + class Package(AutoToolsPackageBase): + def __init__(self): + AutoToolsPackageBase.__init__(self) +else: + class Package(CMakePackageBase): + def __init__(self): + CMakePackageBase.__init__(self) +