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

Collapse All | Expand All

(-)wine-1.7.21.ebuild (-26 / +24 lines)
Lines 1-6 Link Here
1
# Copyright 1999-2014 Gentoo Foundation
1
# Copyright 1999-2014 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.21.ebuild,v 1.1 2014/06/29 00:42:47 tetromino Exp $
3
# $Header: $
4
4
5
EAPI="5"
5
EAPI="5"
6
6
Lines 25-31 Link Here
25
GV="2.24"
25
GV="2.24"
26
MV="4.5.2"
26
MV="4.5.2"
27
PULSE_PATCHES="winepulse-patches-1.7.21"
27
PULSE_PATCHES="winepulse-patches-1.7.21"
28
COMPHOLIOV="1.7.21"
28
COMPHOLIOV="${PV}"
29
COMPHOLIO_PATCHES="wine-compholio-daily-${COMPHOLIOV}"
29
COMPHOLIO_PATCHES="wine-compholio-daily-${COMPHOLIOV}"
30
WINE_GENTOO="wine-gentoo-2013.06.24"
30
WINE_GENTOO="wine-gentoo-2013.06.24"
31
DESCRIPTION="Free implementation of Windows(tm) on Unix"
31
DESCRIPTION="Free implementation of Windows(tm) on Unix"
Lines 36-43 Link Here
36
		abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
36
		abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
37
	)
37
	)
38
	mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
38
	mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
39
	pipelight? ( https://github.com/compholio/wine-compholio-daily/archive/v${COMPHOLIOV}.tar.gz -> ${COMPHOLIO_PATCHES}.tar.gz )
39
	pipelight? (
40
	pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2 )
40
		https://github.com/compholio/wine-compholio-daily/archive/v${COMPHOLIOV}.tar.gz -> ${COMPHOLIO_PATCHES}.tar.gz
41
	)
42
	pulseaudio? (
43
		https://github.com/compholio/wine-compholio-daily/archive/v${COMPHOLIOV}.tar.gz -> ${COMPHOLIO_PATCHES}.tar.gz
44
	)
45
	gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2 )
41
	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
46
	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
42
47
43
LICENSE="LGPL-2.1"
48
LICENSE="LGPL-2.1"
Lines 295-308 Link Here
295
		unpack ${MY_P}.tar.bz2
300
		unpack ${MY_P}.tar.bz2
296
	fi
301
	fi
297
302
298
	use pulseaudio && unpack "${PULSE_PATCHES}.tar.bz2"
303
	use gstreamer && unpack "${PULSE_PATCHES}.tar.bz2"
299
	if use pipelight; then
304
	use pipelight || use pulseaudio && unpack "${COMPHOLIO_PATCHES}.tar.gz"
300
		unpack "${COMPHOLIO_PATCHES}.tar.gz"
305
301
		# we use a separate pulseaudio patchset
302
		rm -r "${COMPHOLIO_PATCHES}/patches/06-winepulse" || die
303
		# ... and need special tools for binary patches
304
		mv "${COMPHOLIO_PATCHES}/patches/10-Missing_Fonts" "${T}" || die
305
	fi
306
	unpack "${WINE_GENTOO}.tar.bz2"
306
	unpack "${WINE_GENTOO}.tar.bz2"
307
307
308
	l10n_find_plocales_changes "${S}/po" "" ".po"
308
	l10n_find_plocales_changes "${S}/po" "" ".po"
Lines 317-325 Link Here
317
		"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
317
		"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
318
		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
318
		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
319
	)
319
	)
320
	use pulseaudio && PATCHES+=(
321
		"../${PULSE_PATCHES}"/*.patch #421365
322
	)
323
	if use gstreamer; then
320
	if use gstreamer; then
324
		# See http://bugs.winehq.org/show_bug.cgi?id=30557
321
		# See http://bugs.winehq.org/show_bug.cgi?id=30557
325
		ewarn "Applying experimental patch to fix GStreamer support. Note that"
322
		ewarn "Applying experimental patch to fix GStreamer support. Note that"
Lines 331-348 Link Here
331
		ewarn "Applying the unofficial Compholio patchset for Pipelight support,"
328
		ewarn "Applying the unofficial Compholio patchset for Pipelight support,"
332
		ewarn "which is unsupported by Wine developers. Please don't report bugs"
329
		ewarn "which is unsupported by Wine developers. Please don't report bugs"
333
		ewarn "to Wine bugzilla unless you can reproduce them with USE=-pipelight"
330
		ewarn "to Wine bugzilla unless you can reproduce them with USE=-pipelight"
334
331
		# First of all, don't run autoreconf and tools/make_requests twice
335
		PATCHES+=(
332
		sed -i 's/.*cat.*sort.*patchlist.*APPLY.*/&\n\n.PHONY: postinstall\npostinstall:/' \
336
			"../${COMPHOLIO_PATCHES}/patches"/*/*.patch #507950
333
			"../wine-compholio-${COMPHOLIOV}"/patches/Makefile || die
337
			"../${COMPHOLIO_PATCHES}/patches/patch-list.patch"
334
		# Use Makefile instead of manually applying patches
338
		)
335
		# ...exclude pulseaudio patchset, we apply it conditionally
339
		# epatch doesn't support binary patches
336
		make -C "../wine-compholio-${COMPHOLIOV}"/patches DESTDIR=$(pwd) \
340
		ebegin "Applying Compholio font patches"
337
			install -W winepulse-PulseAudio_Support.ok
341
		for f in "${T}/10-Missing_Fonts"/*.patch; do
342
			"../${COMPHOLIO_PATCHES}/debian/tools/gitapply.sh" < "${f}" || die "Failed to apply Compholio font patches"
343
		done
344
		eend
345
	fi
338
	fi
339
	# See bug #518792: use pulseaudio patches as provided by compholio upstream
340
	use pulseaudio && PATCHES+=(
341
		"../wine-compholio-${COMPHOLIOV}"/patches/winepulse-PulseAudio_Support/*.patch
342
	)
346
	autotools-utils_src_prepare
343
	autotools-utils_src_prepare
347
344
348
	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
345
	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
Lines 392-397 Link Here
392
		$(use_with opengl)
389
		$(use_with opengl)
393
		$(use_with osmesa)
390
		$(use_with osmesa)
394
		$(use_with oss)
391
		$(use_with oss)
392
		--without-pcap
395
		$(use_with png)
393
		$(use_with png)
396
		$(use_with threads pthread)
394
		$(use_with threads pthread)
397
		$(use_with scanner sane)
395
		$(use_with scanner sane)

Return to bug 518792