Open sl1pkn07 opened 4 years ago
This project is still working in progress. Please wait until I finish it, tag it, and release it. Thanks.
/tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/src/cpuid.cpp: En la función ‘void __cpuid(int*, int)’:
/tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/src/cpuid.cpp:33:3: error: ‘__get_cpuid_count’ no se declaró en este ámbito
33 | __get_cpuid_count(leaf, 0, &eax, &ebx, &ecx, &edx);
| ^~~~~~~~~~~~~~~~~
make[2]: *** [CMakeFiles/neo-vague-denoiser.dir/build.make:161: CMakeFiles/neo-vague-denoiser.dir/src/cpuid.cpp.o] Error 1
make[2]: *** Se espera a que terminen otras tareas....
after sed '1i#include <cpuid.h>' -i src/cpuid.cpp
[ 87%] Building CXX object CMakeFiles/neo-vague-denoiser.dir/src/cpuid.cpp.o
En el fichero incluido desde /tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/main.cpp:5:
/tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/src/neo_vd.hpp: En la función miembro ‘virtual DSFrame VagueDenoiser::GetFrame(int, std::unordered_map<int, DSFrame>)’:
/tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/src/neo_vd.hpp:222:48: error: ‘_aligned_malloc’ was not declared in this scope; did you mean ‘aligned_alloc’?
222 | ep.padBuffer[p].push_back((float *)_aligned_malloc(ep.padSizeBytes[p], FRAME_ALIGN));
| ^~~~~~~~~~~~~~~
| aligned_alloc
/tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/src/neo_vd.hpp:224:51: error: ‘_aligned_malloc’ was not declared in this scope; did you mean ‘aligned_alloc’?
224 | ep.tmpBuffer[p][0].push_back((float *)_aligned_malloc(ep.tmpSizeBytes[p], FRAME_ALIGN));
| ^~~~~~~~~~~~~~~
| aligned_alloc
/tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/src/neo_vd.hpp:229:48: error: ‘_aligned_malloc’ was not declared in this scope; did you mean ‘aligned_alloc’?
229 | ep.hvBuffer[p][0].push_back((int *)_aligned_malloc(ep.nsteps, FRAME_ALIGN));
| ^~~~~~~~~~~~~~~
| aligned_alloc
make[2]: *** [CMakeFiles/neo-vague-denoiser.dir/build.make:83: CMakeFiles/neo-vague-denoiser.dir/main.cpp.o] Error 1
make[1]: *** [CMakeFiles/Makefile2:96: CMakeFiles/neo-vague-denoiser.dir/all] Error 2
make: *** [Makefile:104: all] Error 2
greetings
Try again?
[ 12%] Building CXX object CMakeFiles/neo-vague-denoiser.dir/src/cpuid.cpp.o
/tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/src/cpuid.cpp:31:52: error: macro "__cpuid" requires 5 arguments, but only 2 given
31 | static inline void __cpuid(int cpuinfo[4], int leaf) {
| ^
In file included from /tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/src/cpuid.cpp:29:
/usr/lib/gcc/x86_64-pc-linux-gnu/9.3.0/include/cpuid.h:203: note: macro "__cpuid" defined here
203 | #define __cpuid(level, a, b, c, d) \
|
/tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/src/cpuid.cpp:62:21: error: macro "__cpuid" requires 5 arguments, but only 2 given
62 | __cpuid(cpuinfo, 1);
| ^
In file included from /tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/src/cpuid.cpp:29:
/usr/lib/gcc/x86_64-pc-linux-gnu/9.3.0/include/cpuid.h:203: note: macro "__cpuid" defined here
203 | #define __cpuid(level, a, b, c, d) \
|
/tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/src/cpuid.cpp:97:25: error: macro "__cpuid" requires 5 arguments, but only 2 given
97 | __cpuid(cpuinfo, 7);
| ^
In file included from /tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/src/cpuid.cpp:29:
/usr/lib/gcc/x86_64-pc-linux-gnu/9.3.0/include/cpuid.h:203: note: macro "__cpuid" defined here
203 | #define __cpuid(level, a, b, c, d) \
|
/tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/src/cpuid.cpp:106:25: error: macro "__cpuid" requires 5 arguments, but only 2 given
106 | __cpuid(cpuinfo, 7);
| ^
In file included from /tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/src/cpuid.cpp:29:
/usr/lib/gcc/x86_64-pc-linux-gnu/9.3.0/include/cpuid.h:203: note: macro "__cpuid" defined here
203 | #define __cpuid(level, a, b, c, d) \
|
/tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/src/cpuid.cpp:129:30: error: macro "__cpuid" requires 5 arguments, but only 2 given
129 | __cpuid(cpuinfo, 0x80000000);
| ^
In file included from /tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/src/cpuid.cpp:29:
/usr/lib/gcc/x86_64-pc-linux-gnu/9.3.0/include/cpuid.h:203: note: macro "__cpuid" defined here
203 | #define __cpuid(level, a, b, c, d) \
|
/tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/src/cpuid.cpp:132:32: error: macro "__cpuid" requires 5 arguments, but only 2 given
132 | __cpuid(cpuinfo, 0x80000001);
| ^
In file included from /tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/src/cpuid.cpp:29:
/usr/lib/gcc/x86_64-pc-linux-gnu/9.3.0/include/cpuid.h:203: note: macro "__cpuid" defined here
203 | #define __cpuid(level, a, b, c, d) \
|
/tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/src/cpuid.cpp:31:20: error: variable or field '__cpuid' declared void
31 | static inline void __cpuid(int cpuinfo[4], int leaf) {
| ^~~~~~~
/tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/src/cpuid.cpp:32:3: error: expected primary-expression before 'unsigned'
32 | unsigned int eax, ebx, ecx, edx;
| ^~~~~~~~
/tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/src/cpuid.cpp:32:3: error: expected '}' before 'unsigned'
/tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/src/cpuid.cpp:31:54: note: to match this '{'
31 | static inline void __cpuid(int cpuinfo[4], int leaf) {
| ^
/tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/src/cpuid.cpp:34:20: error: expected constructor, destructor, or type conversion before '(' token
34 | __get_cpuid_count(leaf, 0, &eax, &ebx, &ecx, &edx);
| ^
/tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/src/cpuid.cpp:35:3: error: 'cpuinfo' does not name a type
35 | cpuinfo[0] = eax;
| ^~~~~~~
/tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/src/cpuid.cpp:36:3: error: 'cpuinfo' does not name a type
36 | cpuinfo[1] = ebx;
| ^~~~~~~
/tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/src/cpuid.cpp:37:3: error: 'cpuinfo' does not name a type
37 | cpuinfo[2] = ecx;
| ^~~~~~~
/tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/src/cpuid.cpp:38:3: error: 'cpuinfo' does not name a type
38 | cpuinfo[3] = edx;
| ^~~~~~~
/tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/src/cpuid.cpp:39:1: error: expected declaration before '}' token
39 | }
| ^
/tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/src/cpuid.cpp: In function 'int CPUCheckForExtensions()':
/tmp/makepkg/foosynth-plugin-neo_vague_denoiser-git/src/neo_vague_denoiser/src/cpuid.cpp:62:3: error: '__cpuid' was not declared in this scope; did you mean '__get_cpuid'?
62 | __cpuid(cpuinfo, 1);
| ^~~~~~~
| __get_cpuid
make[2]: *** [CMakeFiles/neo-vague-denoiser.dir/build.make:161: CMakeFiles/neo-vague-denoiser.dir/src/cpuid.cpp.o] Error 1
make[1]: *** [CMakeFiles/Makefile2:96: CMakeFiles/neo-vague-denoiser.dir/all] Error 2
make: *** [Makefile:104: all] Error 2
diff --git a/src/cpuid.cpp b/src/cpuid.cpp
index 2fa66f8..5a750b9 100644
--- a/src/cpuid.cpp
+++ b/src/cpuid.cpp
@@ -25,8 +25,8 @@
#include <intrin.h>
#else
#include <x86intrin.h>
-#undef __cpuid
#include <cpuid.h>
+#undef __cpuid
static inline void __cpuid(int cpuinfo[4], int leaf) {
unsigned int eax, ebx, ecx, edx;
with this build ok, or in other position before #undef __cpuid
Thanks. Updated.
if you can, do the same in the other neo projects
greetings
https://github.com/HomeOfAviSynthPlusEvolution/neo_Vague_Denoiser/blob/e24e5ccd8347dd33a0aa932b5c3cd33d07748b39/CMakeLists.txt#L10-L12
seems this sniplet not works unless you set tags to the repository
build.make
other projects with tags:
_neo_gradient_mask also is not taged, but cmakelists.txt lacks the git version sniplet
greetrings