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

Collapse All | Expand All

(-)wine-1.7.33-r5.ebuild (-20 / +19 lines)
Lines 26-31 Link Here
26
GV="2.34"
26
GV="2.34"
27
MV="4.5.4"
27
MV="4.5.4"
28
STAGING_P="wine-staging-${PV}"
28
STAGING_P="wine-staging-${PV}"
29
STAGING_DIR="${WORKDIR}/${STAGING_P}"
29
WINE_GENTOO="wine-gentoo-2013.06.24"
30
WINE_GENTOO="wine-gentoo-2013.06.24"
30
DESCRIPTION="Free implementation of Windows(tm) on Unix"
31
DESCRIPTION="Free implementation of Windows(tm) on Unix"
31
HOMEPAGE="http://www.winehq.org/"
32
HOMEPAGE="http://www.winehq.org/"
Lines 303-309 Link Here
303
		if use staging || use pulseaudio; then
304
		if use staging || use pulseaudio; then
304
			EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
305
			EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
305
			unset ${PN}_LIVE_REPO;
306
			unset ${PN}_LIVE_REPO;
306
			EGIT_CHECKOUT_DIR=${WORKDIR}/${STAGING_P} git-r3_src_unpack
307
			EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
307
		fi
308
		fi
308
	else
309
	else
309
		unpack ${MY_P}.tar.bz2
310
		unpack ${MY_P}.tar.bz2
Lines 317-332 Link Here
317
318
318
src_prepare() {
319
src_prepare() {
319
	local md5="$(md5sum server/protocol.def)"
320
	local md5="$(md5sum server/protocol.def)"
320
	local f
321
	local PATCHES=(
321
	local PATCHES=(
322
		"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
322
		"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
323
		"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
323
		"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
324
		"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
324
		"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
325
		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
325
		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
326
	)
326
	)
327
	local STAGING_MAKE_ARGS="-W fonts-Missing_Fonts.ok"
328
327
329
	use pipelight || STAGING_MAKE_ARGS="${STAGING_MAKE_ARGS} -W Pipelight.ok"
330
	if use gstreamer; then
328
	if use gstreamer; then
331
		# See http://bugs.winehq.org/show_bug.cgi?id=30557
329
		# See http://bugs.winehq.org/show_bug.cgi?id=30557
332
		ewarn "Applying experimental patch to fix GStreamer support. Note that"
330
		ewarn "Applying experimental patch to fix GStreamer support. Note that"
Lines 339-361 Link Here
339
		ewarn "by Wine developers. Please don't report bugs to Wine bugzilla"
337
		ewarn "by Wine developers. Please don't report bugs to Wine bugzilla"
340
		ewarn "unless you can reproduce them with USE=-staging"
338
		ewarn "unless you can reproduce them with USE=-staging"
341
339
342
		# epatch doesn't support binary patches and we ship our own pulse patches
340
		# Apply temporary patch to wine-staging to allow for epatch as a backend to wine-staging's new patch script
343
		emake -C "${WORKDIR}/${STAGING_P}/patches" \
341
		pushd "${STAGING_DIR}"
344
			$(echo ${STAGING_MAKE_ARGS}) \
342
		epatch "${FILESDIR}"/wine-staging-gentoo-epatch-support.patch
345
		    series
343
		popd
346
344
347
		PATCHES+=( $(sed -e "s:^:${WORKDIR}/${STAGING_P}/patches/:" \
345
		local STAGING_EXCLUDE=""
348
		    "${WORKDIR}/${STAGING_P}/patches/series") )
346
		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
349
347
350
		# epatch doesn't support binary patches
348
		# Launch wine-staging patcher in a subshell, using epatch as a backend, and gitapply.sh as a backend for binary patches
351
		ebegin "Applying Wine-Staging font patches"
349
		ebegin "Running Wine-Staging patch installer"
352
		for f in "${WORKDIR}/${STAGING_P}/patches/fonts-Missing_Fonts"/*.patch; do
350
		(
353
			"../${STAGING_P}/debian/tools/gitapply.sh" < "${f}" \
351
			set -- DESTDIR="${S}" --backend=epatch --all ${STAGING_EXCLUDE}
354
			    || die "Failed to apply ${f}"
352
			cd "${STAGING_DIR}/patches"
355
		done
353
			source "${STAGING_DIR}/patches/patchinstall.sh"
356
		eend
354
		)
355
		eend $?
357
	elif use pulseaudio; then
356
	elif use pulseaudio; then
358
		PATCHES+=( "../${STAGING_P}/patches/winepulse-PulseAudio_Support"/*.patch )
357
		PATCHES+=( "${STAGING_DIR}/patches/winepulse-PulseAudio_Support"/*.patch )
359
	fi
358
	fi
360
	autotools-utils_src_prepare
359
	autotools-utils_src_prepare
361
360

Return to bug 536380