Created attachment 393152 [details] wine-1.7.33-r1.ebuild/wine-9999.ebuild The current wine-1.7.33 ebuild has two use flags of pertinence to this discussion "pipelight" and "pulseaudio." The current implementation of the pipelight use flag is basically a full fledged wine-staging patchset, including the pipelight functionality, and the pulseaudio functionality. Attached is an ebuild which adds an additional use flag, "staging". When used, staging provides all wine-staging functionality except pulseaudio and pipelight. The pipelight use flag is now dependent on the existence and use of the staging use flag. Pulseaudio support has been left functionally where it was: when the pulseaudio flag is used: if staging is used, pulseaudio support will be baked into wine-staging, if staging is not used, pulseaudio support is still used, through the pulseaudio specific patches from wine-staging. Additionally, the attached ebuild expands upon the upstream change in name and changes all instances of "${COMPHOLIO_P}" to "${STAGING_P}", and all textual instances of Compholio to Wine-Staging. Currently, the 9999 ebuild is out of date, doesn't function, and uses a versioned wine-staging tarball with a live wine git repo. Use of a versioned wine-staging tarball is highly recommended against by upstream wine-staging due to the fact that they update their repo whenever one of their patches has been accepted upstream, so by using a versioned tarball, the patching will potentially fail. The attached ebuild uses a hack with the git-r3 eclass to pull in wine-staging's git repo, as recommended by dwfreed and eroen.
Created attachment 393154 [details] metadata.xml Updated metadata.xml, adding staging use flag and refactoring "Compholio" references to "Wine-Staging".
Created attachment 393158 [details, diff] ebuild.patch changes as stated by diff -Naur for ebuild, as requested by eroen.
Created attachment 393160 [details, diff] metadata.patch changes as stated by diff -Naur for metadata.xml, as requested by eroen.
Created attachment 393190 [details] wine-1.7.33-r1.ebuild/wine-9999.ebuild updated as per bug 534732
Created attachment 393192 [details] metadata.xml updated as per bug 534732
Created attachment 393194 [details, diff] ebuild.patch updated as per bug 534732
Created attachment 393196 [details, diff] metadata.patch updated as per bug 534732
Created attachment 393724 [details] wine-1.7.33-r1.ebuild/wine-9999.ebuild Fix tab issue
Created attachment 393726 [details, diff] ebuild.patch Fix tab issue
Created attachment 393728 [details] Alternative wine-1.7.33-r1 The previously proposed patch disables dxtn support at the patch and configure level. Due to the way that Wine-Staging currently applies its patches, this makes it impossible to decouple it from CSMT support. This alternative, proposed by the folks at wine-staging, removes dxtn support only via configure, so that users can still have CSMT support (without dxtn). I've opted to leave the patch line in, but commented, but obviously, you can choose to omit it if desired. This should reflect however you choose to handle it in bug 534732.
Created attachment 393730 [details, diff] Alternative ebuild.patch The previously proposed patch disables dxtn support at the patch and configure level. Due to the way that Wine-Staging currently applies its patches, this makes it impossible to decouple it from CSMT support. This alternative, proposed by the folks at wine-staging, removes dxtn support only via configure, so that users can still have CSMT support (without dxtn). I've opted to leave the patch line in, but commented, but obviously, you can choose to omit it if desired. This should reflect however you choose to handle it in bug 534732.
Changed from >= to = due to bug 536378
Comment on attachment 393724 [details] wine-1.7.33-r1.ebuild/wine-9999.ebuild ryao via IRC stated preference for alt ebuild
Comment on attachment 393726 [details, diff] ebuild.patch ryao via IRC stated preference for alt patch
Created attachment 393786 [details] wine-1.7.33-r1.ebuild This is the final version, including the now renamed (and previously unused) use flag txc_dxtn to s3tc.
Created attachment 393788 [details] metadata.xml
Created attachment 393916 [details] wine-1.7.33-r1.ebuild Minor QA fixes from dwfreed and eroen
Created attachment 393918 [details, diff] wine-1.7.33-r1.patch
Created attachment 393920 [details] metadata.xml
Created attachment 393922 [details, diff] metadata.patch
Fixed, I've imported NP-Hardass's overlay changes into our 9999 and 1.7.38.
