Created attachment 369578 [details] wine-1.7.2-osmesa-check.patch.out wine-1.7.2-osmesa-check.patch no longer applies to wine-9999 at start of emerge, as the target file (configure.ac) no longer exists at that location in the build tree: --- PATCH COMMAND: patch -p0 -g0 -E --no-backup-if-mismatch < '/usr/portage/app-emulation/wine/files/wine-1.7.2-osmesa-check.patch' ========================================= can't find file to patch at input line 21 Perhaps you used the wrong -p or --strip option? --- This obviously fails the ebuild. Relevant support attachments to follow.
Output of emerge --info: Portage 2.2.8-r1 (default/linux/amd64/13.0/desktop, gcc-4.6.4, glibc-2.17, 3.10.25-gentoo x86_64) ================================================================= System Settings ================================================================= System uname: Linux-3.10.25-gentoo-x86_64-Intel-R-_Core-TM-2_Duo_CPU_E8400_@_3.00GHz-with-gentoo-2.2 KiB Mem: 4058524 total, 55228 free KiB Swap: 8386556 total, 8183828 free Timestamp of tree: Wed, 05 Feb 2014 08:00:01 +0000 ld GNU ld (GNU Binutils) 2.24 app-shells/bash: 4.2_p45 dev-java/java-config: 2.2.0 dev-lang/python: 2.7.6, 3.3.3 dev-util/cmake: 2.8.12.2 dev-util/pkgconfig: 0.28 sys-apps/baselayout: 2.2 sys-apps/openrc: 0.12.4 sys-apps/sandbox: 2.6-r1 sys-devel/autoconf: 2.13, 2.69 sys-devel/automake: 1.11.6, 1.12.6, 1.14.1 sys-devel/binutils: 2.24-r2 sys-devel/gcc: 4.5.4, 4.6.4, 4.7.3-r1 sys-devel/gcc-config: 1.7.3 sys-devel/libtool: 2.4.2 sys-devel/make: 3.82-r4 sys-kernel/linux-headers: 3.13 (virtual/os-headers) sys-libs/glibc: 2.17 Repositories: gentoo portage-rich steam-overlay roslin ACCEPT_KEYWORDS="amd64" ACCEPT_LICENSE="* -@EULA dlj-1.1 skype-eula AdobeFlash-10 AdobeFlash-10.1 AdobeFlash-9.0.31.0 PUEL Oracle-BCLA-JavaSE AdobeFlash-10.3 google-talkplugin skype-4.0.0.7-copyright google-chrome AdobeFlash-11.x Google-TOS" CBUILD="x86_64-pc-linux-gnu" CFLAGS="-O2 -pipe" CHOST="x86_64-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/share/config /usr/share/gnupg/qualified.txt /usr/share/themes/oxygen-gtk/gtk-2.0 /var/lib/hsqldb" CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/dconf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/php/apache2-php5.5/ext-active/ /etc/php/cgi-php5.5/ext-active/ /etc/php/cli-php5.5/ext-active/ /etc/revdep-rebuild /etc/sandbox.d /etc/splash /etc/terminfo" CXXFLAGS="-O2 -pipe" DISTDIR="/usr/portage/distfiles" EMERGE_DEFAULT_OPTS="--quiet-build=n" FCFLAGS="-O2 -pipe" FEATURES="assume-digests binpkg-logs config-protect-if-modified distlocks ebuild-locks fixlafiles merge-sync news parallel-fetch preserve-libs protect-owned sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync" FFLAGS="-O2 -pipe" GENTOO_MIRRORS="http://distfiles.gentoo.org" LDFLAGS="-Wl,-O1 -Wl,--as-needed" PKGDIR="/usr/portage/packages" PORTAGE_CONFIGROOT="/" PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/usr/portage" PORTDIR_OVERLAY="/var/lib/layman/rich0 /var/lib/layman/steam /var/lib/layman/roslin" USE="X a52 aac acl acpi alsa amd64 berkdb bluetooth branding bzip2 cairo cdda cdr cli consolekit cracklib crypt cups cxx dbus dri dts dvd dvdr emboss encode exif fam fbcondecor flac fortran gdbm gif gpm gtk iconv ipv6 jack jpeg lash lcms ldap libnotify mad mmx mng modules mp3 mp4 mpeg multilib ncurses nls nptl ogg opengl openmp pam pango pcre pdf png policykit ppds pulseaudio qt3support qt4 readline sdl session spell sse sse2 ssl startup-notification svg tcpd tiff truetype udev udisks unicode upower usb vorbis wxwidgets x264 xcb xml xulrunner xv xvid zlib" ABI_X86="32 64" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CALLIGRA_FEATURES="kexi words flow plan sheets stage tables krita karbon braindump author" CAMERAS="ptp2" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip tripmate tnt ublox ubx" INPUT_DEVICES="keyboard mouse evdev" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php5-5" PYTHON_SINGLE_TARGET="python2_7" PYTHON_TARGETS="python2_7 python3_3" RUBY_TARGETS="ruby19 ruby18" USERLAND="GNU" VIDEO_CARDS="nvidia nouveau fbdev v4l vesa" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dhcpmac delude chaos account" Unset: CPPFLAGS, CTARGET, INSTALL_MASK, LANG, LC_ALL, MAKEOPTS, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, SYNC, USE_PYTHON ================================================================= Package Settings ================================================================= app-emulation/wine-9999 was built with the following: USE="X alsa cups custom-cflags fontconfig gecko jpeg lcms ldap mono mp3 ncurses nls opengl perl png prelink realtime run-exes ssl threads truetype udisks xml -capi -dos -gphoto2 -gsm -gstreamer -netapi -odbc -openal -opencl -osmesa -oss (-pulseaudio) -samba -scanner (-selinux) -test -v4l -xcomposite -xinerama" ABI_X86="32 64 -x32" LINGUAS="-ar -bg -ca -cs -da -de -el -en -en_US -eo -es -fa -fi -fr -he -hi -hr -hu -it -ja -ko -lt -ml -nb_NO -nl -or -pa -pl -pt_BR -pt_PT -rm -ro -ru -sk -sl -sr_RS@cyrillic -sr_RS@latin -sv -te -th -tr -uk -wa -zh_CN -zh_TW" CFLAGS="-O2 -ggdb -pipe"
Output of emerge -pqv '=app-emulation/wine-9999::gentoo': [ebuild R ] app-emulation/wine-9999 USE="X alsa cups custom-cflags fontconfig gecko jpeg lcms ldap mono mp3 ncurses nls opengl perl png prelink realtime run-exes ssl threads truetype udisks xml -capi -dos -gphoto2 -gsm -gstreamer -netapi -odbc -openal -opencl -osmesa -oss (-pulseaudio) -samba -scanner (-selinux) {-test} -v4l -xcomposite -xinerama" ABI_X86="32 64 (-x32)" LINGUAS="-ar -bg -ca -cs -da -de -el -en -en_US -eo -es -fa -fi -fr -he -hi -hr -hu -it -ja -ko -lt -ml -nb_NO -nl -or -pa -pl -pt_BR -pt_PT -rm -ro -ru -sk -sl -sr_RS@cyrillic -sr_RS@latin -sv -te -th -tr -uk -wa -zh_CN -zh_TW"
Created attachment 369580 [details] build.log as requested by emerge for support
Created attachment 369582 [details] environment as requested by emerge for support
Created attachment 369824 [details, diff] wine-1.7.12-osmesa-check.patch I didn't check quite what it does, I didn't look for whether it's still required, just replicated what the old patch did, incorporating the recent change in configure.ac. Patch applied, it builds right now, so no guarantees. ;)
Hmm, the only problem is that this doesn't suppress the existing (1.7.2-[etc.]) patch specified by the ebuild. I suppose I'm going to have to make a custom wine-9999-r1 ebuild until the change is applied. =\ Doesn't seem like a definitive answer yet, but we'll see what the mysterious WINE maintainer can come up with. Thanks!
Copied a custom ebuild in /usr/portage/app-emulation/wine and added wine-1.7.12-osmesa-check.patch to the files directory, then regenerated the ebuild manifest. In the resulting ebuild the patch fails with "patch program exited with status 1". Attaching the patch.out.
Created attachment 369848 [details] wine-1.7.12-osmesa-check.patch.out
Created attachment 369872 [details, diff] wine-1.7.12.ebuild.diff I don't know what you did in your ebuild, it worked for me at least, so I'm attaching my ebuild diff to 1.7.12. At this point in time, wine-9999 = wine-1.7.12, so it should work for you as well.
Applied diff to a copy of wine-9999.ebuild. Same error as above ("patch program exited with status 1"). The output was the exact same as the previously attached wine-1.7.12.osmesa-check.patch.out. Exact steps taken in the /usr/portage/app-emulation/wine directory to set up the build attempt were as follows: - 'cp wine-9999.ebuild wine-9999-r1.ebuild' - Applied changes from wine-1.17.2.ebuild.diff to wine-9999-r1.ebuild - Saved wine-1.7.12.osmesa-check.patch to /usr/portage/app-emulation/wine/files - 'ebuild wine-9999-r1.ebuild manifest' - 'emerge =app-emulation/wine-9999-r1' Do you need me to attach any emerge information? Aside from the above, I don't believe anything has changed in this situation, though.
Could you take a look whether your local copy of wine-1.7.12.osmesa-check.patch actually contains valid/all the content as attached here?
Fixed, thanks for reporting. Wine's developers refactored configure.ac for the 1.7.12 release, so our osmesa and pulseaudio patches had to be updated. +*wine-1.7.12 (08 Feb 2014) + + 08 Feb 2014; Alexandre Rostovtsev <tetromino@gentoo.org> +wine-1.7.12.ebuild, + wine-9999.ebuild, +files/wine-1.7.12-osmesa-check.patch: + Version bump, see http://www.winehq.org/announce/1.7.12 for the announcement. + Update osmesa patch (bug #500352).
Confirmed, mainline wine-9999 ebuild works again. No hitch. (Strange about Sturmlechner's patch having that problem, though--ahwell, it's a moot point and a mystery for some other time. Thanks anyway, man.)
