diff --git a/libs/_autotools/gavl/FixCputest.patch b/libs/_autotools/gavl/FixCputest.patch new file mode 100644 index 00000000..a112f6b6 --- /dev/null +++ b/libs/_autotools/gavl/FixCputest.patch @@ -0,0 +1,45 @@ +Description: simplify cpuid detection. + since all CPUs that can run Debian also have cpuid(), + we don't need to explicitly test for it. + This fixes an FTBFS on x32 +Author: Adam Borowski +Reviewed-by: IOhannes m zmölnig +Last-Update: 2015-07-13 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- gavl.orig/gavl/cputest.c ++++ gavl/gavl/cputest.c +@@ -69,32 +69,8 @@ + int rval = 0; + int eax, ebx, ecx, edx; + int max_std_level, max_ext_level, std_caps=0, ext_caps=0; +- long a, c; +- +- __asm__ __volatile__ ( +- /* See if CPUID instruction is supported ... */ +- /* ... Get copies of EFLAGS into eax and ecx */ +- "pushf\n\t" +- "pop %0\n\t" +- "mov %0, %1\n\t" +- +- /* ... Toggle the ID bit in one copy and store */ +- /* to the EFLAGS reg */ +- "xor $0x200000, %0\n\t" +- "push %0\n\t" +- "popf\n\t" +- +- /* ... Get the (hopefully modified) EFLAGS */ +- "pushf\n\t" +- "pop %0\n\t" +- : "=a" (a), "=c" (c) +- : +- : "cc" +- ); +- +- if (a == c) +- return 0; /* CPUID not supported */ + ++ /* any CPU that can run Debian has CPUID */ + cpuid(0, max_std_level, ebx, ecx, edx); + + if(max_std_level >= 1){ diff --git a/libs/_autotools/gavl/gavl.py b/libs/_autotools/gavl/gavl.py new file mode 100644 index 00000000..4a3b9140 --- /dev/null +++ b/libs/_autotools/gavl/gavl.py @@ -0,0 +1,25 @@ +import info + + +class subinfo(info.infoclass): + def setTargets(self): + for ver in ['1.4.0']: + self.targets[ver] = f"https://downloads.sourceforge.net/gmerlin/gavl-{ver}.tar.gz" + self.targetInstSrc[ver] = f"gavl-{ver}" + self.targetDigests['1.4.0'] = (['51aaac41391a915bd9bad07710957424b046410a276e7deaff24a870929d33ce'], CraftHash.HashAlgorithm.SHA256) + self.patchToApply['1.4.0'] = ('FixCputest.patch', 1) + + self.description = "Low level library, upon which multimedia APIs can be built" + self.webpage = "https://gmerlin.sourceforge.net" + self.defaultTarget = '1.4.0' + + def setDependencies(self): + self.runtimeDependencies["virtual/base"] = None + +from Package.AutoToolsPackageBase import * + + +class Package(AutoToolsPackageBase): + def __init__(self, **args): + AutoToolsPackageBase.__init__(self) + self.subinfo.options.configure.args += ' --without-doxygen ' diff --git a/libs/frei0r-plugins/frei0r-plugins.py b/libs/frei0r-plugins/frei0r-plugins.py index 3c031561..86bb4e29 100644 --- a/libs/frei0r-plugins/frei0r-plugins.py +++ b/libs/frei0r-plugins/frei0r-plugins.py @@ -1,25 +1,26 @@ import info class subinfo(info.infoclass): def setTargets(self): self.description = 'Minimalistic plugin API for video effects, plugins collection' self.webpage = 'http://frei0r.dyne.org/' for ver in ['1.6.1']: self.targets[ ver ] = f"https://github.com/dyne/frei0r/archive/v{ver}.tar.gz" self.targetInstSrc[ ver ] = f"frei0r-{ver}" self.targetDigests['1.6.1'] = (['dae0ca623c83173788ce4fc74cb67ac7e50cf33a4412ee3d33bed284da1a8437'], CraftHash.HashAlgorithm.SHA256) + self.patchLevel['master'] = 1 self.svnTargets['master'] = 'https://github.com/dyne/frei0r.git' self.defaultTarget = 'master' def setDependencies(self): self.runtimeDependencies["virtual/base"] = None + self.runtimeDependencies["libs/gavl"] = None #self.runtimeDependencies["libs/opencv"] = None #self.runtimeDependencies["libs/cairo"] = None - #self.runtimeDependencies["libs/gavl"] = None from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__(self, **args): CMakePackageBase.__init__(self)