From 20d1c91c29cb105cb8fc76d85d4bb783aff699e0 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Fri, 25 Jul 2014 18:58:38 -0600 Subject: [PATCH] Move 97-Pipelight to Pipelight. --- patches/Makefile | 52 +++++++++---------- ...X11DRV_FLUSH_GDI_DISPLAY-ExtEscape-c.patch | 0 ...se-minimum-SetTimer-interval-to-5-ms.patch | 0 ...anging-strict-drawing-through-an-exp.patch | 0 ...cate-direct-rendering-through-OpenGL.patch | 0 .../{97-Pipelight => Pipelight}/definition | 0 6 files changed, 26 insertions(+), 26 deletions(-) rename patches/{97-Pipelight => Pipelight}/0001-winex11-Implement-X11DRV_FLUSH_GDI_DISPLAY-ExtEscape-c.patch (100%) rename patches/{97-Pipelight => Pipelight}/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch (100%) rename patches/{97-Pipelight => Pipelight}/0003-wined3d-allow-changing-strict-drawing-through-an-exp.patch (100%) rename patches/{97-Pipelight => Pipelight}/0004-winex11.drv-Indicate-direct-rendering-through-OpenGL.patch (100%) rename patches/{97-Pipelight => Pipelight}/definition (100%) diff --git a/patches/Makefile b/patches/Makefile index 7c13e18d..e693c56d 100644 --- a/patches/Makefile +++ b/patches/Makefile @@ -5,8 +5,8 @@ CURDIR ?= ${.CURDIR} PATCH := $(CURDIR)/../debian/tools/gitapply.sh -d $(DESTDIR) -PATCHLIST := 97-Pipelight.ok \ - 98-Miscellaneous.ok \ +PATCHLIST := 98-Miscellaneous.ok \ + Pipelight.ok \ fonts-Missing_Fonts.ok \ kernel32-GetVolumePathName.ok \ kernel32-Named_Pipe.ok \ @@ -48,30 +48,6 @@ clean: .NOTPARALLEL: -# Patchset 97-Pipelight -# | -# | Included patches: -# | * Decrease minimum SetTimer interval to 5 ms. [rev 2, by Michael Müller] -# | * Allow changing strict draw ordering through an exported function. [by Michael Müller] -# | * Indicate direct rendering through OpenGL extension. [by Michael Müller] -# | * Implement X11DRV_FLUSH_GDI_DISPLAY ExtEscape command. [by Sebastian Lackner] -# | -# | Modified files: -# | * dlls/user32/message.c, dlls/wined3d/wined3d.spec, dlls/wined3d/wined3d_main.c, dlls/winex11.drv/init.c, -# | dlls/winex11.drv/opengl.c, dlls/winex11.drv/x11drv.h -# | -97-Pipelight.ok: - $(PATCH) < 97-Pipelight/0001-winex11-Implement-X11DRV_FLUSH_GDI_DISPLAY-ExtEscape-c.patch - $(PATCH) < 97-Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch - $(PATCH) < 97-Pipelight/0003-wined3d-allow-changing-strict-drawing-through-an-exp.patch - $(PATCH) < 97-Pipelight/0004-winex11.drv-Indicate-direct-rendering-through-OpenGL.patch - ( \ - echo "+ { \"97-Pipelight\", \"Michael Müller\", \"Decrease minimum SetTimer interval to 5 ms. [rev 2]\" },"; \ - echo "+ { \"97-Pipelight\", \"Michael Müller\", \"Allow changing strict draw ordering through an exported function.\" },"; \ - echo "+ { \"97-Pipelight\", \"Michael Müller\", \"Indicate direct rendering through OpenGL extension.\" },"; \ - echo "+ { \"97-Pipelight\", \"Sebastian Lackner\", \"Implement X11DRV_FLUSH_GDI_DISPLAY ExtEscape command.\" },"; \ - ) > 97-Pipelight.ok - # Patchset 98-Miscellaneous # | # | Included patches: @@ -92,6 +68,30 @@ clean: echo "+ { \"98-Miscellaneous\", \"Sebastian Lackner\", \"wined3d: Silence repeated wined3d_swapchain_present FIXME.\" },"; \ ) > 98-Miscellaneous.ok +# Patchset Pipelight +# | +# | Included patches: +# | * Decrease minimum SetTimer interval to 5 ms. [rev 2, by Michael Müller] +# | * Allow changing strict draw ordering through an exported function. [by Michael Müller] +# | * Indicate direct rendering through OpenGL extension. [by Michael Müller] +# | * Implement X11DRV_FLUSH_GDI_DISPLAY ExtEscape command. [by Sebastian Lackner] +# | +# | Modified files: +# | * dlls/user32/message.c, dlls/wined3d/wined3d.spec, dlls/wined3d/wined3d_main.c, dlls/winex11.drv/init.c, +# | dlls/winex11.drv/opengl.c, dlls/winex11.drv/x11drv.h +# | +Pipelight.ok: + $(PATCH) < Pipelight/0001-winex11-Implement-X11DRV_FLUSH_GDI_DISPLAY-ExtEscape-c.patch + $(PATCH) < Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch + $(PATCH) < Pipelight/0003-wined3d-allow-changing-strict-drawing-through-an-exp.patch + $(PATCH) < Pipelight/0004-winex11.drv-Indicate-direct-rendering-through-OpenGL.patch + ( \ + echo "+ { \"Pipelight\", \"Michael Müller\", \"Decrease minimum SetTimer interval to 5 ms. [rev 2]\" },"; \ + echo "+ { \"Pipelight\", \"Michael Müller\", \"Allow changing strict draw ordering through an exported function.\" },"; \ + echo "+ { \"Pipelight\", \"Michael Müller\", \"Indicate direct rendering through OpenGL extension.\" },"; \ + echo "+ { \"Pipelight\", \"Sebastian Lackner\", \"Implement X11DRV_FLUSH_GDI_DISPLAY ExtEscape command.\" },"; \ + ) > Pipelight.ok + # Patchset fonts-Missing_Fonts # | # | Included patches: diff --git a/patches/97-Pipelight/0001-winex11-Implement-X11DRV_FLUSH_GDI_DISPLAY-ExtEscape-c.patch b/patches/Pipelight/0001-winex11-Implement-X11DRV_FLUSH_GDI_DISPLAY-ExtEscape-c.patch similarity index 100% rename from patches/97-Pipelight/0001-winex11-Implement-X11DRV_FLUSH_GDI_DISPLAY-ExtEscape-c.patch rename to patches/Pipelight/0001-winex11-Implement-X11DRV_FLUSH_GDI_DISPLAY-ExtEscape-c.patch diff --git a/patches/97-Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch b/patches/Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch similarity index 100% rename from patches/97-Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch rename to patches/Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch diff --git a/patches/97-Pipelight/0003-wined3d-allow-changing-strict-drawing-through-an-exp.patch b/patches/Pipelight/0003-wined3d-allow-changing-strict-drawing-through-an-exp.patch similarity index 100% rename from patches/97-Pipelight/0003-wined3d-allow-changing-strict-drawing-through-an-exp.patch rename to patches/Pipelight/0003-wined3d-allow-changing-strict-drawing-through-an-exp.patch diff --git a/patches/97-Pipelight/0004-winex11.drv-Indicate-direct-rendering-through-OpenGL.patch b/patches/Pipelight/0004-winex11.drv-Indicate-direct-rendering-through-OpenGL.patch similarity index 100% rename from patches/97-Pipelight/0004-winex11.drv-Indicate-direct-rendering-through-OpenGL.patch rename to patches/Pipelight/0004-winex11.drv-Indicate-direct-rendering-through-OpenGL.patch diff --git a/patches/97-Pipelight/definition b/patches/Pipelight/definition similarity index 100% rename from patches/97-Pipelight/definition rename to patches/Pipelight/definition