История изменений
Исправление anTaRes, (текущая версия) :
Разве что патчем к wine с соответствующим юз-флагом в Gentoo.
гентушники уже pulseaudio и pipelight патчи оттеда берут
я забампил в локальном оверлее себе с юзом experimental и накатываю все, кроме пульсы
примерный ебилд будет после такого:
--- wine-1.7.29.ebuild 2014-10-25 23:37:44.000000000 +0300
+++ wine-1.7.33.ebuild 2014-12-15 11:39:38.284311234 +0200
@@ -22,8 +22,8 @@
S=${WORKDIR}/${MY_P}
fi
-GV="2.24"
-MV="4.5.2"
+GV="2.34"
+MV="4.5.4"
COMPHOLIO_P="wine-staging-${PV}"
WINE_GENTOO="wine-gentoo-2013.06.24"
DESCRIPTION="Free implementation of Windows(tm) on Unix"
@@ -34,13 +34,13 @@
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/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${COMPHOLIO_P}.tar.gz )
+ experimental? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${COMPHOLIO_P}.tar.gz )
pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${COMPHOLIO_P}.tar.gz )
http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pipelight +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl +experimental +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
test? ( abi_x86_32 )
elibc_glibc? ( threads )
@@ -62,7 +62,6 @@
gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
X? (
x11-libs/libXcursor
- x11-libs/libXext
x11-libs/libXrandr
x11-libs/libXi
x11-libs/libXxf86vm
@@ -84,7 +83,7 @@
nls? ( sys-devel/gettext )
odbc? ( dev-db/unixODBC:= )
osmesa? ( media-libs/mesa[osmesa] )
- pipelight? ( sys-apps/attr )
+ experimental? ( sys-apps/attr )
pulseaudio? ( media-sound/pulseaudio )
xml? ( dev-libs/libxml2 dev-libs/libxslt )
scanner? ( media-gfx/sane-backends:= )
@@ -192,7 +191,7 @@
>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
) )
- pipelight? ( || (
+ experimental? ( || (
app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
) )
@@ -291,7 +290,7 @@
unpack ${MY_P}.tar.bz2
fi
- use pipelight || use pulseaudio && unpack "${COMPHOLIO_P}.tar.gz"
+ use experimental || use pulseaudio && unpack "${COMPHOLIO_P}.tar.gz"
unpack "${WINE_GENTOO}.tar.bz2"
@@ -307,9 +306,11 @@
"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
)
- local COMPHOLIO_MAKE_ARGS="-W fonts-Missing_Fonts.ok"
+ #local COMPHOLIO_MAKE_ARGS="-W fonts-Missing_Fonts.ok"
+ local COMPHOLIO_MAKE_ARGS=""
use pulseaudio || COMPHOLIO_MAKE_ARGS="${COMPHOLIO_MAKE_ARGS} -W winepulse-PulseAudio_Support.ok"
+
if use gstreamer; then
# See http://bugs.winehq.org/show_bug.cgi?id=30557
ewarn "Applying experimental patch to fix GStreamer support. Note that"
@@ -317,29 +318,31 @@
PATCHES+=( "${FILESDIR}/${PN}-1.7.28-gstreamer-v4.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"
+ if use experimental; then
+ ewarn "Applying the unofficial Compholio patchset, which is unsupported by Wine developers."
+ ewarn "Please don't report bugs to Wine bugzilla unless you can reproduce them with USE=-experimental"
# epatch doesn't support binary patches and we ship our own pulse patches
emake -C "${WORKDIR}/${COMPHOLIO_P}/patches" \
+ DESTDIR=${S}
$(echo ${COMPHOLIO_MAKE_ARGS}) \
- series
+ install
- PATCHES+=( $(sed -e "s:^:${WORKDIR}/${COMPHOLIO_P}/patches/:" \
- "${WORKDIR}/${COMPHOLIO_P}/patches/series") )
+ #PATCHES+=( $(sed -e "s:^:${WORKDIR}/${COMPHOLIO_P}/patches/:" \
+ # "${WORKDIR}/${COMPHOLIO_P}/patches/series") )
- # epatch doesn't support binary patches
- ebegin "Applying Compholio font patches"
- for f in "${WORKDIR}/${COMPHOLIO_P}/patches/fonts-Missing_Fonts"/*.patch; do
- "../${COMPHOLIO_P}/debian/tools/gitapply.sh" < "${f}" \
- || die "Failed to apply ${f}"
- done
- eend
- elif use pulseaudio; then
- PATCHES+=( "../${COMPHOLIO_P}/patches/winepulse-PulseAudio_Support"/*.patch )
+ ## epatch doesn't support binary patches
+ #ebegin "Applying Compholio font patches"
+ #for f in "${WORKDIR}/${COMPHOLIO_P}/patches/fonts-Missing_Fonts"/*.patch; do
+ # "../${COMPHOLIO_P}/debian/tools/gitapply.sh" < "${f}" \
+ # || die "Failed to apply ${f}"
+ #done
+ #eend
+ #elif use pulseaudio; then
+ # PATCHES+=( "../${COMPHOLIO_P}/patches/winepulse-PulseAudio_Support"/*.patch )
fi
+
+
autotools-utils_src_prepare
if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
@@ -404,7 +407,7 @@
)
use pulseaudio && myconf+=( --with-pulse )
- use pipelight && myconf+=( --with-xattr )
+ use experimental && myconf+=( --with-xattr )
local PKG_CONFIG AR RANLIB
# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
Исходная версия anTaRes, :
Разве что патчем к wine с соответствующим юз-флагом в Gentoo.
гентушники уже pulseaudio и pipelight патчи оттеда берут я забампил в локальном оверлее себе с юзом experimental и накатываю все, кроме пульсы
примерный ебилд будет после такого:
--- wine-1.7.29.ebuild 2014-10-25 23:37:44.000000000 +0300
+++ wine-1.7.33.ebuild 2014-12-15 11:39:38.284311234 +0200
@@ -22,8 +22,8 @@
S=${WORKDIR}/${MY_P}
fi
-GV="2.24"
-MV="4.5.2"
+GV="2.34"
+MV="4.5.4"
COMPHOLIO_P="wine-staging-${PV}"
WINE_GENTOO="wine-gentoo-2013.06.24"
DESCRIPTION="Free implementation of Windows(tm) on Unix"
@@ -34,13 +34,13 @@
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/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${COMPHOLIO_P}.tar.gz )
+ experimental? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${COMPHOLIO_P}.tar.gz )
pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${COMPHOLIO_P}.tar.gz )
http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pipelight +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl +experimental +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
test? ( abi_x86_32 )
elibc_glibc? ( threads )
@@ -62,7 +62,6 @@
gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
X? (
x11-libs/libXcursor
- x11-libs/libXext
x11-libs/libXrandr
x11-libs/libXi
x11-libs/libXxf86vm
@@ -84,7 +83,7 @@
nls? ( sys-devel/gettext )
odbc? ( dev-db/unixODBC:= )
osmesa? ( media-libs/mesa[osmesa] )
- pipelight? ( sys-apps/attr )
+ experimental? ( sys-apps/attr )
pulseaudio? ( media-sound/pulseaudio )
xml? ( dev-libs/libxml2 dev-libs/libxslt )
scanner? ( media-gfx/sane-backends:= )
@@ -192,7 +191,7 @@
>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
) )
- pipelight? ( || (
+ experimental? ( || (
app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
) )
@@ -291,7 +290,7 @@
unpack ${MY_P}.tar.bz2
fi
- use pipelight || use pulseaudio && unpack "${COMPHOLIO_P}.tar.gz"
+ use experimental || use pulseaudio && unpack "${COMPHOLIO_P}.tar.gz"
unpack "${WINE_GENTOO}.tar.bz2"
@@ -307,9 +306,11 @@
"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
)
- local COMPHOLIO_MAKE_ARGS="-W fonts-Missing_Fonts.ok"
+ #local COMPHOLIO_MAKE_ARGS="-W fonts-Missing_Fonts.ok"
+ local COMPHOLIO_MAKE_ARGS=""
use pulseaudio || COMPHOLIO_MAKE_ARGS="${COMPHOLIO_MAKE_ARGS} -W winepulse-PulseAudio_Support.ok"
+
if use gstreamer; then
# See http://bugs.winehq.org/show_bug.cgi?id=30557
ewarn "Applying experimental patch to fix GStreamer support. Note that"
@@ -317,29 +318,31 @@
PATCHES+=( "${FILESDIR}/${PN}-1.7.28-gstreamer-v4.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"
+ if use experimental; then
+ ewarn "Applying the unofficial Compholio patchset, which is unsupported by Wine developers."
+ ewarn "Please don't report bugs to Wine bugzilla unless you can reproduce them with USE=-experimental"
# epatch doesn't support binary patches and we ship our own pulse patches
emake -C "${WORKDIR}/${COMPHOLIO_P}/patches" \
+ DESTDIR=${S}
$(echo ${COMPHOLIO_MAKE_ARGS}) \
- series
+ install
- PATCHES+=( $(sed -e "s:^:${WORKDIR}/${COMPHOLIO_P}/patches/:" \
- "${WORKDIR}/${COMPHOLIO_P}/patches/series") )
+ #PATCHES+=( $(sed -e "s:^:${WORKDIR}/${COMPHOLIO_P}/patches/:" \
+ # "${WORKDIR}/${COMPHOLIO_P}/patches/series") )
- # epatch doesn't support binary patches
- ebegin "Applying Compholio font patches"
- for f in "${WORKDIR}/${COMPHOLIO_P}/patches/fonts-Missing_Fonts"/*.patch; do
- "../${COMPHOLIO_P}/debian/tools/gitapply.sh" < "${f}" \
- || die "Failed to apply ${f}"
- done
- eend
- elif use pulseaudio; then
- PATCHES+=( "../${COMPHOLIO_P}/patches/winepulse-PulseAudio_Support"/*.patch )
+ ## epatch doesn't support binary patches
+ #ebegin "Applying Compholio font patches"
+ #for f in "${WORKDIR}/${COMPHOLIO_P}/patches/fonts-Missing_Fonts"/*.patch; do
+ # "../${COMPHOLIO_P}/debian/tools/gitapply.sh" < "${f}" \
+ # || die "Failed to apply ${f}"
+ #done
+ #eend
+ #elif use pulseaudio; then
+ # PATCHES+=( "../${COMPHOLIO_P}/patches/winepulse-PulseAudio_Support"/*.patch )
fi
+
+
autotools-utils_src_prepare
if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
@@ -404,7 +407,7 @@
)
use pulseaudio && myconf+=( --with-pulse )
- use pipelight && myconf+=( --with-xattr )
+ use experimental && myconf+=( --with-xattr )
local PKG_CONFIG AR RANLIB
# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038