Bug 205233
Summary: | File conflicts in SDL | ||||||
---|---|---|---|---|---|---|---|
Product: | [Fedora] Fedora | Reporter: | Bill Nottingham <notting> | ||||
Component: | SDL | Assignee: | Thomas Woerner <twoerner> | ||||
Status: | CLOSED CURRENTRELEASE | QA Contact: | |||||
Severity: | medium | Docs Contact: | |||||
Priority: | medium | ||||||
Version: | rawhide | CC: | hdegoede, rvokal | ||||
Target Milestone: | --- | ||||||
Target Release: | --- | ||||||
Hardware: | All | ||||||
OS: | Linux | ||||||
Whiteboard: | |||||||
Fixed In Version: | 1.2.10-8 | Doc Type: | Bug Fix | ||||
Doc Text: | Story Points: | --- | |||||
Clone Of: | Environment: | ||||||
Last Closed: | 2007-02-12 14:26:13 UTC | Type: | --- | ||||
Regression: | --- | Mount Type: | --- | ||||
Documentation: | --- | CRM: | |||||
Verified Versions: | Category: | --- | |||||
oVirt Team: | --- | RHEL 7.3 requirements from Atomic Host: | |||||
Cloudforms Team: | --- | Target Upstream Version: | |||||
Embargoed: | |||||||
Bug Depends On: | |||||||
Bug Blocks: | 192658 | ||||||
Attachments: |
|
Description
Bill Nottingham
2006-09-05 14:33:30 UTC
Created attachment 138530 [details] diff between the 2 conflicting header files I just did a diff between the 2 conflicting header files, and this is it. The main difference seems to be caused by bug 207903. With 207903 resolved the only remaining problem is: @@ -300,7 +300,7 @@ /* Enable assembly routines */ #define SDL_ASSEMBLY_ROUTINES 1 -#define SDL_HERMES_BLITTERS 1 +/* #undef SDL_HERMES_BLITTERS */ /* #undef SDL_ALTIVEC_BLITTERS */ #endif /* _SDL_config_h */ Which can be easily solved by making this: /* Enable assembly routines */ #define SDL_ASSEMBLY_ROUTINES 1 #ifdef __i386__ #define SDL_HERMES_BLITTERS 1 #endif /* #undef SDL_ALTIVEC_BLITTERS */ #endif /* _SDL_config_h */ Let me know if you want me to take a closer look (as time permits) and send you a patch. This is fixed as of 1.2.10-8 which is available in updates, closing. |