This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
0c70bd4e25
commit
ecca4191fc
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:674c18c7c6d2a5af8be4f073892323ad312e0924c9bde2123bd2391cb57279b6
|
||||
size 13911896
|
||||
3
wine-0.9.63_aka_1.0.rc2.tar.bz2
Normal file
3
wine-0.9.63_aka_1.0.rc2.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ce5f81aebb77187bfa19ce64be797c4795b82fed387823a844fdb5d42f87e728
|
||||
size 13913212
|
||||
@ -1,47 +0,0 @@
|
||||
--- dlls/dsound/mixer.c
|
||||
+++ dlls/dsound/mixer.c
|
||||
@@ -238,29 +238,26 @@
|
||||
offset = event->dwOffset;
|
||||
TRACE("checking %d, position %d, event = %p\n",
|
||||
i, offset, event->hEventNotify);
|
||||
- /* DSBPN_OFFSETSTOP has to be the last element. So this is */
|
||||
- /* OK. [Inside DirectX, p274] */
|
||||
- /* */
|
||||
- /* This also means we can't sort the entries by offset, */
|
||||
- /* because DSBPN_OFFSETSTOP == -1 */
|
||||
+ /* DSBPN_OFFSETSTOP is not necessarily the last element. */
|
||||
if (offset == DSBPN_OFFSETSTOP) {
|
||||
if (dsb->state == STATE_STOPPED) {
|
||||
SetEvent(event->hEventNotify);
|
||||
TRACE("signalled event %p (%d)\n", event->hEventNotify, i);
|
||||
- return;
|
||||
- } else
|
||||
- return;
|
||||
- }
|
||||
- if ((playpos + len) >= dsb->buflen) {
|
||||
- if ((offset < ((playpos + len) % dsb->buflen)) ||
|
||||
- (offset >= playpos)) {
|
||||
- TRACE("signalled event %p (%d)\n", event->hEventNotify, i);
|
||||
- SetEvent(event->hEventNotify);
|
||||
}
|
||||
- } else {
|
||||
- if ((offset >= playpos) && (offset < (playpos + len))) {
|
||||
- TRACE("signalled event %p (%d)\n", event->hEventNotify, i);
|
||||
- SetEvent(event->hEventNotify);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ if ((playpos + len) >= dsb->buflen) {
|
||||
+ if ((offset < ((playpos + len) % dsb->buflen)) ||
|
||||
+ (offset >= playpos)) {
|
||||
+ TRACE("signalled event %p (%d)\n", event->hEventNotify, i);
|
||||
+ SetEvent(event->hEventNotify);
|
||||
+ }
|
||||
+ } else {
|
||||
+ if ((offset >= playpos) && (offset < (playpos + len))) {
|
||||
+ TRACE("signalled event %p (%d)\n", event->hEventNotify, i);
|
||||
+ SetEvent(event->hEventNotify);
|
||||
+ }
|
||||
}
|
||||
}
|
||||
}
|
||||
12
wine.changes
12
wine.changes
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri May 23 18:47:45 CEST 2008 - meissner@suse.de
|
||||
|
||||
- Upgraded to upstream 1.0-rc2 (labeled 0.9.63_aka_1.0.rc2
|
||||
to avoid update problems to 1.0)
|
||||
- Bug fixes only, we are in code freeze.
|
||||
- merged in ulis fixes into local GIT
|
||||
- updated to current winetricks
|
||||
- directx9 downloader (for the helper dlls)
|
||||
- bugfixes
|
||||
- mfc42 alias
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 16 11:46:40 CEST 2008 - uli@suse.de
|
||||
|
||||
|
||||
25
wine.spec
25
wine.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package wine (Version 0.9.62_aka_1.0.rc1)
|
||||
# spec file for package wine (Version 0.9.63_aka_1.0.rc2)
|
||||
#
|
||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@ -16,16 +16,14 @@ BuildRequires: alsa-devel bison capi4linux-devel cups-devel desktop-file-utils
|
||||
License: LGPL v2.1 or later
|
||||
Group: System/Emulators/PC
|
||||
AutoReqProv: on
|
||||
Version: 0.9.62_aka_1.0.rc1
|
||||
Release: 4
|
||||
Version: 0.9.63_aka_1.0.rc2
|
||||
Release: 1
|
||||
Summary: An MS Windows Emulator
|
||||
Url: http://www.winehq.com
|
||||
Source0: wine-%version.tar.bz2
|
||||
Source1: http://kegel.com/wine/winetricks
|
||||
Source3: README.SuSE
|
||||
Source4: wine.desktop
|
||||
Patch: winegcc-m32.aptch
|
||||
Patch1: wine-dsound-notify.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
@ -58,8 +56,6 @@ libraries.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch
|
||||
%patch1
|
||||
#
|
||||
cp %{S:3} .
|
||||
#
|
||||
@ -97,11 +93,9 @@ mv $RPM_BUILD_ROOT/%{_mandir}/fr.UTF-8 $RPM_BUILD_ROOT/%{_mandir}/fr
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post
|
||||
%run_ldconfig
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%postun
|
||||
%run_ldconfig
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
@ -124,6 +118,15 @@ rm -rf $RPM_BUILD_ROOT
|
||||
/usr/share/aclocal/wine.m4
|
||||
|
||||
%changelog
|
||||
* Fri May 23 2008 meissner@suse.de
|
||||
- Upgraded to upstream 1.0-rc2 (labeled 0.9.63_aka_1.0.rc2
|
||||
to avoid update problems to 1.0)
|
||||
- Bug fixes only, we are in code freeze.
|
||||
- merged in ulis fixes into local GIT
|
||||
- updated to current winetricks
|
||||
- directx9 downloader (for the helper dlls)
|
||||
- bugfixes
|
||||
- mfc42 alias
|
||||
* Fri May 16 2008 uli@suse.de
|
||||
- always use -m32/--32/-m elf_i386, even on x86 (allows x86
|
||||
devel tools to work on AMD64)
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- configure.ac
|
||||
+++ configure.ac
|
||||
@@ -79,7 +79,7 @@
|
||||
|
||||
AC_CANONICAL_HOST
|
||||
case $host in
|
||||
- x86_64*linux*)
|
||||
+ x86_64*linux*|*i[[3456789]]86*)
|
||||
if test "x$enable_win64" != "xyes"
|
||||
then
|
||||
test -n "$CC" || CC="gcc -m32"
|
||||
566
winetricks
566
winetricks
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user