Bug 205233 - File conflicts in SDL
Summary: File conflicts in SDL
Keywords:
Status: CLOSED CURRENTRELEASE
Alias: None
Product: Fedora
Classification: Fedora
Component: SDL
Version: rawhide
Hardware: All
OS: Linux
medium
medium
Target Milestone: ---
Assignee: Thomas Woerner
QA Contact:
URL:
Whiteboard:
Depends On:
Blocks: multilibdevel
TreeView+ depends on / blocked
 
Reported: 2006-09-05 14:33 UTC by Bill Nottingham
Modified: 2014-03-17 03:02 UTC (History)
2 users (show)

Fixed In Version: 1.2.10-8
Clone Of:
Environment:
Last Closed: 2007-02-12 14:26:13 UTC
Type: ---
Embargoed:

Attachments (Terms of Use)
diff between the 2 conflicting header files (1012 bytes, text/plain)
2006-10-15 16:15 UTC, Hans de Goede 		no flags Details
View All

Description Bill Nottingham 2006-09-05 14:33:30 UTC 
Description of problem:

        file /usr/include/SDL/SDL_config.h from install of SDL-devel-1.2.10-6.2
conflicts with file from package SDL-devel-1.2.10-6.2
Comment 1 Hans de Goede 2006-10-15 16:16:05 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.
Comment 2 Hans de Goede 2007-02-12 14:26:13 UTC 
This is fixed as of 1.2.10-8 which is available in updates, closing.
Note You need to log in before you can comment on or make changes to this bug.