diff options
author | 2004-04-05 05:43:52 +0000 | |
---|---|---|
committer | 2004-04-05 05:43:52 +0000 | |
commit | 595fb9b2e8fca89bda71cca48dc6a618077f65bc (patch) | |
tree | 31d8563ea32769f95108de2703a1c1b698b16d5e /media-libs/libsdl/files | |
parent | Cosmetic fixes (Manifest recommit) (diff) | |
download | gentoo-2-595fb9b2e8fca89bda71cca48dc6a618077f65bc.tar.gz gentoo-2-595fb9b2e8fca89bda71cca48dc6a618077f65bc.tar.bz2 gentoo-2-595fb9b2e8fca89bda71cca48dc6a618077f65bc.zip |
old
Diffstat (limited to 'media-libs/libsdl/files')
-rw-r--r-- | media-libs/libsdl/files/digest-libsdl-1.2.5-r1 | 1 | ||||
-rw-r--r-- | media-libs/libsdl/files/digest-libsdl-1.2.5-r2 | 1 | ||||
-rw-r--r-- | media-libs/libsdl/files/libsdl-1.2.5-xfree-4.3.patch | 159 | ||||
-rw-r--r-- | media-libs/libsdl/files/libsdl_gcc33_fix.diff | 14 |
4 files changed, 0 insertions, 175 deletions
diff --git a/media-libs/libsdl/files/digest-libsdl-1.2.5-r1 b/media-libs/libsdl/files/digest-libsdl-1.2.5-r1 deleted file mode 100644 index 7f81a2ad2402..000000000000 --- a/media-libs/libsdl/files/digest-libsdl-1.2.5-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 cacacf4e4cca546de168fedc23b9b44b SDL-1.2.5.tar.gz 1854550 diff --git a/media-libs/libsdl/files/digest-libsdl-1.2.5-r2 b/media-libs/libsdl/files/digest-libsdl-1.2.5-r2 deleted file mode 100644 index 7f81a2ad2402..000000000000 --- a/media-libs/libsdl/files/digest-libsdl-1.2.5-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 cacacf4e4cca546de168fedc23b9b44b SDL-1.2.5.tar.gz 1854550 diff --git a/media-libs/libsdl/files/libsdl-1.2.5-xfree-4.3.patch b/media-libs/libsdl/files/libsdl-1.2.5-xfree-4.3.patch deleted file mode 100644 index d571a8a7d43a..000000000000 --- a/media-libs/libsdl/files/libsdl-1.2.5-xfree-4.3.patch +++ /dev/null @@ -1,159 +0,0 @@ -diff -urN SDL-1.2.5.old/src/video/x11/SDL_x11modes.c SDL-1.2.5/src/video/x11/SDL_x11modes.c ---- SDL-1.2.5.old/src/video/x11/SDL_x11modes.c 2002-09-29 17:35:25.000000000 -0700 -+++ SDL-1.2.5/src/video/x11/SDL_x11modes.c 2003-04-13 22:03:43.000000000 -0700 -@@ -44,6 +44,8 @@ - #endif - - #define MAX(a, b) (a > b ? a : b) -+#define V_INTERLACE 0x010 -+#define V_DBLSCAN 0x020 - - #ifdef XFREE86_VM - Bool SDL_NAME(XF86VidModeGetModeInfo)(Display *dpy, int scr, SDL_NAME(XF86VidModeModeInfo) *info) -@@ -91,6 +93,77 @@ - } - #endif - -+#ifdef XFREE86_VM -+static int get_vidmode_filter(SDL_NAME(XF86VidModeModeInfo) **modes, int nmodes, char **bitmap) -+{ -+ int i, result = 0; -+ int use_all_modes, use_specific_mode; -+ const char *variable; -+ char *temp; -+ -+ if (!nmodes) -+ return 0; -+ -+ temp = (char *)malloc((nmodes)*sizeof(char)); -+ if (!temp) -+ return 0; -+ -+ for ( i = 0; i < nmodes; ++i ) -+ temp[i] = 0; -+ -+ variable = getenv("SDL_VIDEO_X11_USE_ALL_MODES"); -+ use_all_modes = variable ? atoi(variable) : 0; -+ variable = getenv("SDL_VIDEO_X11_USE_SPECIFIC_MODE"); -+ use_specific_mode = variable ? atoi(variable) : 0; -+ -+ qsort(modes, nmodes, sizeof *modes, cmpmodes); -+ -+ if ( use_all_modes ) { -+ for ( i = 0; i < nmodes; ++i ) -+ temp[i] = 1; -+ result = 1; -+/* } else if ( use_specific_mode ) { ... */ -+ } else { -+ int previous_refresh, current_refresh; -+ SDL_NAME(XF86VidModeModeInfo) *previous, *current; -+ -+ previous = modes[0]; -+ previous_refresh = (int)(previous->dotclock * 1000.0 / -+ (previous->htotal * previous->vtotal)); -+ if ( previous->flags & V_INTERLACE ) previous_refresh *= 2; -+ else if ( previous->flags & V_DBLSCAN ) previous_refresh /= 2; -+ -+ temp[0] = 1; -+ for ( i = 1; i < nmodes; ++i ) { -+ current = modes[i]; -+ current_refresh = (int)(current->dotclock * 1000.0 / -+ (current->htotal * current->vtotal)); -+ if ( current->flags & V_INTERLACE ) current_refresh *= 2; -+ else if ( current->flags & V_DBLSCAN ) current_refresh /= 2; -+ -+ /* Compare this mode to the previous one */ -+ if ( current->hdisplay == previous->hdisplay && -+ current->vdisplay == previous->vdisplay ) { -+ if ( current_refresh > previous_refresh ) { -+ temp[i-1] = 0; -+ temp[i] = 1; -+ } -+ else -+ temp[i] = 0; -+ } -+ else -+ temp[i] = 1; -+ -+ previous = current; -+ previous_refresh = current_refresh; -+ } -+ result = 1; -+ } -+ *bitmap = temp; -+ return result; -+} -+#endif -+ - static void get_real_resolution(_THIS, int* w, int* h); - - static void set_best_resolution(_THIS, int width, int height) -@@ -101,10 +174,11 @@ - SDL_NAME(XF86VidModeModeInfo) **modes; - int i; - int nmodes; -+ char *bitmap; - - if ( SDL_NAME(XF86VidModeGetModeLine)(SDL_Display, SDL_Screen, &i, &mode) && -- SDL_NAME(XF86VidModeGetAllModeLines)(SDL_Display,SDL_Screen,&nmodes,&modes)){ -- qsort(modes, nmodes, sizeof *modes, cmpmodes); -+ SDL_NAME(XF86VidModeGetAllModeLines)(SDL_Display,SDL_Screen,&nmodes,&modes) && -+ get_vidmode_filter(modes, nmodes, &bitmap) ) { - #ifdef XFREE86_DEBUG - printf("Available modes:\n"); - for ( i = 0; i < nmodes; ++i ) { -@@ -114,7 +188,8 @@ - #endif - for ( i = nmodes-1; i > 0 ; --i ) { - if ( (modes[i]->hdisplay >= width) && -- (modes[i]->vdisplay >= height) ) -+ (modes[i]->vdisplay >= height) && -+ (bitmap[i] == 1) ) - break; - } - if ( (modes[i]->hdisplay != mode.hdisplay) || -@@ -122,6 +197,7 @@ - SDL_NAME(XF86VidModeSwitchToMode)(SDL_Display, SDL_Screen, modes[i]); - } - XFree(modes); -+ if (bitmap) free(bitmap); - } - } - #endif /* XFREE86_VM */ -@@ -269,6 +345,7 @@ - int vm_major, vm_minor; - int nmodes; - SDL_NAME(XF86VidModeModeInfo) **modes; -+ char *bitmap = (char*)0; - #endif - #ifdef HAVE_XIGXME - int xme_major, xme_minor; -@@ -330,15 +407,18 @@ - } - } - if ( ! buggy_X11 && -- SDL_NAME(XF86VidModeGetAllModeLines)(SDL_Display, SDL_Screen,&nmodes,&modes) ) { -+ SDL_NAME(XF86VidModeGetAllModeLines)(SDL_Display, SDL_Screen,&nmodes,&modes) && -+ get_vidmode_filter(modes, nmodes, &bitmap) ) { - -- qsort(modes, nmodes, sizeof *modes, cmpmodes); - SDL_modelist = (SDL_Rect **)malloc((nmodes+2)*sizeof(SDL_Rect *)); - if ( SDL_modelist ) { - n = 0; - for ( i=0; i<nmodes; ++i ) { - int w, h; - -+ /* Exclude those vidmodes that have been filtered out */ -+ if (!bitmap[i]) continue; -+ - /* Check to see if we should add the screen size (Xinerama) */ - w = modes[i]->hdisplay; - h = modes[i]->vdisplay; -@@ -371,6 +451,7 @@ - SDL_modelist[n] = NULL; - } - XFree(modes); -+ if (bitmap) free(bitmap); - - use_vidmode = vm_major * 100 + vm_minor; - save_mode(this); diff --git a/media-libs/libsdl/files/libsdl_gcc33_fix.diff b/media-libs/libsdl/files/libsdl_gcc33_fix.diff deleted file mode 100644 index 3346509de9a2..000000000000 --- a/media-libs/libsdl/files/libsdl_gcc33_fix.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- SDL-1.2.5-old/src/video/SDL_stretch.c 2002-03-06 12:23:03.000000000 +0100 -+++ SDL-1.2.5/src/video/SDL_stretch.c 2003-05-28 21:46:38.000000000 +0200 -@@ -261,9 +261,8 @@ - break; - default: - #ifdef __GNUC__ -- __asm__ __volatile__ (" -- call _copy_row -- " -+ __asm__ __volatile__ ( -+ "call _copy_row" - : "=&D" (u1), "=&S" (u2) - : "0" (dstp), "1" (srcp) - : "memory" ); |