From nobody@FreeBSD.org  Tue Jun 28 19:41:00 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B724F1065674
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 28 Jun 2011 19:41:00 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 9D71B8FC1E
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 28 Jun 2011 19:41:00 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p5SJf08T047809
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 28 Jun 2011 19:41:00 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p5SJf0ZX047808;
	Tue, 28 Jun 2011 19:41:00 GMT
	(envelope-from nobody)
Message-Id: <201106281941.p5SJf0ZX047808@red.freebsd.org>
Date: Tue, 28 Jun 2011 19:41:00 GMT
From: David Naylor <naylor.b.david@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] update wine 1.3.21 -> 1.3.23
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         158406
>Category:       ports
>Synopsis:       [patch] update emulators/wine 1.3.21 -> 1.3.23
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gerald
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 28 19:50:06 UTC 2011
>Closed-Date:    Tue Jul 19 21:26:26 UTC 2011
>Last-Modified:  Tue Jul 19 21:26:26 UTC 2011
>Originator:     David Naylor
>Release:        FreeBSD
>Organization:
Private
>Environment:
>Description:
Update wine from 1.3.21 to 1.3.23, also add support for XInput2 (required for some games to run properly, relating to mouse warping) and properly handle the OpenAL option.  
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -u /usr/ports/emulators/wine/Makefile wine/Makefile
--- /usr/ports/emulators/wine/Makefile	2011-06-06 04:08:38.000000000 +0200
+++ wine/Makefile	2011-06-25 15:21:26.000000000 +0200
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	wine
-DISTVERSION=	1.3.21
-PORTREVISION=	1
+DISTVERSION=	1.3.23
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
@@ -23,7 +22,8 @@
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
 		lcms.1:${PORTSDIR}/graphics/lcms \
 		png.6:${PORTSDIR}/graphics/png \
-		xml2:${PORTSDIR}/textproc/libxml2
+		xml2:${PORTSDIR}/textproc/libxml2 \
+		libXi.6:${PORTSDIR}/x11/libXi
 
 LICENSE=	LGPL21 LGPL3
 LICENSE_COMB=	dual
@@ -107,8 +107,10 @@
 .ifdef WITH_OPENAL
 CONFIGURE_ARGS+=	--with-openal
 USE_OPENAL=		yes
+PLIST_SUB=		OPENAL=""
 .else
 CONFIGURE_ARGS+=	--without-openal
+PLIST_SUB=		OPENAL="@comment "
 .endif
 
 .ifdef WITH_WINEMAKER
@@ -134,7 +136,8 @@
 	          ${MAN1PREFIX}/man/de.UTF-8/man1/wineserver.1 \
 	          ${MAN1PREFIX}/man/fr.UTF-8/man1/wine.1 \
 	          ${MAN1PREFIX}/man/fr.UTF-8/man1/winemaker.1 \
-	          ${MAN1PREFIX}/man/fr.UTF-8/man1/wineserver.1
+	          ${MAN1PREFIX}/man/fr.UTF-8/man1/wineserver.1 \
+	          ${MAN1PREFIX}/man/pl.UTF-8/man1/wine.1
 	@-${RMDIR} -p ${MAN1PREFIX}/man/de.UTF-8/man1 \
 	              ${MAN1PREFIX}/man/fr.UTF-8/man1
 	${MV} -f ${WINELIBDIR}/libwine.so.1.0 ${WINELIBDIR}/libwine.so.1
diff -u /usr/ports/emulators/wine/distinfo wine/distinfo
--- /usr/ports/emulators/wine/distinfo	2011-05-30 04:31:19.000000000 +0200
+++ wine/distinfo	2011-06-25 13:47:17.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (wine-1.3.21.tar.bz2) = 6c089df0d164c442a5620f7b5eee48ab21fd746a75793731cc3a028b20df57a0
-SIZE (wine-1.3.21.tar.bz2) = 19371426
+SHA256 (wine-1.3.23.tar.bz2) = 386c8939c5881b4625b045356a18ed7c7b20eab693f643e17185c96bac084792
+SIZE (wine-1.3.23.tar.bz2) = 19474860
Common subdirectories: /usr/ports/emulators/wine/files and wine/files
diff -u /usr/ports/emulators/wine/pkg-plist wine/pkg-plist
--- /usr/ports/emulators/wine/pkg-plist	2011-05-30 04:31:19.000000000 +0200
+++ wine/pkg-plist	2011-06-25 15:27:49.000000000 +0200
@@ -255,8 +255,8 @@
 include/wine/windows/dxfile.h
 include/wine/windows/dxgi.h
 include/wine/windows/dxgi.idl
+include/wine/windows/dxgiformat.h
 include/wine/windows/dxgitype.h
-include/wine/windows/dxgitype.idl
 include/wine/windows/dyngraph.idl
 include/wine/windows/endpointvolume.h
 include/wine/windows/endpointvolume.idl
@@ -271,6 +271,7 @@
 include/wine/windows/exdispid.h
 include/wine/windows/fci.h
 include/wine/windows/fdi.h
+include/wine/windows/fltdefs.h
 include/wine/windows/fusion.h
 include/wine/windows/fusion.idl
 include/wine/windows/gameux.h
@@ -303,6 +304,8 @@
 include/wine/windows/icm.h
 include/wine/windows/icmpapi.h
 include/wine/windows/idispids.h
+include/wine/windows/iextag.h
+include/wine/windows/iextag.idl
 include/wine/windows/ifdef.h
 include/wine/windows/imagehlp.h
 include/wine/windows/imm.h
@@ -1104,6 +1107,7 @@
 lib/wine/fakedlls/olesvr32.dll
 lib/wine/fakedlls/olethk32.dll
 lib/wine/fakedlls/oleview.exe
+%%OPENAL%%lib/wine/fakedlls/openal32.dll
 lib/wine/fakedlls/opengl32.dll
 lib/wine/fakedlls/pdh.dll
 lib/wine/fakedlls/pidgen.dll
@@ -1202,6 +1206,7 @@
 lib/wine/fakedlls/userenv.dll
 lib/wine/fakedlls/usp10.dll
 lib/wine/fakedlls/uxtheme.dll
+lib/wine/fakedlls/vbscript.dll
 lib/wine/fakedlls/vcomp.dll
 lib/wine/fakedlls/vdhcp.vxd
 lib/wine/fakedlls/vdmdbg.dll
@@ -1595,6 +1600,7 @@
 lib/wine/olesvr32.dll.so
 lib/wine/olethk32.dll.so
 lib/wine/oleview.exe.so
+%%OPENAL%%lib/wine/openal32.dll.so
 lib/wine/opengl32.dll.so
 lib/wine/pdh.dll.so
 lib/wine/pidgen.dll.so
@@ -1693,6 +1699,7 @@
 lib/wine/userenv.dll.so
 lib/wine/usp10.dll.so
 lib/wine/uxtheme.dll.so
+lib/wine/vbscript.dll.so
 lib/wine/vcomp.dll.so
 lib/wine/vdhcp.vxd.so
 lib/wine/vdmdbg.dll.so


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->gerald 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Tue Jun 28 20:39:19 UTC 2011 
Responsible-Changed-Why:  
Fix synopsis and assign. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=158406 

From: Alex Kozlov <spam@rm-rf.kiev.ua>
To: bug-followup@FreeBSD.org, naylor.b.david@gmail.com, gerald@freebsd.org,
	spam@rm-rf.kiev.ua
Cc:  
Subject: Re: ports/158406: [patch] update emulators/wine 1.3.21 -> 1.3.23
Date: Mon, 4 Jul 2011 01:36:32 +0300

 Hi, David
 
 Please use USE_XORG+= xi, btw are You sure that freebsd xorg-server(1.7.7)
 supports xinput2?
 Also You can remove redudant ${OSVERSION} < 700041 check.
 
 p.s. 1.3.23 have some nasty regressions in wine3d that can be observed in
 Age of Mythology: the Titans Demo for example, so maybe You want to hold update
 a little, Gerald.
 On the other hand, this is wine we talking about, they always break something.
 
 
 --
 Adios

From: David Naylor <naylor.b.david@gmail.com>
To: Alex Kozlov <spam@rm-rf.kiev.ua>
Cc: bug-followup@freebsd.org,
 gerald@freebsd.org
Subject: Re: ports/158406: [patch] update emulators/wine 1.3.21 -> 1.3.23
Date: Wed, 6 Jul 2011 17:18:47 +0200

 --Boundary-00=_ozHFOsS6C52VDar
 Content-Type: Text/Plain;
   charset="us-ascii"
 Content-Transfer-Encoding: 7bit
 
 On Monday 04 July 2011 00:36:32 Alex Kozlov wrote:
 > Hi, David
 
 Hi
 
 > Please use USE_XORG+= xi, btw are You sure that freebsd xorg-server(1.7.7)
 > supports xinput2?
 
 I remember reading that Xorg-server 1.9 was the first to support XInput2.  
 That said I am running xorg-server-1.7.7 and adding libXi fixes the mouse warp 
 for me.  Emperically, I would say having libXi is enough to fix the problem, 
 regardless of Xorg-server version.  
 
 > Also You can remove redudant ${OSVERSION} < 700041 check.
 
 Done, see attached
 
 > p.s. 1.3.23 have some nasty regressions in wine3d that can be observed in
 > Age of Mythology: the Titans Demo for example, so maybe You want to hold
 > update a little, Gerald.
 > On the other hand, this is wine we talking about, they always break
 > something.
 
 I agree.  There are probably some programs that work properly under 1.3.23. 
 for example Civilization V.  
 
 --Boundary-00=_ozHFOsS6C52VDar
 Content-Type: text/x-patch;
   charset="ISO-8859-1";
   name="wine.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
 	filename="wine.diff"
 
 diff -u /usr/ports/emulators/wine/Makefile wine/Makefile
 --- /usr/ports/emulators/wine/Makefile	2011-07-04 03:24:35.000000000 +0200
 +++ wine/Makefile	2011-07-06 17:17:17.000000000 +0200
 @@ -3,12 +3,11 @@
  # Date created:         Sa   9 Nov 1996 00:52:22 MET
  # Whom:			se
  #
 -# $FreeBSD: ports/emulators/wine/Makefile,v 1.375 2011/07/03 15:39:11 gerald Exp $
 +# $FreeBSD$
  #
  
  PORTNAME=	wine
 -DISTVERSION=	1.3.22
 -PORTREVISION=	1
 +DISTVERSION=	1.3.23
  PORTEPOCH=	1
  CATEGORIES=	emulators
  MASTER_SITES=	SF/${PORTNAME}/Source \
 @@ -54,7 +53,7 @@
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_GL=		glu
 -USE_XORG=	xcursor xpm xrandr xrender
 +USE_XORG=	xcursor xi xpm xrandr xrender
  
  SUB_FILES=	pkg-message
  PKGMESSAGE=	${WRKDIR}/pkg-message
 @@ -107,8 +106,10 @@
  .ifdef WITH_OPENAL
  CONFIGURE_ARGS+=	--with-openal
  USE_OPENAL=		yes
 +PLIST_SUB=		OPENAL=""
  .else
  CONFIGURE_ARGS+=	--without-openal
 +PLIST_SUB=		OPENAL="@comment "
  .endif
  
  .ifdef WITH_WINEMAKER
 @@ -119,12 +120,6 @@
  IGNORE=		lacks required sound support on FreeBSD before 8.0
  .endif
  
 -post-patch:
 -.if ${OSVERSION} < 700041
 -	${REINPLACE_CMD} 's/-lpthread/-lthr/g' ${WRKSRC}/configure
 -	${REINPLACE_CMD} '/ac_hal_libs=/s/"$$/ -lthr"/' ${WRKSRC}/configure
 -.endif
 -
  pre-build:
  	cd ${WRKSRC} && ${GMAKE} depend
  
 @@ -137,8 +132,7 @@
  	          ${MAN1PREFIX}/man/fr.UTF-8/man1/wineserver.1 \
  	          ${MAN1PREFIX}/man/pl.UTF-8/man1/wine.1
  	@-${RMDIR} -p ${MAN1PREFIX}/man/de.UTF-8/man1 \
 -	              ${MAN1PREFIX}/man/fr.UTF-8/man1 \
 -	              ${MAN1PREFIX}/man/pl.UTF-8/man1
 +	              ${MAN1PREFIX}/man/fr.UTF-8/man1
  	${MV} -f ${WINELIBDIR}/libwine.so.1.0 ${WINELIBDIR}/libwine.so.1
  	${LN} -sf libwine.so.1 ${WINELIBDIR}/libwine.so
  .if !defined(NOPORTDOCS)
 diff -u /usr/ports/emulators/wine/distinfo wine/distinfo
 --- /usr/ports/emulators/wine/distinfo	2011-07-04 03:24:35.000000000 +0200
 +++ wine/distinfo	2011-06-25 13:47:17.000000000 +0200
 @@ -1,2 +1,2 @@
 -SHA256 (wine-1.3.22.tar.bz2) = 87c05c140c7e316f9533f01e888952221880d047be33ca25b4a343c19aa9a586
 -SIZE (wine-1.3.22.tar.bz2) = 19393697
 +SHA256 (wine-1.3.23.tar.bz2) = 386c8939c5881b4625b045356a18ed7c7b20eab693f643e17185c96bac084792
 +SIZE (wine-1.3.23.tar.bz2) = 19474860
 Common subdirectories: /usr/ports/emulators/wine/files and wine/files
 diff -u /usr/ports/emulators/wine/pkg-plist wine/pkg-plist
 --- /usr/ports/emulators/wine/pkg-plist	2011-07-04 03:24:35.000000000 +0200
 +++ wine/pkg-plist	2011-07-06 17:18:12.000000000 +0200
 @@ -255,8 +255,8 @@
  include/wine/windows/dxfile.h
  include/wine/windows/dxgi.h
  include/wine/windows/dxgi.idl
 +include/wine/windows/dxgiformat.h
  include/wine/windows/dxgitype.h
 -include/wine/windows/dxgitype.idl
  include/wine/windows/dyngraph.idl
  include/wine/windows/endpointvolume.h
  include/wine/windows/endpointvolume.idl
 @@ -1107,6 +1107,7 @@
  lib/wine/fakedlls/olesvr32.dll
  lib/wine/fakedlls/olethk32.dll
  lib/wine/fakedlls/oleview.exe
 +%%OPENAL%%lib/wine/fakedlls/openal32.dll
  lib/wine/fakedlls/opengl32.dll
  lib/wine/fakedlls/pdh.dll
  lib/wine/fakedlls/pidgen.dll
 @@ -1205,6 +1206,7 @@
  lib/wine/fakedlls/userenv.dll
  lib/wine/fakedlls/usp10.dll
  lib/wine/fakedlls/uxtheme.dll
 +lib/wine/fakedlls/vbscript.dll
  lib/wine/fakedlls/vcomp.dll
  lib/wine/fakedlls/vdhcp.vxd
  lib/wine/fakedlls/vdmdbg.dll
 @@ -1598,6 +1600,7 @@
  lib/wine/olesvr32.dll.so
  lib/wine/olethk32.dll.so
  lib/wine/oleview.exe.so
 +%%OPENAL%%lib/wine/openal32.dll.so
  lib/wine/opengl32.dll.so
  lib/wine/pdh.dll.so
  lib/wine/pidgen.dll.so
 @@ -1696,6 +1699,7 @@
  lib/wine/userenv.dll.so
  lib/wine/usp10.dll.so
  lib/wine/uxtheme.dll.so
 +lib/wine/vbscript.dll.so
  lib/wine/vcomp.dll.so
  lib/wine/vdhcp.vxd.so
  lib/wine/vdmdbg.dll.so
 
 --Boundary-00=_ozHFOsS6C52VDar--

From: Alex Kozlov <spam@rm-rf.kiev.ua>
To: David Naylor <naylor.b.david@gmail.com>, gerald@freebsd.org,
	bug-followup@freebsd.org, spam@rm-rf.kiev.ua
Cc:  
Subject: Re: ports/158406: [patch] update emulators/wine 1.3.21 -> 1.3.23
Date: Sat, 9 Jul 2011 01:54:05 +0300

 On Wed, Jul 06, 2011 at 05:18:47PM +0200, David Naylor wrote:
 > On Monday 04 July 2011 00:36:32 Alex Kozlov wrote:
 >> Please use USE_XORG+= xi, btw are You sure that freebsd xorg-server(1.7.7)
 >> supports xinput2?
 > I remember reading that Xorg-server 1.9 was the first to support XInput2.
 > That said I am running xorg-server-1.7.7 and adding libXi fixes the mouse warp
 > for me.  Emperically, I would say having libXi is enough to fix the problem,
 > regardless of Xorg-server version.
 I did some research and it seems that xinput2 appeared in xserver 1.7,
 although issues with it still exists even in current version
 (e.g. https://bugs.freedesktop.org/show_bug.cgi?id=30068). However I don't
 think that disabling xinput2 is a good idea.
 
 >> p.s. 1.3.23 have some nasty regressions in wine3d that can be observed in
 >> Age of Mythology: the Titans Demo for example, so maybe You want to hold
 >> update a little, Gerald.
 >> On the other hand, this is wine we talking about, they always break
 >> something.
 > I agree.  There are probably some programs that work properly under 1.3.23.
 > for example Civilization V.
 Can You please update patch to 1.3.24?
 
 
 --
 Adios

From: Gerald Pfeifer <gerald@pfeifer.com>
To: bug-followup@freebsd.org, Alex Kozlov <spam@rm-rf.kiev.ua>
Cc: David Naylor <naylor.b.david@gmail.com>
Subject: Re: ports/158406: [patch] update emulators/wine 1.3.21 -> 1.3.23
Date: Sat, 9 Jul 2011 00:59:17 +0200 (CEST)

 On Sat, 9 Jul 2011, Alex Kozlov wrote:
 > Can You please update patch to 1.3.24?
 
 I'll take care of that.  Let me apply David's original patch for 1.3.23
 for now (this weekend), just leaving the X issue open which I'd like to
 understand a bit better.
 
 Gerald

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/158406: commit references a PR
Date: Fri,  8 Jul 2011 23:15:51 +0000 (UTC)

 gerald      2011-07-08 23:15:38 UTC
 
   FreeBSD ports repository
 
   Modified files:
     emulators/wine       Makefile distinfo pkg-plist 
   Log:
   Update to Wine 1.3.23.  This includes the following changes:
    - Support for stubless COM proxies on x86-64.
    - Builtin dxdiag now outputs real information.
    - Monochrome bitmap format in the DIB engine.
    - Beginnings of a true shell Explorer builtin.
    - A number of new D3DX9 functions.
    - More support for Indic text shaping.
    - Various bug fixes.
   
   Also fix pkg-plist with respect to the USE_OPENAL option.
   
   Remove an obsolete (pre FreeBSD 7.x) post-patch target. [1]
   
   PR:             158406
   Submitted by:   David Naylor <naylor.b.david@gmail.com>
   Reported by:    Alex Kozlov <spam@rm-rf.kiev.ua> [1]
   
   Revision  Changes    Path
   1.376     +3 -8      ports/emulators/wine/Makefile
   1.232     +2 -2      ports/emulators/wine/distinfo
   1.196     +5 -1      ports/emulators/wine/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: Alex Kozlov <spam@rm-rf.kiev.ua>
To: Gerald Pfeifer <gerald@pfeifer.com>,
	David Naylor <naylor.b.david@gmail.com>, bug-followup@freebsd.org,
	spam@rm-rf.kiev.ua
Cc:  
Subject: Re: ports/158406: [patch] update emulators/wine 1.3.21 -> 1.3.23
Date: Sat, 9 Jul 2011 08:41:00 +0300

 On Sat, Jul 09, 2011 at 12:59:17AM +0200, Gerald Pfeifer wrote:
 > On Sat, 9 Jul 2011, Alex Kozlov wrote:
 >> Can You please update patch to 1.3.24?
 > I'll take care of that.  Let me apply David's original patch for 1.3.23
 > for now (this weekend),
 Thanks.
 
 > just leaving the X issue open which I'd like to > understand a bit better.
 Technically, addition xi to USE_XORG just a formality, because libXi
 already installed as a dependency for xserver, and wine's configure
 autodetects it and enables xinput2. But You are right, disabling xinput2 or
 not is somewhat difficult question that worth thinking about, especially
 because we won't get xserver 1.9 and recent xinput fixes anytime soon.
 
 
 --
 Adios
State-Changed-From-To: open->closed 
State-Changed-By: gerald 
State-Changed-When: Tue Jul 19 21:25:51 UTC 2011 
State-Changed-Why:  
Port has been updated a bit ago. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=158406 
>Unformatted:
