mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-23 22:23:15 +00:00
89023c38fc
I made a mistake merge. Reverting it inc778945806undid the state on master, but now I realize it crippled the git merge mechanism. As the merge contained a mix of commits from `master..staging-next` and other commits from `staging-next..staging`, it got the `staging-next` branch into a state that was difficult to recover. I reconstructed the "desired" state of staging-next tree by: - checking out the last commit of the problematic range:4effe769e2- `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken merge commit and its revert from that range (while keeping reapplication from4effe769e2) - merging the last unaffected staging-next commit (803ca85c20) - fortunately no other commits have been pushed to staging-next yet - applying a diff on staging-next to get it into that state
23 lines
569 B
Diff
23 lines
569 B
Diff
--- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig
|
|
+++ ./src/gallium/winsys/svga/drm/vmw_screen.h
|
|
@@ -34,7 +34,7 @@
|
|
#ifndef VMW_SCREEN_H_
|
|
#define VMW_SCREEN_H_
|
|
|
|
-
|
|
+#include <sys/stat.h>
|
|
#include "pipe/p_compiler.h"
|
|
#include "pipe/p_state.h"
|
|
|
|
--- ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
|
|
+++ ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
|
|
@@ -28,6 +28,8 @@
|
|
#ifndef RADV_AMDGPU_WINSYS_H
|
|
#define RADV_AMDGPU_WINSYS_H
|
|
|
|
+#include <sys/types.h>
|
|
+
|
|
#include "radv_radeon_winsys.h"
|
|
#include "ac_gpu_info.h"
|
|
#include "addrlib/addrinterface.h"<Paste>
|