Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!

Bug 534732

Summary: >=app-emulation/wine-1.7.28 should optionally depend on media-libs/libtxc_dxtn
Product: Gentoo Linux Reporter: Adam Feldman <np-hardass>
Component: Current packagesAssignee: Wine Maintainers <wine>
Status: RESOLVED FIXED    
Severity: normal Keywords: PATCH
Priority: Normal    
Version: unspecified   
Hardware: All   
OS: Linux   
Whiteboard:
Package list:
Runtime testing required: ---
Bug Depends on:    
Bug Blocks: 534672    
Attachments: wine-1.7.28.patch
wine-1.7.29.patch
wine-1.7.33.patch
metadata.patch
Alternative wine-1.7.28-r1.patch
wine-1.7.28.patch
Alternative wine-1.7.28-r1.patch
wine-1.7.29.patch
Alternative wine-1.7.29-r1.patch
wine-1.7.33.patch
Alternative wine-1.7.33.patch

Description Adam Feldman gentoo-dev 2015-01-05 01:40:21 UTC
According to the Wine-Staging wiki, libtxc_dxtn is an optional dependency.  This functionality started was added in wine-staging 1.7.27.  Wine-Staging has this enabled by default in its configure script, so the ebuilds need to be updated to disable this functionality if the user doesn't want it, or pull in libtxc_dxtn if they do want it.
I'll submit a patch for each ebuild ASAP.
Comment 1 Adam Feldman gentoo-dev 2015-01-05 03:12:24 UTC
Created attachment 393182 [details, diff]
wine-1.7.28.patch
Comment 2 Adam Feldman gentoo-dev 2015-01-05 03:13:12 UTC
Created attachment 393184 [details, diff]
wine-1.7.29.patch
Comment 3 Adam Feldman gentoo-dev 2015-01-05 03:13:41 UTC
Created attachment 393186 [details, diff]
wine-1.7.33.patch
Comment 4 Adam Feldman gentoo-dev 2015-01-05 03:21:15 UTC
Created attachment 393188 [details, diff]
metadata.patch
Comment 5 Adam Feldman gentoo-dev 2015-01-11 18:39:19 UTC
Created attachment 393710 [details, diff]
Alternative wine-1.7.28-r1.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.
Comment 6 Adam Feldman gentoo-dev 2015-01-11 18:41:13 UTC
Created attachment 393712 [details, diff]
wine-1.7.28.patch

fix accidental change in tab spacing
Comment 7 Adam Feldman gentoo-dev 2015-01-11 18:42:49 UTC
Created attachment 393714 [details, diff]
Alternative wine-1.7.28-r1.patch

Sorry about that, applied diff in the wrong direction :P
Comment 8 Adam Feldman gentoo-dev 2015-01-11 18:53:34 UTC
Created attachment 393716 [details, diff]
wine-1.7.29.patch

Fix tab issue
Comment 9 Adam Feldman gentoo-dev 2015-01-11 18:54:10 UTC
Created attachment 393718 [details, diff]
Alternative wine-1.7.29-r1.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.
Comment 10 Adam Feldman gentoo-dev 2015-01-11 18:58:32 UTC
Created attachment 393720 [details, diff]
wine-1.7.33.patch

Fix tab issue
Comment 11 Adam Feldman gentoo-dev 2015-01-11 18:59:03 UTC
Created attachment 393722 [details, diff]
Alternative wine-1.7.33.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.
Comment 12 Adam Feldman gentoo-dev 2015-01-12 12:20:55 UTC
Comment on attachment 393712 [details, diff]
wine-1.7.28.patch

ryao via IRC stated preference for alt patch
Comment 13 Adam Feldman gentoo-dev 2015-01-12 12:21:12 UTC
Comment on attachment 393716 [details, diff]
wine-1.7.29.patch

ryao via IRC stated preference for alt patch
Comment 14 Adam Feldman gentoo-dev 2015-01-12 12:21:36 UTC
Comment on attachment 393720 [details, diff]
wine-1.7.33.patch

ryao via IRC stated preference for alt patch
Comment 15 Adam Feldman gentoo-dev 2015-01-12 12:43:14 UTC
I've actually since decided (in my 1.7.34/9999 ebuilds) to rename this new USE flag from txc_dxtn to s3tc (since there are a couple of other packages also using s3tc for libtxc_dxtn).  I upload updated patches if requested.
Comment 16 Alexandre Rostovtsev (RETIRED) gentoo-dev 2015-03-08 07:17:24 UTC
Fixed, I've imported NP-Hardass's overlay changes into our 9999 and 1.7.38.