From 55e0e0ed4ee118e106262dde879e7a82119434bb Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Fri, 25 Jul 2014 18:49:52 -0600 Subject: [PATCH] Move 18-quartz-MediaSeeking_Positions to quartz-MediaSeeking_Positions. --- patches/Makefile | 42 +++++++++---------- ...he-stream-position-in-addition-to-th.patch | 0 ...-MediaSeeking_GetCurrentPosition-on-.patch | 0 ...-MediaSeeking_GetStopPosition-on-top.patch | 0 ...used-cache-of-MediaSeeking-stop-posi.patch | 0 .../definition | 0 6 files changed, 21 insertions(+), 21 deletions(-) rename patches/{18-quartz-MediaSeeking_Positions => quartz-MediaSeeking_Positions}/0001-quartz-Include-the-stream-position-in-addition-to-th.patch (100%) rename patches/{18-quartz-MediaSeeking_Positions => quartz-MediaSeeking_Positions}/0002-quartz-Implement-MediaSeeking_GetCurrentPosition-on-.patch (100%) rename patches/{18-quartz-MediaSeeking_Positions => quartz-MediaSeeking_Positions}/0003-quartz-Implement-MediaSeeking_GetStopPosition-on-top.patch (100%) rename patches/{18-quartz-MediaSeeking_Positions => quartz-MediaSeeking_Positions}/0004-quartz-Remove-unused-cache-of-MediaSeeking-stop-posi.patch (100%) rename patches/{18-quartz-MediaSeeking_Positions => quartz-MediaSeeking_Positions}/definition (100%) diff --git a/patches/Makefile b/patches/Makefile index 24cf3aed..fc3611df 100644 --- a/patches/Makefile +++ b/patches/Makefile @@ -8,7 +8,6 @@ PATCH := $(CURDIR)/../debian/tools/gitapply.sh -d $(DESTDIR) PATCHLIST := 13-Misc_ACL.ok \ 15-wtsapi32.ok \ 16-server-CreateProcess_ACLs.ok \ - 18-quartz-MediaSeeking_Positions.ok \ 19-ntdll-Dynamic_DST.ok \ 97-Pipelight.ok \ 98-Miscellaneous.ok \ @@ -18,6 +17,7 @@ PATCHLIST := 13-Misc_ACL.ok \ loader-Cmdline_Diagnostics.ok \ ntdll-FD_Cache.ok \ ntdll-Junction_Points.ok \ + quartz-MediaSeeking_Positions.ok \ server-ACL_Compat.ok \ server-Address_Change_Notification.ok \ server-Inherited_ACLs.ok \ @@ -105,26 +105,6 @@ clean: echo "+ { \"16-server-CreateProcess_ACLs\", \"Joris van der Wel\", \"Implement passing ACLs to CreateProcess.\" },"; \ ) > 16-server-CreateProcess_ACLs.ok -# Patchset 18-quartz-MediaSeeking_Positions -# | -# | Included patches: -# | * Return correct IMediaSeeking stream positions in quartz. [by Erich E. Hoover] -# | -# | This patchset fixes the following Wine bugs: -# | * [#23174] Fallout 3: Diologue and Video/sound issues -# | -# | Modified files: -# | * dlls/quartz/filtergraph.c -# | -18-quartz-MediaSeeking_Positions.ok: - $(PATCH) < 18-quartz-MediaSeeking_Positions/0001-quartz-Include-the-stream-position-in-addition-to-th.patch - $(PATCH) < 18-quartz-MediaSeeking_Positions/0002-quartz-Implement-MediaSeeking_GetCurrentPosition-on-.patch - $(PATCH) < 18-quartz-MediaSeeking_Positions/0003-quartz-Implement-MediaSeeking_GetStopPosition-on-top.patch - $(PATCH) < 18-quartz-MediaSeeking_Positions/0004-quartz-Remove-unused-cache-of-MediaSeeking-stop-posi.patch - ( \ - echo "+ { \"18-quartz-MediaSeeking_Positions\", \"Erich E. Hoover\", \"Return correct IMediaSeeking stream positions in quartz.\" },"; \ - ) > 18-quartz-MediaSeeking_Positions.ok - # Patchset 19-ntdll-Dynamic_DST # | # | Included patches: @@ -296,6 +276,26 @@ ntdll-Junction_Points.ok: echo "+ { \"ntdll-Junction_Points\", \"Erich E. Hoover\", \"Support for junction points/reparse points.\" },"; \ ) > ntdll-Junction_Points.ok +# Patchset quartz-MediaSeeking_Positions +# | +# | Included patches: +# | * Return correct IMediaSeeking stream positions in quartz. [by Erich E. Hoover] +# | +# | This patchset fixes the following Wine bugs: +# | * [#23174] Fallout 3: Diologue and Video/sound issues +# | +# | Modified files: +# | * dlls/quartz/filtergraph.c +# | +quartz-MediaSeeking_Positions.ok: + $(PATCH) < quartz-MediaSeeking_Positions/0001-quartz-Include-the-stream-position-in-addition-to-th.patch + $(PATCH) < quartz-MediaSeeking_Positions/0002-quartz-Implement-MediaSeeking_GetCurrentPosition-on-.patch + $(PATCH) < quartz-MediaSeeking_Positions/0003-quartz-Implement-MediaSeeking_GetStopPosition-on-top.patch + $(PATCH) < quartz-MediaSeeking_Positions/0004-quartz-Remove-unused-cache-of-MediaSeeking-stop-posi.patch + ( \ + echo "+ { \"quartz-MediaSeeking_Positions\", \"Erich E. Hoover\", \"Return correct IMediaSeeking stream positions in quartz.\" },"; \ + ) > quartz-MediaSeeking_Positions.ok + # Patchset server-ACL_Compat # | # | Included patches: diff --git a/patches/18-quartz-MediaSeeking_Positions/0001-quartz-Include-the-stream-position-in-addition-to-th.patch b/patches/quartz-MediaSeeking_Positions/0001-quartz-Include-the-stream-position-in-addition-to-th.patch similarity index 100% rename from patches/18-quartz-MediaSeeking_Positions/0001-quartz-Include-the-stream-position-in-addition-to-th.patch rename to patches/quartz-MediaSeeking_Positions/0001-quartz-Include-the-stream-position-in-addition-to-th.patch diff --git a/patches/18-quartz-MediaSeeking_Positions/0002-quartz-Implement-MediaSeeking_GetCurrentPosition-on-.patch b/patches/quartz-MediaSeeking_Positions/0002-quartz-Implement-MediaSeeking_GetCurrentPosition-on-.patch similarity index 100% rename from patches/18-quartz-MediaSeeking_Positions/0002-quartz-Implement-MediaSeeking_GetCurrentPosition-on-.patch rename to patches/quartz-MediaSeeking_Positions/0002-quartz-Implement-MediaSeeking_GetCurrentPosition-on-.patch diff --git a/patches/18-quartz-MediaSeeking_Positions/0003-quartz-Implement-MediaSeeking_GetStopPosition-on-top.patch b/patches/quartz-MediaSeeking_Positions/0003-quartz-Implement-MediaSeeking_GetStopPosition-on-top.patch similarity index 100% rename from patches/18-quartz-MediaSeeking_Positions/0003-quartz-Implement-MediaSeeking_GetStopPosition-on-top.patch rename to patches/quartz-MediaSeeking_Positions/0003-quartz-Implement-MediaSeeking_GetStopPosition-on-top.patch diff --git a/patches/18-quartz-MediaSeeking_Positions/0004-quartz-Remove-unused-cache-of-MediaSeeking-stop-posi.patch b/patches/quartz-MediaSeeking_Positions/0004-quartz-Remove-unused-cache-of-MediaSeeking-stop-posi.patch similarity index 100% rename from patches/18-quartz-MediaSeeking_Positions/0004-quartz-Remove-unused-cache-of-MediaSeeking-stop-posi.patch rename to patches/quartz-MediaSeeking_Positions/0004-quartz-Remove-unused-cache-of-MediaSeeking-stop-posi.patch diff --git a/patches/18-quartz-MediaSeeking_Positions/definition b/patches/quartz-MediaSeeking_Positions/definition similarity index 100% rename from patches/18-quartz-MediaSeeking_Positions/definition rename to patches/quartz-MediaSeeking_Positions/definition