Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 386060 Details for
Bug 518792
app-emulation/wine-1.7.28 version bump
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
wine-1.7.28.ebuild.diff
wine-1.7.28.ebuild.diff (text/plain), 5.23 KB, created by
Andreas Sturmlechner
on 2014-10-05 00:26:42 UTC
(
hide
)
Description:
wine-1.7.28.ebuild.diff
Filename:
MIME Type:
Creator:
Andreas Sturmlechner
Created:
2014-10-05 00:26:42 UTC
Size:
5.23 KB
patch
obsolete
>--- wine-1.7.21.ebuild 2014-06-29 02:42:47.000000000 +0200 >+++ wine-1.7.28.ebuild 2014-10-04 22:43:38.341738079 +0200 >@@ -1,6 +1,6 @@ > # Copyright 1999-2014 Gentoo Foundation > # Distributed under the terms of the GNU General Public License v2 >-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.21.ebuild,v 1.1 2014/06/29 00:42:47 tetromino Exp $ >+# $Header: $ > > EAPI="5" > >@@ -24,9 +24,12 @@ > > GV="2.24" > MV="4.5.2" >-PULSE_PATCHES="winepulse-patches-1.7.21" >-COMPHOLIOV="1.7.21" >+PULSE_PATCHES="winepulse-patches-1.7.24" >+COMPHOLIOV="${PV}" > COMPHOLIO_PATCHES="wine-compholio-daily-${COMPHOLIOV}" >+COMPHOLIO_SRC_URI="https://github.com/compholio/wine-compholio-daily/archive/v${COMPHOLIOV}.tar.gz -> ${COMPHOLIO_PATCHES}.tar.gz" >+GSTREAMERV="1.7.12" >+GSTREAMER_PATCHES="wine-gstreamer-patches-${GSTREAMERV}" > WINE_GENTOO="wine-gentoo-2013.06.24" > DESCRIPTION="Free implementation of Windows(tm) on Unix" > HOMEPAGE="http://www.winehq.org/" >@@ -36,8 +39,12 @@ > abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi ) > ) > mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi ) >- pipelight? ( https://github.com/compholio/wine-compholio-daily/archive/v${COMPHOLIOV}.tar.gz -> ${COMPHOLIO_PATCHES}.tar.gz ) >- pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2 ) >+ gstreamer? ( https://googledrive.com/host/0BwvWj1tAgHFpcmMwY1hsbUo3Nk0 -> ${GSTREAMER_PATCHES}.tar.xz ) >+ pipelight? ( ${COMPHOLIO_SRC_URI} ) >+ pulseaudio? ( >+ https://googledrive.com/host/0BwvWj1tAgHFpODltdTVpeGZ3ZXc -> ${PULSE_PATCHES}.tar.bz2 >+ ${COMPHOLIO_SRC_URI} >+ ) > http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2" > > LICENSE="LGPL-2.1" >@@ -46,10 +53,8 @@ > REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) > test? ( abi_x86_32 ) > elibc_glibc? ( threads ) >- gstreamer? ( pulseaudio ) > mono? ( abi_x86_32 ) > osmesa? ( opengl )" #286560 >-# winepulse patches needed for gstreamer due to http://bugs.winehq.org/show_bug.cgi?id=30557 > > # FIXME: the test suite is unsuitable for us; many tests require net access > # or fail due to Xvfb's opengl limitations. >@@ -295,14 +300,10 @@ > unpack ${MY_P}.tar.bz2 > fi > >+ use gstreamer && unpack "${GSTREAMER_PATCHES}.tar.xz" > use pulseaudio && unpack "${PULSE_PATCHES}.tar.bz2" >- if use pipelight; then >- unpack "${COMPHOLIO_PATCHES}.tar.gz" >- # we use a separate pulseaudio patchset >- rm -r "${COMPHOLIO_PATCHES}/patches/06-winepulse" || die >- # ... and need special tools for binary patches >- mv "${COMPHOLIO_PATCHES}/patches/10-Missing_Fonts" "${T}" || die >- fi >+ use pipelight || use pulseaudio && unpack "${COMPHOLIO_PATCHES}.tar.gz" >+ > unpack "${WINE_GENTOO}.tar.bz2" > > l10n_find_plocales_changes "${S}/po" "" ".po" >@@ -310,39 +311,38 @@ > > src_prepare() { > local md5="$(md5sum server/protocol.def)" >- local f > local PATCHES=( > "${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726 > "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615 > "${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386 > "${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508 > ) >- use pulseaudio && PATCHES+=( >- "../${PULSE_PATCHES}"/*.patch #421365 >- ) > if use gstreamer; then > # See http://bugs.winehq.org/show_bug.cgi?id=30557 > ewarn "Applying experimental patch to fix GStreamer support. Note that" > ewarn "this patch has been reported to cause crashes in certain games." > >- PATCHES+=( "../${PULSE_PATCHES}"/gstreamer/*.patch ) >+ PATCHES+=( "../${GSTREAMER_PATCHES}"/*.patch ) > fi > if use pipelight; then > ewarn "Applying the unofficial Compholio patchset for Pipelight support," > ewarn "which is unsupported by Wine developers. Please don't report bugs" > ewarn "to Wine bugzilla unless you can reproduce them with USE=-pipelight" >- >- PATCHES+=( >- "../${COMPHOLIO_PATCHES}/patches"/*/*.patch #507950 >- "../${COMPHOLIO_PATCHES}/patches/patch-list.patch" >- ) >- # epatch doesn't support binary patches >- ebegin "Applying Compholio font patches" >- for f in "${T}/10-Missing_Fonts"/*.patch; do >- "../${COMPHOLIO_PATCHES}/debian/tools/gitapply.sh" < "${f}" || die "Failed to apply Compholio font patches" >- done >- eend >+ # First of all, don't run autoreconf and tools/make_requests twice >+ sed -i 's/.*cat.*sort.*patchlist.*APPLY.*/&\n\n.PHONY: postinstall\npostinstall:/' \ >+ "../wine-compholio-${COMPHOLIOV}"/patches/Makefile || die >+ # Use Makefile instead of manually applying patches >+ # ...exclude pulseaudio patchset, we apply it conditionally >+ # ...also exclude dsound-Fast_Mixer (conflicts with PULSE_PATCHES) >+ make -C "../wine-compholio-${COMPHOLIOV}"/patches DESTDIR=$(pwd) \ >+ install -W winepulse-PulseAudio_Support.ok -W dsound-Fast_Mixer.ok > fi >+ # See bug #518792: use pulseaudio patches as provided by compholio upstream >+ use pulseaudio && PATCHES+=( >+ "../wine-compholio-${COMPHOLIOV}"/patches/winepulse-PulseAudio_Support/*.patch >+ "../wine-compholio-${COMPHOLIOV}"/patches/dsound-Fast_Mixer/*.patch >+ "../${PULSE_PATCHES}"/*.patch #421365 / modified to work with dsound-Fast_Mixer >+ ) > autotools-utils_src_prepare > > if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then >@@ -392,6 +392,7 @@ > $(use_with opengl) > $(use_with osmesa) > $(use_with oss) >+ --without-pcap > $(use_with png) > $(use_with threads pthread) > $(use_with scanner sane)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 518792
:
383004
|
385336
|
385338
|
385340
|
385342
|
385348
|
385350
|
385352
|
385354
|
385356
|
386042
|
386044
|
386046
| 386060 |
386062
|
386064