Hello community,
here is the log from the commit of package wine-nine-standalone for
openSUSE:Factory checked in at 2020-08-17 12:02:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wine-nine-standalone (Old)
and /work/SRC/openSUSE:Factory/.wine-nine-standalone.new.3399 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wine-nine-standalone"
Mon Aug 17 12:02:20 2020 rev:3 rq:827042 version:0.6
Changes:
--------
---
/work/SRC/openSUSE:Factory/wine-nine-standalone/wine-nine-standalone.changes
2020-04-09 23:14:53.890225194 +0200
+++
/work/SRC/openSUSE:Factory/.wine-nine-standalone.new.3399/wine-nine-standalone.changes
2020-08-17 12:03:04.074616942 +0200
@@ -1,0 +2,9 @@
+Sat Aug 15 06:25:56 UTC 2020 - Marcus Meissner <[email protected]>
+
+- Version 0.6
+ - Add Japanese translation
+ - Restore status messages when launching processes via explorer
+ - GCC 10 build fix
+ - Fix for WINE >= 5.14
+
+-------------------------------------------------------------------
Old:
----
wine-nine-standalone-0.5.tar.gz
New:
----
wine-nine-standalone-0.6.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wine-nine-standalone.spec ++++++
--- /var/tmp/diff_new_pack.vnpNBg/_old 2020-08-17 12:03:06.474618280 +0200
+++ /var/tmp/diff_new_pack.vnpNBg/_new 2020-08-17 12:03:06.474618280 +0200
@@ -17,7 +17,7 @@
Name: wine-nine-standalone
-Version: 0.5
+Version: 0.6
Release: 0
Summary: Wine Gallium Nine Standalone version
License: LGPL-2.1-or-later
++++++ wine-nine-standalone-0.5.tar.gz -> wine-nine-standalone-0.6.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wine-nine-standalone-0.5/.travis.yml
new/wine-nine-standalone-0.6/.travis.yml
--- old/wine-nine-standalone-0.5/.travis.yml 2019-09-25 14:25:24.000000000
+0200
+++ new/wine-nine-standalone-0.6/.travis.yml 2020-08-15 07:14:25.000000000
+0200
@@ -81,96 +81,3 @@
draft: true
on:
tags: true
-
- - stage: deploy-unstable
- name: "Packaging unstable"
- if: env(SIRO_COPR_KEY) IS present AND type = push AND branch = master
AND tag IS blank
- services:
- - docker
- addons:
- apt:
- update: true
- packages:
- # required for copr-cli
- - python3-pip
- install:
- # Get the rpmbuilder
- - docker pull mgruener/rpmbuild
- # Get copr-cli
- - pip3 install --user setuptools
- - pip3 install --user --upgrade pip
- - pip3 install --user --upgrade requests
- - pip3 install --user --upgrade 'marshmallow<3.0'
- - pip3 install --user copr-cli
- script:
- # create the folder structure for RPMBUILD
- - mkdir -p $HOME/rpmbuild/SOURCES $HOME/rpmbuild/SPECS
$HOME/rpmbuild/SRPMS $HOME/rpmbuild/BUILD $HOME/rpmbuild/RPMS
$HOME/rpmbuild/BUILDROOT
- - chmod -R 0777 $HOME/rpmbuild
- # create a copy of the sources for RPMBUILD
- - mkdir -p
$HOME/rpmbuild/SOURCES/tmp/wine-nine-standalone-$TRAVIS_COMMIT/
- - cp -r *
$HOME/rpmbuild/SOURCES/tmp/wine-nine-standalone-$TRAVIS_COMMIT/
- - tar -czf $HOME/rpmbuild/SOURCES/$TRAVIS_COMMIT.tar.gz -C
$HOME/rpmbuild/SOURCES/tmp/ .
- - rm -rf
$HOME/rpmbuild/SOURCES/tmp/wine-nine-standalone-$TRAVIS_COMMIT/
- # generate metadata for the SPEC file
- - export PATCHLEVEL=$(git rev-list --count master)
- - export MYCHANGELOG=$(LANG=en git log --pretty=format:"* %cd %an
<%ae>%n- %s%n" --date=format:"%a %b %d %Y" -n 10| sed 's/$/ \\/')
- # should use rpmbuild --define '', but whitespace and newline make it
difficult...
- - printf "%%define patchlevel %s\n" "$PATCHLEVEL" >
$HOME/rpmbuild/SPECS/wine-nine-unstable.spec
- - printf "%%define commithash %s\n" "$TRAVIS_COMMIT" >>
$HOME/rpmbuild/SPECS/wine-nine-unstable.spec
- - printf "%%define mychangelog %s\n" "$MYCHANGELOG" >>
$HOME/rpmbuild/SPECS/wine-nine-unstable.spec
- - cat ./packaging/SPECS/wine-nine-unstable.spec >>
$HOME/rpmbuild/SPECS/wine-nine-unstable.spec
- # create the SRPMs
- - sudo docker run -it --rm -v
$HOME/rpmbuild/:/home/rpmbuild/rpmbuild:z mgruener/rpmbuild rpmbuild -bs
--define 'dist .fc29' rpmbuild/SPECS/wine-nine-unstable.spec
- - sudo docker run -it --rm -v
$HOME/rpmbuild/:/home/rpmbuild/rpmbuild:z mgruener/rpmbuild rpmbuild -bs
--define 'dist .fc30' rpmbuild/SPECS/wine-nine-unstable.spec
- - mkdir -p $HOME/.config/
- - echo "$SIRO_COPR_KEY"|base64 -d - > $HOME/.config/copr
- # upload to copr
- - copr-cli build --nowait wine-nine-unstable
$HOME/rpmbuild/SRPMS/wine-nine-unstable*.src.rpm
-
- - stage: deploy-stable
- name: "Packaging stable"
- if: env(SIRO_COPR_KEY) IS present AND type = push AND tag IS present
- services:
- - docker
- addons:
- apt:
- update: true
- packages:
- # required for copr-cli
- - python3-pip
- install:
- # Get the rpmbuilder
- - docker pull mgruener/rpmbuild
- # Get copr-cli
- - pip3 install --user setuptools
- - pip3 install --user --upgrade pip
- - pip3 install --user --upgrade requests
- - pip3 install --user --upgrade 'marshmallow<3.0'
- - pip3 install --user copr-cli
- script:
- # create the folder structure for RPMBUILD
- - mkdir -p $HOME/rpmbuild/SOURCES $HOME/rpmbuild/SPECS
$HOME/rpmbuild/SRPMS $HOME/rpmbuild/BUILD $HOME/rpmbuild/RPMS
$HOME/rpmbuild/BUILDROOT
- - chmod -R 0777 $HOME/rpmbuild
- # create a copy of the sources for RPMBUILD
- - mkdir -p
$HOME/rpmbuild/SOURCES/tmp/wine-nine-standalone-$TRAVIS_COMMIT/
- - cp -r *
$HOME/rpmbuild/SOURCES/tmp/wine-nine-standalone-$TRAVIS_COMMIT/
- - tar -czf $HOME/rpmbuild/SOURCES/$TRAVIS_COMMIT.tar.gz -C
$HOME/rpmbuild/SOURCES/tmp/ .
- - rm -rf
$HOME/rpmbuild/SOURCES/tmp/wine-nine-standalone-$TRAVIS_COMMIT/
- # generate metadata for the SPEC file
- - export PATCHLEVEL=$(git rev-list --count $TRAVIS_COMMIT)
- - export MYCHANGELOG=$(LANG=en git log --pretty=format:"* %cd %an
<%ae>%n- %s%n" --date=format:"%a %b %d %Y" $TRAVIS_COMMIT -n 1| sed 's/$/ \\/'
&& LANG=en git show --pretty=format:"" $TRAVIS_TAG -q|cut -d$'\n' -f4-| sed
's/$/ \\/'|sed 's/[*]\+/-/g')
- # should use rpmbuild --define '', but whitespace and newline make it
difficult...
- - printf "%%define patchlevel %s\n" "$PATCHLEVEL" >
$HOME/rpmbuild/SPECS/wine-nine.spec
- - printf "%%define commithash %s\n" "$TRAVIS_COMMIT" >>
$HOME/rpmbuild/SPECS/wine-nine.spec
- - printf "%%define mytag %s\n" "$TRAVIS_TAG" >>
$HOME/rpmbuild/SPECS/wine-nine.spec
- - printf "%%define mychangelog %s\n" "$MYCHANGELOG" >>
$HOME/rpmbuild/SPECS/wine-nine.spec
- - cat ./packaging/SPECS/wine-nine.spec >>
$HOME/rpmbuild/SPECS/wine-nine.spec
- # create the SRPMs
- - sudo docker run -it --rm -v
$HOME/rpmbuild/:/home/rpmbuild/rpmbuild:z mgruener/rpmbuild rpmbuild -bs
--define 'dist .fc29' rpmbuild/SPECS/wine-nine.spec
- - sudo docker run -it --rm -v
$HOME/rpmbuild/:/home/rpmbuild/rpmbuild:z mgruener/rpmbuild rpmbuild -bs
--define 'dist .fc30' rpmbuild/SPECS/wine-nine.spec
- - mkdir -p $HOME/.config/
- - echo "$SIRO_COPR_KEY"|base64 -d - > $HOME/.config/copr
- # upload to copr
- - copr-cli build --nowait wine-nine
$HOME/rpmbuild/SRPMS/wine-nine*.src.rpm
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wine-nine-standalone-0.5/common/registry.c
new/wine-nine-standalone-0.6/common/registry.c
--- old/wine-nine-standalone-0.5/common/registry.c 2019-09-25
14:25:24.000000000 +0200
+++ new/wine-nine-standalone-0.6/common/registry.c 2020-08-15
07:14:25.000000000 +0200
@@ -11,8 +11,6 @@
const char * const reg_path_nine = "Software\\Wine\\Direct3DNine";
const char * const reg_key_module_path = "ModulePath";
const char * const reg_value_override = "native";
-const char * const reg_key_debug_active_backend = "ActiveBackend";
-const char * const reg_key_debug_wine_present_version = "WinePresentVersion";
BOOL common_get_registry_string(LPCSTR path, LPCSTR name, LPSTR *value)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wine-nine-standalone-0.5/common/registry.h
new/wine-nine-standalone-0.6/common/registry.h
--- old/wine-nine-standalone-0.5/common/registry.h 2019-09-25
14:25:24.000000000 +0200
+++ new/wine-nine-standalone-0.6/common/registry.h 2020-08-15
07:14:25.000000000 +0200
@@ -11,8 +11,6 @@
extern const char * const reg_path_nine;
extern const char * const reg_key_module_path;
extern const char * const reg_value_override;
-extern const char * const reg_key_debug_active_backend;
-extern const char * const reg_key_debug_wine_present_version;
BOOL common_get_registry_string(LPCSTR path, LPCSTR name, LPSTR *value);
BOOL common_set_registry_string(LPCSTR path, LPCSTR name, LPCSTR value);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wine-nine-standalone-0.5/d3d9-nine/backend.c
new/wine-nine-standalone-0.6/d3d9-nine/backend.c
--- old/wine-nine-standalone-0.5/d3d9-nine/backend.c 2019-09-25
14:25:24.000000000 +0200
+++ new/wine-nine-standalone-0.6/d3d9-nine/backend.c 2020-08-15
07:14:25.000000000 +0200
@@ -84,7 +84,7 @@
backends[i]->destroy(p);
if (i != 0)
- printf("\033[1;31mDRI3 backend not active (slower
performance)\033[0m\n");
+ fprintf(stderr, "\033[1;31mDRI3 backend not active (slower
performance)\033[0m\n");
return TRUE;
}
@@ -121,14 +121,6 @@
{
TRACE("Active backend: %s\n", backends[i]->name);
-#ifndef NDEBUG
- if (!common_set_registry_string(reg_path_nine,
- reg_key_debug_active_backend, backends[i]->name))
- {
- ERR("Failed to set registry key %s\n",
reg_key_debug_active_backend);
- }
-#endif
-
dri_backend->funcs = backends[i];
return dri_backend;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wine-nine-standalone-0.5/d3d9-nine/d3dadapter9.c
new/wine-nine-standalone-0.6/d3d9-nine/d3dadapter9.c
--- old/wine-nine-standalone-0.5/d3d9-nine/d3dadapter9.c 2019-09-25
14:25:24.000000000 +0200
+++ new/wine-nine-standalone-0.6/d3d9-nine/d3dadapter9.c 2020-08-15
07:14:25.000000000 +0200
@@ -525,19 +525,14 @@
{
struct adapter_group *group = &ADAPTER_GROUP;
- unsigned nparams, ordinal;
+ unsigned nparams;
if (BehaviorFlags & D3DCREATE_ADAPTERGROUP_DEVICE)
- {
nparams = group->noutputs;
- ordinal = 0;
- }
else
- {
nparams = 1;
- ordinal = Adapter - This->map[Adapter].master;
- }
- hr = present_create_present_group(This->gdi_display, group->devname,
ordinal,
+
+ hr = present_create_present_group(This->gdi_display, group->devname,
hFocusWindow, pPresentationParameters, nparams, &present,
This->ex,
BehaviorFlags, group->dri_backend);
}
@@ -768,7 +763,7 @@
return E_OUTOFMEMORY;
}
- for (k = 0; EnumDisplaySettingsExW(dd.DeviceName, k, &dm, 0); ++k)
+ for (k = 0; EnumDisplaySettingsExW(group->devname, k, &dm, 0); ++k)
{
D3DDISPLAYMODEEX *mode = add_mode(This);
if (!out)
@@ -955,8 +950,8 @@
*ppOut = (IDirect3D9Ex *)This;
- printf("\033[1;32mNative Direct3D 9 " NINE_VERSION " is active.\n"
- "For more information visit " NINE_URL "\033[0m\n");
+ fprintf(stderr, "\033[1;32mNative Direct3D 9 " NINE_VERSION " is active.\n"
+ "For more information visit " NINE_URL "\033[0m\n");
return D3D_OK;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wine-nine-standalone-0.5/d3d9-nine/present.c
new/wine-nine-standalone-0.6/d3d9-nine/present.c
--- old/wine-nine-standalone-0.5/d3d9-nine/present.c 2019-09-25
14:25:24.000000000 +0200
+++ new/wine-nine-standalone-0.6/d3d9-nine/present.c 2020-08-15
07:14:25.000000000 +0200
@@ -20,7 +20,6 @@
#include "../common/debug.h"
#include "../common/library.h"
-#include "../common/registry.h"
#include "backend.h"
#include "wndproc.h"
#include "xcb_present.h"
@@ -1583,12 +1582,11 @@
};
HRESULT present_create_present_group(Display *gdi_display, const WCHAR
*device_name,
- UINT adapter, HWND focus_wnd, D3DPRESENT_PARAMETERS *params,
+ HWND focus_wnd, D3DPRESENT_PARAMETERS *params,
unsigned nparams, ID3DPresentGroup **group, boolean ex, DWORD
BehaviorFlags,
struct dri_backend *dri_backend)
{
struct DRIPresentGroup *This;
- DISPLAY_DEVICEW dd;
HRESULT hr;
unsigned i;
@@ -1628,22 +1626,10 @@
return E_OUTOFMEMORY;
}
- if (nparams != 1)
- adapter = 0;
-
for (i = 0; i < This->npresent_backends; ++i)
{
- ZeroMemory(&dd, sizeof(dd));
- dd.cb = sizeof(dd);
- /* find final device name */
- if (!EnumDisplayDevicesW(device_name, adapter + i, &dd, 0))
- {
- WARN("Couldn't find subdevice %d from `%s'\n",
- i, nine_dbgstr_w(device_name));
- }
-
/* create an ID3DPresent for it */
- hr = present_create(gdi_display, dd.DeviceName, ¶ms[i],
+ hr = present_create(gdi_display, device_name, ¶ms[i],
focus_wnd, &This->present_backends[i], ex,
This->no_window_changes,
This->dri_backend, This->major, This->minor);
if (FAILED(hr))
@@ -1751,21 +1737,11 @@
goto cleanup;
}
-#ifndef NDEBUG
- char buf[16];
- sprintf(buf, "%d.%d\n",
- D3DADAPTER_DRIVER_PRESENT_VERSION_MAJOR,
- D3DADAPTER_DRIVER_PRESENT_VERSION_MINOR);
-
- if (!common_set_registry_string(reg_path_nine,
reg_key_debug_wine_present_version, buf))
- ERR("Failed to set registry key %s\n",
reg_key_debug_wine_present_version);
-#endif
-
return TRUE;
cleanup:
- printf("\033[1;31mNative Direct3D 9 will be unavailable."
- "\nFor more information visit " NINE_URL "\033[0m\n");
+ fprintf(stderr, "\033[1;31mNative Direct3D 9 will be unavailable."
+ "\nFor more information visit " NINE_URL "\033[0m\n");
if (handle)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wine-nine-standalone-0.5/d3d9-nine/present.h
new/wine-nine-standalone-0.6/d3d9-nine/present.h
--- old/wine-nine-standalone-0.5/d3d9-nine/present.h 2019-09-25
14:25:24.000000000 +0200
+++ new/wine-nine-standalone-0.6/d3d9-nine/present.h 2020-08-15
07:14:25.000000000 +0200
@@ -13,7 +13,7 @@
struct dri_backend;
-HRESULT present_create_present_group(Display *gdi_display, const WCHAR
*device_name, UINT adapter,
+HRESULT present_create_present_group(Display *gdi_display, const WCHAR
*device_name,
HWND focus, D3DPRESENT_PARAMETERS *params, unsigned nparams,
ID3DPresentGroup **group,
boolean ex, DWORD BehaviorFlags, struct dri_backend *dri_backend);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/wine-nine-standalone-0.5/d3d9-nine/shader_validator.h
new/wine-nine-standalone-0.6/d3d9-nine/shader_validator.h
--- old/wine-nine-standalone-0.5/d3d9-nine/shader_validator.h 2019-09-25
14:25:24.000000000 +0200
+++ new/wine-nine-standalone-0.6/d3d9-nine/shader_validator.h 2020-08-15
07:14:25.000000000 +0200
@@ -17,6 +17,6 @@
LONG ref;
} IDirect3DShaderValidator9Impl;
-const void *IDirect3DShaderValidator9Vtbl[6];
+extern const void *IDirect3DShaderValidator9Vtbl[6];
#endif /* __NINE_SHADER_VALIDATOR_H */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wine-nine-standalone-0.5/ninewinecfg/main.c
new/wine-nine-standalone-0.6/ninewinecfg/main.c
--- old/wine-nine-standalone-0.5/ninewinecfg/main.c 2019-09-25
14:25:24.000000000 +0200
+++ new/wine-nine-standalone-0.6/ninewinecfg/main.c 2020-08-15
07:14:25.000000000 +0200
@@ -597,61 +597,6 @@
return FALSE;
}
-#ifndef NDEBUG
-static void load_debug_settings(HWND dialog)
-{
- HMODULE hmod = NULL;
- HRESULT hr;
-
- /* Set defaults */
- set_dlg_string(dialog, IDC_GB_NINE_DEBUG, IDS_GB_NINE_DEBUG);
- set_dlg_string(dialog, IDC_TEXT_BACKEND, IDS_TEXT_BACKEND);
- set_dlg_string(dialog, IDC_TEXT_BACKEND_NAME, IDS_TEXT_UNKNOWN);
- set_dlg_string(dialog, IDC_TEXT_BACKEND_TIP, 0);
- set_dlg_string(dialog, IDC_TEXT_PRESENTATION_IFACE,
IDS_TEXT_PRESENTATION_IFACE);
- set_dlg_string(dialog, IDC_TEXT_PRESENTATION_IFACE_VER, IDS_TEXT_UNKNOWN);
-
- hmod = LoadLibraryA(fn_nine_dll);
-
- if (hmod)
- {
- IDirect3D9Ex *iface;
- LPDIRECT3DCREATE9EX Direct3DCreate9ExPtr;
- CHAR *value = NULL;
-
- Direct3DCreate9ExPtr = (LPDIRECT3DCREATE9EX)
- GetProcAddress(hmod, "Direct3DCreate9Ex");
-
- /* Create a device to update the stats */
- hr = Direct3DCreate9ExPtr(0, &iface);
- if (SUCCEEDED(hr))
- {
- IDirect3DDevice9_Release(iface);
- }
-
- if (common_get_registry_string(reg_path_nine,
- reg_key_debug_active_backend, &value))
- {
- SetDlgItemTextA(dialog, IDC_TEXT_BACKEND_NAME, value);
- if (!strcmp("dri2", value))
- set_dlg_string(dialog, IDC_TEXT_BACKEND_TIP,
- IDS_TEXT_BACKEND_TIP_DRI2);
-
- HeapFree(GetProcessHeap(), 0, value);
- }
-
- if (common_get_registry_string(reg_path_nine,
- reg_key_debug_wine_present_version, &value))
- {
- SetDlgItemTextA(dialog, IDC_TEXT_PRESENTATION_IFACE_VER, value);
- HeapFree(GetProcessHeap(), 0, value);
- }
-
- FreeLibrary(hmod);
- }
-}
-#endif
-
static INT_PTR CALLBACK AppDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
lParam)
{
switch (uMsg)
@@ -704,33 +649,14 @@
return FALSE;
}
-#ifndef NDEBUG
-static INT_PTR CALLBACK DebugDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam,
LPARAM lParam)
-{
- switch (uMsg)
- {
- case WM_INITDIALOG:
- load_debug_settings(hDlg);
- break;
- }
-
- return FALSE;
-}
-#endif
-
static INT_PTR
doPropertySheet (HINSTANCE hInstance, HWND hOwner)
{
-#ifndef NDEBUG
- PROPSHEETPAGEW psp[3];
-#else
PROPSHEETPAGEW psp[2];
-#endif
PROPSHEETHEADERW psh;
INT_PTR res;
WCHAR *tab_main = load_string(IDS_TAB_MAIN);
WCHAR *tab_about = load_string(IDS_TAB_ABOUT);
- WCHAR *tab_debug = load_string(IDS_TAB_DEBUG);
WCHAR *title = load_string(IDS_NINECFG_TITLE);
psp[0].dwSize = sizeof (PROPSHEETPAGEW);
@@ -751,17 +677,6 @@
psp[1].pszTitle = tab_about;
psp[1].lParam = 0;
-#ifndef NDEBUG
- psp[2].dwSize = sizeof (PROPSHEETPAGEW);
- psp[2].dwFlags = PSP_USETITLE;
- psp[2].hInstance = hInstance;
- psp[2].pszTemplate = MAKEINTRESOURCEW (IDD_DEBUG);
- psp[2].pszIcon = NULL;
- psp[2].pfnDlgProc = DebugDlgProc;
- psp[2].pszTitle = tab_debug;
- psp[2].lParam = 0;
-#endif
-
/*
* Fill out the PROPSHEETHEADER
*/
@@ -784,7 +699,6 @@
HeapFree(GetProcessHeap(), 0, title);
HeapFree(GetProcessHeap(), 0, tab_about);
HeapFree(GetProcessHeap(), 0, tab_main);
- HeapFree(GetProcessHeap(), 0, tab_debug);
return res;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wine-nine-standalone-0.5/ninewinecfg/ninewinecfg.rc
new/wine-nine-standalone-0.6/ninewinecfg/ninewinecfg.rc
--- old/wine-nine-standalone-0.5/ninewinecfg/ninewinecfg.rc 2019-09-25
14:25:24.000000000 +0200
+++ new/wine-nine-standalone-0.6/ninewinecfg/ninewinecfg.rc 2020-08-15
07:14:25.000000000 +0200
@@ -19,6 +19,7 @@
#include "nls/deu.rc"
#include "nls/fra.rc"
#include "nls/hun.rc"
+#include "nls/jpn.rc"
IDD_ABOUT DIALOG 0, 0, 260, 196
STYLE WS_CHILD | WS_DISABLED
@@ -36,18 +37,6 @@
CTEXT "Joakim Sindholt\nChristoph Bumiller\nTiziano Bacocco\nDavid
Heidelberg\nAxel Davy\nNick Sarnie\nPatrick Rudolph\nAndre
Heider",IDC_STATIC,16,112,228,64
END
-IDD_DEBUG DIALOG 0, 0, 260, 196
-STYLE WS_CHILD | WS_DISABLED
-FONT 8, "MS Shell Dlg"
-BEGIN
- GROUPBOX "",IDC_GB_NINE_DEBUG,8,8,244,188
- LTEXT "",IDC_TEXT_BACKEND,16,16,100,16, SS_LEFT | WS_GROUP |
BS_VCENTER
- LTEXT "",IDC_TEXT_BACKEND_NAME,108,16,132,16, SS_LEFT | WS_GROUP |
BS_VCENTER
- LTEXT "Tip",IDC_TEXT_BACKEND_TIP,32,28,210,16
- LTEXT "",IDC_TEXT_PRESENTATION_IFACE,16,42,140,16, SS_LEFT |
WS_GROUP | BS_VCENTER
- LTEXT "",IDC_TEXT_PRESENTATION_IFACE_VER,148,42,92,16, SS_LEFT |
WS_GROUP | BS_VCENTER
-END
-
IDD_NINE DIALOG 0, 0, 260, 196
STYLE WS_CHILD | WS_DISABLED
FONT 8, "MS Shell Dlg"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wine-nine-standalone-0.5/ninewinecfg/nls/eng.rc
new/wine-nine-standalone-0.6/ninewinecfg/nls/eng.rc
--- old/wine-nine-standalone-0.5/ninewinecfg/nls/eng.rc 2019-09-25
14:25:24.000000000 +0200
+++ new/wine-nine-standalone-0.6/ninewinecfg/nls/eng.rc 2020-08-15
07:14:25.000000000 +0200
@@ -9,15 +9,6 @@
BEGIN
IDS_TAB_MAIN "Global options"
IDS_TAB_ABOUT "About"
- IDS_TAB_DEBUG "Debug"
-
- IDS_TEXT_UNKNOWN "Unknown"
-
- IDS_GB_NINE_DEBUG "Stats"
- IDS_TEXT_BACKEND "Presentation backend:"
- IDS_TEXT_BACKEND_TIP_DRI2 "Try to enable 'Option \"DRI\" 3'
in your xorg.conf"
-
- IDS_TEXT_PRESENTATION_IFACE "Wine's presentation interface
version:"
IDS_GB_LICENSE "Licence"
IDS_GB_AUTHORS "Authors"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wine-nine-standalone-0.5/ninewinecfg/nls/jpn.rc
new/wine-nine-standalone-0.6/ninewinecfg/nls/jpn.rc
--- old/wine-nine-standalone-0.5/ninewinecfg/nls/jpn.rc 1970-01-01
01:00:00.000000000 +0100
+++ new/wine-nine-standalone-0.6/ninewinecfg/nls/jpn.rc 2020-08-15
07:14:25.000000000 +0200
@@ -0,0 +1,32 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright 2019 Masanori Kakura
+ */
+
+#pragma code_page(65001) /* UTF-8 */
+
+STRINGTABLE LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+BEGIN
+ IDS_TAB_MAIN "全体設定"
+ IDS_TAB_ABOUT "情報"
+
+ IDS_GB_LICENSE "ライセンス"
+ IDS_GB_AUTHORS "作者"
+ IDS_TEXT_MESA_DEP "Gallium Nine は MESA gallium
グラフィックス ドライバを必要とします"
+
+ IDS_TEXT_LOAD_D3DADAPTER "d3d9adapter9 の読み込みに成功"
+ IDS_TEXT_D3D9_NINE_LOAD "d3d9-nine.dll が読み込み可能"
+ IDS_TEXT_CREATE_D3D9_DEV "Direct3D 9 デバイスの作成に成功"
+
+ IDS_BTN_ENABLE_NINE "Gallium Nine を有効にして D3D9 のグラフィック
パフォーマンスを向上させる(&G)"
+
+ IDS_GB_NINE_SETTINGS "Gallium Nine の設定"
+ IDS_GB_INSTALL_STATE "インストールの状態"
+
+ IDS_NINECFG_TITLE "Nine 設定"
+
+ IDS_ERR_UNKNOWN "不明なエラーです"
+ IDS_ERR_OUTOFMEMORY "メモリ確保に失敗しました"
+ IDS_ERR_D3D_NOTAVAILABLE "対応する GPU が見つかりません。ハイブリッド
グラフィックス構成の場合、まず DRI_PRIME=1 を試してください"
+END
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wine-nine-standalone-0.5/ninewinecfg/resource.h
new/wine-nine-standalone-0.6/ninewinecfg/resource.h
--- old/wine-nine-standalone-0.5/ninewinecfg/resource.h 2019-09-25
14:25:24.000000000 +0200
+++ new/wine-nine-standalone-0.6/ninewinecfg/resource.h 2020-08-15
07:14:25.000000000 +0200
@@ -52,20 +52,6 @@
#define IDD_ABOUT 50
#define IDC_NINE_URL 51
-#define IDD_DEBUG 60
-#define IDS_TAB_DEBUG 61
-#define IDC_GB_NINE_DEBUG 62
-#define IDS_GB_NINE_DEBUG 63
-#define IDC_TEXT_BACKEND 64
-#define IDC_TEXT_BACKEND_NAME 65
-#define IDC_TEXT_BACKEND_TIP 66
-#define IDS_TEXT_BACKEND 67
-#define IDS_TEXT_UNKNOWN 68
-#define IDS_TEXT_BACKEND_TIP_DRI2 69
-#define IDC_TEXT_PRESENTATION_IFACE 70
-#define IDS_TEXT_PRESENTATION_IFACE 71
-#define IDC_TEXT_PRESENTATION_IFACE_VER 72
-
#define IDS_ERR_UNKNOWN 100
#define IDS_ERR_OUTOFMEMORY 101
#define IDS_ERR_D3D_NOTAVAILABLE 102
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wine-nine-standalone-0.5/tools/get_version.sh
new/wine-nine-standalone-0.6/tools/get_version.sh
--- old/wine-nine-standalone-0.5/tools/get_version.sh 2019-09-25
14:25:24.000000000 +0200
+++ new/wine-nine-standalone-0.6/tools/get_version.sh 2020-08-15
07:14:25.000000000 +0200
@@ -1,7 +1,7 @@
#!/bin/sh -e
MAJOR=0
-MINOR=5
+MINOR=6
BUILD=0
REVISION=`git rev-list --count HEAD 2>/dev/null || echo "0"`
STAGE="release"
