From 024b5b9bf9391fd66ffe3e91326f305c9eb97424 Mon Sep 17 00:00:00 2001
From: gerald <gerald@FreeBSD.org>
Date: Sun, 14 Sep 2014 11:50:41 +0000
Subject: Update to Wine 1.7.26.  This includes the following changes:  - Still
 more DirectWrite functions.  - Improvements to the common File Dialog.  - A
 number of C runtime improvements.  - Various bug fixes.

Add two new options MPG123 and V4L that pull in and leverage the respective
ports for MP3 and Video support. [1]

Sort OPTIONS alphabetically, except for the two that pull in Gecko and Mono
MSI packages for run-time support.

Submitted by:	kmoore [1]
---
 emulators/wine-devel/Makefile  | 16 ++++++++++------
 emulators/wine-devel/distinfo  |  8 ++++----
 emulators/wine-devel/pkg-plist |  6 ++++++
 3 files changed, 20 insertions(+), 10 deletions(-)

(limited to 'emulators')

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 6b9ff2c7be59..0fae61798f94 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wine
-DISTVERSION=	1.7.25
-PORTREVISION=	1
+DISTVERSION=	1.7.26
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
@@ -30,9 +29,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--verbose --disable-tests \
 		--without-alsa --without-capi --without-dbus \
 		--without-gphoto --without-gsm --without-gstreamer \
-		--without-mpg123 --without-opencl \
-		--with-oss --without-sane --without-tiff \
-		--without-v4l --with-xcomposite --without-xinerama
+		--without-opencl --with-oss --without-sane --without-tiff \
+		--with-xcomposite --without-xinerama
 CONFIGURE_ENV=	FLEX="${LOCALBASE}/bin/flex"
 WINELIBDIR?=	${PREFIX}/lib
 .if !defined(USE_LDCONFIG32)
@@ -45,7 +43,7 @@ SHEBANG_FILES=	tools/winemaker tools/winedump/function_grep.pl
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-OPTIONS_DEFINE=	COMPHOLIO CUPS DOCS DOSBOX GNUTLS HAL LDAP LIBXSLT OPENAL WINEMAKER GECKO MONO X11
+OPTIONS_DEFINE=	COMPHOLIO CUPS DOCS DOSBOX GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL V4L WINEMAKER X11 GECKO MONO
 OPTIONS_DEFAULT=X11
 OPTIONS_SUB=	yes
 
@@ -78,9 +76,15 @@ LIBXSLT_LIB_DEPENDS=	libxslt.so:${PORTSDIR}/textproc/libxslt
 
 MONO_RUN_DEPENDS=	${DATADIR}/mono/wine-mono-4.5.2.msi:${PORTSDIR}/emulators/wine-mono-devel
 
+MPG123_CONFIGURE_WITH=	mpg123
+MPG123_LIB_DEPENDS=	libmpg123.so:${PORTSDIR}/audio/mpg123
+
 OPENAL_CONFIGURE_WITH=	openal
 OPENAL_USES=		openal
 
+V4L_CONFIGURE_WITH=	v4l
+V4L_LIB_DEPENDS=	libv4l1.so:${PORTSDIR}/multimedia/libv4l
+
 WINEMAKER_RUN_DEPENDS=	p5-XML-LibXML>0:${PORTSDIR}/textproc/p5-XML-LibXML
 
 X11_CONFIGURE_WITH=	x fontconfig glu opengl xinput2 xrandr freetype
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index 9d44de308896..449ab16ecce7 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,4 +1,4 @@
-SHA256 (wine-1.7.25.tar.bz2) = f5e35e82e57d49e83d3246a9d84684ecd095705628db59ac0516dab2bb8cf540
-SIZE (wine-1.7.25.tar.bz2) = 21732817
-SHA256 (v1.7.25.tar.gz) = aed651e819f996deb4f12259a596f8c970fdfa0bcd25f94bac357502e7310295
-SIZE (v1.7.25.tar.gz) = 8340792
+SHA256 (wine-1.7.26.tar.bz2) = e20c7c26a3bd887afac655a274335923ae7ccf4053383e4edbb0c290aadb5de8
+SIZE (wine-1.7.26.tar.bz2) = 21708411
+SHA256 (v1.7.26.tar.gz) = e1b9bba860467fa0914d804e07f99ce0491f3f21cc6e1c061674a7667093d751
+SIZE (v1.7.26.tar.gz) = 8358571
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index b1f3c76f4ff2..c19f3acc32c2 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -979,6 +979,7 @@ lib/wine/dpnet.dll.so
 lib/wine/dpnhpast.dll.so
 lib/wine/dpnlobby.dll.so
 lib/wine/dpnsvr.exe.so
+lib/wine/dpvoice.dll.so
 lib/wine/dpwsockx.dll.so
 lib/wine/drmclien.dll.so
 lib/wine/dsound.dll.so
@@ -1187,6 +1188,7 @@ lib/wine/fakedlls/dpnet.dll
 lib/wine/fakedlls/dpnhpast.dll
 lib/wine/fakedlls/dpnlobby.dll
 lib/wine/fakedlls/dpnsvr.exe
+lib/wine/fakedlls/dpvoice.dll
 lib/wine/fakedlls/dpwsockx.dll
 lib/wine/fakedlls/drmclien.dll
 lib/wine/fakedlls/dsound.dll
@@ -1353,6 +1355,7 @@ lib/wine/fakedlls/ngen.exe
 lib/wine/fakedlls/normaliz.dll
 lib/wine/fakedlls/notepad.exe
 lib/wine/fakedlls/npmshtml.dll
+lib/wine/fakedlls/npptools.dll
 lib/wine/fakedlls/ntdll.dll
 lib/wine/fakedlls/ntdsapi.dll
 lib/wine/fakedlls/ntoskrnl.exe
@@ -1529,6 +1532,7 @@ lib/wine/fakedlls/winefile.exe
 lib/wine/fakedlls/winemapi.dll
 lib/wine/fakedlls/winemenubuilder.exe
 lib/wine/fakedlls/winemine.exe
+%%MPG123%%lib/wine/fakedlls/winemp3.acm
 lib/wine/fakedlls/winemsibuilder.exe
 lib/wine/fakedlls/wineoss.drv
 lib/wine/fakedlls/winepath.exe
@@ -1913,6 +1917,7 @@ lib/wine/ngen.exe.so
 lib/wine/normaliz.dll.so
 lib/wine/notepad.exe.so
 lib/wine/npmshtml.dll.so
+lib/wine/npptools.dll.so
 lib/wine/ntdll.dll.so
 lib/wine/ntdsapi.dll.so
 lib/wine/ntoskrnl.exe.so
@@ -2091,6 +2096,7 @@ lib/wine/winemenubuilder.exe.so
 lib/wine/winemine.exe.so
 lib/wine/winemsibuilder.exe.so
 lib/wine/wineoss.drv.so
+%%MPG123%%lib/wine/winemp3.acm.so
 lib/wine/winepath.exe.so
 lib/wine/wineps.drv.so
 lib/wine/wineps16.drv16.so
-- 
cgit