浏览代码

Remove unneeded patches

Kron4ek 4 月之前
父节点
当前提交
8e6e6a207f
共有 4 个文件被更改,包括 1 次插入230 次删除
  1. 1 1
      LICENSE
  2. 0 86
      proton-9.0.patch
  3. 0 28
      proton-exp-8.0.patch
  4. 0 115
      proton-exp-9.0.patch

+ 1 - 1
LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2024 Kron4ek
+Copyright (c) 2018-2025 Kron4ek
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

+ 0 - 86
proton-9.0.patch

@@ -1,86 +0,0 @@
-diff -ruN proton-9.0/dlls/ntdll/unix/virtual.c proton-9.0-new/dlls/ntdll/unix/virtual.c
---- proton-9.0/dlls/ntdll/unix/virtual.c	2024-06-12 21:33:09.217784470 +0000
-+++ proton-9.0-new/dlls/ntdll/unix/virtual.c	2024-06-12 21:34:14.103729743 +0000
-@@ -456,41 +456,7 @@
- 
- static void kernel_writewatch_register_range( struct file_view *view, void *base, size_t size )
- {
--    struct uffdio_register uffdio_register;
--    struct uffdio_writeprotect wp;
--
--    if (!(view->protect & VPROT_WRITEWATCH) || !use_kernel_writewatch) return;
--
--    madvise( base, size, MADV_NOHUGEPAGE );
--    if (use_kernel_writewatch == 2)
--    {
--        kernel_writewatch_reset( base, size );
--        return;
--    }
--
--    uffdio_register.range.start = (UINT_PTR)base;
--    uffdio_register.range.len = size;
--    uffdio_register.mode = UFFDIO_REGISTER_MODE_WP;
--    if (ioctl( uffd_fd, UFFDIO_REGISTER, &uffdio_register ) == -1)
--    {
--        ERR( "ioctl( UFFDIO_REGISTER ) failed, %s.\n", strerror(errno) );
--        return;
--    }
--
--    if (!(uffdio_register.ioctls & UFFDIO_WRITEPROTECT))
--    {
--        ERR( "uffdio_register.ioctls %s.\n", wine_dbgstr_longlong(uffdio_register.ioctls) );
--        return;
--    }
--    wp.range.start = (UINT_PTR)base;
--    wp.range.len = size;
--    wp.mode = UFFDIO_WRITEPROTECT_MODE_WP;
--
--    if (ioctl(uffd_fd, UFFDIO_WRITEPROTECT, &wp) == -1)
--    {
--        perror("ioctl(UFFDIO_WRITEPROTECT)");
--        exit(-1);
--    }
-+	return;
- }
- 
- static NTSTATUS kernel_soft_dirty_get_write_watches( void *base, SIZE_T size, void **addresses, ULONG_PTR *count, BOOL reset )
-diff -ruN proton-9.0/dlls/winegstreamer/Makefile.in proton-9.0-new/dlls/winegstreamer/Makefile.in
---- proton-9.0/dlls/winegstreamer/Makefile.in	2024-06-12 21:33:09.449784276 +0000
-+++ proton-9.0-new/dlls/winegstreamer/Makefile.in	2024-06-12 21:34:47.525701339 +0000
-@@ -30,10 +30,4 @@
- 	winegstreamer_classes.idl \
- 	wm_reader.c \
- 	wma_decoder.c \
--	wmv_decoder.c \
--	media-converter/audioconv.c \
--	media-converter/audioconvbin.c \
--	media-converter/fossilize.c \
--	media-converter/lib.c \
--	media-converter/murmur3.c \
--	media-converter/videoconv.c
-+	wmv_decoder.c
-diff -ruN proton-9.0/dlls/winegstreamer/unixlib.c proton-9.0-new/dlls/winegstreamer/unixlib.c
---- proton-9.0/dlls/winegstreamer/unixlib.c	2024-06-12 21:33:09.451784274 +0000
-+++ proton-9.0-new/dlls/winegstreamer/unixlib.c	2024-06-12 21:35:39.125657224 +0000
-@@ -46,8 +46,6 @@
- 
- GST_DEBUG_CATEGORY(wine);
- 
--extern bool media_converter_init(void);
--
- GstGLDisplay *gl_display;
- 
- GstStreamType stream_type_from_caps(GstCaps *caps)
-@@ -325,12 +323,5 @@
-         }
-     }
- 
--    if (!media_converter_init())
--    {
--        GST_ERROR("Failed to init media converter.");
--        gst_object_unref(gl_display);
--        return STATUS_UNSUCCESSFUL;
--    }
--
-     return STATUS_SUCCESS;
- }

+ 0 - 28
proton-exp-8.0.patch

@@ -1,28 +0,0 @@
-diff -ur proton-exp/dlls/winegstreamer/unixlib.c proton-exp-patched/dlls/winegstreamer/unixlib.c
---- proton-exp/dlls/winegstreamer/unixlib.c	2023-07-19 09:55:49.342288280 +0000
-+++ proton-exp-patched/dlls/winegstreamer/unixlib.c	2023-07-19 09:58:10.275236423 +0000
-@@ -214,23 +214,7 @@
-     GstCaps *caps;
-     gchar *str;
- 
--    if (!(caps = gst_type_find_helper_for_data_with_extension(NULL, data, size,
--            extension ? extension + 1 : NULL, &probability)))
--    {
--        GST_ERROR("Failed to detect caps for url %s, data %p, size %u", url, data, size);
--        return NULL;
--    }
--
--    str = gst_caps_to_string(caps);
--    if (probability > GST_TYPE_FIND_POSSIBLE)
--        GST_INFO("Detected caps %s with probability %u for url %s, data %p, size %u",
--                str, probability, url, data, size);
--    else
--        GST_FIXME("Detected caps %s with probability %u for url %s, data %p, size %u",
--                str, probability, url, data, size);
--    g_free(str);
--
--    return caps;
-+    return NULL;
- }
- 
- GstPad *create_pad_with_caps(GstPadDirection direction, GstCaps *caps)

+ 0 - 115
proton-exp-9.0.patch

@@ -1,115 +0,0 @@
-diff -ruN proton-exp/dlls/ntdll/unix/virtual.c proton-exp-new/dlls/ntdll/unix/virtual.c
---- proton-exp/dlls/ntdll/unix/virtual.c	2024-04-14 14:01:48.709513621 +0000
-+++ proton-exp-new/dlls/ntdll/unix/virtual.c	2024-04-14 14:02:04.503318324 +0000
-@@ -456,41 +456,7 @@
- 
- static void kernel_writewatch_register_range( struct file_view *view, void *base, size_t size )
- {
--    struct uffdio_register uffdio_register;
--    struct uffdio_writeprotect wp;
--
--    if (!(view->protect & VPROT_WRITEWATCH) || !use_kernel_writewatch) return;
--
--    madvise( base, size, MADV_NOHUGEPAGE );
--    if (use_kernel_writewatch == 2)
--    {
--        kernel_writewatch_reset( base, size );
--        return;
--    }
--
--    uffdio_register.range.start = (UINT_PTR)base;
--    uffdio_register.range.len = size;
--    uffdio_register.mode = UFFDIO_REGISTER_MODE_WP;
--    if (ioctl( uffd_fd, UFFDIO_REGISTER, &uffdio_register ) == -1)
--    {
--        ERR( "ioctl( UFFDIO_REGISTER ) failed, %s.\n", strerror(errno) );
--        return;
--    }
--
--    if (!(uffdio_register.ioctls & UFFDIO_WRITEPROTECT))
--    {
--        ERR( "uffdio_register.ioctls %s.\n", wine_dbgstr_longlong(uffdio_register.ioctls) );
--        return;
--    }
--    wp.range.start = (UINT_PTR)base;
--    wp.range.len = size;
--    wp.mode = UFFDIO_WRITEPROTECT_MODE_WP;
--
--    if (ioctl(uffd_fd, UFFDIO_WRITEPROTECT, &wp) == -1)
--    {
--        perror("ioctl(UFFDIO_WRITEPROTECT)");
--        exit(-1);
--    }
-+	return;
- }
- 
- static NTSTATUS kernel_soft_dirty_get_write_watches( void *base, SIZE_T size, void **addresses, ULONG_PTR *count, BOOL reset )
-diff -ruN proton-exp/dlls/winegstreamer/Makefile.in proton-exp-new/dlls/winegstreamer/Makefile.in
---- proton-exp/dlls/winegstreamer/Makefile.in	2024-04-14 14:01:48.969510402 +0000
-+++ proton-exp-new/dlls/winegstreamer/Makefile.in	2024-04-14 14:02:47.668786548 +0000
-@@ -32,11 +32,4 @@
- 	winegstreamer_classes.idl \
- 	wm_reader.c \
- 	wma_decoder.c \
--	wmv_decoder.c \
--	media-converter/audioconv.c \
--	media-converter/audioconvbin.c \
--	media-converter/fossilize.c \
--	media-converter/lib.c \
--	media-converter/murmur3.c \
--	media-converter/protondemuxer.c \
--	media-converter/videoconv.c
-+	wmv_decoder.c
-diff -ruN proton-exp/dlls/winegstreamer/unixlib.c proton-exp-new/dlls/winegstreamer/unixlib.c
---- proton-exp/dlls/winegstreamer/unixlib.c	2024-04-14 14:01:48.973510353 +0000
-+++ proton-exp-new/dlls/winegstreamer/unixlib.c	2024-04-14 14:02:04.503318324 +0000
-@@ -46,8 +46,6 @@
- 
- GST_DEBUG_CATEGORY(wine);
- 
--extern bool media_converter_init(void);
--
- GstGLDisplay *gl_display;
- 
- GstStreamType stream_type_from_caps(GstCaps *caps)
-@@ -325,12 +323,5 @@
-         }
-     }
- 
--    if (!media_converter_init())
--    {
--        GST_ERROR("Failed to init media converter.");
--        gst_object_unref(gl_display);
--        return STATUS_UNSUCCESSFUL;
--    }
--
-     return STATUS_SUCCESS;
- }
-diff -ruN proton-exp/dlls/winegstreamer/wg_source.c proton-exp-new/dlls/winegstreamer/wg_source.c
---- proton-exp/dlls/winegstreamer/wg_source.c	2024-04-14 14:01:48.973510353 +0000
-+++ proton-exp-new/dlls/winegstreamer/wg_source.c	2024-04-14 14:02:04.503318324 +0000
-@@ -82,23 +82,7 @@
-     GstCaps *caps;
-     gchar *str;
- 
--    if (!(caps = gst_type_find_helper_for_data_with_extension(NULL, data, size,
--            extension ? extension + 1 : NULL, &probability)))
--    {
--        GST_ERROR("Failed to detect caps for url %s, data %p, size %u", url, data, size);
--        return NULL;
--    }
--
--    str = gst_caps_to_string(caps);
--    if (probability > GST_TYPE_FIND_POSSIBLE)
--        GST_INFO("Detected caps %s with probability %u for url %s, data %p, size %u",
--                str, probability, url, data, size);
--    else
--        GST_FIXME("Detected caps %s with probability %u for url %s, data %p, size %u",
--                str, probability, url, data, size);
--    g_free(str);
--
--    return caps;
-+    return NULL;
- }
- 
- static GstPad *create_pad_with_caps(GstPadDirection direction, GstCaps *caps)