The following patch (full version at the end)
commit cb8e15a64307e580123b459e4c5964dc7b0d73d9 Author: Huw D. M. Davies huw@codeweavers.com Date: Tue Dec 22 14:26:36 2020 +0000
qcap: Avoid unused variable warning if v4l is absent.
broke builds of Wine 5.0.4 where v4l is not present, specifically when the header <linux/videodev2.h> is not available.
Configuring with --without-v4l2 does not trigger this; it really is about the presence of the header.
The failure mode is
In file included from v4l.c:60: v4l.c: In function 'qcap_driver_destroy': ../../include/wine/debug.h:485:56: error: '__wine_dbch___default' undeclared (first use in this function) : v4l.c:602:5: note: in expansion of macro 'ERR' 602 | ERR("v4l absent: shouldn't be called\n"); \ | ^~~ v4l.c:607:5: note: in expansion of macro 'FAIL_WITH_ERR' 607 | FAIL_WITH_ERR; | ^~~~~~~~~~~~~
and the straightforward fix is simply reverting this patch.
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=254601 has more details.
Gerald
commit cb8e15a64307e580123b459e4c5964dc7b0d73d9 jAuthor: Huw D. M. Davies huw@codeweavers.com Date: Tue Dec 22 14:26:36 2020 +0000
qcap: Avoid unused variable warning if v4l is absent.
Signed-off-by: Huw Davies huw@codeweavers.com Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org (cherry picked from commit 73281bf132e1dad9aebf3410b21616727438fb63) Signed-off-by: Michael Stefaniuc mstefani@winehq.org
diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 0d7e176d3da..e548000187f 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -63,10 +63,9 @@ #include "qcap_main.h" #include "capture.h"
-WINE_DEFAULT_DEBUG_CHANNEL(qcap); - #ifdef HAVE_LINUX_VIDEODEV2_H
+WINE_DEFAULT_DEBUG_CHANNEL(qcap); WINE_DECLARE_DEBUG_CHANNEL(winediag);
static typeof(open) *video_open = open;
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=87903
Your paranoid android.
=== debiant2 (build log) ===
error: patch failed: dlls/qcap/v4l.c:63 Task: Patch failed to apply
=== debiant2 (build log) ===
error: patch failed: dlls/qcap/v4l.c:63 Task: Patch failed to apply
On 3/30/21 2:06 AM, Gerald Pfeifer wrote:
The following patch (full version at the end)
commit cb8e15a64307e580123b459e4c5964dc7b0d73d9 Author: Huw D. M. Davies <huw@codeweavers.com> Date: Tue Dec 22 14:26:36 2020 +0000 qcap: Avoid unused variable warning if v4l is absent.broke builds of Wine 5.0.4 where v4l is not present, specifically when the header <linux/videodev2.h> is not available.
Configuring with --without-v4l2 does not trigger this; it really is about the presence of the header.
The failure mode is
In file included from v4l.c:60: v4l.c: In function 'qcap_driver_destroy': ../../include/wine/debug.h:485:56: error: '__wine_dbch___default' undeclared (first use in this function) : v4l.c:602:5: note: in expansion of macro 'ERR' 602 | ERR("v4l absent: shouldn't be called\n"); \ | ^~~ v4l.c:607:5: note: in expansion of macro 'FAIL_WITH_ERR' 607 | FAIL_WITH_ERR; | ^~~~~~~~~~~~~
and the straightforward fix is simply reverting this patch.
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=254601 has more details.
Gerald
Sorry for missing this. Gerald is correct; this patch should not have been picked to wine-stable.
On 3/30/21 9:06 AM, Gerald Pfeifer wrote:
The following patch (full version at the end)
commit cb8e15a64307e580123b459e4c5964dc7b0d73d9 Author: Huw D. M. Davies <huw@codeweavers.com> Date: Tue Dec 22 14:26:36 2020 +0000 qcap: Avoid unused variable warning if v4l is absent.broke builds of Wine 5.0.4 where v4l is not present, specifically when the header <linux/videodev2.h> is not available.
Thanks for reporting it, I have pushed a wine-5.0.5-rc1 (d313cfa4542545286cbdf6583d88e418f0de8d57) to. https://github.com/mstefani/wine-stable/tree/oldstable
The only commit is the revert of that patch.
I'll wait for a few days if another brown paper bugs pops up. But do not plan to cherry pick any other patch.
bye michael
Configuring with --without-v4l2 does not trigger this; it really is about the presence of the header.
The failure mode is
In file included from v4l.c:60: v4l.c: In function 'qcap_driver_destroy': ../../include/wine/debug.h:485:56: error: '__wine_dbch___default' undeclared (first use in this function) : v4l.c:602:5: note: in expansion of macro 'ERR' 602 | ERR("v4l absent: shouldn't be called\n"); \ | ^~~ v4l.c:607:5: note: in expansion of macro 'FAIL_WITH_ERR' 607 | FAIL_WITH_ERR; | ^~~~~~~~~~~~~
and the straightforward fix is simply reverting this patch.
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=254601 has more details.
Gerald
commit cb8e15a64307e580123b459e4c5964dc7b0d73d9 jAuthor: Huw D. M. Davies huw@codeweavers.com Date: Tue Dec 22 14:26:36 2020 +0000
qcap: Avoid unused variable warning if v4l is absent. Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> (cherry picked from commit 73281bf132e1dad9aebf3410b21616727438fb63) Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 0d7e176d3da..e548000187f 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -63,10 +63,9 @@ #include "qcap_main.h" #include "capture.h"
-WINE_DEFAULT_DEBUG_CHANNEL(qcap);
#ifdef HAVE_LINUX_VIDEODEV2_H
+WINE_DEFAULT_DEBUG_CHANNEL(qcap); WINE_DECLARE_DEBUG_CHANNEL(winediag);
static typeof(open) *video_open = open;
-
Gerald Pfeifer -
Marvin -
Michael Stefaniuc -
Zebediah Figura (she/her)