From 12af26a582434858cd988a3f57d498bd614fd560 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Wed, 17 Dec 2014 04:27:10 +0100 Subject: [PATCH] Avoid duplicate wined3d specfile by adding PARENTSPEC Makefile argument. --- debian/changelog | 1 + patches/Makefile | 19 +- ...ort-for-PARENTSPEC-Makefile-variable.patch | 47 +++ ...nd-dll-with-STAGING_CSMT-definition-.patch | 324 +----------------- patches/wined3d-CSMT_Helper/definition | 1 + 5 files changed, 75 insertions(+), 317 deletions(-) create mode 100644 patches/makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch diff --git a/debian/changelog b/debian/changelog index e8872f55..e6421b44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,5 @@ wine-compholio (1.7.34) UNRELEASED; urgency=low + * Avoid duplicate wined3d specfile by adding PARENTSPEC Makefile argument. * Fix issue in DOS Attributes patch which broke ./configure on systems with alternative shells. * Added patch to fix handling of subdirectory in FtpFindFirstFile. * Added patch to return proper charcount for GetLocaleInfo with LOCALE_IFIRSTDAYOFWEEK. diff --git a/patches/Makefile b/patches/Makefile index efaad4d3..89fa3693 100644 --- a/patches/Makefile +++ b/patches/Makefile @@ -55,6 +55,7 @@ PATCHLIST := \ kernel32-VerifyVersionInfo.ok \ libs-Unicode_Collation.ok \ libwine-BSD_mmap_fixed.ok \ + makedep-PARENTSPEC.ok \ msvcp90-basic_string_wchar_dtor.ok \ msvcrt-atof_strtod.ok \ ntdll-DOS_Attributes.ok \ @@ -767,6 +768,18 @@ libwine-BSD_mmap_fixed.ok: echo '+ { "André Hentschel", "libwine: Use try_mmap_fixed for wine64 on FreeBSD.", 1 },'; \ ) > libwine-BSD_mmap_fixed.ok +# Patchset makedep-PARENTSPEC +# | +# | Modified files: +# | * tools/makedep.c +# | +.INTERMEDIATE: makedep-PARENTSPEC.ok +makedep-PARENTSPEC.ok: + $(call APPLY_FILE,makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch) + @( \ + echo '+ { "Sebastian Lackner", "makedep: Add support for PARENTSPEC Makefile variable.", 1 },'; \ + ) > makedep-PARENTSPEC.ok + # Patchset mshtml-sessionStorage # | # | Modified files: @@ -1778,12 +1791,12 @@ winecfg-Staging.ok: ntdll-DllRedirects.ok wined3d-CSMT_Main.ok # Patchset wined3d-CSMT_Helper # | # | Modified files: -# | * configure.ac, dlls/ddraw/surface.c, dlls/wined3d-csmt/Makefile.in, dlls/wined3d-csmt/version.rc, dlls/wined3d-csmt -# | /wined3d-csmt.spec, dlls/wined3d/resource.c, dlls/wined3d/surface.c, dlls/wined3d/volume.c, dlls/wined3d/wined3d.spec, +# | * configure.ac, dlls/ddraw/surface.c, dlls/wined3d-csmt/Makefile.in, dlls/wined3d-csmt/version.rc, +# | dlls/wined3d/resource.c, dlls/wined3d/surface.c, dlls/wined3d/volume.c, dlls/wined3d/wined3d.spec, # | dlls/wined3d/wined3d_private.h, include/wine/wined3d.h # | .INTERMEDIATE: wined3d-CSMT_Helper.ok -wined3d-CSMT_Helper.ok: wined3d-DXTn.ok +wined3d-CSMT_Helper.ok: makedep-PARENTSPEC.ok wined3d-DXTn.ok $(call APPLY_FILE,wined3d-CSMT_Helper/0001-wined3d-Merge-get_pitch-functions.patch) $(call APPLY_FILE,wined3d-CSMT_Helper/0002-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch) @( \ diff --git a/patches/makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch b/patches/makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch new file mode 100644 index 00000000..e257f2fe --- /dev/null +++ b/patches/makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch @@ -0,0 +1,47 @@ +From 0ca9f8bf78340991e99d8f020c5f04d2029a4177 Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner +Date: Wed, 17 Dec 2014 04:11:58 +0100 +Subject: makedep: Add support for PARENTSPEC Makefile variable. + +--- + tools/makedep.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/tools/makedep.c b/tools/makedep.c +index 54aab45..d68bc03 100644 +--- a/tools/makedep.c ++++ b/tools/makedep.c +@@ -161,6 +161,7 @@ struct makefile + const char *top_src_dir; + const char *top_obj_dir; + const char *parent_dir; ++ const char *parent_spec; + const char *module; + const char *testdll; + const char *staticlib; +@@ -2081,7 +2082,13 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t + char *spec_file = NULL; + + if (!make->appmode.count) +- spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); ++ { ++ if (!make->parent_spec) ++ spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); ++ else ++ spec_file = src_dir_path( make, make->parent_spec ); ++ } ++ + for (i = 0; i < make->delayimports.count; i++) + strarray_add( &all_libs, strmake( "-l%s", make->delayimports.str[i] )); + for (i = 0; i < make->imports.count; i++) +@@ -2597,6 +2604,7 @@ static void update_makefile( const char *path ) + strarray_set_value( &make->vars, "srcdir", src_dir_path( make, "" )); + + make->parent_dir = get_expanded_make_variable( make, "PARENTSRC" ); ++ make->parent_spec = get_expanded_make_variable( make, "PARENTSPEC" ); + make->module = get_expanded_make_variable( make, "MODULE" ); + make->testdll = get_expanded_make_variable( make, "TESTDLL" ); + make->staticlib = get_expanded_make_variable( make, "STATICLIB" ); +-- +2.1.3 + diff --git a/patches/wined3d-CSMT_Helper/0002-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch b/patches/wined3d-CSMT_Helper/0002-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch index 1c20f6fd..ef363cdc 100644 --- a/patches/wined3d-CSMT_Helper/0002-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch +++ b/patches/wined3d-CSMT_Helper/0002-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch @@ -1,23 +1,21 @@ -From af9c8f2a2a01b930ac867b79ca58c9010de40178 Mon Sep 17 00:00:00 2001 +From 437012ece4738ad5cea694b2a6c2759927074ebe Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 14 Dec 2014 20:49:28 +0100 Subject: wined3d: Add second dll with STAGING_CSMT definition set. --- - configure.ac | 1 + - dlls/wined3d-csmt/Makefile.in | 37 +++++ - dlls/wined3d-csmt/version.rc | 27 ++++ - dlls/wined3d-csmt/wined3d-csmt.spec | 297 ++++++++++++++++++++++++++++++++++++ - 4 files changed, 362 insertions(+) + configure.ac | 1 + + dlls/wined3d-csmt/Makefile.in | 38 ++++++++++++++++++++++++++++++++++++++ + dlls/wined3d-csmt/version.rc | 27 +++++++++++++++++++++++++++ + 3 files changed, 66 insertions(+) create mode 100644 dlls/wined3d-csmt/Makefile.in create mode 100644 dlls/wined3d-csmt/version.rc - create mode 100644 dlls/wined3d-csmt/wined3d-csmt.spec diff --git a/configure.ac b/configure.ac -index b909ae8..c197db1 100644 +index e5fb209..7394424 100644 --- a/configure.ac +++ b/configure.ac -@@ -3317,6 +3317,7 @@ WINE_CONFIG_TEST(dlls/windowscodecsext/tests) +@@ -3318,6 +3318,7 @@ WINE_CONFIG_TEST(dlls/windowscodecsext/tests) WINE_CONFIG_DLL(winealsa.drv) WINE_CONFIG_DLL(winecoreaudio.drv) WINE_CONFIG_LIB(winecrt0) @@ -27,14 +25,15 @@ index b909ae8..c197db1 100644 WINE_CONFIG_DLL(winejoystick.drv) diff --git a/dlls/wined3d-csmt/Makefile.in b/dlls/wined3d-csmt/Makefile.in new file mode 100644 -index 0000000..90b2fba +index 0000000..3a401a0 --- /dev/null +++ b/dlls/wined3d-csmt/Makefile.in -@@ -0,0 +1,37 @@ +@@ -0,0 +1,38 @@ +EXTRADEFS = -DSTAGING_CSMT +MODULE = wined3d-csmt.dll +IMPORTS = uuid opengl32 user32 gdi32 advapi32 +PARENTSRC = ../wined3d ++PARENTSPEC = ../wined3d/wined3d.spec + +C_SRCS = \ + arb_program_shader.c \ @@ -101,309 +100,6 @@ index 0000000..0439375 +#define WINE_PRODUCTNAME_STR "Wine D3D" + +#include "wine/wine_common_ver.rc" -diff --git a/dlls/wined3d-csmt/wined3d-csmt.spec b/dlls/wined3d-csmt/wined3d-csmt.spec -new file mode 100644 -index 0000000..28d9a05 ---- /dev/null -+++ b/dlls/wined3d-csmt/wined3d-csmt.spec -@@ -0,0 +1,297 @@ -+@ stdcall wined3d_mutex_lock() -+@ stdcall wined3d_mutex_unlock() -+ -+@ cdecl wined3d_calculate_format_pitch(ptr long long long) -+@ cdecl wined3d_check_depth_stencil_match(ptr long long long long long) -+@ cdecl wined3d_check_device_format(ptr long long long long long long) -+@ cdecl wined3d_check_device_format_conversion(ptr long long long long) -+@ cdecl wined3d_check_device_multisample_type(ptr long long long long long ptr) -+@ cdecl wined3d_check_device_type(ptr long long long long long) -+@ cdecl wined3d_create(long) -+@ cdecl wined3d_decref(ptr) -+@ cdecl wined3d_enum_adapter_modes(ptr long long long long ptr) -+@ cdecl wined3d_get_adapter_count(ptr) -+@ cdecl wined3d_get_adapter_display_mode(ptr long ptr ptr) -+@ cdecl wined3d_get_adapter_identifier(ptr long long ptr) -+@ cdecl wined3d_get_adapter_mode_count(ptr long long long) -+@ cdecl wined3d_get_adapter_monitor(ptr long) -+@ cdecl wined3d_get_adapter_raster_status(ptr long ptr) -+@ cdecl wined3d_get_device_caps(ptr long long ptr) -+@ cdecl wined3d_incref(ptr) -+@ cdecl wined3d_register_software_device(ptr ptr) -+@ cdecl wined3d_set_adapter_display_mode(ptr long ptr) -+ -+@ cdecl wined3d_buffer_create(ptr ptr ptr ptr ptr ptr) -+@ cdecl wined3d_buffer_create_ib(ptr long long long ptr ptr ptr) -+@ cdecl wined3d_buffer_create_vb(ptr long long long ptr ptr ptr) -+@ cdecl wined3d_buffer_decref(ptr) -+@ cdecl wined3d_buffer_get_parent(ptr) -+@ cdecl wined3d_buffer_get_resource(ptr) -+@ cdecl wined3d_buffer_incref(ptr) -+@ cdecl wined3d_buffer_map(ptr long long ptr long) -+@ cdecl wined3d_buffer_preload(ptr) -+@ cdecl wined3d_buffer_unmap(ptr) -+ -+@ cdecl wined3d_device_acquire_focus_window(ptr ptr) -+@ cdecl wined3d_device_begin_scene(ptr) -+@ cdecl wined3d_device_begin_stateblock(ptr) -+@ cdecl wined3d_device_clear(ptr long ptr long ptr float long) -+@ cdecl wined3d_device_clear_rendertarget_view(ptr ptr ptr ptr) -+@ cdecl wined3d_device_copy_resource(ptr ptr ptr) -+@ cdecl wined3d_device_create(ptr long long ptr long long ptr ptr) -+@ cdecl wined3d_device_decref(ptr) -+@ cdecl wined3d_device_draw_indexed_primitive(ptr long long) -+@ cdecl wined3d_device_draw_indexed_primitive_instanced(ptr long long long long) -+@ cdecl wined3d_device_draw_primitive(ptr long long) -+@ cdecl wined3d_device_end_scene(ptr) -+@ cdecl wined3d_device_end_stateblock(ptr ptr) -+@ cdecl wined3d_device_evict_managed_resources(ptr) -+@ cdecl wined3d_device_get_available_texture_mem(ptr) -+@ cdecl wined3d_device_get_back_buffer(ptr long long long ptr) -+@ cdecl wined3d_device_get_base_vertex_index(ptr) -+@ cdecl wined3d_device_get_clip_plane(ptr long ptr) -+@ cdecl wined3d_device_get_clip_status(ptr ptr) -+@ cdecl wined3d_device_get_creation_parameters(ptr ptr) -+@ cdecl wined3d_device_get_depth_stencil_view(ptr) -+@ cdecl wined3d_device_get_device_caps(ptr ptr) -+@ cdecl wined3d_device_get_display_mode(ptr long ptr ptr) -+@ cdecl wined3d_device_get_front_buffer_data(ptr long ptr) -+@ cdecl wined3d_device_get_gamma_ramp(ptr long ptr) -+@ cdecl wined3d_device_get_geometry_shader(ptr) -+@ cdecl wined3d_device_get_gs_cb(ptr long) -+@ cdecl wined3d_device_get_gs_resource_view(ptr long) -+@ cdecl wined3d_device_get_gs_sampler(ptr long) -+@ cdecl wined3d_device_get_index_buffer(ptr ptr) -+@ cdecl wined3d_device_get_light(ptr long ptr) -+@ cdecl wined3d_device_get_light_enable(ptr long ptr) -+@ cdecl wined3d_device_get_material(ptr ptr) -+@ cdecl wined3d_device_get_npatch_mode(ptr) -+@ cdecl wined3d_device_get_pixel_shader(ptr) -+@ cdecl wined3d_device_get_predication(ptr ptr) -+@ cdecl wined3d_device_get_primitive_type(ptr ptr) -+@ cdecl wined3d_device_get_ps_cb(ptr long) -+@ cdecl wined3d_device_get_ps_consts_b(ptr long ptr long) -+@ cdecl wined3d_device_get_ps_consts_f(ptr long ptr long) -+@ cdecl wined3d_device_get_ps_consts_i(ptr long ptr long) -+@ cdecl wined3d_device_get_ps_resource_view(ptr long) -+@ cdecl wined3d_device_get_ps_sampler(ptr long) -+@ cdecl wined3d_device_get_raster_status(ptr long ptr) -+@ cdecl wined3d_device_get_render_state(ptr long) -+@ cdecl wined3d_device_get_rendertarget_view(ptr long) -+@ cdecl wined3d_device_get_sampler_state(ptr long long) -+@ cdecl wined3d_device_get_scissor_rect(ptr ptr) -+@ cdecl wined3d_device_get_software_vertex_processing(ptr) -+@ cdecl wined3d_device_get_stream_output(ptr long ptr) -+@ cdecl wined3d_device_get_stream_source(ptr long ptr ptr ptr) -+@ cdecl wined3d_device_get_stream_source_freq(ptr long ptr) -+@ cdecl wined3d_device_get_surface_from_dc(ptr ptr) -+@ cdecl wined3d_device_get_swapchain(ptr long) -+@ cdecl wined3d_device_get_swapchain_count(ptr) -+@ cdecl wined3d_device_get_texture(ptr long) -+@ cdecl wined3d_device_get_texture_stage_state(ptr long long) -+@ cdecl wined3d_device_get_transform(ptr long ptr) -+@ cdecl wined3d_device_get_vertex_declaration(ptr) -+@ cdecl wined3d_device_get_vertex_shader(ptr) -+@ cdecl wined3d_device_get_viewport(ptr ptr) -+@ cdecl wined3d_device_get_vs_cb(ptr long) -+@ cdecl wined3d_device_get_vs_consts_b(ptr long ptr long) -+@ cdecl wined3d_device_get_vs_consts_f(ptr long ptr long) -+@ cdecl wined3d_device_get_vs_consts_i(ptr long ptr long) -+@ cdecl wined3d_device_get_vs_resource_view(ptr long) -+@ cdecl wined3d_device_get_vs_sampler(ptr long) -+@ cdecl wined3d_device_incref(ptr) -+@ cdecl wined3d_device_init_3d(ptr ptr) -+@ cdecl wined3d_device_init_gdi(ptr ptr) -+@ cdecl wined3d_device_multiply_transform(ptr long ptr) -+@ cdecl wined3d_device_present(ptr ptr ptr ptr ptr long) -+@ cdecl wined3d_device_process_vertices(ptr long long long ptr ptr long long) -+@ cdecl wined3d_device_release_focus_window(ptr) -+@ cdecl wined3d_device_reset(ptr ptr ptr ptr long) -+@ cdecl wined3d_device_restore_fullscreen_window(ptr ptr) -+@ cdecl wined3d_device_set_base_vertex_index(ptr long) -+@ cdecl wined3d_device_set_clip_plane(ptr long ptr) -+@ cdecl wined3d_device_set_clip_status(ptr ptr) -+@ cdecl wined3d_device_set_cursor_position(ptr long long long) -+@ cdecl wined3d_device_set_cursor_properties(ptr long long ptr) -+@ cdecl wined3d_device_set_depth_stencil_view(ptr ptr) -+@ cdecl wined3d_device_set_dialog_box_mode(ptr long) -+@ cdecl wined3d_device_set_gamma_ramp(ptr long long ptr) -+@ cdecl wined3d_device_set_geometry_shader(ptr ptr) -+@ cdecl wined3d_device_set_gs_cb(ptr long ptr) -+@ cdecl wined3d_device_set_gs_resource_view(ptr long ptr) -+@ cdecl wined3d_device_set_gs_sampler(ptr long ptr) -+@ cdecl wined3d_device_set_index_buffer(ptr ptr long) -+@ cdecl wined3d_device_set_light(ptr long ptr) -+@ cdecl wined3d_device_set_light_enable(ptr long long) -+@ cdecl wined3d_device_set_material(ptr ptr) -+@ cdecl wined3d_device_set_multithreaded(ptr) -+@ cdecl wined3d_device_set_npatch_mode(ptr float) -+@ cdecl wined3d_device_set_pixel_shader(ptr ptr) -+@ cdecl wined3d_device_set_predication(ptr ptr long) -+@ cdecl wined3d_device_set_primitive_type(ptr long) -+@ cdecl wined3d_device_set_ps_cb(ptr long ptr) -+@ cdecl wined3d_device_set_ps_consts_b(ptr long ptr long) -+@ cdecl wined3d_device_set_ps_consts_f(ptr long ptr long) -+@ cdecl wined3d_device_set_ps_consts_i(ptr long ptr long) -+@ cdecl wined3d_device_set_ps_resource_view(ptr long ptr) -+@ cdecl wined3d_device_set_ps_sampler(ptr long ptr) -+@ cdecl wined3d_device_set_render_state(ptr long long) -+@ cdecl wined3d_device_set_rendertarget_view(ptr long ptr long) -+@ cdecl wined3d_device_set_sampler_state(ptr long long long) -+@ cdecl wined3d_device_set_scissor_rect(ptr ptr) -+@ cdecl wined3d_device_set_software_vertex_processing(ptr long) -+@ cdecl wined3d_device_set_stream_output(ptr long ptr long) -+@ cdecl wined3d_device_set_stream_source(ptr long ptr long long) -+@ cdecl wined3d_device_set_stream_source_freq(ptr long long) -+@ cdecl wined3d_device_set_texture(ptr long ptr) -+@ cdecl wined3d_device_set_texture_stage_state(ptr long long long) -+@ cdecl wined3d_device_set_transform(ptr long ptr) -+@ cdecl wined3d_device_set_vertex_declaration(ptr ptr) -+@ cdecl wined3d_device_set_vertex_shader(ptr ptr) -+@ cdecl wined3d_device_set_viewport(ptr ptr) -+@ cdecl wined3d_device_set_vs_cb(ptr long ptr) -+@ cdecl wined3d_device_set_vs_consts_b(ptr long ptr long) -+@ cdecl wined3d_device_set_vs_consts_f(ptr long ptr long) -+@ cdecl wined3d_device_set_vs_consts_i(ptr long ptr long) -+@ cdecl wined3d_device_set_vs_resource_view(ptr long ptr) -+@ cdecl wined3d_device_set_vs_sampler(ptr long ptr) -+@ cdecl wined3d_device_setup_fullscreen_window(ptr ptr long long) -+@ cdecl wined3d_device_show_cursor(ptr long) -+@ cdecl wined3d_device_uninit_3d(ptr) -+@ cdecl wined3d_device_uninit_gdi(ptr) -+@ cdecl wined3d_device_update_surface(ptr ptr ptr ptr ptr) -+@ cdecl wined3d_device_update_texture(ptr ptr ptr) -+@ cdecl wined3d_device_validate_device(ptr ptr) -+ -+@ cdecl wined3d_palette_create(ptr long long ptr ptr) -+@ cdecl wined3d_palette_decref(ptr) -+@ cdecl wined3d_palette_get_entries(ptr long long long ptr) -+@ cdecl wined3d_palette_apply_to_dc(ptr ptr) -+@ cdecl wined3d_palette_incref(ptr) -+@ cdecl wined3d_palette_set_entries(ptr long long long ptr) -+ -+@ cdecl wined3d_query_create(ptr long ptr ptr) -+@ cdecl wined3d_query_decref(ptr) -+@ cdecl wined3d_query_get_data(ptr ptr long long) -+@ cdecl wined3d_query_get_data_size(ptr) -+@ cdecl wined3d_query_get_parent(ptr) -+@ cdecl wined3d_query_get_type(ptr) -+@ cdecl wined3d_query_incref(ptr) -+@ cdecl wined3d_query_issue(ptr long) -+ -+@ cdecl wined3d_resource_get_desc(ptr ptr) -+@ cdecl wined3d_resource_get_parent(ptr) -+@ cdecl wined3d_resource_get_pitch(ptr ptr ptr) -+@ cdecl wined3d_resource_get_priority(ptr) -+@ cdecl wined3d_resource_set_parent(ptr ptr) -+@ cdecl wined3d_resource_set_priority(ptr long) -+ -+@ cdecl wined3d_rendertarget_view_create(ptr ptr ptr ptr ptr) -+@ cdecl wined3d_rendertarget_view_create_from_surface(ptr ptr ptr ptr) -+@ cdecl wined3d_rendertarget_view_decref(ptr) -+@ cdecl wined3d_rendertarget_view_get_parent(ptr) -+@ cdecl wined3d_rendertarget_view_get_resource(ptr) -+@ cdecl wined3d_rendertarget_view_get_sub_resource_parent(ptr) -+@ cdecl wined3d_rendertarget_view_incref(ptr) -+@ cdecl wined3d_rendertarget_view_set_parent(ptr ptr) -+ -+@ cdecl wined3d_sampler_create(ptr ptr) -+@ cdecl wined3d_sampler_decref(ptr) -+@ cdecl wined3d_sampler_get_parent(ptr) -+@ cdecl wined3d_sampler_incref(ptr) -+ -+@ cdecl wined3d_shader_create_gs(ptr ptr ptr ptr ptr ptr long) -+@ cdecl wined3d_shader_create_ps(ptr ptr ptr ptr ptr ptr long) -+@ cdecl wined3d_shader_create_vs(ptr ptr ptr ptr ptr ptr long) -+@ cdecl wined3d_shader_decref(ptr) -+@ cdecl wined3d_shader_get_byte_code(ptr ptr ptr) -+@ cdecl wined3d_shader_get_parent(ptr) -+@ cdecl wined3d_shader_incref(ptr) -+@ cdecl wined3d_shader_set_local_constants_float(ptr long ptr long) -+ -+@ cdecl wined3d_shader_resource_view_create(ptr ptr ptr) -+@ cdecl wined3d_shader_resource_view_decref(ptr) -+@ cdecl wined3d_shader_resource_view_get_parent(ptr) -+@ cdecl wined3d_shader_resource_view_incref(ptr) -+ -+@ cdecl wined3d_stateblock_apply(ptr) -+@ cdecl wined3d_stateblock_capture(ptr) -+@ cdecl wined3d_stateblock_create(ptr long ptr) -+@ cdecl wined3d_stateblock_decref(ptr) -+@ cdecl wined3d_stateblock_incref(ptr) -+ -+@ cdecl wined3d_surface_blt(ptr ptr ptr ptr long ptr long) -+@ cdecl wined3d_surface_decref(ptr) -+@ cdecl wined3d_surface_from_resource(ptr) -+@ cdecl wined3d_surface_get_blt_status(ptr long) -+@ cdecl wined3d_surface_get_flip_status(ptr long) -+@ cdecl wined3d_surface_get_overlay_position(ptr ptr ptr) -+@ cdecl wined3d_surface_get_parent(ptr) -+@ cdecl wined3d_surface_get_render_target_data(ptr ptr) -+@ cdecl wined3d_surface_get_resource(ptr) -+@ cdecl wined3d_surface_getdc(ptr ptr) -+@ cdecl wined3d_surface_incref(ptr) -+@ cdecl wined3d_surface_is_lost(ptr) -+@ cdecl wined3d_surface_map(ptr ptr ptr long) -+@ cdecl wined3d_surface_preload(ptr) -+@ cdecl wined3d_surface_releasedc(ptr ptr) -+@ cdecl wined3d_surface_restore(ptr) -+@ cdecl wined3d_surface_set_overlay_position(ptr long long) -+@ cdecl wined3d_surface_unmap(ptr) -+@ cdecl wined3d_surface_update_overlay(ptr ptr ptr ptr long ptr) -+@ cdecl wined3d_surface_update_overlay_z_order(ptr long ptr) -+ -+@ cdecl wined3d_swapchain_create(ptr ptr ptr ptr ptr) -+@ cdecl wined3d_swapchain_decref(ptr) -+@ cdecl wined3d_swapchain_get_back_buffer(ptr long long) -+@ cdecl wined3d_swapchain_get_device(ptr) -+@ cdecl wined3d_swapchain_get_display_mode(ptr ptr ptr) -+@ cdecl wined3d_swapchain_get_front_buffer_data(ptr ptr) -+@ cdecl wined3d_swapchain_get_gamma_ramp(ptr ptr) -+@ cdecl wined3d_swapchain_get_parent(ptr) -+@ cdecl wined3d_swapchain_get_desc(ptr ptr) -+@ cdecl wined3d_swapchain_get_raster_status(ptr ptr) -+@ cdecl wined3d_swapchain_incref(ptr) -+@ cdecl wined3d_swapchain_present(ptr ptr ptr ptr ptr long) -+@ cdecl wined3d_swapchain_set_gamma_ramp(ptr long ptr) -+@ cdecl wined3d_swapchain_set_palette(ptr ptr) -+@ cdecl wined3d_swapchain_set_window(ptr ptr) -+ -+@ cdecl wined3d_texture_add_dirty_region(ptr long ptr) -+@ cdecl wined3d_texture_create(ptr ptr long long ptr ptr ptr) -+@ cdecl wined3d_texture_decref(ptr) -+@ cdecl wined3d_texture_generate_mipmaps(ptr) -+@ cdecl wined3d_texture_get_autogen_filter_type(ptr) -+@ cdecl wined3d_texture_get_level_count(ptr) -+@ cdecl wined3d_texture_get_lod(ptr) -+@ cdecl wined3d_texture_get_parent(ptr) -+@ cdecl wined3d_texture_get_resource(ptr) -+@ cdecl wined3d_texture_get_sub_resource(ptr long) -+@ cdecl wined3d_texture_incref(ptr) -+@ cdecl wined3d_texture_preload(ptr) -+@ cdecl wined3d_texture_set_autogen_filter_type(ptr long) -+@ cdecl wined3d_texture_set_color_key(ptr long ptr) -+@ cdecl wined3d_texture_set_lod(ptr long) -+@ cdecl wined3d_texture_update_desc(ptr long long long long long ptr long) -+ -+@ cdecl wined3d_vertex_declaration_create(ptr ptr long ptr ptr ptr) -+@ cdecl wined3d_vertex_declaration_create_from_fvf(ptr long ptr ptr ptr) -+@ cdecl wined3d_vertex_declaration_decref(ptr) -+@ cdecl wined3d_vertex_declaration_get_parent(ptr) -+@ cdecl wined3d_vertex_declaration_incref(ptr) -+ -+@ cdecl wined3d_volume_decref(ptr) -+@ cdecl wined3d_volume_from_resource(ptr) -+@ cdecl wined3d_volume_get_parent(ptr) -+@ cdecl wined3d_volume_get_resource(ptr) -+@ cdecl wined3d_volume_incref(ptr) -+@ cdecl wined3d_volume_map(ptr ptr ptr long) -+@ cdecl wined3d_volume_preload(ptr) -+@ cdecl wined3d_volume_unmap(ptr) -+ -+@ cdecl wined3d_dxt1_decode(ptr ptr long long long long long) -+@ cdecl wined3d_dxt1_encode(ptr ptr long long long long long) -+@ cdecl wined3d_dxt3_decode(ptr ptr long long long long long) -+@ cdecl wined3d_dxt3_encode(ptr ptr long long long long long) -+@ cdecl wined3d_dxt5_decode(ptr ptr long long long long long) -+@ cdecl wined3d_dxt5_encode(ptr ptr long long long long long) -- 2.1.3 diff --git a/patches/wined3d-CSMT_Helper/definition b/patches/wined3d-CSMT_Helper/definition index 2ba814c6..30411c02 100644 --- a/patches/wined3d-CSMT_Helper/definition +++ b/patches/wined3d-CSMT_Helper/definition @@ -1 +1,2 @@ Depends: wined3d-DXTn +Depends: makedep-PARENTSPEC