Attachment 150292 Details for Bug 195765 – patch-wine-devel.diff

[patch] patch-wine-devel.diff

patch-wine-devel.diff (text/plain), 7.52 KB, created by Andriy Voskoboinyk on 2014-12-07 01:22:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Voskoboinyk

Created: 2014-12-07 01:22:38 UTC

Size: 7.52 KB

patch

obsolete

>Index: emulators/wine-devel/Makefile
>===================================================================
>--- emulators/wine-devel/Makefile	(revision 373847)
>+++ emulators/wine-devel/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	wine
> DISTVERSION=	1.7.32
>+PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	emulators
> MASTER_SITES=	SF/${PORTNAME}/Source \
>@@ -28,9 +29,10 @@
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS+=--verbose --disable-tests \
> 		--without-alsa --without-capi --without-dbus \
>-		--without-gphoto --without-gsm --without-gstreamer \
>-		--without-opencl --with-oss --without-sane --without-tiff \
>-		--with-xcomposite --without-xinerama
>+		--without-gettextpo --without-gphoto --without-gsm \
>+		--without-gstreamer --without-opencl --without-osmesa \
>+		--with-oss --without-sane --without-tiff --with-xcomposite \
>+		--without-xinerama
> CONFIGURE_ENV=	FLEX="${LOCALBASE}/bin/flex"
> WINELIBDIR?=	${PREFIX}/lib
> .if !defined(USE_LDCONFIG32)
>@@ -37,14 +39,16 @@
> USE_LDCONFIG=	${WINELIBDIR} ${WINELIBDIR}/wine
> .endif
> ONLY_FOR_ARCHS=	i386
>-USES=		bison compiler:c11 gmake shebangfix tar:bzip2
>-SHEBANG_FILES=	tools/winemaker tools/winedump/function_grep.pl
>+USES=		bison compiler:c11 desktop-file-utils gmake shebangfix tar:bzip2
>+SHEBANG_FILES=	tools/make_requests 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 MPG123 OPENAL V4L WINEMAKER X11 GECKO MONO
>-OPTIONS_DEFAULT=X11
>+OPTIONS_DEFINE=	COMPHOLIO CUPS DOCS DOSBOX GNUTLS HAL LDAP LIBXSLT MPG123 \
>+		NLS OPENAL V4L WINEMAKER X11 GECKO MONO
>+OPTIONS_DEFAULT=NLS X11
> OPTIONS_SUB=	yes
> 
> COMPHOLIO_DESC=	Include the Compholio patchset, needed for Pipelight support
>@@ -78,6 +82,9 @@
> MPG123_CONFIGURE_WITH=	mpg123
> MPG123_LIB_DEPENDS=	libmpg123.so:${PORTSDIR}/audio/mpg123
> 
>+NLS_CONFIGURE_WITH=	gettext
>+NLS_USES=		gettext-tools
>+
> OPENAL_CONFIGURE_WITH=	openal
> OPENAL_USES=		openal
> 
>@@ -86,8 +93,8 @@
> 
> WINEMAKER_RUN_DEPENDS=	p5-XML-LibXML>0:${PORTSDIR}/textproc/p5-XML-LibXML
> 
>-X11_CONFIGURE_WITH=	x fontconfig glu opengl xinput2 xrandr freetype
>-X11_USE=		GL=glu XORG=xcomposite,xcursor,xi,xpm,xrandr,xrender
>+X11_CONFIGURE_WITH=	x cms fontconfig glu jpeg opengl png xinput2 xrandr freetype
>+X11_USE=		GL=glu XORG=xcomposite,xcursor,xi,xrandr,xrender
> X11_LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
> 			libfreetype.so:${PORTSDIR}/print/freetype2 \
> 			libjpeg.so:${PORTSDIR}/graphics/jpeg \
>@@ -106,6 +113,15 @@
> BUILD_DEPENDS+=	bash:${PORTSDIR}/shells/bash \
> 		git:${PORTSDIR}/devel/git
> 
>+CONFIGURE_ARGS+=--without-pulse
>+
>+. if ${PORT_OPTIONS:MX11}
>+CONFIGURE_ARGS+=--with-txc_dxtn
>+LIB_DEPENDS+=	libtxc_dxtn.so:${PORTSDIR}/graphics/libtxc_dxtn
>+. else
>+CONFIGURE_ARGS+=--without-txc_dxtn
>+. endif
>+
> pre-configure:
> 	cd ${WRKSRC} && ${TAR} xf ${DISTDIR}/${COMP_DIST} --strip-components 1
> 	cd ${WRKSRC} && ${MAKE_CMD} -C ./patches DESTDIR=${WRKSRC} install
>Index: emulators/wine-devel/pkg-plist
>===================================================================
>--- emulators/wine-devel/pkg-plist	(revision 373847)
>+++ emulators/wine-devel/pkg-plist	(working copy)
>@@ -488,6 +488,7 @@
> include/wine/windows/ntddscsi.h
> include/wine/windows/ntddstor.h
> include/wine/windows/ntdsapi.h
>+%%COMPHOLIO%%include/wine/windows/ntifs.h
> include/wine/windows/ntquery.h
> include/wine/windows/ntsecapi.h
> include/wine/windows/ntsecpkg.h
>@@ -773,6 +774,7 @@
> include/wine/windows/xmllite.idl
> include/wine/windows/zmouse.h
> include/wine/windows/ddk/compstui.h
>+%%COMPHOLIO%%include/wine/windows/ddk/csq.h
> include/wine/windows/ddk/hidsdi.h
> include/wine/windows/ddk/imm.h
> include/wine/windows/ddk/mountmgr.h
>@@ -801,9 +803,14 @@
> lib/wine/amstream.dll.so
> lib/wine/api-ms-win-core-com-l1-1-0.dll.so
> lib/wine/api-ms-win-core-console-l1-1-0.dll.so
>+%%COMPHOLIO%%lib/wine/api-ms-win-core-datetime-l1-1-0.dll.so
>+%%COMPHOLIO%%lib/wine/api-ms-win-core-datetime-l1-1-1.dll.so
> lib/wine/api-ms-win-core-debug-l1-1-1.dll.so
> lib/wine/api-ms-win-core-errorhandling-l1-1-1.dll.so
>+%%COMPHOLIO%%lib/wine/api-ms-win-core-fibers-l1-1-0.dll.so
>+%%COMPHOLIO%%lib/wine/api-ms-win-core-fibers-l1-1-1.dll.so
> lib/wine/api-ms-win-core-file-l1-2-0.dll.so
>+%%COMPHOLIO%%lib/wine/api-ms-win-core-file-l2-1-0.dll.so
> lib/wine/api-ms-win-core-handle-l1-1-0.dll.so
> lib/wine/api-ms-win-core-heap-l1-2-0.dll.so
> lib/wine/api-ms-win-core-heap-obsolete-l1-1-0.dll.so
>@@ -812,6 +819,7 @@
> lib/wine/api-ms-win-core-kernel32-legacy-l1-1-0.dll.so
> lib/wine/api-ms-win-core-libraryloader-l1-1-1.dll.so
> lib/wine/api-ms-win-core-localization-l1-2-0.dll.so
>+%%COMPHOLIO%%lib/wine/api-ms-win-core-localization-l1-2-1.dll.so
> lib/wine/api-ms-win-core-localization-obsolete-l1-1-0.dll.so
> lib/wine/api-ms-win-core-localregistry-l1-1-0.dll.so
> lib/wine/api-ms-win-core-memory-l1-1-1.dll.so
>@@ -832,7 +840,10 @@
> lib/wine/api-ms-win-core-url-l1-1-0.dll.so
> lib/wine/api-ms-win-core-util-l1-1-0.dll.so
> lib/wine/api-ms-win-core-winrt-error-l1-1-0.dll.so
>+%%COMPHOLIO%%lib/wine/api-ms-win-core-winrt-error-l1-1-1.dll.so
>+%%COMPHOLIO%%lib/wine/api-ms-win-core-winrt-l1-1-0.dll.so
> lib/wine/api-ms-win-core-winrt-string-l1-1-0.dll.so
>+%%COMPHOLIO%%lib/wine/api-ms-win-core-xstate-l2-1-0.dll.so
> lib/wine/api-ms-win-downlevel-advapi32-l1-1-0.dll.so
> lib/wine/api-ms-win-downlevel-advapi32-l2-1-0.dll.so
> lib/wine/api-ms-win-downlevel-normaliz-l1-1-0.dll.so
>@@ -1011,9 +1022,14 @@
> lib/wine/fakedlls/amstream.dll
> lib/wine/fakedlls/api-ms-win-core-com-l1-1-0.dll
> lib/wine/fakedlls/api-ms-win-core-console-l1-1-0.dll
>+%%COMPHOLIO%%lib/wine/fakedlls/api-ms-win-core-datetime-l1-1-0.dll
>+%%COMPHOLIO%%lib/wine/fakedlls/api-ms-win-core-datetime-l1-1-1.dll
> lib/wine/fakedlls/api-ms-win-core-debug-l1-1-1.dll
> lib/wine/fakedlls/api-ms-win-core-errorhandling-l1-1-1.dll
>+%%COMPHOLIO%%lib/wine/fakedlls/api-ms-win-core-fibers-l1-1-0.dll
>+%%COMPHOLIO%%lib/wine/fakedlls/api-ms-win-core-fibers-l1-1-1.dll
> lib/wine/fakedlls/api-ms-win-core-file-l1-2-0.dll
>+%%COMPHOLIO%%lib/wine/fakedlls/api-ms-win-core-file-l2-1-0.dll
> lib/wine/fakedlls/api-ms-win-core-handle-l1-1-0.dll
> lib/wine/fakedlls/api-ms-win-core-heap-l1-2-0.dll
> lib/wine/fakedlls/api-ms-win-core-heap-obsolete-l1-1-0.dll
>@@ -1022,6 +1038,7 @@
> lib/wine/fakedlls/api-ms-win-core-kernel32-legacy-l1-1-0.dll
> lib/wine/fakedlls/api-ms-win-core-libraryloader-l1-1-1.dll
> lib/wine/fakedlls/api-ms-win-core-localization-l1-2-0.dll
>+%%COMPHOLIO%%lib/wine/fakedlls/api-ms-win-core-localization-l1-2-1.dll
> lib/wine/fakedlls/api-ms-win-core-localization-obsolete-l1-1-0.dll
> lib/wine/fakedlls/api-ms-win-core-localregistry-l1-1-0.dll
> lib/wine/fakedlls/api-ms-win-core-memory-l1-1-1.dll
>@@ -1042,7 +1059,10 @@
> lib/wine/fakedlls/api-ms-win-core-url-l1-1-0.dll
> lib/wine/fakedlls/api-ms-win-core-util-l1-1-0.dll
> lib/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-0.dll
>+%%COMPHOLIO%%lib/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-1.dll
>+%%COMPHOLIO%%lib/wine/fakedlls/api-ms-win-core-winrt-l1-1-0.dll
> lib/wine/fakedlls/api-ms-win-core-winrt-string-l1-1-0.dll
>+%%COMPHOLIO%%lib/wine/fakedlls/api-ms-win-core-xstate-l2-1-0.dll
> lib/wine/fakedlls/api-ms-win-downlevel-advapi32-l1-1-0.dll
> lib/wine/fakedlls/api-ms-win-downlevel-advapi32-l2-1-0.dll
> lib/wine/fakedlls/api-ms-win-downlevel-normaliz-l1-1-0.dll
>@@ -2209,6 +2229,8 @@
> %%PORTDOCS%%%%DOCSDIR%%/README.winedbg
> %%PORTDOCS%%%%DOCSDIR%%/README.winedump
> %%COMPHOLIO%%%%X11%%%%DATADIR%%/fonts/arial.ttf
>+%%COMPHOLIO%%%%X11%%%%DATADIR%%/fonts/cour.ttf
>+%%COMPHOLIO%%%%X11%%%%DATADIR%%/fonts/msyh.ttf
> %%X11%%%%DATADIR%%/fonts/coue1255.fon
> %%X11%%%%DATADIR%%/fonts/coue1256.fon
> %%X11%%%%DATADIR%%/fonts/coue1257.fon

Actions: View | Diff

Attachments on bug 195765: 150292