Here is an SDL update various people have asked for.
I have only lightly tested it on amd64 so far, and would
love to get more comments.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/sdl/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile 1 Aug 2006 23:39:08 -0000 1.45
+++ Makefile 8 Oct 2006 06:05:15 -0000
@@ -3,9 +3,9 @@
COMMENT= "cross-platform multimedia library"
-VERSION= 1.2.9
+VERSION= 1.2.11
DISTNAME= SDL-${VERSION}
-PKGNAME= ${DISTNAME:L}p1
+PKGNAME= ${DISTNAME:L}
CATEGORIES= devel
HOMEPAGE= http://www.libsdl.org/
@@ -29,12 +29,10 @@ FLAVOR?= sun
USE_LIBTOOL= Yes
-AUTOCONF_VERSION= 2.59
-AUTOMAKE_VERSION= 1.9
SEPARATE_BUILD= concurrent
-CONFIGURE_STYLE= autoconf
+CONFIGURE_STYLE= gnu
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/test
-SHARED_LIBS= SDL 6.0
+SHARED_LIBS= SDL 7.0
CONFIGURE_ENV+= X11BASE="${X11BASE}" \
CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
@@ -100,7 +98,7 @@ CONFIGURE_ARGS+= --without-x \
--disable-video-x11
.else
USE_X11= Yes
-WANTLIB+= X11 Xext
+WANTLIB+= X11 Xext Xrandr Xrender
.endif
NO_REGRESS= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/sdl/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo 17 Sep 2005 00:38:15 -0000 1.11
+++ distinfo 8 Oct 2006 04:27:25 -0000
@@ -1,8 +1,8 @@
-MD5 (SDL-1.2.9.tar.gz) = 80919ef556425ff82a8555ff40a579a0
+MD5 (SDL-1.2.11.tar.gz) = 418b42956b7cd103bfab1b9077ccc149
MD5 (patch-libsd1.2.7-libcaca0.9.diff) = dff6cf5fc97494dbe05880866e151660
-RMD160 (SDL-1.2.9.tar.gz) = 9faeeda9cf8f649a2b506e9db7c5cedb4512cfe7
+RMD160 (SDL-1.2.11.tar.gz) = 91dc8877224415a4ba59e1de57c31861e550d644
RMD160 (patch-libsd1.2.7-libcaca0.9.diff) =
e74a1ece864577b6fdaf8516a9e4b400958e575b
-SHA1 (SDL-1.2.9.tar.gz) = 8140de00e73ccdbdee196fa8fd9952ddb3cc75f1
+SHA1 (SDL-1.2.11.tar.gz) = 2259134d714e35ab1469d513674a3cd02510d198
SHA1 (patch-libsd1.2.7-libcaca0.9.diff) =
4e4d3f5f0286e6960e0e5cdad2f90c54997a6c04
-SIZE (SDL-1.2.9.tar.gz) = 2688179
+SIZE (SDL-1.2.11.tar.gz) = 2796407
SIZE (patch-libsd1.2.7-libcaca0.9.diff) = 28259
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_in 8 Oct 2006 05:51:54 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- Makefile.in.orig Mon Jun 19 23:49:00 2006
++++ Makefile.in Sat Oct 7 23:51:35 2006
+@@ -44,7 +44,7 @@ LT_AGE = @LT_AGE@
+ LT_CURRENT = @LT_CURRENT@
+ LT_RELEASE = @LT_RELEASE@
+ LT_REVISION = @LT_REVISION@
+-LT_LDFLAGS = -no-undefined -rpath $(libdir) -release $(LT_RELEASE)
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
++LT_LDFLAGS = -no-undefined -rpath $(libdir) $(LT_RELEASE) -version-info
$(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+
+ all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET)
$(objects)/$(SDLMAIN_TARGET)
+
+@@ -98,7 +98,7 @@ install-data:
+ $(SHELL) $(auxdir)/mkinstalldirs $(datadir)/aclocal
+ $(INSTALL) -m 644 $(srcdir)/sdl.m4 $(datadir)/aclocal/sdl.m4
+ $(SHELL) $(auxdir)/mkinstalldirs $(libdir)/pkgconfig
+- $(INSTALL) -m 644 $(srcdir)/sdl.pc $(libdir)/pkgconfig
++ $(INSTALL) -m 644 sdl.pc $(libdir)/pkgconfig
+ install-man:
+ $(SHELL) $(auxdir)/mkinstalldirs $(mandir)/man3
+ for src in $(srcdir)/docs/man3/*.3; do \
Index: patches/patch-configure_in
===================================================================
RCS file: patches/patch-configure_in
diff -N patches/patch-configure_in
--- patches/patch-configure_in 17 Sep 2005 00:38:15 -0000 1.25
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,71 +0,0 @@
-$OpenBSD: patch-configure_in,v 1.25 2005/09/17 00:38:15 pvalchev Exp $
---- configure.in.orig Sun Aug 28 00:31:18 2005
-+++ configure.in Sat Sep 10 20:34:34 2005
-@@ -535,9 +535,6 @@ CheckNASM()
- win32)
- NASMFLAGS="-f win32"
- ;;
-- openbsd)
-- NASMFLAGS="-f aoutb"
-- ;;
- *)
- NASMFLAGS="-f elf"
- ;;
-@@ -1082,9 +1079,6 @@ CheckOpenGL()
- AC_MSG_RESULT($video_opengl)
- if test x$video_opengl = xyes; then
- CFLAGS="$CFLAGS -DHAVE_OPENGL"
-- if test x$use_dlopen != xyes; then
-- AC_CHECK_LIB(dl, dlopen, SYSTEM_LIBS="$SYSTEM_LIBS -ldl")
-- fi
- fi
- fi
- }
-@@ -1105,9 +1099,6 @@ CheckOpenGLQNX()
- if test x$video_opengl = xyes; then
- CFLAGS="$CFLAGS -DHAVE_OPENGL"
- SYSTEM_LIBS="$SYSTEM_LIBS -lGL"
-- if test x$use_dlopen != xyes; then
-- AC_CHECK_LIB(c, dlopen, SYSTEM_LIBS="$SYSTEM_LIBS",
AC_CHECK_LIB(ltdl, dlopen, SYSTEM_LIBS="$SYSTEM_LIBS -lltdl"))
-- fi
- fi
- fi
- }
-@@ -1680,6 +1671,9 @@ CheckDLOPEN()
- AC_ARG_ENABLE(sdl-dlopen,
- [ --enable-sdl-dlopen use dlopen for shared object loading
[default=yes]],
- , enable_sdl_dlopen=yes)
-+ AC_ARG_ENABLE(ltdl,
-+[ --enable-ltdl use libtool for shared object loading
[default=no]],
-+ , enable_ltdl=yes)
- if test x$enable_sdl_dlopen = xyes; then
- AC_MSG_CHECKING(for dlopen)
- use_dlopen=no
-@@ -1691,7 +1685,7 @@ CheckDLOPEN()
- ])
- AC_MSG_RESULT($use_dlopen)
-
-- if test x$use_dlopen = xyes; then
-+ if test x$use_dlopen = xyes -a x$enable_ltdl = xyes; then
- CFLAGS="$CFLAGS -DUSE_DLOPEN"
- AC_CHECK_LIB(c, dlopen, SYSTEM_LIBS="$SYSTEM_LIBS",
- AC_CHECK_LIB(dl, dlopen, SYSTEM_LIBS="$SYSTEM_LIBS -ldl",
-@@ -2764,6 +2758,9 @@ if test "x$enable_rpath" = "xyes"; then
- else
- SDL_RLD_FLAGS=""
- fi
-+if test $ARCH = openbsd -a x$enable_video_x11 = xyes; then
-+ SDL_RLD_FLAGS="-L${X11BASE}/lib"
-+fi
-
- case "$ARCH" in
- openbsd | netbsd | bsdi)
-@@ -2797,7 +2794,7 @@ esac
- STATIC_SYSTEM_LIBS="$SYSTEM_LIBS"
-
- dnl Output the video drivers we use
--if test x$enable_video = xtrue; then
-+if test x$enable_video = xyes; then
- if test "$VIDEO_SUBDIRS" = ""; then
- AC_MSG_ERROR(*** No video drivers are enabled!)
- fi
Index: patches/patch-sdl-config_in
===================================================================
RCS file: patches/patch-sdl-config_in
diff -N patches/patch-sdl-config_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-sdl-config_in 8 Oct 2006 06:25:54 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- sdl-config.in.orig Mon Jun 19 21:33:59 2006
++++ sdl-config.in Sun Oct 8 00:25:47 2006
+@@ -41,10 +41,10 @@ while test $# -gt 0; do
+ echo @SDL_VERSION@
+ ;;
+ --cflags)
+- echo [EMAIL PROTECTED]@/SDL @SDL_CFLAGS@
++ echo [EMAIL PROTECTED]@ [EMAIL PROTECTED]@/SDL @SDL_CFLAGS@
+ ;;
+ @ENABLE_SHARED_TRUE@ --libs)
[EMAIL PROTECTED]@ echo [EMAIL PROTECTED]@ @SDL_RLD_FLAGS@ @SDL_LIBS@
[EMAIL PROTECTED]@ echo [EMAIL PROTECTED]@ @SDL_RLD_FLAGS@ @SDL_LIBS@
@X_LIBS@
+ @ENABLE_SHARED_TRUE@ ;;
+ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs)
+ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs)
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: patches/patch-src_Makefile_in
diff -N patches/patch-src_Makefile_in
--- patches/patch-src_Makefile_in 17 Sep 2005 00:38:15 -0000 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_Makefile_in,v 1.9 2005/09/17 00:38:15 pvalchev Exp $
---- src/Makefile.in.orig Sun Aug 28 00:31:37 2005
-+++ src/Makefile.in Sat Sep 10 20:34:34 2005
-@@ -306,7 +306,6 @@ lib_LTLIBRARIES = libSDL.la
- libSDL_la_SOURCES = $(GENERAL_SRCS)
- libSDL_la_LDFLAGS = \
- -no-undefined \
-- -release $(LT_RELEASE) \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
- libSDL_la_LIBADD = \
Index: patches/patch-src_SDL_fatal_c
===================================================================
RCS file: patches/patch-src_SDL_fatal_c
diff -N patches/patch-src_SDL_fatal_c
--- patches/patch-src_SDL_fatal_c 30 Nov 2002 11:17:26 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_SDL_fatal_c,v 1.1 2002/11/30 11:17:26 wcobb Exp $
---- src/SDL_fatal.c.orig Tue Nov 12 23:20:24 2002
-+++ src/SDL_fatal.c Tue Nov 12 23:22:35 2002
-@@ -72,9 +72,6 @@ static void SDL_Parachute(int sig)
- signal(sig, SIG_DFL);
- print_msg("Fatal signal: ");
- switch (sig) {
-- case SIGSEGV:
-- print_msg("Segmentation Fault");
-- break;
- #ifdef SIGBUS
- #if SIGBUS != SIGSEGV
- case SIGBUS:
-@@ -109,7 +106,6 @@ static void SDL_Parachute(int sig)
- }
-
- static int SDL_fatal_signals[] = {
-- SIGSEGV,
- #ifdef SIGBUS
- SIGBUS,
- #endif
Index: patches/patch-src_audio_openbsd_SDL_openbsdaudio_c
===================================================================
RCS file: patches/patch-src_audio_openbsd_SDL_openbsdaudio_c
diff -N patches/patch-src_audio_openbsd_SDL_openbsdaudio_c
--- patches/patch-src_audio_openbsd_SDL_openbsdaudio_c 28 Dec 2003 22:26:18
-0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,63 +0,0 @@
-$OpenBSD: patch-src_audio_openbsd_SDL_openbsdaudio_c,v 1.5 2003/12/28 22:26:18
espie Exp $
---- src/audio/openbsd/SDL_openbsdaudio.c.orig 2003-12-28 19:42:30.000000000
+0100
-+++ src/audio/openbsd/SDL_openbsdaudio.c 2003-12-28 19:43:45.000000000
+0100
-@@ -262,21 +262,21 @@ OBSD_Status(_THIS)
- return;
- }
-
-- fprintf(stderr,"
--[play/record info]
--buffer size : %d bytes
--sample rate : %i Hz
--channels : %i
--precision : %i-bit
--encoding : 0x%x
--seek : %i
--sample count : %i
--EOF count : %i
--paused : %s
--error occured : %s
--waiting : %s
--active : %s
--",
-+ fprintf(stderr,"\n"
-+"[play/record info]\n"
-+"buffer size : %d bytes\n"
-+"sample rate : %i Hz\n"
-+"channels : %i\n"
-+"precision : %i-bit\n"
-+"encoding : 0x%x\n"
-+"seek : %i\n"
-+"sample count : %i\n"
-+"EOF count : %i\n"
-+"paused : %s\n"
-+"error occured : %s\n"
-+"waiting : %s\n"
-+"active : %s\n"
-+"",
- info.play.buffer_size,
- info.play.sample_rate,
- info.play.channels,
-@@ -290,14 +290,14 @@ active : %s
- info.play.waiting ? "yes" : "no",
- info.play.active ? "yes": "no");
-
-- fprintf(stderr,"
--[audio info]
--monitor_gain : %i
--hw block size : %d bytes
--hi watermark : %i
--lo watermark : %i
--audio mode : %s
--",
-+ fprintf(stderr,"\n"
-+"[audio info]\n"
-+"monitor_gain : %i\n"
-+"hw block size : %d bytes\n"
-+"hi watermark : %i\n"
-+"lo watermark : %i\n"
-+"audio mode : %s\n"
-+"",
- info.monitor_gain,
- info.blocksize,
- info.hiwat, info.lowat,
Index: patches/patch-src_joystick_bsd_SDL_sysjoystick_c
===================================================================
RCS file: patches/patch-src_joystick_bsd_SDL_sysjoystick_c
diff -N patches/patch-src_joystick_bsd_SDL_sysjoystick_c
--- patches/patch-src_joystick_bsd_SDL_sysjoystick_c 11 May 2005 17:26:15
-0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_joystick_bsd_SDL_sysjoystick_c,v 1.6 2005/05/11 17:26:15
pvalchev Exp $
---- src/joystick/bsd/SDL_sysjoystick.c.orig Mon Dec 13 18:54:32 2004
-+++ src/joystick/bsd/SDL_sysjoystick.c Fri Dec 17 16:36:39 2004
-@@ -60,7 +60,7 @@ static char rcsid =
- #include <sys/joystick.h>
- #endif
-
--#if defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__NetBSD__) || (defined(__OpenBSD__) && defined(__i386__))
- #include <machine/joystick.h>
- #endif
-
-@@ -370,7 +370,7 @@ SDL_SYS_JoystickUpdate(SDL_Joystick *joy
- int nbutton, naxe = -1;
- Sint32 v;
-
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || (defined(__OpenBSD__) &&
defined(__i386__))
- struct joystick gameport;
- static int x, y, xmin = 0xffff, ymin = 0xffff, xmax = 0, ymax = 0;
-
Index: patches/patch-src_video_x11_SDL_x11gl_c
===================================================================
RCS file: /cvs/ports/devel/sdl/patches/patch-src_video_x11_SDL_x11gl_c,v
retrieving revision 1.9
diff -u -p -r1.9 patch-src_video_x11_SDL_x11gl_c
--- patches/patch-src_video_x11_SDL_x11gl_c 10 Aug 2005 00:25:17 -0000
1.9
+++ patches/patch-src_video_x11_SDL_x11gl_c 8 Oct 2006 05:13:31 -0000
@@ -1,9 +1,9 @@
-$OpenBSD: patch-src_video_x11_SDL_x11gl_c,v 1.9 2005/08/10 00:25:17 jolan Exp $
---- src/video/x11/SDL_x11gl.c.orig Fri Dec 17 16:35:24 2004
-+++ src/video/x11/SDL_x11gl.c Fri Dec 17 16:35:36 2004
-@@ -38,7 +38,7 @@ static char rcsid =
- /* IRIX doesn't have a GL library versioning system */
- #define DEFAULT_OPENGL "libGL.so"
+$OpenBSD$
+--- src/video/x11/SDL_x11gl.c.orig Sat Oct 7 23:06:31 2006
++++ src/video/x11/SDL_x11gl.c Sat Oct 7 23:06:55 2006
+@@ -34,7 +34,7 @@
+ #elif defined(__QNXNTO__)
+ #define DEFAULT_OPENGL "libGL.so.3"
#else
-#define DEFAULT_OPENGL "libGL.so.1"
+#define DEFAULT_OPENGL "libGL.so.4.0"
Index: patches/patch-src_video_x11_SDL_x11modes_c
===================================================================
RCS file: patches/patch-src_video_x11_SDL_x11modes_c
diff -N patches/patch-src_video_x11_SDL_x11modes_c
--- patches/patch-src_video_x11_SDL_x11modes_c 11 May 2005 17:26:15 -0000
1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,171 +0,0 @@
-$OpenBSD: patch-src_video_x11_SDL_x11modes_c,v 1.5 2005/05/11 17:26:15
pvalchev Exp $
---- src/video/x11/SDL_x11modes.c.orig Mon Dec 13 18:54:37 2004
-+++ src/video/x11/SDL_x11modes.c Fri Dec 17 16:36:39 2004
-@@ -44,6 +44,8 @@ static char rcsid =
- #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)
-@@ -92,6 +94,82 @@ static int cmpmodes(const void *va, cons
- }
- #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 ) {
-+#ifdef XFREE86_DEBUG
-+ printf("Comparing %dx%d at %d Hz and %d Hz\n",
-+ current->hdisplay, current->vdisplay,
-+ current_refresh, previous_refresh);
-+#endif
-+ 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)
-@@ -103,9 +181,11 @@ static void set_best_resolution(_THIS, i
- int i;
- int best_width = 0, best_height = 0;
- int nmodes;
-+ char *bitmap;
-
- if ( SDL_NAME(XF86VidModeGetModeLine)(SDL_Display, SDL_Screen, &i,
&mode) &&
--
SDL_NAME(XF86VidModeGetAllModeLines)(SDL_Display,SDL_Screen,&nmodes,&modes)){
-+
SDL_NAME(XF86VidModeGetAllModeLines)(SDL_Display,SDL_Screen,&nmodes,&modes) &&
-+ get_vidmode_filter(modes, nmodes, &bitmap) ){
- #ifdef XFREE86_DEBUG
- printf("Available modes (unsorted):\n");
- for ( i = 0; i < nmodes; ++i ) {
-@@ -117,14 +197,16 @@ static void set_best_resolution(_THIS, i
- #endif
- for ( i = 0; i < nmodes ; i++ ) {
- if ( (modes[i]->hdisplay == width) &&
-- (modes[i]->vdisplay == height) )
-+ (modes[i]->vdisplay == height) &&
-+ (bitmap[i] == 1) )
- goto match;
- }
- qsort(modes, nmodes, sizeof *modes, cmpmodes);
- for ( i = nmodes-1; i > 0 ; i-- ) {
- if ( ! best_width ) {
- if ( (modes[i]->hdisplay >= width) &&
-- (modes[i]->vdisplay >= height) ) {
-+ (modes[i]->vdisplay >= height) &&
-+ (bitmap[i] == 1) ) {
- best_width = modes[i]->hdisplay;
- best_height = modes[i]->vdisplay;
- }
-@@ -142,6 +224,7 @@ static void set_best_resolution(_THIS, i
- SDL_NAME(XF86VidModeSwitchToMode)(SDL_Display, SDL_Screen,
modes[i]);
- }
- XFree(modes);
-+ if (bitmap) free(bitmap);
- }
- }
- #endif /* XFREE86_VM */
-@@ -289,6 +372,7 @@ int X11_GetVideoModes(_THIS)
- int vm_major, vm_minor;
- int nmodes;
- SDL_NAME(XF86VidModeModeInfo) **modes;
-+ char *bitmap = (char*)0;
- #endif
- #ifdef HAVE_XIGXME
- int xme_major, xme_minor;
-@@ -350,7 +434,8 @@ int X11_GetVideoModes(_THIS)
- }
- }
- 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) ) {
-
- #ifdef XFREE86_DEBUG
- printf("Available modes: (sorted)\n");
-@@ -369,6 +454,9 @@ int X11_GetVideoModes(_THIS)
- 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;
-@@ -401,6 +489,7 @@ int X11_GetVideoModes(_THIS)
- SDL_modelist[n] = NULL;
- }
- XFree(modes);
-+ if (bitmap) free(bitmap);
-
- use_vidmode = vm_major * 100 + vm_minor;
- save_mode(this);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/sdl/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 25 Oct 2004 02:34:21 -0000 1.9
+++ pkg/PLIST 8 Oct 2006 05:54:52 -0000
@@ -6,6 +6,14 @@ include/SDL/SDL_active.h
include/SDL/SDL_audio.h
include/SDL/SDL_byteorder.h
include/SDL/SDL_cdrom.h
+include/SDL/SDL_config.h
+include/SDL/SDL_config_amiga.h
+include/SDL/SDL_config_dreamcast.h
+include/SDL/SDL_config_macos.h
+include/SDL/SDL_config_macosx.h
+include/SDL/SDL_config_minimal.h
+include/SDL/SDL_config_os2.h
+include/SDL/SDL_config_win32.h
include/SDL/SDL_copying.h
include/SDL/SDL_cpuinfo.h
include/SDL/SDL_endian.h
@@ -21,8 +29,10 @@ include/SDL/SDL_mouse.h
include/SDL/SDL_mutex.h
include/SDL/SDL_name.h
include/SDL/SDL_opengl.h
+include/SDL/SDL_platform.h
include/SDL/SDL_quit.h
include/SDL/SDL_rwops.h
+include/SDL/SDL_stdinc.h
include/SDL/SDL_syswm.h
include/SDL/SDL_thread.h
include/SDL/SDL_timer.h
@@ -34,6 +44,8 @@ include/SDL/close_code.h
lib/libSDL.a
lib/libSDL.la
lib/libSDLmain.a
+lib/pkgconfig/
+lib/pkgconfig/sdl.pc
@man man/man3/SDLKey.3
@man man/man3/SDL_ActiveEvent.3
@man man/man3/SDL_AddTimer.3
