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 |
COMPHOLIO_SRC_URI="https://github.com/compholio/wine-compholio-daily/archive/v${COMPHOLIOV}.tar.gz -> ${COMPHOLIO_PATCHES}.tar.gz" |
30 |
COMPHOLIO_SRC_URI="https://github.com/compholio/wine-compholio-daily/archive/v${COMPHOLIOV}.tar.gz -> ${COMPHOLIO_PATCHES}.tar.gz" |
Lines 42-48
Link Here
|
42 |
gstreamer? ( https://googledrive.com/host/0BwvWj1tAgHFpcmMwY1hsbUo3Nk0 -> ${GSTREAMER_PATCHES}.tar.xz ) |
42 |
gstreamer? ( https://googledrive.com/host/0BwvWj1tAgHFpcmMwY1hsbUo3Nk0 -> ${GSTREAMER_PATCHES}.tar.xz ) |
43 |
pipelight? ( ${COMPHOLIO_SRC_URI} ) |
43 |
pipelight? ( ${COMPHOLIO_SRC_URI} ) |
44 |
pulseaudio? ( |
44 |
pulseaudio? ( |
45 |
https://googledrive.com/host/0BwvWj1tAgHFpODltdTVpeGZ3ZXc -> ${PULSE_PATCHES}.tar.bz2 |
45 |
https://googledrive.com/host/0BwvWj1tAgHFpMFRleE11a0dNNTQ -> ${PULSE_PATCHES}.tar.bz2 |
46 |
${COMPHOLIO_SRC_URI} |
46 |
${COMPHOLIO_SRC_URI} |
47 |
) |
47 |
) |
48 |
http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2" |
48 |
http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2" |
Lines 331-347
Link Here
|
331 |
# First of all, don't run autoreconf and tools/make_requests twice |
331 |
# First of all, don't run autoreconf and tools/make_requests twice |
332 |
sed -i 's/.*cat.*sort.*patchlist.*APPLY.*/&\n\n.PHONY: postinstall\npostinstall:/' \ |
332 |
sed -i 's/.*cat.*sort.*patchlist.*APPLY.*/&\n\n.PHONY: postinstall\npostinstall:/' \ |
333 |
"../wine-compholio-${COMPHOLIOV}"/patches/Makefile || die |
333 |
"../wine-compholio-${COMPHOLIOV}"/patches/Makefile || die |
|
|
334 |
# See bug #518792: fix possible awk trouble |
335 |
sed -i 's/# Decode base85 git data.*/export LANG=C\nexport LC_ALL=C\n\n&/' \ |
336 |
"../wine-compholio-${COMPHOLIOV}"/debian/tools/gitapply.sh || die |
337 |
# excluding patch dirs does not seem to work in this version |
338 |
sed -i '/winepulse-PulseAudio_Support.ok \\/d' \ |
339 |
"../wine-compholio-${COMPHOLIOV}"/patches/Makefile || die |
334 |
# Use Makefile instead of manually applying patches |
340 |
# Use Makefile instead of manually applying patches |
335 |
# ...exclude pulseaudio patchset, we apply it conditionally |
341 |
# ...exclude pulseaudio patchset, we apply it conditionally |
336 |
# ...also exclude dsound-Fast_Mixer (conflicts with PULSE_PATCHES) |
|
|
337 |
make -C "../wine-compholio-${COMPHOLIOV}"/patches DESTDIR=$(pwd) \ |
342 |
make -C "../wine-compholio-${COMPHOLIOV}"/patches DESTDIR=$(pwd) \ |
338 |
install -W winepulse-PulseAudio_Support.ok -W dsound-Fast_Mixer.ok |
343 |
install -W winepulse-PulseAudio_Support.ok |
339 |
fi |
344 |
fi |
340 |
# See bug #518792: use pulseaudio patches as provided by compholio upstream |
345 |
# See bug #518792: use pulseaudio patches as provided by compholio upstream |
341 |
use pulseaudio && PATCHES+=( |
346 |
use pulseaudio && PATCHES+=( |
342 |
"../wine-compholio-${COMPHOLIOV}"/patches/winepulse-PulseAudio_Support/*.patch |
347 |
"../wine-compholio-${COMPHOLIOV}"/patches/winepulse-PulseAudio_Support/*.patch |
343 |
"../wine-compholio-${COMPHOLIOV}"/patches/dsound-Fast_Mixer/*.patch |
348 |
"../${PULSE_PATCHES}"/*.patch #421365 |
344 |
"../${PULSE_PATCHES}"/*.patch #421365 / modified to work with dsound-Fast_Mixer |
|
|
345 |
) |
349 |
) |
346 |
autotools-utils_src_prepare |
350 |
autotools-utils_src_prepare |
347 |
|
351 |
|
Lines 392-398
Link Here
|
392 |
$(use_with opengl) |
396 |
$(use_with opengl) |
393 |
$(use_with osmesa) |
397 |
$(use_with osmesa) |
394 |
$(use_with oss) |
398 |
$(use_with oss) |
395 |
--without-pcap |
|
|
396 |
$(use_with png) |
399 |
$(use_with png) |
397 |
$(use_with threads pthread) |
400 |
$(use_with threads pthread) |
398 |
$(use_with scanner sane) |
401 |
$(use_with scanner sane) |