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

(-)/usr/portage/app-emulation/wine/wine-1.7.21.ebuild (-25 / +22 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 24-31 Link Here
24
24
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.24"
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 37-43 Link Here
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? ( https://github.com/compholio/wine-compholio-daily/archive/v${COMPHOLIOV}.tar.gz -> ${COMPHOLIO_PATCHES}.tar.gz )
40
	pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2 )
40
	pulseaudio? (
41
		http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2
42
		https://github.com/compholio/wine-compholio-daily/archive/v${COMPHOLIOV}.tar.gz -> ${COMPHOLIO_PATCHES}.tar.gz
43
	)
41
	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
44
	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
42
45
43
LICENSE="LGPL-2.1"
46
LICENSE="LGPL-2.1"
Lines 296-308 Link Here
296
	fi
299
	fi
297
300
298
	use pulseaudio && unpack "${PULSE_PATCHES}.tar.bz2"
301
	use pulseaudio && unpack "${PULSE_PATCHES}.tar.bz2"
299
	if use pipelight; then
302
	use pipelight || use pulseaudio && unpack "${COMPHOLIO_PATCHES}.tar.gz"
300
		unpack "${COMPHOLIO_PATCHES}.tar.gz"
303
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"
304
	unpack "${WINE_GENTOO}.tar.bz2"
307
305
308
	l10n_find_plocales_changes "${S}/po" "" ".po"
306
	l10n_find_plocales_changes "${S}/po" "" ".po"
Lines 317-325 Link Here
317
		"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
315
		"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
318
		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
316
		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
319
	)
317
	)
320
	use pulseaudio && PATCHES+=(
321
		"../${PULSE_PATCHES}"/*.patch #421365
322
	)
323
	if use gstreamer; then
318
	if use gstreamer; then
324
		# See http://bugs.winehq.org/show_bug.cgi?id=30557
319
		# See http://bugs.winehq.org/show_bug.cgi?id=30557
325
		ewarn "Applying experimental patch to fix GStreamer support. Note that"
320
		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,"
326
		ewarn "Applying the unofficial Compholio patchset for Pipelight support,"
332
		ewarn "which is unsupported by Wine developers. Please don't report bugs"
327
		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"
328
		ewarn "to Wine bugzilla unless you can reproduce them with USE=-pipelight"
334
329
		# First of all, don't run autoreconf and tools/make_requests twice
335
		PATCHES+=(
330
		sed -i 's/.*cat.*sort.*patchlist.*APPLY.*/&\n\n.PHONY: postinstall\npostinstall:/' \
336
			"../${COMPHOLIO_PATCHES}/patches"/*/*.patch #507950
331
			"../wine-compholio-${COMPHOLIOV}"/patches/Makefile || die
337
			"../${COMPHOLIO_PATCHES}/patches/patch-list.patch"
332
		# Use Makefile instead of manually applying patches
338
		)
333
		# ...exclude pulseaudio patchset, we apply it conditionally
339
		# epatch doesn't support binary patches
334
		make -C "../wine-compholio-${COMPHOLIOV}"/patches DESTDIR=$(pwd) \
340
		ebegin "Applying Compholio font patches"
335
			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
336
	fi
337
	# See bug #518792: use pulseaudio patches as provided by compholio upstream
338
	use pulseaudio && PATCHES+=(
339
		"../wine-compholio-${COMPHOLIOV}"/patches/winepulse-PulseAudio_Support/*.patch
340
		"../${PULSE_PATCHES}"/*.patch #421365
341
	)
346
	autotools-utils_src_prepare
342
	autotools-utils_src_prepare
347
343
348
	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
344
	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
Lines 392-397 Link Here
392
		$(use_with opengl)
388
		$(use_with opengl)
393
		$(use_with osmesa)
389
		$(use_with osmesa)
394
		$(use_with oss)
390
		$(use_with oss)
391
		--without-pcap
395
		$(use_with png)
392
		$(use_with png)
396
		$(use_with threads pthread)
393
		$(use_with threads pthread)
397
		$(use_with scanner sane)
394
		$(use_with scanner sane)

Return to bug 518792