|
Lines 24-30
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.24" |
27 |
PULSE_PATCHES="winepulse-patches-1.7.22" |
| 28 |
COMPHOLIOV="${PV}" |
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" |
|
Lines 329-345
Link Here
|
| 329 |
# First of all, don't run autoreconf and tools/make_requests twice |
329 |
# First of all, don't run autoreconf and tools/make_requests twice |
| 330 |
sed -i 's/.*cat.*sort.*patchlist.*APPLY.*/&\n\n.PHONY: postinstall\npostinstall:/' \ |
330 |
sed -i 's/.*cat.*sort.*patchlist.*APPLY.*/&\n\n.PHONY: postinstall\npostinstall:/' \ |
| 331 |
"../wine-compholio-${COMPHOLIOV}"/patches/Makefile || die |
331 |
"../wine-compholio-${COMPHOLIOV}"/patches/Makefile || die |
|
|
332 |
# See bug #518792: fix possible awk trouble |
| 333 |
sed -i 's/# Decode base85 git data.*/export LANG=C\nexport LC_ALL=C\n\n&/' \ |
| 334 |
"../wine-compholio-${COMPHOLIOV}"/debian/tools/gitapply.sh || die |
| 335 |
# excluding patch dirs does not seem to work in this version |
| 336 |
sed -i '/winepulse-PulseAudio_Support.ok \\/d' \ |
| 337 |
"../wine-compholio-${COMPHOLIOV}"/patches/Makefile || die |
| 332 |
# Use Makefile instead of manually applying patches |
338 |
# Use Makefile instead of manually applying patches |
| 333 |
# ...exclude pulseaudio patchset, we apply it conditionally |
339 |
# ...exclude pulseaudio patchset, we apply it conditionally |
| 334 |
# ...also exclude dsound-Fast_Mixer (conflicts with PULSE_PATCHES) |
|
|
| 335 |
make -C "../wine-compholio-${COMPHOLIOV}"/patches DESTDIR=$(pwd) \ |
340 |
make -C "../wine-compholio-${COMPHOLIOV}"/patches DESTDIR=$(pwd) \ |
| 336 |
install -W winepulse-PulseAudio_Support.ok -W dsound-Fast_Mixer.ok |
341 |
install -W winepulse-PulseAudio_Support.ok |
| 337 |
fi |
342 |
fi |
| 338 |
# See bug #518792: use pulseaudio patches as provided by compholio upstream |
343 |
# See bug #518792: use pulseaudio patches as provided by compholio upstream |
| 339 |
use pulseaudio && PATCHES+=( |
344 |
use pulseaudio && PATCHES+=( |
| 340 |
"../wine-compholio-${COMPHOLIOV}"/patches/winepulse-PulseAudio_Support/*.patch |
345 |
"../wine-compholio-${COMPHOLIOV}"/patches/winepulse-PulseAudio_Support/*.patch |
| 341 |
"../wine-compholio-${COMPHOLIOV}"/patches/dsound-Fast_Mixer/*.patch |
346 |
"../${PULSE_PATCHES}"/*.patch #421365 |
| 342 |
"../${PULSE_PATCHES}"/*.patch #421365 / modified to work with dsound-Fast_Mixer |
|
|
| 343 |
) |
347 |
) |
| 344 |
autotools-utils_src_prepare |
348 |
autotools-utils_src_prepare |
| 345 |
|
349 |
|
|
Lines 390-396
Link Here
|
| 390 |
$(use_with opengl) |
394 |
$(use_with opengl) |
| 391 |
$(use_with osmesa) |
395 |
$(use_with osmesa) |
| 392 |
$(use_with oss) |
396 |
$(use_with oss) |
| 393 |
--without-pcap |
|
|
| 394 |
$(use_with png) |
397 |
$(use_with png) |
| 395 |
$(use_with threads pthread) |
398 |
$(use_with threads pthread) |
| 396 |
$(use_with scanner sane) |
399 |
$(use_with scanner sane) |
