Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 647970 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/portage/app-emulation/wine-staging/wine-staging-2.21.ebuild (-8 / +11 lines)
Lines 36-55 Link Here
36
"
36
"
37
37
38
if [[ ${PV} == "9999" ]] ; then
38
if [[ ${PV} == "9999" ]] ; then
39
	STAGING_EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging.git"
39
	STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
40
else
40
else
41
	SRC_URI="${SRC_URI}
41
	SRC_URI="${SRC_URI}
42
	staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
42
	staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
43
fi
43
fi
44
44
45
LICENSE="LGPL-2.1"
45
LICENSE="LGPL-2.1"
46
SLOT="${PV}"
46
SLOT="${PV}"
47
IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi +X +xcomposite xinerama +xml"
47
IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vulkan +X +xcomposite xinerama +xml"
48
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
48
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
49
	X? ( truetype )
49
	X? ( truetype )
50
	elibc_glibc? ( threads )
50
	elibc_glibc? ( threads )
51
	osmesa? ( opengl )
51
	osmesa? ( opengl )
52
	pipelight? ( staging )
53
	s3tc? ( staging )
52
	s3tc? ( staging )
54
	test? ( abi_x86_32 )
53
	test? ( abi_x86_32 )
55
	themes? ( staging )
54
	themes? ( staging )
Lines 110-115 Link Here
110
	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
109
	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
111
	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
110
	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
112
	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
111
	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
112
	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
113
	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
113
	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
114
	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
114
	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
115
	xml? (
115
	xml? (
Lines 182-188 Link Here
182
	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
182
	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
183
	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
183
	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
184
	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
184
	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
185
	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
185
#	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
186
)
186
)
187
PATCHES_BIN=()
187
PATCHES_BIN=()
188
188
Lines 367-375 Link Here
367
		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
367
		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
368
		ewarn "Wine bugzilla should explicitly state that staging was used."
368
		ewarn "Wine bugzilla should explicitly state that staging was used."
369
369
370
		local STAGING_EXCLUDE=""
370
		# I disabled STAGING_EXCLUDE because the flex's bug was fixed in flex 2.6.4 and Pipelight is discontinued since long time ago.
371
		STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132
371
#		local STAGING_EXCLUDE=""
372
		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
372
#		STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132
373
#		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
373
374
374
		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
375
		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
375
		ebegin "Running Wine-Staging patch installer"
376
		ebegin "Running Wine-Staging patch installer"
Lines 451-456 Link Here
451
		--localstatedir="${MY_LOCALSTATEDIR}"
452
		--localstatedir="${MY_LOCALSTATEDIR}"
452
		--mandir="${MY_MANDIR}"
453
		--mandir="${MY_MANDIR}"
453
		--sysconfdir=/etc/wine
454
		--sysconfdir=/etc/wine
455
		--disable-tests
454
		$(use_with alsa)
456
		$(use_with alsa)
455
		$(use_with capi)
457
		$(use_with capi)
456
		$(use_with lcms cms)
458
		$(use_with lcms cms)
Lines 485-490 Link Here
485
		$(use_with truetype freetype)
487
		$(use_with truetype freetype)
486
		$(use_with udev)
488
		$(use_with udev)
487
		$(use_with v4l)
489
		$(use_with v4l)
490
		$(use_with vulkan)
488
		$(use_with X x)
491
		$(use_with X x)
489
		$(use_with X xfixes)
492
		$(use_with X xfixes)
490
		$(use_with xcomposite)
493
		$(use_with xcomposite)

Return to bug 647970