34a430.patch 1.3 KB

12345678910111213141516171819202122232425262728293031323334353637383940
  1. From 34a430a16ec2cb9851b1f2bc7fc2117e19b9fcc7 Mon Sep 17 00:00:00 2001
  2. From: Florian Weimer <fweimer@redhat.com>
  3. Date: Thu, 13 Apr 2023 15:45:58 +0200
  4. Subject: [PATCH] fb: Declare wfbFinishScreenInit, wfbScreenInit for
  5. !FB_ACCESS_WRAPPER
  6. xf86-video-nouveau calls wfbScreenInit without defining
  7. FB_ACCESS_WRAPPER (which has other unintended side effects).
  8. Presently, this compiles and links because compilers still support
  9. implicit function declarations, but this is going to change fairly
  10. soon. This seems to be the most straightforward change to keep
  11. the driver building.
  12. ---
  13. fb/fb.h | 2 --
  14. 1 file changed, 2 deletions(-)
  15. diff --git a/fb/fb.h b/fb/fb.h
  16. index 08143a0d49..309f15294c 100644
  17. --- a/fb/fb.h
  18. +++ b/fb/fb.h
  19. @@ -1027,7 +1027,6 @@ extern _X_EXPORT Bool
  20. int dpiy, int width, /* pixel width of frame buffer */
  21. int bpp); /* bits per pixel of frame buffer */
  22. -#ifdef FB_ACCESS_WRAPPER
  23. extern _X_EXPORT Bool
  24. wfbFinishScreenInit(ScreenPtr pScreen,
  25. void *pbits,
  26. @@ -1049,7 +1048,6 @@ wfbScreenInit(ScreenPtr pScreen,
  27. int width,
  28. int bpp,
  29. SetupWrapProcPtr setupWrap, FinishWrapProcPtr finishWrap);
  30. -#endif
  31. extern _X_EXPORT Bool
  32. fbFinishScreenInit(ScreenPtr pScreen,
  33. --
  34. GitLab