diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-04-09 11:55:04 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-04-09 11:55:04 +0000 |
| commit | 8ed8aafc20f5bbb802536df1c9c60b6e8c4a3220 (patch) | |
| tree | a2747f7614694d1f568fd0fa2639e77228c1c234 /devel | |
| parent | f8cfa28522c7e06ce5f5b9297d559a07ea66e646 (diff) | |
| download | ports-8ed8aafc20f5bbb802536df1c9c60b6e8c4a3220.tar.gz ports-8ed8aafc20f5bbb802536df1c9c60b6e8c4a3220.zip | |
Notes
Diffstat (limited to 'devel')
41 files changed, 4 insertions, 3142 deletions
diff --git a/devel/Makefile b/devel/Makefile index c57105808daa..ae423e9bc976 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -408,8 +408,8 @@ SUBDIR += ruby-unit SUBDIR += rvm SUBDIR += sdcc - SUBDIR += sdl - SUBDIR += sdl-devel + SUBDIR += sdl10 + SUBDIR += sdl12 SUBDIR += sdts++ SUBDIR += sfio SUBDIR += sh-rtems-binutils diff --git a/devel/ruby-sdl/Makefile b/devel/ruby-sdl/Makefile index a8e71a05cf0b..7b2685b0250e 100644 --- a/devel/ruby-sdl/Makefile +++ b/devel/ruby-sdl/Makefile @@ -16,7 +16,7 @@ DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org -LIB_DEPENDS= SDL-1.1.3:${PORTSDIR}/devel/sdl-devel \ +LIB_DEPENDS= SDL-1.1.3:${PORTSDIR}/devel/sdl12 \ SDL_image.10:${PORTSDIR}/graphics/sdl_image \ SDL_ttf.2:${PORTSDIR}/graphics/sdl_ttf \ SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer diff --git a/devel/sdl-devel/Makefile b/devel/sdl-devel/Makefile deleted file mode 100644 index ab91b1f8f142..000000000000 --- a/devel/sdl-devel/Makefile +++ /dev/null @@ -1,78 +0,0 @@ -# New ports collection makefile for: SDL -# Date created: 1 April 2000 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= sdl-devel -PORTVERSION= 1.2.0 -CATEGORIES= devel -MASTER_SITES= http://www.libsdl.org/release/ \ - http://www.devolution.com/~slouken/SDL/release/ -DISTNAME= SDL-${PORTVERSION} - -MAINTAINER= sobomax@FreeBSD.org - -LIB_DEPENDS= aa.1:${PORTSDIR}/graphics/aalib \ - vga.1:${PORTSDIR}/graphics/svgalib -BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm - -USE_XLIB= yes -USE_ESOUND= yes -INSTALLS_SHLIB= yes -USE_LIBTOOL= yes -CONFIGURE_ENV= NASM="${LOCALBASE}/bin/nasm" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" -CONFIGURE_ARGS= --enable-video-aalib \ - --enable-video-svga \ - --disable-arts \ - --disable-nas - -CFLAGS+= ${PTHREAD_CFLAGS} - -.if exists(/usr/lib/libvgl.so.3) -CONFIGURE_ARGS+=--enable-video-vgl -DISPLAY_MSG= ${CAT} ${PKGMESSAGE} -.else -CONFIGURE_ARGS+=--disable-video-vgl -PKGMESSAGE= /I/hate/ports/Mk/bsd.port.mk -DISPLAY_MSG= ${DO_NADA} -.endif - -.if defined(WITHOUT_GL) -CONFIGURE_ARGS+=--disable-video-opengl -.else -USE_MESA= yes -CONFIGURE_ARGS+=--enable-video-opengl -.endif - -.include <bsd.port.pre.mk> - -MAN3!= /bin/cat ${FILESDIR}/man3 - -pre-configure: - @find ${WRKSRC} -type f -name Makefile.in | xargs ${TOUCH} - -post-configure: - @cd ${WRKSRC} && \ - ${CP} sdl-config sdl11-config && \ - ${CP} sdl.m4 sdl11.m4 - @${PERL} -pi -e 's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \ - ${WRKSRC}/libtool - -post-install: - @${MKDIR} ${PREFIX}/share/examples/SDL11 - ${INSTALL_DATA} ${WRKSRC}/test/* ${PREFIX}/share/examples/SDL11 -.if !defined(NOPORTDOCS) - @${MKDIR} ${PREFIX}/share/doc/SDL11/docs -.for file in BUGS COPYING CREDITS README WhatsNew docs.html - ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/SDL11 -.endfor - @cd ${WRKSRC}/docs; tar cf - `${ECHO} [^Mm]*` | \ - (cd ${PREFIX}/share/doc/SDL11/docs; ${TAR} --unlink -xf - ) -.endif - @${DISPLAY_MSG} - -.include <bsd.port.post.mk> diff --git a/devel/sdl-devel/distinfo b/devel/sdl-devel/distinfo deleted file mode 100644 index 4db58e936dd4..000000000000 --- a/devel/sdl-devel/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (SDL-1.2.0.tar.gz) = 20419c09eed9c3a64ec5fb39e0cb924c diff --git a/devel/sdl-devel/files/man3 b/devel/sdl-devel/files/man3 deleted file mode 100644 index cdfa1d039b32..000000000000 --- a/devel/sdl-devel/files/man3 +++ /dev/null @@ -1,172 +0,0 @@ -SDLKey.3 -SDL_ActiveEvent.3 -SDL_AddTimer.3 -SDL_AudioCVT.3 -SDL_AudioSpec.3 -SDL_BlitSurface.3 -SDL_BuildAudioCVT.3 -SDL_CD.3 -SDL_CDClose.3 -SDL_CDEject.3 -SDL_CDName.3 -SDL_CDNumDrives.3 -SDL_CDOpen.3 -SDL_CDPause.3 -SDL_CDPlay.3 -SDL_CDPlayTracks.3 -SDL_CDResume.3 -SDL_CDStatus.3 -SDL_CDStop.3 -SDL_CDtrack.3 -SDL_CloseAudio.3 -SDL_Color.3 -SDL_CondBroadcast.3 -SDL_CondSignal.3 -SDL_CondWait.3 -SDL_CondWaitTimeout.3 -SDL_ConvertAudio.3 -SDL_ConvertSurface.3 -SDL_CreateCond.3 -SDL_CreateCursor.3 -SDL_CreateMutex.3 -SDL_CreateRGBSurface.3 -SDL_CreateRGBSurfaceFrom.3 -SDL_CreateSemaphore.3 -SDL_CreateThread.3 -SDL_CreateYUVOverlay.3 -SDL_Delay.3 -SDL_DestroyCond.3 -SDL_DestroyMutex.3 -SDL_DestroySemaphore.3 -SDL_DisplayFormat.3 -SDL_DisplayFormatAlpha.3 -SDL_DisplayYUVOverlay.3 -SDL_EnableKeyRepeat.3 -SDL_EnableUNICODE.3 -SDL_Event.3 -SDL_EventState.3 -SDL_FillRect.3 -SDL_Flip.3 -SDL_FreeCursor.3 -SDL_FreeSurface.3 -SDL_FreeWAV.3 -SDL_FreeYUVOverlay.3 -SDL_GL_GetAttribute.3 -SDL_GL_GetProcAddress.3 -SDL_GL_LoadLibrary.3 -SDL_GL_SetAttribute.3 -SDL_GL_SwapBuffers.3 -SDL_GLattr.3 -SDL_GetAppState.3 -SDL_GetAudioStatus.3 -SDL_GetClipRect.3 -SDL_GetCursor.3 -SDL_GetEventFilter.3 -SDL_GetGamma.3 -SDL_GetGammaRamp.3 -SDL_GetKeyName.3 -SDL_GetKeyState.3 -SDL_GetModState.3 -SDL_GetMouseState.3 -SDL_GetRGB.3 -SDL_GetRGBA.3 -SDL_GetRelativeMouseState.3 -SDL_GetThreadID.3 -SDL_GetTicks.3 -SDL_GetVideoInfo.3 -SDL_GetVideoSurface.3 -SDL_Init.3 -SDL_InitSubSystem.3 -SDL_JoyAxisEvent.3 -SDL_JoyBallEvent.3 -SDL_JoyButtonEvent.3 -SDL_JoyHatEvent.3 -SDL_JoystickClose.3 -SDL_JoystickEventState.3 -SDL_JoystickGetAxis.3 -SDL_JoystickGetBall.3 -SDL_JoystickGetButton.3 -SDL_JoystickGetHat.3 -SDL_JoystickIndex.3 -SDL_JoystickName.3 -SDL_JoystickNumAxes.3 -SDL_JoystickNumBalls.3 -SDL_JoystickNumButtons.3 -SDL_JoystickNumHats.3 -SDL_JoystickOpen.3 -SDL_JoystickOpened.3 -SDL_JoystickUpdate.3 -SDL_KeyboardEvent.3 -SDL_KillThread.3 -SDL_ListModes.3 -SDL_LoadBMP.3 -SDL_LoadWAV.3 -SDL_LockAudio.3 -SDL_LockSurface.3 -SDL_LockYUVOverlay.3 -SDL_MapRGB.3 -SDL_MapRGBA.3 -SDL_MixAudio.3 -SDL_MouseButtonEvent.3 -SDL_MouseMotionEvent.3 -SDL_NumJoysticks.3 -SDL_OpenAudio.3 -SDL_Overlay.3 -SDL_Palette.3 -SDL_PauseAudio.3 -SDL_PeepEvents.3 -SDL_PixelFormat.3 -SDL_PollEvent.3 -SDL_PumpEvents.3 -SDL_PushEvent.3 -SDL_Quit.3 -SDL_QuitEvent.3 -SDL_QuitSubSystem.3 -SDL_RWFromFile.3 -SDL_Rect.3 -SDL_RemoveTimer.3 -SDL_ResizeEvent.3 -SDL_SaveBMP.3 -SDL_SemPost.3 -SDL_SemTryWait.3 -SDL_SemValue.3 -SDL_SemWait.3 -SDL_SemWaitTimeout.3 -SDL_SetAlpha.3 -SDL_SetClipRect.3 -SDL_SetColorKey.3 -SDL_SetColors.3 -SDL_SetCursor.3 -SDL_SetEventFilter.3 -SDL_SetGamma.3 -SDL_SetGammaRamp.3 -SDL_SetModState.3 -SDL_SetPalette.3 -SDL_SetTimer.3 -SDL_SetVideoMode.3 -SDL_ShowCursor.3 -SDL_Surface.3 -SDL_SysWMEvent.3 -SDL_ThreadID.3 -SDL_UnlockAudio.3 -SDL_UnlockSurface.3 -SDL_UnlockYUVOverlay.3 -SDL_UpdateRect.3 -SDL_UpdateRects.3 -SDL_UserEvent.3 -SDL_VideoDriverName.3 -SDL_VideoInfo.3 -SDL_VideoModeOK.3 -SDL_WM_GetCaption.3 -SDL_WM_GrabInput.3 -SDL_WM_IconifyWindow.3 -SDL_WM_SetCaption.3 -SDL_WM_SetIcon.3 -SDL_WM_ToggleFullScreen.3 -SDL_WaitEvent.3 -SDL_WaitThread.3 -SDL_WarpMouse.3 -SDL_WasInit.3 -SDL_keysym.3 -SDL_mutexP.3 -SDL_mutexV.3 diff --git a/devel/sdl-devel/files/patch-ac b/devel/sdl-devel/files/patch-ac deleted file mode 100644 index 67930064f5d7..000000000000 --- a/devel/sdl-devel/files/patch-ac +++ /dev/null @@ -1,152 +0,0 @@ - -$FreeBSD$ - ---- configure.orig Tue Mar 27 06:39:34 2001 -+++ configure Mon Apr 2 11:25:59 2001 -@@ -84,6 +84,8 @@ - ac_help="$ac_help - --enable-video-svga use SVGAlib video driver [default=no]" - ac_help="$ac_help -+ --enable-video-vgl use VGL video driver [default=no]" -+ac_help="$ac_help - --enable-video-aalib use AAlib video driver [default=no]" - ac_help="$ac_help - --enable-video-opengl include OpenGL context creation [default=yes]" -@@ -621,7 +623,7 @@ - SDL_MAJOR_VERSION=1 - SDL_MINOR_VERSION=2 - SDL_MICRO_VERSION=0 --SDL_INTERFACE_AGE=0 -+SDL_INTERFACE_AGE=3 - SDL_BINARY_AGE=0 - SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION - -@@ -634,9 +636,9 @@ - - # libtool versioning - LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION --LT_CURRENT=`expr $SDL_MICRO_VERSION - $SDL_INTERFACE_AGE` -+LT_CURRENT=$SDL_INTERFACE_AGE - LT_REVISION=$SDL_INTERFACE_AGE --LT_AGE=`expr $SDL_BINARY_AGE - $SDL_INTERFACE_AGE` -+LT_AGE=$SDL_INTERFACE_AGE - - - -@@ -3042,7 +3044,7 @@ - - - SDL_CFLAGS="" --SDL_LIBS="-lSDL" -+SDL_LIBS="-lSDL-1.1" - - - case "$target" in -@@ -5226,6 +5228,57 @@ - fi - } - -+CheckVGL() -+{ -+ # Check whether --enable-video-vgl or --disable-video-vgl was given. -+if test "${enable_video_vgl+set}" = set; then -+ enableval="$enable_video_vgl" -+ : -+else -+ enable_video_vgl=no -+fi -+ -+ if test x$enable_video = xyes -a x$enable_video_vgl = xyes; then -+ echo $ac_n "checking for libVGL support""... $ac_c" 1>&6 -+echo "configure:5162: checking for libVGL support" >&5 -+ video_vgl=no -+ cat > conftest.$ac_ext <<EOF -+#line 5165 "configure" -+#include "confdefs.h" -+ -+ #include <sys/fbio.h> -+ #include <sys/consio.h> -+ #include <sys/kbio.h> -+ #include <vgl.h> -+ -+int main() { -+ -+ VGLBitmap bitmap; -+ exit(bitmap.PixelBytes); -+ -+; return 0; } -+EOF -+if { (eval echo configure:5180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ -+ video_vgl=yes -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+fi -+rm -f conftest* -+ echo "$ac_t""$video_vgl" 1>&6 -+ if test x$video_vgl = xyes; then -+ CFLAGS="$CFLAGS -DENABLE_VGL" -+ SYSTEM_LIBS="$SYSTEM_LIBS -lvgl" -+ -+ VIDEO_SUBDIRS="$VIDEO_SUBDIRS vgl" -+ VIDEO_DRIVERS="$VIDEO_DRIVERS vgl/libvideo_vgl.la" -+ fi -+ fi -+} -+ - CheckAAlib() - { - # Check whether --enable-video-aalib or --disable-video-aalib was given. -@@ -5451,8 +5504,8 @@ - # pthread_cflags="-D_REENTRANT -D_THREAD_SAFE" - ;; - *-*-freebsd*) -- pthread_cflags="-D_REENTRANT -D_THREAD_SAFE" -- pthread_lib="-pthread" -+ pthread_cflags="-D_REENTRANT ${PTHREAD_CFLAGS}" -+ pthread_lib="${PTHREAD_LIBS}" - ;; - *-*-openbsd*) - pthread_cflags="-D_REENTRANT" -@@ -6193,6 +6246,7 @@ - CheckX11 - CheckDGA - CheckSVGA -+ CheckVGL - CheckAAlib - CheckOpenGL - CheckPTHREAD -@@ -6378,10 +6432,10 @@ - cat >>$new <$old - - # Set up files for the audio library -- if test x$enable_audio = xyes; then -- AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun" -- AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la" -- fi -+ #if test x$enable_audio = xyes; then -+ # AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun" -+ # AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la" -+ #fi - # Set up files for the joystick library - # (No joystick support yet) - if test x$enable_joystick = xyes; then -@@ -8818,6 +8872,7 @@ - src/video/macdsp/Makefile - src/video/macrom/Makefile - src/video/svga/Makefile -+src/video/vgl/Makefile - src/video/aalib/Makefile - src/video/wincommon/Makefile - src/video/windib/Makefile -@@ -9042,6 +9097,7 @@ - src/video/macdsp/Makefile - src/video/macrom/Makefile - src/video/svga/Makefile -+src/video/vgl/Makefile - src/video/aalib/Makefile - src/video/wincommon/Makefile - src/video/windib/Makefile diff --git a/devel/sdl-devel/files/patch-ag b/devel/sdl-devel/files/patch-ag deleted file mode 100644 index 303d3b2889e9..000000000000 --- a/devel/sdl-devel/files/patch-ag +++ /dev/null @@ -1,24 +0,0 @@ ---- src/Makefile.in.orig Fri Mar 31 08:31:12 2000 -+++ src/Makefile.in Sun Apr 23 23:45:07 2000 -@@ -118,10 +118,10 @@ - DIST_SUBDIRS = $(CORE_SUBDIRS) $(EXTRA_SUBDIRS) - - # The SDL library target --lib_LTLIBRARIES = libSDL.la -+lib_LTLIBRARIES = libSDL-1.1.la - - libSDL_la_SOURCES = $(GENERAL_SRCS) --libSDL_la_LDFLAGS = -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -+libSDL_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) - - libSDL_la_LIBADD = main/libarch.la @SDL_EXTRALIBS@ @SYSTEM_LIBS@ - -@@ -239,7 +239,7 @@ - - maintainer-clean-libtool: - --libSDL.la: $(libSDL_la_OBJECTS) $(libSDL_la_DEPENDENCIES) -+libSDL-1.1.la: $(libSDL_la_OBJECTS) $(libSDL_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libSDL_la_LDFLAGS) $(libSDL_la_OBJECTS) $(libSDL_la_LIBADD) $(LIBS) - - # This directory's subdirectories are mostly independent; you can cd diff --git a/devel/sdl-devel/files/patch-ah b/devel/sdl-devel/files/patch-ah deleted file mode 100644 index 43115ee865d0..000000000000 --- a/devel/sdl-devel/files/patch-ah +++ /dev/null @@ -1,26 +0,0 @@ ---- src/main/Makefile.in.orig Sun Apr 23 22:37:43 2000 -+++ src/main/Makefile.in Sun Apr 23 22:45:12 2000 -@@ -109,7 +109,7 @@ - ARCH_SUBDIRS = beos linux macos win32 - - # Build a separate library containing the main() entry point. --lib_LIBRARIES = libSDLmain.a -+lib_LIBRARIES = libSDLmain-1.1.a - - MAINLIB_ARCH_SRCS = SDL_main.c - -@@ -257,10 +257,10 @@ - - maintainer-clean-libtool: - --libSDLmain.a: $(libSDLmain_a_OBJECTS) $(libSDLmain_a_DEPENDENCIES) -- -rm -f libSDLmain.a -- $(AR) cru libSDLmain.a $(libSDLmain_a_OBJECTS) $(libSDLmain_a_LIBADD) -- $(RANLIB) libSDLmain.a -+libSDLmain-1.1.a: $(libSDLmain_a_OBJECTS) $(libSDLmain_a_DEPENDENCIES) -+ -rm -f libSDLmain-1.1.a -+ $(AR) cru libSDLmain-1.1.a $(libSDLmain_a_OBJECTS) $(libSDLmain_a_LIBADD) -+ $(RANLIB) libSDLmain-1.1.a - - mostlyclean-noinstLTLIBRARIES: - diff --git a/devel/sdl-devel/files/patch-ai b/devel/sdl-devel/files/patch-ai deleted file mode 100644 index 6084e7e540c3..000000000000 --- a/devel/sdl-devel/files/patch-ai +++ /dev/null @@ -1,11 +0,0 @@ ---- include/Makefile.in.orig Sun Apr 23 22:34:25 2000 -+++ include/Makefile.in Sun Apr 23 22:34:43 2000 -@@ -106,7 +106,7 @@ - with_gcc = @with_gcc@ - with_gnu_ld = @with_gnu_ld@ - --libSDLincludedir = $(includedir)/SDL -+libSDLincludedir = $(includedir)/SDL11 - - # Which header files to install - libSDLinclude_HEADERS = SDL.h SDL_active.h SDL_audio.h SDL_byteorder.h SDL_cdrom.h SDL_copying.h SDL_endian.h SDL_error.h SDL_events.h SDL_joystick.h SDL_keyboard.h SDL_keysym.h SDL_main.h SDL_mouse.h SDL_mutex.h SDL_quit.h SDL_rwops.h SDL_syswm.h SDL_thread.h SDL_timer.h SDL_types.h SDL_version.h SDL_video.h begin_code.h close_code.h diff --git a/devel/sdl-devel/files/patch-aj b/devel/sdl-devel/files/patch-aj deleted file mode 100644 index 1aea9b14afdd..000000000000 --- a/devel/sdl-devel/files/patch-aj +++ /dev/null @@ -1,38 +0,0 @@ - -$FreeBSD$ - ---- Makefile.in.orig Fri Jan 5 22:18:18 2001 -+++ Makefile.in Wed Jan 24 12:02:04 2001 -@@ -44,10 +44,10 @@ - - top_builddir = . - --ACLOCAL = @ACLOCAL@ --AUTOCONF = @AUTOCONF@ --AUTOMAKE = @AUTOMAKE@ --AUTOHEADER = @AUTOHEADER@ -+ACLOCAL = #@ACLOCAL@ -+AUTOCONF = #@AUTOCONF@ -+AUTOMAKE = #@AUTOMAKE@ -+AUTOHEADER = #@AUTOHEADER@ - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -110,7 +110,7 @@ - DIST_SUBDIRS = $(SUBDIRS) docs - - # SDL runtime configuration script --bin_SCRIPTS = sdl-config -+bin_SCRIPTS = sdl11-config - - # All the rest of the distributed files - EXTRA_DIST = BUGS TODO COPYING CREDITS INSTALL README README-SDL.txt README.Win32 README.MacOS README.MacOSX VisualC.html VisualC.zip CWprojects.sea.hqx MPWmake.sea.hqx WhatsNew docs.html sdl.m4 autogen.sh strip_fPIC.sh -@@ -118,7 +118,7 @@ - - # M4 macro file for inclusion with autoconf - m4datadir = $(datadir)/aclocal --m4data_DATA = sdl.m4 -+m4data_DATA = sdl11.m4 - - # Create a CVS snapshot that people can run update -d on - CVSROOT = :pserver:guest@cvs.lokigames.com:/cvs diff --git a/devel/sdl-devel/files/patch-ak b/devel/sdl-devel/files/patch-ak deleted file mode 100644 index 1f83063293f4..000000000000 --- a/devel/sdl-devel/files/patch-ak +++ /dev/null @@ -1,28 +0,0 @@ - -$FreeBSD$ - ---- sdl-config.in.orig Wed Feb 28 17:53:18 2001 -+++ sdl-config.in Fri Mar 30 17:30:06 2001 -@@ -5,7 +5,7 @@ - exec_prefix_set=no - - usage="\ --Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]" -+Usage: sdl11-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]" - - if test $# -eq 0; then - echo "${usage}" 1>&2 -@@ -45,11 +45,11 @@ - - includes=-I@includedir@ - fi -- echo $includes -I@includedir@/SDL @SDL_CFLAGS@ -+ echo $includes -I@includedir@/SDL11 @SDL_CFLAGS@ - ;; - @ENABLE_SHARED_TRUE@ --libs) - @ENABLE_SHARED_TRUE@ libdirs="-L@libdir@ @SDL_RLD_FLAGS@" --@ENABLE_SHARED_TRUE@ echo $libdirs @SDL_LIBS@ -+@ENABLE_SHARED_TRUE@ echo $libdirs @SDL_LIBS@ @SYSTEM_LIBS@ - @ENABLE_SHARED_TRUE@ ;; - @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs) - @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs) diff --git a/devel/sdl-devel/files/patch-configure.in b/devel/sdl-devel/files/patch-configure.in deleted file mode 100644 index 83a0f76ac4ec..000000000000 --- a/devel/sdl-devel/files/patch-configure.in +++ /dev/null @@ -1,59 +0,0 @@ - -$FreeBSD$ - ---- configure.in.orig Fri Jan 5 22:18:17 2001 -+++ configure.in Sun Jan 21 23:01:12 2001 -@@ -600,6 +600,37 @@ - fi - } - -+dnl Find the VGL includes and libraries -+CheckVGL() -+{ -+ AC_ARG_ENABLE(video-vgl, -+[ --enable-video-vgl use VGL video driver [default=no]], -+ , enable_video_vgl=no) -+ if test x$enable_video = xyes -a x$enable_video_vgl = xyes; then -+ AC_MSG_CHECKING(for libVGL support) -+ video_vgl=no -+ AC_TRY_COMPILE([ -+ #include <sys/fbio.h> -+ #include <sys/consio.h> -+ #include <sys/kbio.h> -+ #include <vgl.h> -+ ],[ -+ VGLBitmap bitmap; -+ exit(bitmap.PyxelBytes); -+ ],[ -+ video_vgl=yes -+ ]) -+ AC_MSG_RESULT($video_vgl) -+ if test x$video_vgl = xyes; then -+ CFLAGS="$CFLAGS -DENABLE_VGL" -+ SYSTEM_LIBS="$SYSTEM_LIBS -lvgl" -+ -+ VIDEO_SUBDIRS="$VIDEO_SUBDIRS vgl" -+ VIDEO_DRIVERS="$VIDEO_DRIVERS vgl/libvideo_vgl.la" -+ fi -+ fi -+} -+ - dnl Find the AAlib includes - CheckAAlib() - { -@@ -998,6 +1029,7 @@ - CheckX11 - CheckDGA - CheckSVGA -+ CheckVGL - CheckAAlib - CheckOpenGL - CheckPTHREAD -@@ -1659,6 +1691,7 @@ - src/video/macdsp/Makefile - src/video/macrom/Makefile - src/video/svga/Makefile -+src/video/vgl/Makefile - src/video/aalib/Makefile - src/video/wincommon/Makefile - src/video/windib/Makefile diff --git a/devel/sdl-devel/files/patch-src_video_Makefile.am b/devel/sdl-devel/files/patch-src_video_Makefile.am deleted file mode 100644 index 7a13c06bd5d9..000000000000 --- a/devel/sdl-devel/files/patch-src_video_Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- src/video/Makefile.am 2001/01/21 20:09:35 1.1 -+++ src/video/Makefile.am 2001/01/21 20:10:15 -@@ -7,7 +7,8 @@ - SUBDIRS = @VIDEO_SUBDIRS@ - DIST_SUBDIRS = x11 dga fbcon svga ggi aalib \ - wincommon windib windx5 \ -- maccommon macdsp macrom bwindow photon cybergfx -+ maccommon macdsp macrom bwindow photon cybergfx \ -+ vgl - - DRIVERS = @VIDEO_DRIVERS@ - diff --git a/devel/sdl-devel/files/patch-src_video_Makefile.in b/devel/sdl-devel/files/patch-src_video_Makefile.in deleted file mode 100644 index d6bccaefb1a1..000000000000 --- a/devel/sdl-devel/files/patch-src_video_Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- src/video/Makefile.in 2001/01/21 20:10:22 1.1 -+++ src/video/Makefile.in 2001/01/21 20:10:38 -@@ -103,7 +103,7 @@ - - # Define which subdirectories need to be built - SUBDIRS = @VIDEO_SUBDIRS@ --DIST_SUBDIRS = x11 dga fbcon svga ggi aalib wincommon windib windx5 maccommon macdsp macrom bwindow photon cybergfx -+DIST_SUBDIRS = x11 dga fbcon svga ggi aalib wincommon windib windx5 maccommon macdsp macrom bwindow photon cybergfx vgl - - - DRIVERS = @VIDEO_DRIVERS@ diff --git a/devel/sdl-devel/files/patch-src_video_SDL__sysvideo.h b/devel/sdl-devel/files/patch-src_video_SDL__sysvideo.h deleted file mode 100644 index 4d1e3580c69e..000000000000 --- a/devel/sdl-devel/files/patch-src_video_SDL__sysvideo.h +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- src/video/SDL_sysvideo.h 2001/01/21 20:12:21 1.1 -+++ src/video/SDL_sysvideo.h 2001/01/21 20:12:51 -@@ -331,6 +331,9 @@ - #ifdef ENABLE_SVGALIB - extern VideoBootStrap SVGALIB_bootstrap; - #endif -+#ifdef ENABLE_VGL -+extern VideoBootStrap VGL_bootstrap; -+#endif - #ifdef ENABLE_AALIB - extern VideoBootStrap AALIB_bootstrap; - #endif diff --git a/devel/sdl-devel/files/patch-src_video_SDL__video.c b/devel/sdl-devel/files/patch-src_video_SDL__video.c deleted file mode 100644 index 98e603c9d132..000000000000 --- a/devel/sdl-devel/files/patch-src_video_SDL__video.c +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- src/video/SDL_video.c 2001/01/21 20:11:02 1.1 -+++ src/video/SDL_video.c 2001/01/21 20:11:59 -@@ -60,6 +60,9 @@ - #ifdef ENABLE_SVGALIB - &SVGALIB_bootstrap, - #endif -+#ifdef ENABLE_VGL -+ &VGL_bootstrap, -+#endif - #ifdef ENABLE_AALIB - &AALIB_bootstrap, - #endif diff --git a/devel/sdl-devel/files/patch-src_video_svga_SDL__svgaevents.c b/devel/sdl-devel/files/patch-src_video_svga_SDL__svgaevents.c deleted file mode 100644 index 113384935c43..000000000000 --- a/devel/sdl-devel/files/patch-src_video_svga_SDL__svgaevents.c +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- src/video/svga/SDL_svgaevents.c 2001/01/27 17:53:11 1.1 -+++ src/video/svga/SDL_svgaevents.c 2001/01/27 17:53:58 -@@ -28,6 +28,7 @@ - /* Handle the event stream, converting X11 events into SDL events */ - - #include <stdio.h> -+#include <stdlib.h> - - #include <vga.h> - #include <vgamouse.h> diff --git a/devel/sdl-devel/files/patch-src_video_vgl_Makefile.am b/devel/sdl-devel/files/patch-src_video_vgl_Makefile.am deleted file mode 100644 index e8ff77fb26e3..000000000000 --- a/devel/sdl-devel/files/patch-src_video_vgl_Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Sun Jan 21 22:16:58 2001 -+++ src/video/vgl/Makefile.am Sun Jan 21 22:04:06 2001 -@@ -0,0 +1,15 @@ -+ -+## Makefile.am for SDL using the libVGL video driver -+ -+noinst_LTLIBRARIES = libvideo_vgl.la -+libvideo_vgl_la_SOURCES = $(VGL_SRCS) -+ -+# The SDL libVGL video driver sources -+VGL_SRCS = \ -+ SDL_vglvideo.h \ -+ SDL_vglevents.c \ -+ SDL_vglevents_c.h \ -+ SDL_vglmouse.c \ -+ SDL_vglmouse_c.h \ -+ SDL_vglvideo.c -+ diff --git a/devel/sdl-devel/files/patch-src_video_vgl_Makefile.in b/devel/sdl-devel/files/patch-src_video_vgl_Makefile.in deleted file mode 100644 index 248449f66e78..000000000000 --- a/devel/sdl-devel/files/patch-src_video_vgl_Makefile.in +++ /dev/null @@ -1,328 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Sun Jan 21 22:16:58 2001 -+++ src/video/vgl/Makefile.in Sun Jan 21 22:06:20 2001 -@@ -0,0 +1,322 @@ -+# Makefile.in generated automatically by automake 1.4a from Makefile.am -+ -+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# This Makefile.in is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -+# PARTICULAR PURPOSE. -+ -+ -+SHELL = @SHELL@ -+ -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+VPATH = @srcdir@ -+prefix = @prefix@ -+exec_prefix = @exec_prefix@ -+ -+bindir = @bindir@ -+sbindir = @sbindir@ -+libexecdir = @libexecdir@ -+datadir = @datadir@ -+sysconfdir = @sysconfdir@ -+sharedstatedir = @sharedstatedir@ -+localstatedir = @localstatedir@ -+libdir = @libdir@ -+infodir = @infodir@ -+mandir = @mandir@ -+includedir = @includedir@ -+oldincludedir = /usr/include -+ -+DESTDIR = -+ -+pkgdatadir = $(datadir)/@PACKAGE@ -+pkglibdir = $(libdir)/@PACKAGE@ -+pkgincludedir = $(includedir)/@PACKAGE@ -+ -+top_builddir = ../../.. -+ -+ACLOCAL = @ACLOCAL@ -+AUTOCONF = @AUTOCONF@ -+AUTOMAKE = @AUTOMAKE@ -+AUTOHEADER = @AUTOHEADER@ -+ -+INSTALL = @INSTALL@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_FLAG = -+transform = @program_transform_name@ -+ -+NORMAL_INSTALL = : -+PRE_INSTALL = : -+POST_INSTALL = : -+NORMAL_UNINSTALL = : -+PRE_UNINSTALL = : -+POST_UNINSTALL = : -+host_alias = @host_alias@ -+host_triplet = @host@ -+ARCH = @ARCH@ -+ARTSCCONFIG = @ARTSCCONFIG@ -+AS = @AS@ -+AUDIO_DRIVERS = @AUDIO_DRIVERS@ -+AUDIO_SUBDIRS = @AUDIO_SUBDIRS@ -+CC = @CC@ -+CXX = @CXX@ -+DLLTOOL = @DLLTOOL@ -+ESD_CFLAGS = @ESD_CFLAGS@ -+ESD_CONFIG = @ESD_CONFIG@ -+ESD_LIBS = @ESD_LIBS@ -+LIBTOOL = @LIBTOOL@ -+LN_S = @LN_S@ -+LT_AGE = @LT_AGE@ -+LT_CURRENT = @LT_CURRENT@ -+LT_RELEASE = @LT_RELEASE@ -+LT_REVISION = @LT_REVISION@ -+MAKEINFO = @MAKEINFO@ -+NASM = @NASM@ -+NASMFLAGS = @NASMFLAGS@ -+OBJDUMP = @OBJDUMP@ -+PACKAGE = @PACKAGE@ -+RANLIB = @RANLIB@ -+SDL_BINARY_AGE = @SDL_BINARY_AGE@ -+SDL_CFLAGS = @SDL_CFLAGS@ -+SDL_EXTRADIRS = @SDL_EXTRADIRS@ -+SDL_EXTRALIBS = @SDL_EXTRALIBS@ -+SDL_INTERFACE_AGE = @SDL_INTERFACE_AGE@ -+SDL_LIBS = @SDL_LIBS@ -+SDL_MAJOR_VERSION = @SDL_MAJOR_VERSION@ -+SDL_MICRO_VERSION = @SDL_MICRO_VERSION@ -+SDL_MINOR_VERSION = @SDL_MINOR_VERSION@ -+SDL_RLD_FLAGS = @SDL_RLD_FLAGS@ -+SDL_VERSION = @SDL_VERSION@ -+SYSTEM_LIBS = @SYSTEM_LIBS@ -+VERSION = @VERSION@ -+VIDEO_DRIVERS = @VIDEO_DRIVERS@ -+VIDEO_SUBDIRS = @VIDEO_SUBDIRS@ -+ -+noinst_LTLIBRARIES = libvideo_vgl.la -+libvideo_vgl_la_SOURCES = $(VGL_SRCS) -+ -+# The SDL VGLlib video driver sources -+VGL_SRCS = SDL_vglvideo.h SDL_vglevents.c SDL_vglevents_c.h SDL_vglmouse.c SDL_vglmouse_c.h SDL_vglvideo.c -+ -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(noinst_LTLIBRARIES) -+ -+ -+DEFS = @DEFS@ -I. -I$(srcdir) -+CPPFLAGS = @CPPFLAGS@ -+LDFLAGS = @LDFLAGS@ -+LIBS = @LIBS@ -+X_CFLAGS = @X_CFLAGS@ -+X_LIBS = @X_LIBS@ -+X_EXTRA_LIBS = @X_EXTRA_LIBS@ -+X_PRE_LIBS = @X_PRE_LIBS@ -+libvideo_vgl_la_LDFLAGS = -+libvideo_vgl_la_LIBADD = -+libvideo_vgl_la_OBJECTS = SDL_vglevents.lo SDL_vglmouse.lo \ -+SDL_vglvideo.lo -+CFLAGS = @CFLAGS@ -+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -+DIST_COMMON = Makefile.am Makefile.in -+ -+ -+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -+ -+TAR = gtar -+GZIP_ENV = --best -+SOURCES = $(libvideo_vgl_la_SOURCES) -+OBJECTS = $(libvideo_vgl_la_OBJECTS) -+ -+all: all-redirect -+.SUFFIXES: -+.SUFFIXES: .S .c .lo .o .s -+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+ cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps src/video/vgl/Makefile -+ -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) \ -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ -+ -+mostlyclean-noinstLTLIBRARIES: -+ -+clean-noinstLTLIBRARIES: -+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) -+ -+distclean-noinstLTLIBRARIES: -+ -+maintainer-clean-noinstLTLIBRARIES: -+ -+.c.o: -+ $(COMPILE) -c $< -+ -+.s.o: -+ $(COMPILE) -c $< -+ -+.S.o: -+ $(COMPILE) -c $< -+ -+mostlyclean-compile: -+ -rm -f *.o core *.core -+ -+clean-compile: -+ -+distclean-compile: -+ -rm -f *.tab.c -+ -+maintainer-clean-compile: -+ -+.c.lo: -+ $(LIBTOOL) --mode=compile $(COMPILE) -c $< -+ -+.s.lo: -+ $(LIBTOOL) --mode=compile $(COMPILE) -c $< -+ -+.S.lo: -+ $(LIBTOOL) --mode=compile $(COMPILE) -c $< -+ -+mostlyclean-libtool: -+ -rm -f *.lo -+ -+clean-libtool: -+ -rm -rf .libs _libs -+ -+distclean-libtool: -+ -+maintainer-clean-libtool: -+ -+libvideo_vgl.la: $(libvideo_vgl_la_OBJECTS) $(libvideo_vgl_la_DEPENDENCIES) -+ $(LINK) $(libvideo_vgl_la_LDFLAGS) $(libvideo_vgl_la_OBJECTS) $(libvideo_vgl_la_LIBADD) $(LIBS) -+ -+tags: TAGS -+ -+ID: $(HEADERS) $(SOURCES) $(LISP) -+ list='$(SOURCES) $(HEADERS)'; \ -+ unique=`for i in $$list; do echo $$i; done | \ -+ awk ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ here=`pwd` && cd $(srcdir) \ -+ && mkid -f$$here/ID $$unique $(LISP) -+ -+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ list='$(SOURCES) $(HEADERS)'; \ -+ unique=`for i in $$list; do echo $$i; done | \ -+ awk ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -+ || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -+ -+mostlyclean-tags: -+ -+clean-tags: -+ -+distclean-tags: -+ -rm -f TAGS ID -+ -+maintainer-clean-tags: -+ -+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) -+ -+subdir = src/video/vgl -+ -+distdir: $(DISTFILES) -+ @for file in $(DISTFILES); do \ -+ d=$(srcdir); \ -+ if test -d $$d/$$file; then \ -+ cp -pr $$d/$$file $(distdir)/$$file; \ -+ else \ -+ test -f $(distdir)/$$file \ -+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -+ || cp -p $$d/$$file $(distdir)/$$file || :; \ -+ fi; \ -+ done -+info-am: -+info: info-am -+dvi-am: -+dvi: dvi-am -+check-am: all-am -+check: check-am -+installcheck-am: -+installcheck: installcheck-am -+install-exec-am: -+install-exec: install-exec-am -+ -+install-data-am: -+install-data: install-data-am -+ -+install-am: all-am -+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -+install: install-am -+uninstall-am: -+uninstall: uninstall-am -+all-am: Makefile $(LTLIBRARIES) -+all-redirect: all-am -+install-strip: -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install -+installdirs: -+ -+ -+mostlyclean-generic: -+ -+clean-generic: -+ -+distclean-generic: -+ -rm -f Makefile $(CONFIG_CLEAN_FILES) -+ -rm -f config.cache config.log stamp-h stamp-h[0-9]* -+ -+maintainer-clean-generic: -+mostlyclean-am: mostlyclean-noinstLTLIBRARIES mostlyclean-compile \ -+ mostlyclean-libtool mostlyclean-tags \ -+ mostlyclean-generic -+ -+mostlyclean: mostlyclean-am -+ -+clean-am: clean-noinstLTLIBRARIES clean-compile clean-libtool \ -+ clean-tags clean-generic mostlyclean-am -+ -+clean: clean-am -+ -+distclean-am: distclean-noinstLTLIBRARIES distclean-compile \ -+ distclean-libtool distclean-tags distclean-generic \ -+ clean-am -+ -rm -f libtool -+ -+distclean: distclean-am -+ -+maintainer-clean-am: maintainer-clean-noinstLTLIBRARIES \ -+ maintainer-clean-compile maintainer-clean-libtool \ -+ maintainer-clean-tags maintainer-clean-generic \ -+ distclean-am -+ @echo "This command is intended for maintainers to use;" -+ @echo "it deletes files that may require special tools to rebuild." -+ -+maintainer-clean: maintainer-clean-am -+ -+.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \ -+clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \ -+mostlyclean-compile distclean-compile clean-compile \ -+maintainer-clean-compile mostlyclean-libtool distclean-libtool \ -+clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -+distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -+install-exec install-data-am install-data install-am install \ -+uninstall-am uninstall all-redirect all-am all installdirs \ -+mostlyclean-generic distclean-generic clean-generic \ -+maintainer-clean-generic clean mostlyclean distclean maintainer-clean -+ -+ -+# Tell versions [3.59,3.63) of GNU make to not export all variables. -+# Otherwise a system limit (for SysV at least) may be exceeded. -+.NOEXPORT: diff --git a/devel/sdl-devel/files/patch-src_video_vgl_SDL__vglevents.c b/devel/sdl-devel/files/patch-src_video_vgl_SDL__vglevents.c deleted file mode 100644 index 9caaeae82822..000000000000 --- a/devel/sdl-devel/files/patch-src_video_vgl_SDL__vglevents.c +++ /dev/null @@ -1,311 +0,0 @@ - -$FreeBSD$ - ---- src/video/vgl/SDL_vglevents.c.orig Wed Jan 24 00:51:13 2001 -+++ src/video/vgl/SDL_vglevents.c Wed Jan 24 00:51:13 2001 -@@ -0,0 +1,305 @@ -+/* -+ SDL - Simple DirectMedia Layer -+ Copyright (C) 1997, 1998, 1999, 2000 Sam Lantinga -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Library General Public -+ License as published by the Free Software Foundation; either -+ version 2 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Library General Public License for more details. -+ -+ You should have received a copy of the GNU Library General Public -+ License along with this library; if not, write to the Free -+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ -+ Sam Lantinga -+ slouken@devolution.com -+*/ -+ -+#ifdef SAVE_RCSID -+static char rcsid = -+ "@(#) $Id: SDL_vglevents.c,v 1.1 2001/01/22 17:35:16 root Exp $"; -+#endif -+ -+/* Handle the event stream, converting X11 events into SDL events */ -+ -+#include <stdio.h> -+ -+#include <sys/fbio.h> -+#include <sys/consio.h> -+#include <sys/kbio.h> -+#include <vgl.h> -+ -+#include "SDL.h" -+#include "SDL_thread.h" -+#include "SDL_sysevents.h" -+#include "SDL_events_c.h" -+#include "SDL_vglvideo.h" -+#include "SDL_vglevents_c.h" -+ -+/* The translation tables from a console scancode to a SDL keysym */ -+/* FIXME: Free the keymap when we shut down the video mode */ -+static keymap_t *vga_keymap = NULL; -+static SDLKey keymap[128]; -+static SDL_keysym *TranslateKey(int scancode, SDL_keysym *keysym); -+ -+static int posted = 0; -+static int oldx = 0; -+static int oldy = 0; -+static struct mouse_info mouseinfo; -+ -+/* Ugh, we have to duplicate the kernel's keysym mapping code... -+ Oh, it's not so bad. :-) -+ -+ FIXME: Add keyboard LED handling code -+ */ -+int VGL_initkeymaps(int fd) -+{ -+ vga_keymap = malloc(sizeof(keymap_t)); -+ if ( ! vga_keymap ) { -+ SDL_OutOfMemory(); -+ return(-1); -+ } -+ if (ioctl(fd, GIO_KEYMAP, vga_keymap) == -1) { -+ free(vga_keymap); -+ vga_keymap = NULL; -+ SDL_SetError("Unable to get keyboard map"); -+ return(-1); -+ } -+ return(0); -+} -+ -+static void handle_keyboard(_THIS) -+{ -+ SDL_keysym keysym; -+ int c, pressed, scancode; -+ -+ while ((c = VGLKeyboardGetCh()) != 0) { -+ scancode = c & 0x7F; -+ if (c & 0x80) { -+ pressed = SDL_RELEASED; -+ } else { -+ pressed = SDL_PRESSED; -+ } -+ -+ posted += SDL_PrivateKeyboard(pressed, -+ TranslateKey(scancode, &keysym)); -+ } -+} -+ -+int VGL_initmouse(int fd) -+{ -+ mouseinfo.operation = MOUSE_GETINFO; -+ if (ioctl(fd, CONS_MOUSECTL, &mouseinfo) != 0) -+ return -1; -+ oldx = mouseinfo.u.data.x; -+ oldy = mouseinfo.u.data.y; -+ SDL_PrivateMouseMotion(0, 0, oldx, oldy); -+ return 0; -+} -+ -+static void handle_mouse(_THIS) -+{ -+ char buttons; -+ int x, y; -+ int button_state, state_changed, state; -+ int i; -+ -+ ioctl(0, CONS_MOUSECTL, &mouseinfo); -+ x = mouseinfo.u.data.x; -+ y = mouseinfo.u.data.y; -+ buttons = mouseinfo.u.data.buttons; -+ -+ if ((x != oldx) || (y != oldy)) { -+ posted += SDL_PrivateMouseMotion(0, 0, x, y); -+ oldx = x; -+ oldy = y; -+ } -+ -+ /* See what's changed */ -+ button_state = SDL_GetMouseState(NULL, NULL); -+ state_changed = button_state ^ buttons; -+ for (i = 0; i < 8; i++) { -+ if (state_changed & (1<<i)) { -+ if (buttons & (1<<i)) { -+ state = SDL_PRESSED; -+ } else { -+ state = SDL_RELEASED; -+ } -+ posted += SDL_PrivateMouseButton(state, i + 1, 0, 0); -+ } -+ } -+} -+ -+ -+void VGL_PumpEvents(_THIS) -+{ -+ do { -+ posted = 0; -+ handle_keyboard(this); -+ handle_mouse(this); -+ } while (posted != 0); -+} -+ -+void VGL_InitOSKeymap(_THIS) -+{ -+ int i; -+ -+ /* Initialize the BeOS key translation table */ -+ for ( i=0; i<SDL_TABLESIZE(keymap); ++i ) -+ keymap[i] = SDLK_UNKNOWN; -+ -+ keymap[SCANCODE_ESCAPE] = SDLK_ESCAPE; -+ keymap[SCANCODE_1] = SDLK_1; -+ keymap[SCANCODE_2] = SDLK_2; -+ keymap[SCANCODE_3] = SDLK_3; -+ keymap[SCANCODE_4] = SDLK_4; -+ keymap[SCANCODE_5] = SDLK_5; -+ keymap[SCANCODE_6] = SDLK_6; -+ keymap[SCANCODE_7] = SDLK_7; -+ keymap[SCANCODE_8] = SDLK_8; -+ keymap[SCANCODE_9] = SDLK_9; -+ keymap[SCANCODE_0] = SDLK_0; -+ keymap[SCANCODE_MINUS] = SDLK_MINUS; -+ keymap[SCANCODE_EQUAL] = SDLK_EQUALS; -+ keymap[SCANCODE_BACKSPACE] = SDLK_BACKSPACE; -+ keymap[SCANCODE_TAB] = SDLK_TAB; -+ keymap[SCANCODE_Q] = SDLK_q; -+ keymap[SCANCODE_W] = SDLK_w; -+ keymap[SCANCODE_E] = SDLK_e; -+ keymap[SCANCODE_R] = SDLK_r; -+ keymap[SCANCODE_T] = SDLK_t; -+ keymap[SCANCODE_Y] = SDLK_y; -+ keymap[SCANCODE_U] = SDLK_u; -+ keymap[SCANCODE_I] = SDLK_i; -+ keymap[SCANCODE_O] = SDLK_o; -+ keymap[SCANCODE_P] = SDLK_p; -+ keymap[SCANCODE_BRACKET_LEFT] = SDLK_LEFTBRACKET; -+ keymap[SCANCODE_BRACKET_RIGHT] = SDLK_RIGHTBRACKET; -+ keymap[SCANCODE_ENTER] = SDLK_RETURN; -+ keymap[SCANCODE_LEFTCONTROL] = SDLK_LCTRL; -+ keymap[SCANCODE_A] = SDLK_a; -+ keymap[SCANCODE_S] = SDLK_s; -+ keymap[SCANCODE_D] = SDLK_d; -+ keymap[SCANCODE_F] = SDLK_f; -+ keymap[SCANCODE_G] = SDLK_g; -+ keymap[SCANCODE_H] = SDLK_h; -+ keymap[SCANCODE_J] = SDLK_j; -+ keymap[SCANCODE_K] = SDLK_k; -+ keymap[SCANCODE_L] = SDLK_l; -+ keymap[SCANCODE_SEMICOLON] = SDLK_SEMICOLON; -+ keymap[SCANCODE_APOSTROPHE] = SDLK_QUOTE; -+ keymap[SCANCODE_GRAVE] = SDLK_BACKQUOTE; -+ keymap[SCANCODE_LEFTSHIFT] = SDLK_LSHIFT; -+ keymap[SCANCODE_BACKSLASH] = SDLK_BACKSLASH; -+ keymap[SCANCODE_Z] = SDLK_z; -+ keymap[SCANCODE_X] = SDLK_x; -+ keymap[SCANCODE_C] = SDLK_c; -+ keymap[SCANCODE_V] = SDLK_v; -+ keymap[SCANCODE_B] = SDLK_b; -+ keymap[SCANCODE_N] = SDLK_n; -+ keymap[SCANCODE_M] = SDLK_m; -+ keymap[SCANCODE_COMMA] = SDLK_COMMA; -+ keymap[SCANCODE_PERIOD] = SDLK_PERIOD; -+ keymap[SCANCODE_SLASH] = SDLK_SLASH; -+ keymap[SCANCODE_RIGHTSHIFT] = SDLK_RSHIFT; -+ keymap[SCANCODE_KEYPADMULTIPLY] = SDLK_KP_MULTIPLY; -+ keymap[SCANCODE_LEFTALT] = SDLK_LALT; -+ keymap[SCANCODE_SPACE] = SDLK_SPACE; -+ keymap[SCANCODE_CAPSLOCK] = SDLK_CAPSLOCK; -+ keymap[SCANCODE_F1] = SDLK_F1; -+ keymap[SCANCODE_F2] = SDLK_F2; -+ keymap[SCANCODE_F3] = SDLK_F3; -+ keymap[SCANCODE_F4] = SDLK_F4; -+ keymap[SCANCODE_F5] = SDLK_F5; -+ keymap[SCANCODE_F6] = SDLK_F6; -+ keymap[SCANCODE_F7] = SDLK_F7; -+ keymap[SCANCODE_F8] = SDLK_F8; -+ keymap[SCANCODE_F9] = SDLK_F9; -+ keymap[SCANCODE_F10] = SDLK_F10; -+ keymap[SCANCODE_NUMLOCK] = SDLK_NUMLOCK; -+ keymap[SCANCODE_SCROLLLOCK] = SDLK_SCROLLOCK; -+ keymap[SCANCODE_KEYPAD7] = SDLK_KP7; -+ keymap[SCANCODE_CURSORUPLEFT] = SDLK_KP7; -+ keymap[SCANCODE_KEYPAD8] = SDLK_KP8; -+ keymap[SCANCODE_CURSORUP] = SDLK_KP8; -+ keymap[SCANCODE_KEYPAD9] = SDLK_KP9; -+ keymap[SCANCODE_CURSORUPRIGHT] = SDLK_KP9; -+ keymap[SCANCODE_KEYPADMINUS] = SDLK_KP_MINUS; -+ keymap[SCANCODE_KEYPAD4] = SDLK_KP4; -+ keymap[SCANCODE_CURSORLEFT] = SDLK_KP4; -+ keymap[SCANCODE_KEYPAD5] = SDLK_KP5; -+ keymap[SCANCODE_KEYPAD6] = SDLK_KP6; -+ keymap[SCANCODE_CURSORRIGHT] = SDLK_KP6; -+ keymap[SCANCODE_KEYPADPLUS] = SDLK_KP_PLUS; -+ keymap[SCANCODE_KEYPAD1] = SDLK_KP1; -+ keymap[SCANCODE_CURSORDOWNLEFT] = SDLK_KP1; -+ keymap[SCANCODE_KEYPAD2] = SDLK_KP2; -+ keymap[SCANCODE_CURSORDOWN] = SDLK_KP2; -+ keymap[SCANCODE_KEYPAD3] = SDLK_KP3; -+ keymap[SCANCODE_CURSORDOWNRIGHT] = SDLK_KP3; -+ keymap[SCANCODE_KEYPAD0] = SDLK_KP0; -+ keymap[SCANCODE_KEYPADPERIOD] = SDLK_KP_PERIOD; -+ keymap[SCANCODE_LESS] = SDLK_LESS; -+ keymap[SCANCODE_F11] = SDLK_F11; -+ keymap[SCANCODE_F12] = SDLK_F12; -+ keymap[SCANCODE_KEYPADENTER] = SDLK_KP_ENTER; -+ keymap[SCANCODE_RIGHTCONTROL] = SDLK_RCTRL; -+ keymap[SCANCODE_CONTROL] = SDLK_RCTRL; -+ keymap[SCANCODE_KEYPADDIVIDE] = SDLK_KP_DIVIDE; -+ keymap[SCANCODE_PRINTSCREEN] = SDLK_PRINT; -+ keymap[SCANCODE_RIGHTALT] = SDLK_RALT; -+ keymap[SCANCODE_BREAK] = SDLK_BREAK; -+ keymap[SCANCODE_BREAK_ALTERNATIVE] = SDLK_UNKNOWN; -+ keymap[SCANCODE_HOME] = SDLK_HOME; -+ keymap[SCANCODE_CURSORBLOCKUP] = SDLK_UP; -+ keymap[SCANCODE_PAGEUP] = SDLK_PAGEUP; -+ keymap[SCANCODE_CURSORBLOCKLEFT] = SDLK_LEFT; -+ keymap[SCANCODE_CURSORBLOCKRIGHT] = SDLK_RIGHT; -+ keymap[SCANCODE_END] = SDLK_END; -+ keymap[SCANCODE_CURSORBLOCKDOWN] = SDLK_DOWN; -+ keymap[SCANCODE_PAGEDOWN] = SDLK_PAGEDOWN; -+ keymap[SCANCODE_INSERT] = SDLK_INSERT; -+ keymap[SCANCODE_REMOVE] = SDLK_DELETE; -+ keymap[119] = SDLK_PAUSE; -+ keymap[SCANCODE_RIGHTWIN] = SDLK_RSUPER; -+ keymap[SCANCODE_LEFTWIN] = SDLK_LSUPER; -+ keymap[127] = SDLK_MENU; -+} -+ -+static SDL_keysym *TranslateKey(int scancode, SDL_keysym *keysym) -+{ -+ /* Set the keysym information */ -+ keysym->scancode = scancode; -+ keysym->sym = keymap[scancode]; -+ keysym->mod = KMOD_NONE; -+ -+ /* If UNICODE is on, get the UNICODE value for the key */ -+ keysym->unicode = 0; -+ if ( SDL_TranslateUNICODE && vga_keymap ) { -+ int map; -+ SDLMod modstate; -+ -+ modstate = SDL_GetModState(); -+ map = 0; -+ if ( modstate & KMOD_SHIFT ) { -+ map += 1; -+ } -+ if ( modstate & KMOD_CTRL ) { -+ map += 2; -+ } -+ if ( modstate & KMOD_ALT ) { -+ map += 4; -+ } -+ if ( !(vga_keymap->key[scancode].spcl & (0x80 >> map)) ) { -+ keysym->unicode = vga_keymap->key[scancode].map[map]; -+ } -+ -+ } -+ return(keysym); -+} -+ diff --git a/devel/sdl-devel/files/patch-src_video_vgl_SDL__vglevents__c.h b/devel/sdl-devel/files/patch-src_video_vgl_SDL__vglevents__c.h deleted file mode 100644 index ed719a784f6d..000000000000 --- a/devel/sdl-devel/files/patch-src_video_vgl_SDL__vglevents__c.h +++ /dev/null @@ -1,165 +0,0 @@ - -$FreeBSD$ - ---- src/video/vgl/SDL_vglevents_c.h.orig Wed Jan 24 00:51:13 2001 -+++ src/video/vgl/SDL_vglevents_c.h Wed Jan 24 00:51:13 2001 -@@ -0,0 +1,159 @@ -+/* -+ SDL - Simple DirectMedia Layer -+ Copyright (C) 1997, 1998, 1999, 2000 Sam Lantinga -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Library General Public -+ License as published by the Free Software Foundation; either -+ version 2 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Library General Public License for more details. -+ -+ You should have received a copy of the GNU Library General Public -+ License along with this library; if not, write to the Free -+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ -+ Sam Lantinga -+ slouken@devolution.com -+*/ -+ -+#ifdef SAVE_RCSID -+static char rcsid = -+ "@(#) $Id: SDL_vglevents_c.h,v 1.2.2.2 2000/10/03 16:00:58 hercules Exp $"; -+#endif -+ -+#include "SDL_vglvideo.h" -+ -+/* Variables and functions exported by SDL_sysevents.c to other parts -+ of the native video subsystem (SDL_sysvideo.c) -+*/ -+extern int VGL_initkeymaps(int fd); -+extern int VGL_initmouse(int fd); -+extern void VGL_keyboardcallback(int scancode, int pressed); -+ -+extern void VGL_InitOSKeymap(_THIS); -+extern void VGL_PumpEvents(_THIS); -+ -+/* Mouse buttons */ -+#define MOUSE_LEFTBUTTON 0x01 -+#define MOUSE_MIDDLEBUTTON 0x02 -+#define MOUSE_RIGHTBUTTON 0x04 -+ -+/* Scancodes */ -+#define SCANCODE_ESCAPE 1 -+#define SCANCODE_1 2 -+#define SCANCODE_2 3 -+#define SCANCODE_3 4 -+#define SCANCODE_4 5 -+#define SCANCODE_5 6 -+#define SCANCODE_6 7 -+#define SCANCODE_7 8 -+#define SCANCODE_8 9 -+#define SCANCODE_9 10 -+#define SCANCODE_0 11 -+#define SCANCODE_MINUS 12 -+#define SCANCODE_EQUAL 13 -+#define SCANCODE_BACKSPACE 14 -+#define SCANCODE_TAB 15 -+#define SCANCODE_Q 16 -+#define SCANCODE_W 17 -+#define SCANCODE_E 18 -+#define SCANCODE_R 19 -+#define SCANCODE_T 20 -+#define SCANCODE_Y 21 -+#define SCANCODE_U 22 -+#define SCANCODE_I 23 -+#define SCANCODE_O 24 -+#define SCANCODE_P 25 -+#define SCANCODE_BRACKET_LEFT 26 -+#define SCANCODE_BRACKET_RIGHT 27 -+#define SCANCODE_ENTER 28 -+#define SCANCODE_LEFTCONTROL 29 -+#define SCANCODE_A 30 -+#define SCANCODE_S 31 -+#define SCANCODE_D 32 -+#define SCANCODE_F 33 -+#define SCANCODE_G 34 -+#define SCANCODE_H 35 -+#define SCANCODE_J 36 -+#define SCANCODE_K 37 -+#define SCANCODE_L 38 -+#define SCANCODE_SEMICOLON 39 -+#define SCANCODE_APOSTROPHE 40 -+#define SCANCODE_GRAVE 41 -+#define SCANCODE_LEFTSHIFT 42 -+#define SCANCODE_BACKSLASH 43 -+#define SCANCODE_Z 44 -+#define SCANCODE_X 45 -+#define SCANCODE_C 46 -+#define SCANCODE_V 47 -+#define SCANCODE_B 48 -+#define SCANCODE_N 49 -+#define SCANCODE_M 50 -+#define SCANCODE_COMMA 51 -+#define SCANCODE_PERIOD 52 -+#define SCANCODE_SLASH 53 -+#define SCANCODE_RIGHTSHIFT 54 -+#define SCANCODE_KEYPADMULTIPLY 55 -+#define SCANCODE_LEFTALT 56 -+#define SCANCODE_SPACE 57 -+#define SCANCODE_CAPSLOCK 58 -+#define SCANCODE_F1 59 -+#define SCANCODE_F2 60 -+#define SCANCODE_F3 61 -+#define SCANCODE_F4 62 -+#define SCANCODE_F5 63 -+#define SCANCODE_F6 64 -+#define SCANCODE_F7 65 -+#define SCANCODE_F8 66 -+#define SCANCODE_F9 67 -+#define SCANCODE_F10 68 -+#define SCANCODE_NUMLOCK 69 -+#define SCANCODE_SCROLLLOCK 70 -+#define SCANCODE_KEYPAD7 71 -+#define SCANCODE_CURSORUPLEFT 71 -+#define SCANCODE_KEYPAD8 72 -+#define SCANCODE_CURSORUP 72 -+#define SCANCODE_KEYPAD9 73 -+#define SCANCODE_CURSORUPRIGHT 73 -+#define SCANCODE_KEYPADMINUS 74 -+#define SCANCODE_KEYPAD4 75 -+#define SCANCODE_CURSORLEFT 75 -+#define SCANCODE_KEYPAD5 76 -+#define SCANCODE_KEYPAD6 77 -+#define SCANCODE_CURSORRIGHT 77 -+#define SCANCODE_KEYPADPLUS 78 -+#define SCANCODE_KEYPAD1 79 -+#define SCANCODE_CURSORDOWNLEFT 79 -+#define SCANCODE_KEYPAD2 80 -+#define SCANCODE_CURSORDOWN 80 -+#define SCANCODE_KEYPAD3 81 -+#define SCANCODE_CURSORDOWNRIGHT 81 -+#define SCANCODE_KEYPAD0 82 -+#define SCANCODE_KEYPADPERIOD 83 -+#define SCANCODE_LESS 86 -+#define SCANCODE_F11 87 -+#define SCANCODE_F12 88 -+#define SCANCODE_KEYPADENTER 89 -+#define SCANCODE_RIGHTCONTROL 90 -+#define SCANCODE_CONTROL 107 -+#define SCANCODE_KEYPADDIVIDE 91 -+#define SCANCODE_PRINTSCREEN 92 -+#define SCANCODE_RIGHTALT 93 -+#define SCANCODE_BREAK 104 /* Beware: is 119 */ -+#define SCANCODE_BREAK_ALTERNATIVE 104 /* on some keyboards! */ -+#define SCANCODE_HOME 94 -+#define SCANCODE_CURSORBLOCKUP 95 /* Cursor key block */ -+#define SCANCODE_PAGEUP 96 -+#define SCANCODE_CURSORBLOCKLEFT 97 /* Cursor key block */ -+#define SCANCODE_CURSORBLOCKRIGHT 98 /* Cursor key block */ -+#define SCANCODE_END 99 -+#define SCANCODE_CURSORBLOCKDOWN 100 /* Cursor key block */ -+#define SCANCODE_PAGEDOWN 101 -+#define SCANCODE_INSERT 102 -+#define SCANCODE_REMOVE 103 -+#define SCANCODE_RIGHTWIN 106 -+#define SCANCODE_LEFTWIN 105 diff --git a/devel/sdl-devel/files/patch-src_video_vgl_SDL__vglmouse.c b/devel/sdl-devel/files/patch-src_video_vgl_SDL__vglmouse.c deleted file mode 100644 index 33247ab1e59d..000000000000 --- a/devel/sdl-devel/files/patch-src_video_vgl_SDL__vglmouse.c +++ /dev/null @@ -1,72 +0,0 @@ - -$FreeBSD$ - ---- src/video/vgl/SDL_vglmouse.c.orig Wed Jan 24 00:51:13 2001 -+++ src/video/vgl/SDL_vglmouse.c Wed Jan 24 00:51:13 2001 -@@ -0,0 +1,66 @@ -+/* -+ SDL - Simple DirectMedia Layer -+ Copyright (C) 1997, 1998, 1999, 2000 Sam Lantinga -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Library General Public -+ License as published by the Free Software Foundation; either -+ version 2 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Library General Public License for more details. -+ -+ You should have received a copy of the GNU Library General Public -+ License along with this library; if not, write to the Free -+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ -+ Sam Lantinga -+ slouken@devolution.com -+*/ -+ -+#ifdef SAVE_RCSID -+static char rcsid = -+ "@(#) $Id: SDL_vglmouse.c,v 1.1.2.1 2000/03/16 15:20:39 hercules Exp $"; -+#endif -+ -+#include <stdio.h> -+ -+#include "SDL_error.h" -+#include "SDL_mouse.h" -+#include "SDL_events_c.h" -+#include "SDL_vglvideo.h" -+#include "SDL_vglmouse_c.h" -+ -+ -+/* The implementation dependent data for the window manager cursor */ -+struct WMcursor { -+ int unused; -+}; -+ -+ -+void VGL_FreeWMCursor(_THIS, WMcursor *cursor) -+{ -+ return; -+} -+ -+WMcursor *VGL_CreateWMCursor(_THIS, -+ Uint8 *data, Uint8 *mask, int w, int h, int hot_x, int hot_y) -+{ -+ return(NULL); -+} -+ -+int VGL_ShowWMCursor(_THIS, WMcursor *cursor) -+{ -+ return(0); -+} -+ -+void VGL_WarpWMCursor(_THIS, Uint16 x, Uint16 y) -+{ -+ x += (this->screen->offset % this->screen->pitch) / -+ this->screen->format->BytesPerPixel; -+ y += (this->screen->offset / this->screen->pitch); -+ SDL_PrivateMouseMotion(0, 0, x, y); -+} -+ diff --git a/devel/sdl-devel/files/patch-src_video_vgl_SDL__vglmouse__c.h b/devel/sdl-devel/files/patch-src_video_vgl_SDL__vglmouse__c.h deleted file mode 100644 index 9e750085ab0e..000000000000 --- a/devel/sdl-devel/files/patch-src_video_vgl_SDL__vglmouse__c.h +++ /dev/null @@ -1,42 +0,0 @@ - -$FreeBSD$ - ---- src/video/vgl/SDL_vglmouse_c.h.orig Wed Jan 24 00:51:13 2001 -+++ src/video/vgl/SDL_vglmouse_c.h Wed Jan 24 00:51:13 2001 -@@ -0,0 +1,36 @@ -+/* -+ SDL - Simple DirectMedia Layer -+ Copyright (C) 1997, 1998, 1999, 2000 Sam Lantinga -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Library General Public -+ License as published by the Free Software Foundation; either -+ version 2 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Library General Public License for more details. -+ -+ You should have received a copy of the GNU Library General Public -+ License along with this library; if not, write to the Free -+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ -+ Sam Lantinga -+ slouken@devolution.com -+*/ -+ -+#ifdef SAVE_RCSID -+static char rcsid = -+ "@(#) $Id: SDL_vglmouse_c.h,v 1.2.2.1 2000/03/16 15:20:39 hercules Exp $"; -+#endif -+ -+#include "SDL_vglvideo.h" -+ -+/* Functions to be exported */ -+extern void VGL_FreeWMCursor(_THIS, WMcursor *cursor); -+extern WMcursor *VGL_CreateWMCursor(_THIS, -+ Uint8 *data, Uint8 *mask, int w, int h, int hot_x, int hot_y); -+extern int VGL_ShowWMCursor(_THIS, WMcursor *cursor); -+extern void VGL_WarpWMCursor(_THIS, Uint16 x, Uint16 y); -+ diff --git a/devel/sdl-devel/files/patch-src_video_vgl_SDL__vglvideo.c b/devel/sdl-devel/files/patch-src_video_vgl_SDL__vglvideo.c deleted file mode 100644 index d08442068f7d..000000000000 --- a/devel/sdl-devel/files/patch-src_video_vgl_SDL__vglvideo.c +++ /dev/null @@ -1,628 +0,0 @@ - -$FreeBSD$ - ---- src/video/vgl/SDL_vglvideo.c.orig Sat Jan 27 22:36:17 2001 -+++ src/video/vgl/SDL_vglvideo.c Sat Jan 27 23:14:47 2001 -@@ -0,0 +1,622 @@ -+/* -+ SDL - Simple DirectMedia Layer -+ Copyright (C) 1997, 1998, 1999, 2000 Sam Lantinga -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Library General Public -+ License as published by the Free Software Foundation; either -+ version 2 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Library General Public License for more details. -+ -+ You should have received a copy of the GNU Library General Public -+ License along with this library; if not, write to the Free -+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ -+ Sam Lantinga -+ slouken@devolution.com -+*/ -+ -+#ifdef SAVE_RCSID -+static char rcsid = -+ "@(#) $Id: SDL_vglvideo.c,v 1.1 2001/01/20 18:21:25 root Exp root $"; -+#endif -+ -+/* libvga based SDL video driver implementation. -+*/ -+ -+#include <err.h> -+#include <osreldate.h> -+#include <stdlib.h> -+#include <stdio.h> -+#include <unistd.h> -+#include <sys/stat.h> -+ -+#include <sys/fbio.h> -+#include <sys/consio.h> -+#include <sys/kbio.h> -+#include <vgl.h> -+ -+#include "SDL.h" -+#include "SDL_error.h" -+#include "SDL_video.h" -+#include "SDL_mouse.h" -+#include "SDL_sysvideo.h" -+#include "SDL_pixels_c.h" -+#include "SDL_events_c.h" -+#include "SDL_vglvideo.h" -+#include "SDL_vglevents_c.h" -+#include "SDL_vglmouse_c.h" -+ -+ -+/* Initialization/Query functions */ -+static int VGL_VideoInit(_THIS, SDL_PixelFormat *vformat); -+static SDL_Rect **VGL_ListModes(_THIS, SDL_PixelFormat *format, Uint32 flags); -+static SDL_Surface *VGL_SetVideoMode(_THIS, SDL_Surface *current, int width, int height, int bpp, Uint32 flags); -+static int VGL_SetColors(_THIS, int firstcolor, int ncolors, -+ SDL_Color *colors); -+static void VGL_VideoQuit(_THIS); -+ -+/* Hardware surface functions */ -+static int VGL_AllocHWSurface(_THIS, SDL_Surface *surface); -+static int VGL_LockHWSurface(_THIS, SDL_Surface *surface); -+static int VGL_FlipHWSurface(_THIS, SDL_Surface *surface); -+static void VGL_UnlockHWSurface(_THIS, SDL_Surface *surface); -+static void VGL_FreeHWSurface(_THIS, SDL_Surface *surface); -+ -+/* Misc function */ -+static VGLMode ** VGLListModes(int depth, int mem_model); -+static void VGLWaitRetrace(void); -+ -+/* VGL driver bootstrap functions */ -+ -+static int VGL_Available(void) -+{ -+ /* Check to see if we are root and stdin is a virtual console */ -+ int console; -+ -+ console = STDIN_FILENO; -+ if ( console >= 0 ) { -+ struct stat sb; -+ struct vt_mode dummy; -+ -+ if ( (fstat(console, &sb) < 0) || -+ (ioctl(console, VT_GETMODE, &dummy) < 0) ) { -+ console = -1; -+ } -+ } -+ return((geteuid() == 0) && (console >= 0)); -+} -+ -+static void VGL_DeleteDevice(SDL_VideoDevice *device) -+{ -+ free(device->hidden); -+ free(device); -+} -+ -+static SDL_VideoDevice *VGL_CreateDevice(int devindex) -+{ -+ SDL_VideoDevice *device; -+ -+ /* Initialize all variables that we clean on shutdown */ -+ device = (SDL_VideoDevice *)malloc(sizeof(SDL_VideoDevice)); -+ if ( device ) { -+ memset(device, 0, (sizeof *device)); -+ device->hidden = (struct SDL_PrivateVideoData *) -+ malloc((sizeof *device->hidden)); -+ } -+ if ( (device == NULL) || (device->hidden == NULL) ) { -+ SDL_OutOfMemory(); -+ if ( device ) { -+ free(device); -+ } -+ return(0); -+ } -+ memset(device->hidden, 0, (sizeof *device->hidden)); -+ -+ /* Set the function pointers */ -+ device->VideoInit = VGL_VideoInit; -+ device->ListModes = VGL_ListModes; -+ device->SetVideoMode = VGL_SetVideoMode; -+ device->SetColors = VGL_SetColors; -+ device->UpdateRects = NULL; -+ device->VideoQuit = VGL_VideoQuit; -+ device->AllocHWSurface = VGL_AllocHWSurface; -+ device->CheckHWBlit = NULL; -+ device->FillHWRect = NULL; -+ device->SetHWColorKey = NULL; -+ device->SetHWAlpha = NULL; -+ device->LockHWSurface = VGL_LockHWSurface; -+ device->UnlockHWSurface = VGL_UnlockHWSurface; -+ device->FlipHWSurface = VGL_FlipHWSurface; -+ device->FreeHWSurface = VGL_FreeHWSurface; -+ device->SetIcon = NULL; -+ device->SetCaption = NULL; -+ device->GetWMInfo = NULL; -+ device->FreeWMCursor = VGL_FreeWMCursor; -+ device->CreateWMCursor = VGL_CreateWMCursor; -+ device->ShowWMCursor = VGL_ShowWMCursor; -+ device->WarpWMCursor = VGL_WarpWMCursor; -+ device->InitOSKeymap = VGL_InitOSKeymap; -+ device->PumpEvents = VGL_PumpEvents; -+ -+ device->free = VGL_DeleteDevice; -+ -+ return device; -+} -+ -+VideoBootStrap VGL_bootstrap = { -+ "vgl", "FreeBSD libVGL", -+ VGL_Available, VGL_CreateDevice -+}; -+ -+static int VGL_AddMode(_THIS, VGLMode *inmode) -+{ -+ SDL_Rect *mode; -+ -+ int i, index; -+ int next_mode; -+ -+ /* Check to see if we already have this mode */ -+ if (inmode->Depth < 8) { /* Not supported */ -+ return 0; -+ } -+ index = ((inmode->Depth + 7) / 8) - 1; -+ for (i=0; i<SDL_nummodes[index]; ++i) { -+ mode = SDL_modelist[index][i]; -+ if ((mode->w == inmode->ModeInfo.Xsize) && -+ (mode->h == inmode->ModeInfo.Ysize)) -+ return 0; -+ } -+ -+ /* Set up the new video mode rectangle */ -+ mode = (SDL_Rect *)malloc(sizeof *mode); -+ if (mode == NULL) { -+ SDL_OutOfMemory(); -+ return -1; -+ } -+ mode->x = 0; -+ mode->y = 0; -+ mode->w = inmode->ModeInfo.Xsize; -+ mode->h = inmode->ModeInfo.Ysize; -+ -+ /* Allocate the new list of modes, and fill in the new mode */ -+ next_mode = SDL_nummodes[index]; -+ SDL_modelist[index] = (SDL_Rect **) -+ realloc(SDL_modelist[index], (1+next_mode+1)*sizeof(SDL_Rect *)); -+ if (SDL_modelist[index] == NULL) { -+ SDL_OutOfMemory(); -+ SDL_nummodes[index] = 0; -+ free(mode); -+ return -1; -+ } -+ SDL_modelist[index][next_mode] = mode; -+ SDL_modelist[index][next_mode+1] = NULL; -+ SDL_nummodes[index]++; -+ -+ return 0; -+} -+ -+static void VGL_UpdateVideoInfo(_THIS) -+{ -+ this->info.wm_available = 0; -+ this->info.hw_available = 1; -+ this->info.video_mem = 0; -+ if (VGLCurMode == NULL) { -+ return; -+ } -+ if (VGLCurMode->ModeInfo.PixelBytes > 0) { -+ this->info.video_mem = VGLCurMode->ModeInfo.PixelBytes * -+ VGLCurMode->ModeInfo.Xsize * -+ VGLCurMode->ModeInfo.Ysize; -+ } -+} -+ -+int VGL_VideoInit(_THIS, SDL_PixelFormat *vformat) -+{ -+ int i; -+ int total_modes; -+ VGLMode **modes; -+ -+ /* Initialize all variables that we clean on shutdown */ -+ for ( i=0; i<NUM_MODELISTS; ++i ) { -+ SDL_nummodes[i] = 0; -+ SDL_modelist[i] = NULL; -+ } -+ -+ /* Enable mouse and keyboard support */ -+ if (getenv("SDL_NO_RAWKBD") == NULL) { -+ if (VGLKeyboardInit(VGL_CODEKEYS) != 0) { -+ SDL_SetError("Unable to initialize keyboard"); -+ return -1; -+ } -+ } else { -+ warnx("Requiest to put keyboard into a raw mode ignored"); -+ } -+ if (VGL_initkeymaps(STDIN_FILENO) != 0) { -+ SDL_SetError("Unable to initialize keymap"); -+ return -1; -+ } -+ if (VGL_initmouse(STDIN_FILENO) != 0) { -+ SDL_SetError("Unable to initialize mouse"); -+ return -1; -+ } -+ -+ /* Determine the screen depth */ -+ if (VGLCurMode != NULL) -+ vformat->BitsPerPixel = VGLCurMode->Depth; -+ else -+ vformat->BitsPerPixel = 16; /* Good default */ -+ -+ /* Query for the list of available video modes */ -+ total_modes = 0; -+ modes = VGLListModes(-1, V_INFO_MM_DIRECT | V_INFO_MM_PACKED); -+ for (i = 0; modes[i] != NULL; i++) { -+ if ((modes[i]->ModeInfo.Type == VIDBUF8) || -+ (modes[i]->ModeInfo.Type == VIDBUF16) || -+ (modes[i]->ModeInfo.Type == VIDBUF32)) { -+ VGL_AddMode(this, modes[i]); -+ total_modes++; -+ } -+ } -+ if (total_modes == 0) { -+ SDL_SetError("No linear video modes available"); -+ return -1; -+ } -+ -+ /* Fill in our hardware acceleration capabilities */ -+ VGL_UpdateVideoInfo(this); -+ -+ /* Create the hardware surface lock mutex */ -+ hw_lock = SDL_CreateMutex(); -+ if (hw_lock == NULL) { -+ SDL_SetError("Unable to create lock mutex"); -+ VGL_VideoQuit(this); -+ return -1; -+ } -+ -+ /* We're done! */ -+ return 0; -+} -+ -+SDL_Rect **VGL_ListModes(_THIS, SDL_PixelFormat *format, Uint32 flags) -+{ -+ return SDL_modelist[((format->BitsPerPixel+7)/8)-1]; -+} -+ -+/* Various screen update functions available */ -+static void VGL_DirectUpdate(_THIS, int numrects, SDL_Rect *rects); -+static void VGL_BankedUpdate(_THIS, int numrects, SDL_Rect *rects); -+ -+SDL_Surface *VGL_SetVideoMode(_THIS, SDL_Surface *current, -+ int width, int height, int bpp, Uint32 flags) -+{ -+ int mode_found; -+ int i; -+ VGLMode **modes; -+ -+ modes = VGLListModes(bpp, V_INFO_MM_DIRECT | V_INFO_MM_PACKED); -+ mode_found = 0; -+ for (i = 0; modes[i] != NULL; i++) { -+ if ((modes[i]->ModeInfo.Xsize == width) && -+ (modes[i]->ModeInfo.Ysize == height) && -+ ((modes[i]->ModeInfo.Type == VIDBUF8) || -+ (modes[i]->ModeInfo.Type == VIDBUF16) || -+ (modes[i]->ModeInfo.Type == VIDBUF32))) { -+ mode_found = 1; -+ break; -+ } -+ } -+ if (mode_found == 0) { -+ SDL_SetError("No matching video mode found"); -+ return NULL; -+ } -+ -+ /* Shutdown previous videomode (if any) */ -+ if (VGLCurMode != NULL) -+ VGLEnd(); -+ -+ /* Try to set the requested linear video mode */ -+ if (VGLInit(modes[i]->ModeId) != 0) { -+ SDL_SetError("Unable to switch to requested mode"); -+ return NULL; -+ } -+ -+ VGLCurMode = realloc(VGLCurMode, sizeof(VGLMode)); -+ VGLCurMode->ModeInfo = *VGLDisplay; -+ VGLCurMode->Depth = modes[i]->Depth; -+ VGLCurMode->ModeId = modes[i]->ModeId; -+ VGLCurMode->Rmask = modes[i]->Rmask; -+ VGLCurMode->Gmask = modes[i]->Gmask; -+ VGLCurMode->Bmask = modes[i]->Bmask; -+ -+ /* Workaround a bug in libvgl */ -+ if (VGLCurMode->ModeInfo.PixelBytes == 0) -+ (VGLCurMode->ModeInfo.PixelBytes = 1); -+ -+ current->w = VGLCurMode->ModeInfo.Xsize; -+ current->h = VGLCurMode->ModeInfo.Ysize; -+ current->pixels = VGLCurMode->ModeInfo.Bitmap; -+ current->pitch = VGLCurMode->ModeInfo.Xsize * -+ VGLCurMode->ModeInfo.PixelBytes; -+ current->flags = (SDL_FULLSCREEN | SDL_HWSURFACE); -+ -+ /* Check if we are in a pseudo-color mode */ -+ if (VGLCurMode->ModeInfo.Type == VIDBUF8) -+ current->flags |= SDL_HWPALETTE; -+ -+ /* Check if we can do doublebuffering */ -+ if (flags & SDL_DOUBLEBUF) { -+ if (VGLCurMode->ModeInfo.Xsize * 2 <= -+ VGLCurMode->ModeInfo.VYsize) { -+ current->flags |= SDL_DOUBLEBUF; -+ flip_page = 0; -+ flip_address[0] = (byte *)current->pixels; -+ flip_address[1] = (byte *)current->pixels + -+ current->h * current->pitch; -+ VGL_FlipHWSurface(this, current); -+ } -+ } -+ -+ if (! SDL_ReallocFormat(current, modes[i]->Depth, VGLCurMode->Rmask, -+ VGLCurMode->Gmask, VGLCurMode->Bmask, 0)) { -+ return NULL; -+ } -+ -+ /* Update hardware acceleration info */ -+ VGL_UpdateVideoInfo(this); -+ -+ /* Set the blit function */ -+ this->UpdateRects = VGL_DirectUpdate; -+ -+ /* We're done */ -+ return current; -+} -+ -+/* We don't actually allow hardware surfaces other than the main one */ -+static int VGL_AllocHWSurface(_THIS, SDL_Surface *surface) -+{ -+ return -1; -+} -+static void VGL_FreeHWSurface(_THIS, SDL_Surface *surface) -+{ -+ return; -+} -+ -+/* We need to wait for vertical retrace on page flipped displays */ -+static int VGL_LockHWSurface(_THIS, SDL_Surface *surface) -+{ -+ if (surface == SDL_VideoSurface) { -+ SDL_mutexP(hw_lock); -+ } -+ return 0; -+} -+static void VGL_UnlockHWSurface(_THIS, SDL_Surface *surface) -+{ -+ if (surface == SDL_VideoSurface) { -+ SDL_mutexV(hw_lock); -+ } -+} -+ -+static int VGL_FlipHWSurface(_THIS, SDL_Surface *surface) -+{ -+// VGLWaitRetrace(); -+ if (VGLPanScreen(VGLDisplay, 0, flip_page * surface->h) < 0) { -+ SDL_SetError("VGLPanSreen() failed"); -+ return -1; -+ } -+ -+ flip_page = !flip_page; -+ surface->pixels = flip_address[flip_page]; -+ -+ return 0; -+} -+ -+static void VGL_DirectUpdate(_THIS, int numrects, SDL_Rect *rects) -+{ -+ return; -+} -+ -+static void VGL_BankedUpdate(_THIS, int numrects, SDL_Rect *rects) -+{ -+ return; -+} -+ -+int VGL_SetColors(_THIS, int firstcolor, int ncolors, SDL_Color *colors) -+{ -+ int i; -+ -+ for(i = 0; i < ncolors; i++) { -+ VGLSetPaletteIndex(firstcolor + i, -+ colors[i].r, -+ colors[i].g, -+ colors[i].b); -+ } -+ return 1; -+} -+ -+/* Note: If we are terminated, this could be called in the middle of -+ another SDL video routine -- notably UpdateRects. -+*/ -+void VGL_VideoQuit(_THIS) -+{ -+ int i, j; -+ -+ /* Return the keyboard to the normal state */ -+ VGLKeyboardEnd(); -+ -+ /* Reset the console video mode if we actually initialised one */ -+ if (VGLCurMode != NULL) { -+ VGLEnd(); -+ free(VGLCurMode); -+ VGLCurMode = NULL; -+ } -+ -+ /* Clear the lock mutex */ -+ if (hw_lock != NULL) { -+ SDL_DestroyMutex(hw_lock); -+ hw_lock = NULL; -+ } -+ -+ /* Free video mode lists */ -+ for (i = 0; i < NUM_MODELISTS; i++) { -+ if (SDL_modelist[i] != NULL) { -+ for (j = 0; SDL_modelist[i][j] != NULL; ++j) { -+ free(SDL_modelist[i][j]); -+ } -+ free(SDL_modelist[i]); -+ SDL_modelist[i] = NULL; -+ } -+ } -+ -+ if ( this->screen && (this->screen->flags & SDL_HWSURFACE) ) { -+ /* Direct screen access, not a memory buffer */ -+ this->screen->pixels = NULL; -+ } -+} -+ -+#define VGL_RED_INDEX 0 -+#define VGL_GREEN_INDEX 1 -+#define VGL_BLUE_INDEX 2 -+ -+static VGLMode ** -+VGLListModes(int depth, int mem_model) -+{ -+ static VGLMode **modes = NULL; -+ -+ VGLBitmap *vminfop; -+ VGLMode **modesp, *modescp; -+ video_info_t minfo; -+ int adptype, i, modenum; -+ -+ if (modes == NULL) { -+ modes = malloc(sizeof(VGLMode *) * M_VESA_MODE_MAX); -+ bzero(modes, sizeof(VGLMode *) * M_VESA_MODE_MAX); -+ } -+ modesp = modes; -+ -+ for (modenum = 0; modenum < M_VESA_MODE_MAX; modenum++) { -+ minfo.vi_mode = modenum; -+ if (ioctl(0, CONS_MODEINFO, &minfo) || ioctl(0, CONS_CURRENT, &adptype)) -+ continue; -+ if (minfo.vi_mode != modenum) -+ continue; -+ if ((minfo.vi_flags & V_INFO_GRAPHICS) == 0) -+ continue; -+ if ((mem_model != -1) && ((minfo.vi_mem_model & mem_model) == 0)) -+ continue; -+ if ((depth > 1) && (minfo.vi_depth != depth)) -+ continue; -+ -+ /* reallocf can fail */ -+ if ((*modesp = reallocf(*modesp, sizeof(VGLMode))) == NULL) -+ return NULL; -+ modescp = *modesp; -+ -+ vminfop = &(modescp->ModeInfo); -+ bzero(vminfop, sizeof(VGLBitmap)); -+ -+ vminfop->Type = NOBUF; -+ -+ vminfop->PixelBytes = 1; /* Good default value */ -+ switch (minfo.vi_mem_model) { -+ case V_INFO_MM_PLANAR: -+ /* we can handle EGA/VGA planar modes only */ -+ if (!(minfo.vi_depth != 4 || minfo.vi_planes != 4 -+ || (adptype != KD_EGA && adptype != KD_VGA))) -+ vminfop->Type = VIDBUF4; -+ break; -+ case V_INFO_MM_PACKED: -+ /* we can do only 256 color packed modes */ -+ if (minfo.vi_depth == 8) -+ vminfop->Type = VIDBUF8; -+ break; -+ case V_INFO_MM_VGAX: -+ vminfop->Type = VIDBUF8X; -+ break; -+#if defined(__FreeBSD_version) && __FreeBSD_version >= 500000 -+ case V_INFO_MM_DIRECT: -+ vminfop->PixelBytes = minfo.vi_pixel_size; -+ switch (vminfop->PixelBytes) { -+ case 2: -+ vminfop->Type = VIDBUF16; -+ break; -+#if notyet -+ case 3: -+ vminfop->Type = VIDBUF24; -+ break; -+#endif -+ case 4: -+ vminfop->Type = VIDBUF32; -+ break; -+ default: -+ break; -+ } -+#endif -+ default: -+ break; -+ } -+ if (vminfop->Type == NOBUF) -+ continue; -+ -+ switch (vminfop->Type) { -+ case VIDBUF16: -+ case VIDBUF32: -+ modescp->Rmask = ((1 << minfo.vi_pixel_fsizes[VGL_RED_INDEX]) - 1) << -+ minfo.vi_pixel_fields[VGL_RED_INDEX]; -+ modescp->Gmask = ((1 << minfo.vi_pixel_fsizes[VGL_GREEN_INDEX]) - 1) << -+ minfo.vi_pixel_fields[VGL_GREEN_INDEX]; -+ modescp->Bmask = ((1 << minfo.vi_pixel_fsizes[VGL_BLUE_INDEX]) - 1) << -+ minfo.vi_pixel_fields[VGL_BLUE_INDEX]; -+ break; -+ -+ default: -+ break; -+ } -+ -+ vminfop->Xsize = minfo.vi_width; -+ vminfop->Ysize = minfo.vi_height; -+ modescp->Depth = minfo.vi_depth; -+ -+ /* XXX */ -+ if (minfo.vi_mode >= M_VESA_BASE) -+ modescp->ModeId = _IO('V', minfo.vi_mode - M_VESA_BASE); -+ else -+ modescp->ModeId = _IO('S', minfo.vi_mode); -+ -+ /* Sort list */ -+ for (i = 0; modes + i < modesp ; i++) { -+ if (modes[i]->ModeInfo.Xsize * modes[i]->ModeInfo.Ysize > -+ vminfop->Xsize * modes[i]->ModeInfo.Ysize) -+ continue; -+ if ((modes[i]->ModeInfo.Xsize * modes[i]->ModeInfo.Ysize == -+ vminfop->Xsize * vminfop->Ysize) && -+ (modes[i]->Depth >= modescp->Depth)) -+ continue; -+ *modesp = modes[i]; -+ modes[i] = modescp; -+ modescp = *modesp; -+ vminfop = &(modescp->ModeInfo); -+ } -+ -+ modesp++; -+ } -+ -+ if (*modesp != NULL) { -+ free(*modesp); -+ *modesp = NULL; -+ } -+ -+ return modes; -+} -+ -+static void -+VGLWaitRetrace(void) -+{ -+ while (!(inb(0x3DA) & 8)); -+ while (inb(0x3DA) & 8); -+} -+ diff --git a/devel/sdl-devel/files/patch-src_video_vgl_SDL__vglvideo.h b/devel/sdl-devel/files/patch-src_video_vgl_SDL__vglvideo.h deleted file mode 100644 index c6b440f85188..000000000000 --- a/devel/sdl-devel/files/patch-src_video_vgl_SDL__vglvideo.h +++ /dev/null @@ -1,75 +0,0 @@ - -$FreeBSD$ - ---- src/video/vgl/SDL_vglvideo.h.orig Sat Jan 27 17:25:12 2001 -+++ src/video/vgl/SDL_vglvideo.h Sat Jan 27 17:30:56 2001 -@@ -0,0 +1,69 @@ -+/* -+ SDL - Simple DirectMedia Layer -+ Copyright (C) 1997, 1998, 1999, 2000 Sam Lantinga -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Library General Public -+ License as published by the Free Software Foundation; either -+ version 2 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Library General Public License for more details. -+ -+ You should have received a copy of the GNU Library General Public -+ License along with this library; if not, write to the Free -+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ -+ Sam Lantinga -+ slouken@devolution.com -+*/ -+ -+#ifdef SAVE_RCSID -+static char rcsid = -+ "@(#) $Id: SDL_vglvideo.h,v 1.3.2.1 2000/03/16 15:20:39 hercules Exp $"; -+#endif -+ -+#ifndef _SDL_vglvideo_h -+#define _SDL_vglvideo_h -+ -+#include <sys/fbio.h> -+#include <sys/consio.h> -+#include <vgl.h> -+ -+#include "SDL_mouse.h" -+#include "SDL_mutex.h" -+#include "SDL_sysvideo.h" -+ -+/* Hidden "this" pointer for the video functions */ -+#define _THIS SDL_VideoDevice *this -+ -+typedef struct { -+ int ModeId; -+ int Depth; -+ int Rmask; -+ int Gmask; -+ int Bmask; -+ VGLBitmap ModeInfo; -+} VGLMode; -+ -+/* Private display data */ -+struct SDL_PrivateVideoData { -+#define NUM_MODELISTS 4 /* 8, 16, 24, and 32 bits-per-pixel */ -+ int SDL_nummodes[NUM_MODELISTS]; -+ SDL_Rect **SDL_modelist[NUM_MODELISTS]; -+ SDL_mutex *hw_lock; -+ VGLMode *VGLCurMode; -+ int flip_page; -+ byte *flip_address[2]; -+}; -+/* Old variable names */ -+#define SDL_nummodes (this->hidden->SDL_nummodes) -+#define SDL_modelist (this->hidden->SDL_modelist) -+#define hw_lock (this->hidden->hw_lock) -+#define VGLCurMode (this->hidden->VGLCurMode) -+#define flip_page (this->hidden->flip_page) -+#define flip_address (this->hidden->flip_address) -+ -+#endif /* _SDL_vglvideo_h */ diff --git a/devel/sdl-devel/files/patch-src_video_x11_SDL__x11events.c b/devel/sdl-devel/files/patch-src_video_x11_SDL__x11events.c deleted file mode 100644 index 0951242378f6..000000000000 --- a/devel/sdl-devel/files/patch-src_video_x11_SDL__x11events.c +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- src/video/x11/SDL_x11events.c 2001/01/27 17:49:30 1.1 -+++ src/video/x11/SDL_x11events.c 2001/01/27 17:49:54 -@@ -35,7 +35,9 @@ - #ifdef __SVR4 - #include <X11/Sunkeysym.h> - #endif -+#include <sys/types.h> - #include <sys/time.h> -+#include <unistd.h> - - #include "SDL.h" - #include "SDL_syswm.h" diff --git a/devel/sdl-devel/pkg-comment b/devel/sdl-devel/pkg-comment deleted file mode 100644 index 2d9a693c2d5e..000000000000 --- a/devel/sdl-devel/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -Cross-platform multi-media development API (developm. vers.) diff --git a/devel/sdl-devel/pkg-descr b/devel/sdl-devel/pkg-descr deleted file mode 100644 index 30ea42683300..000000000000 --- a/devel/sdl-devel/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -Unstable development version of the SDL library. - -This library is designed to make it easy to write games that run on UNIX, -Win32 and BeOS using the various native high-performance media interfaces, -(for video, audio, etc) and presenting a single source-code level API to -your application. This is a fairly low level API, but using this, completely -portable applications can be written with a great deal of flexibility. - -WWW: http://www.libsdl.org/ diff --git a/devel/sdl-devel/pkg-message b/devel/sdl-devel/pkg-message deleted file mode 100644 index 1e8daa08f54e..000000000000 --- a/devel/sdl-devel/pkg-message +++ /dev/null @@ -1,9 +0,0 @@ ------------------------------------------------------------------------------- - Your SDL library has been built with libvgl support, which means that you - can run almost any SDL application straight on your console (VESA 2.0 - compatible videocard is required). To do this you have to enable VESA - support in the kernel by adding "option VESA" into your kernel - configuration file and set environment variable "SDL_VIDEODRIVER=vgl". - - Good luck! ------------------------------------------------------------------------------- diff --git a/devel/sdl-devel/pkg-plist b/devel/sdl-devel/pkg-plist deleted file mode 100644 index 8643d04213a9..000000000000 --- a/devel/sdl-devel/pkg-plist +++ /dev/null @@ -1,288 +0,0 @@ -bin/sdl11-config -include/SDL11/SDL.h -include/SDL11/SDL_active.h -include/SDL11/SDL_audio.h -include/SDL11/SDL_byteorder.h -include/SDL11/SDL_cdrom.h -include/SDL11/SDL_copying.h -include/SDL11/SDL_endian.h -include/SDL11/SDL_error.h -include/SDL11/SDL_events.h -include/SDL11/SDL_getenv.h -include/SDL11/SDL_joystick.h -include/SDL11/SDL_keyboard.h -include/SDL11/SDL_keysym.h -include/SDL11/SDL_main.h -include/SDL11/SDL_mouse.h -include/SDL11/SDL_mutex.h -include/SDL11/SDL_quit.h -include/SDL11/SDL_rwops.h -include/SDL11/SDL_syswm.h -include/SDL11/SDL_thread.h -include/SDL11/SDL_timer.h -include/SDL11/SDL_types.h -include/SDL11/SDL_version.h -include/SDL11/SDL_video.h -include/SDL11/begin_code.h -include/SDL11/close_code.h -lib/libSDL-1.1.a -lib/libSDL-1.1.so -lib/libSDL-1.1.so.3 -lib/libSDLmain-1.1.a -share/aclocal/sdl11.m4 -share/doc/SDL11/BUGS -share/doc/SDL11/COPYING -share/doc/SDL11/CREDITS -share/doc/SDL11/README -share/doc/SDL11/WhatsNew -share/doc/SDL11/docs.html -share/doc/SDL11/docs/html/Makefile -share/doc/SDL11/docs/html/Makefile.am -share/doc/SDL11/docs/html/Makefile.in -share/doc/SDL11/docs/html/audio.html -share/doc/SDL11/docs/html/cdrom.html -share/doc/SDL11/docs/html/event.html -share/doc/SDL11/docs/html/eventfunctions.html -share/doc/SDL11/docs/html/eventstructures.html -share/doc/SDL11/docs/html/general.html -share/doc/SDL11/docs/html/guide.html -share/doc/SDL11/docs/html/guideaboutsdldoc.html -share/doc/SDL11/docs/html/guideaudioexamples.html -share/doc/SDL11/docs/html/guidebasicsinit.html -share/doc/SDL11/docs/html/guidecdromexamples.html -share/doc/SDL11/docs/html/guidecredits.html -share/doc/SDL11/docs/html/guideeventexamples.html -share/doc/SDL11/docs/html/guideexamples.html -share/doc/SDL11/docs/html/guideinput.html -share/doc/SDL11/docs/html/guideinputkeyboard.html -share/doc/SDL11/docs/html/guidepreface.html -share/doc/SDL11/docs/html/guidethebasics.html -share/doc/SDL11/docs/html/guidetimeexamples.html -share/doc/SDL11/docs/html/guidevideo.html -share/doc/SDL11/docs/html/guidevideoexamples.html -share/doc/SDL11/docs/html/index.html -share/doc/SDL11/docs/html/joystick.html -share/doc/SDL11/docs/html/reference.html -share/doc/SDL11/docs/html/sdlactiveevent.html -share/doc/SDL11/docs/html/sdladdtimer.html -share/doc/SDL11/docs/html/sdlaudiocvt.html -share/doc/SDL11/docs/html/sdlaudiospec.html -share/doc/SDL11/docs/html/sdlblitsurface.html -share/doc/SDL11/docs/html/sdlbuildaudiocvt.html -share/doc/SDL11/docs/html/sdlcd.html -share/doc/SDL11/docs/html/sdlcdclose.html -share/doc/SDL11/docs/html/sdlcdeject.html -share/doc/SDL11/docs/html/sdlcdname.html -share/doc/SDL11/docs/html/sdlcdnumdrives.html -share/doc/SDL11/docs/html/sdlcdopen.html -share/doc/SDL11/docs/html/sdlcdpause.html -share/doc/SDL11/docs/html/sdlcdplay.html -share/doc/SDL11/docs/html/sdlcdplaytracks.html -share/doc/SDL11/docs/html/sdlcdresume.html -share/doc/SDL11/docs/html/sdlcdstatus.html -share/doc/SDL11/docs/html/sdlcdstop.html -share/doc/SDL11/docs/html/sdlcdtrack.html -share/doc/SDL11/docs/html/sdlcloseaudio.html -share/doc/SDL11/docs/html/sdlcolor.html -share/doc/SDL11/docs/html/sdlcondbroadcast.html -share/doc/SDL11/docs/html/sdlcondsignal.html -share/doc/SDL11/docs/html/sdlcondwait.html -share/doc/SDL11/docs/html/sdlcondwaittimeout.html -share/doc/SDL11/docs/html/sdlconvertaudio.html -share/doc/SDL11/docs/html/sdlconvertsurface.html -share/doc/SDL11/docs/html/sdlcreatecond.html -share/doc/SDL11/docs/html/sdlcreatecursor.html -share/doc/SDL11/docs/html/sdlcreatemutex.html -share/doc/SDL11/docs/html/sdlcreatergbsurface.html -share/doc/SDL11/docs/html/sdlcreatergbsurfacefrom.html -share/doc/SDL11/docs/html/sdlcreatesemaphore.html -share/doc/SDL11/docs/html/sdlcreatethread.html -share/doc/SDL11/docs/html/sdlcreateyuvoverlay.html -share/doc/SDL11/docs/html/sdldelay.html -share/doc/SDL11/docs/html/sdldestroycond.html -share/doc/SDL11/docs/html/sdldestroymutex.html -share/doc/SDL11/docs/html/sdldestroysemaphore.html -share/doc/SDL11/docs/html/sdldisplayformat.html -share/doc/SDL11/docs/html/sdldisplayformatalpha.html -share/doc/SDL11/docs/html/sdldisplayyuvoverlay.html -share/doc/SDL11/docs/html/sdlenablekeyrepeat.html -share/doc/SDL11/docs/html/sdlenableunicode.html -share/doc/SDL11/docs/html/sdlevent.html -share/doc/SDL11/docs/html/sdleventstate.html -share/doc/SDL11/docs/html/sdlfillrect.html -share/doc/SDL11/docs/html/sdlflip.html -share/doc/SDL11/docs/html/sdlfreecursor.html -share/doc/SDL11/docs/html/sdlfreesurface.html -share/doc/SDL11/docs/html/sdlfreewav.html -share/doc/SDL11/docs/html/sdlfreeyuvoverlay.html -share/doc/SDL11/docs/html/sdlgetappstate.html -share/doc/SDL11/docs/html/sdlgetaudiostatus.html -share/doc/SDL11/docs/html/sdlgetcliprect.html -share/doc/SDL11/docs/html/sdlgetcursor.html -share/doc/SDL11/docs/html/sdlgeteventfilter.html -share/doc/SDL11/docs/html/sdlgetgammaramp.html -share/doc/SDL11/docs/html/sdlgetkeyname.html -share/doc/SDL11/docs/html/sdlgetkeystate.html -share/doc/SDL11/docs/html/sdlgetmodstate.html -share/doc/SDL11/docs/html/sdlgetmousestate.html -share/doc/SDL11/docs/html/sdlgetrelativemousestate.html -share/doc/SDL11/docs/html/sdlgetrgb.html -share/doc/SDL11/docs/html/sdlgetrgba.html -share/doc/SDL11/docs/html/sdlgetthreadid.html -share/doc/SDL11/docs/html/sdlgetticks.html -share/doc/SDL11/docs/html/sdlgetvideoinfo.html -share/doc/SDL11/docs/html/sdlgetvideosurface.html -share/doc/SDL11/docs/html/sdlglattr.html -share/doc/SDL11/docs/html/sdlglgetattribute.html -share/doc/SDL11/docs/html/sdlglgetprocaddress.html -share/doc/SDL11/docs/html/sdlglloadlibrary.html -share/doc/SDL11/docs/html/sdlglsetattribute.html -share/doc/SDL11/docs/html/sdlglswapbuffers.html -share/doc/SDL11/docs/html/sdlinit.html -share/doc/SDL11/docs/html/sdlinitsubsystem.html -share/doc/SDL11/docs/html/sdljoyaxisevent.html -share/doc/SDL11/docs/html/sdljoyballevent.html -share/doc/SDL11/docs/html/sdljoybuttonevent.html -share/doc/SDL11/docs/html/sdljoyhatevent.html -share/doc/SDL11/docs/html/sdljoystickclose.html -share/doc/SDL11/docs/html/sdljoystickeventstate.html -share/doc/SDL11/docs/html/sdljoystickgetaxis.html -share/doc/SDL11/docs/html/sdljoystickgetball.html -share/doc/SDL11/docs/html/sdljoystickgetbutton.html -share/doc/SDL11/docs/html/sdljoystickgethat.html -share/doc/SDL11/docs/html/sdljoystickindex.html -share/doc/SDL11/docs/html/sdljoystickname.html -share/doc/SDL11/docs/html/sdljoysticknumaxes.html -share/doc/SDL11/docs/html/sdljoysticknumballs.html -share/doc/SDL11/docs/html/sdljoysticknumbuttons.html -share/doc/SDL11/docs/html/sdljoysticknumhats.html -share/doc/SDL11/docs/html/sdljoystickopen.html -share/doc/SDL11/docs/html/sdljoystickopened.html -share/doc/SDL11/docs/html/sdljoystickupdate.html -share/doc/SDL11/docs/html/sdlkey.html -share/doc/SDL11/docs/html/sdlkeyboardevent.html -share/doc/SDL11/docs/html/sdlkeysym.html -share/doc/SDL11/docs/html/sdlkillthread.html -share/doc/SDL11/docs/html/sdllistmodes.html -share/doc/SDL11/docs/html/sdlloadbmp.html -share/doc/SDL11/docs/html/sdlloadwav.html -share/doc/SDL11/docs/html/sdllockaudio.html -share/doc/SDL11/docs/html/sdllocksurface.html -share/doc/SDL11/docs/html/sdllockyuvoverlay.html -share/doc/SDL11/docs/html/sdlmaprgb.html -share/doc/SDL11/docs/html/sdlmaprgba.html -share/doc/SDL11/docs/html/sdlmixaudio.html -share/doc/SDL11/docs/html/sdlmousebuttonevent.html -share/doc/SDL11/docs/html/sdlmousemotionevent.html -share/doc/SDL11/docs/html/sdlmutexp.html -share/doc/SDL11/docs/html/sdlmutexv.html -share/doc/SDL11/docs/html/sdlnumjoysticks.html -share/doc/SDL11/docs/html/sdlopenaudio.html -share/doc/SDL11/docs/html/sdloverlay.html -share/doc/SDL11/docs/html/sdlpalette.html -share/doc/SDL11/docs/html/sdlpauseaudio.html -share/doc/SDL11/docs/html/sdlpeepevents.html -share/doc/SDL11/docs/html/sdlpixelformat.html -share/doc/SDL11/docs/html/sdlpollevent.html -share/doc/SDL11/docs/html/sdlpumpevents.html -share/doc/SDL11/docs/html/sdlpushevent.html -share/doc/SDL11/docs/html/sdlquit.html -share/doc/SDL11/docs/html/sdlquitevent.html -share/doc/SDL11/docs/html/sdlquitsubsystem.html -share/doc/SDL11/docs/html/sdlrect.html -share/doc/SDL11/docs/html/sdlremovetimer.html -share/doc/SDL11/docs/html/sdlresizeevent.html -share/doc/SDL11/docs/html/sdlsavebmp.html -share/doc/SDL11/docs/html/sdlsempost.html -share/doc/SDL11/docs/html/sdlsemtrywait.html -share/doc/SDL11/docs/html/sdlsemvalue.html -share/doc/SDL11/docs/html/sdlsemwait.html -share/doc/SDL11/docs/html/sdlsemwaittimeout.html -share/doc/SDL11/docs/html/sdlsetalpha.html -share/doc/SDL11/docs/html/sdlsetcliprect.html -share/doc/SDL11/docs/html/sdlsetcolorkey.html -share/doc/SDL11/docs/html/sdlsetcolors.html -share/doc/SDL11/docs/html/sdlsetcursor.html -share/doc/SDL11/docs/html/sdlseteventfilter.html -share/doc/SDL11/docs/html/sdlsetgamma.html -share/doc/SDL11/docs/html/sdlsetgammaramp.html -share/doc/SDL11/docs/html/sdlsetmodstate.html -share/doc/SDL11/docs/html/sdlsetpalette.html -share/doc/SDL11/docs/html/sdlsettimer.html -share/doc/SDL11/docs/html/sdlsetvideomode.html -share/doc/SDL11/docs/html/sdlshowcursor.html -share/doc/SDL11/docs/html/sdlsurface.html -share/doc/SDL11/docs/html/sdlsyswmevent.html -share/doc/SDL11/docs/html/sdlthreadid.html -share/doc/SDL11/docs/html/sdlunlockaudio.html -share/doc/SDL11/docs/html/sdlunlocksurface.html -share/doc/SDL11/docs/html/sdlunlockyuvoverlay.html -share/doc/SDL11/docs/html/sdlupdaterect.html -share/doc/SDL11/docs/html/sdlupdaterects.html -share/doc/SDL11/docs/html/sdluserevent.html -share/doc/SDL11/docs/html/sdlvideodrivername.html -share/doc/SDL11/docs/html/sdlvideoinfo.html -share/doc/SDL11/docs/html/sdlvideomodeok.html -share/doc/SDL11/docs/html/sdlwaitevent.html -share/doc/SDL11/docs/html/sdlwaitthread.html -share/doc/SDL11/docs/html/sdlwarpmouse.html -share/doc/SDL11/docs/html/sdlwasinit.html -share/doc/SDL11/docs/html/sdlwmgetcaption.html -share/doc/SDL11/docs/html/sdlwmgrabinput.html -share/doc/SDL11/docs/html/sdlwmiconifywindow.html -share/doc/SDL11/docs/html/sdlwmsetcaption.html -share/doc/SDL11/docs/html/sdlwmseticon.html -share/doc/SDL11/docs/html/sdlwmtogglefullscreen.html -share/doc/SDL11/docs/html/thread.html -share/doc/SDL11/docs/html/time.html -share/doc/SDL11/docs/html/video.html -share/doc/SDL11/docs/html/wm.html -share/doc/SDL11/docs/index.html -share/examples/SDL11/COPYING -share/examples/SDL11/Makefile.am -share/examples/SDL11/Makefile.in -share/examples/SDL11/README -share/examples/SDL11/acinclude.m4 -share/examples/SDL11/aclocal.m4 -share/examples/SDL11/autogen.sh -share/examples/SDL11/checkkeys.c -share/examples/SDL11/config.guess -share/examples/SDL11/config.sub -share/examples/SDL11/configure -share/examples/SDL11/configure.in -share/examples/SDL11/graywin.c -share/examples/SDL11/icon.bmp -share/examples/SDL11/install-sh -share/examples/SDL11/loopwave.c -share/examples/SDL11/missing -share/examples/SDL11/mkinstalldirs -share/examples/SDL11/picture.xbm -share/examples/SDL11/sail.bmp -share/examples/SDL11/sample.bmp -share/examples/SDL11/sample.wav -share/examples/SDL11/testalpha.c -share/examples/SDL11/testbitmap.c -share/examples/SDL11/testcdrom.c -share/examples/SDL11/testerror.c -share/examples/SDL11/testgamma.c -share/examples/SDL11/testgl.c -share/examples/SDL11/testhread.c -share/examples/SDL11/testjoystick.c -share/examples/SDL11/testkeys.c -share/examples/SDL11/testlock.c -share/examples/SDL11/testpalette.c -share/examples/SDL11/testsem.c -share/examples/SDL11/testsprite.c -share/examples/SDL11/testtimer.c -share/examples/SDL11/testtypes.c -share/examples/SDL11/testver.c -share/examples/SDL11/testvidinfo.c -share/examples/SDL11/testwin.c -share/examples/SDL11/testwm.c -share/examples/SDL11/threadwin.c -share/examples/SDL11/torturethread.c -@dirrm share/examples/SDL11 -@dirrm share/doc/SDL11/docs/html -@dirrm share/doc/SDL11/docs -@dirrm share/doc/SDL11 -@dirrm include/SDL11 diff --git a/devel/sdl/Makefile b/devel/sdl/Makefile deleted file mode 100644 index 308ed4c1bafd..000000000000 --- a/devel/sdl/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# New ports collection makefile for: SDL -# Date created: 8 August 1999 -# Whom: Andrey Zakhvatov -# -# $FreeBSD$ -# - -PORTNAME= sdl -PORTVERSION= 1.0.8 -PORTREVISION= 1 -CATEGORIES= devel -MASTER_SITES= http://www.libsdl.org/release/ \ - http://www.devolution.com/~slouken/SDL/release/ -DISTNAME= SDL-${PORTVERSION} - -MAINTAINER= sobomax@FreeBSD.org - -LIB_DEPENDS= vga.1:${PORTSDIR}/graphics/svgalib -BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm - -USE_GMAKE= yes -USE_XLIB= yes -USE_ESOUND= yes -INSTALLS_SHLIB= yes -USE_LIBTOOL= yes -CONFIGURE_ENV= NASM="${LOCALBASE}/bin/nasm" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" -CONFIGURE_ARGS= --enable-video-svga - -CFLAGS+= ${PTHREAD_CFLAGS} - -post-configure: - @${PERL} -pi -e 's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \ - ${WRKSRC}/libtool - -post-install: - @${MKDIR} ${PREFIX}/share/examples/SDL - ${INSTALL_DATA} ${WRKSRC}/test/* ${PREFIX}/share/examples/SDL -.if !defined(NOPORTDOCS) - @${MKDIR} ${PREFIX}/share/doc/SDL -.for file in BUGS COPYING CREDITS README WhatsNew docs.html - ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/SDL -.endfor - cd ${WRKSRC}/docs; tar cf - `${ECHO} [^M]*` | \ - (cd ${PREFIX}/share/doc/SDL; ${TAR} --unlink -xf - ) -.endif - -.include <bsd.port.mk> diff --git a/devel/sdl/distinfo b/devel/sdl/distinfo deleted file mode 100644 index 10531f7c7c07..000000000000 --- a/devel/sdl/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (SDL-1.0.8.tar.gz) = c58bcf59d41181c492a06cd10ce97a6a diff --git a/devel/sdl/files/patch-ac b/devel/sdl/files/patch-ac deleted file mode 100644 index 3806f37749de..000000000000 --- a/devel/sdl/files/patch-ac +++ /dev/null @@ -1,55 +0,0 @@ - -$FreeBSD$ - ---- configure.orig Sat Mar 4 04:58:00 2000 -+++ configure Fri Mar 30 17:04:33 2001 -@@ -604,9 +604,9 @@ - - # libtool versioning - LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION --LT_CURRENT=`expr $SDL_MICRO_VERSION - $SDL_INTERFACE_AGE` -+LT_CURRENT=$SDL_INTERFACE_AGE - LT_REVISION=$SDL_INTERFACE_AGE --LT_AGE=`expr $SDL_BINARY_AGE - $SDL_INTERFACE_AGE` -+LT_AGE=$SDL_INTERFACE_AGE - - - -@@ -4279,8 +4279,6 @@ - #include <vga.h> - #include <vgamouse.h> - #include <vgakeyboard.h> -- #include <linux/kd.h> -- #include <linux/keyboard.h> - - int main() { - -@@ -4324,7 +4322,7 @@ - ac_save_libs="$LIBS" - case "$target" in - *-*-freebsd*) -- pthread_lib="-lc_r" -+ pthread_lib="${PTHREAD_LIBS}" - ;; - *-*-openbsd*) - pthread_lib="-lc_r" -@@ -4364,7 +4362,7 @@ - echo "$ac_t""$use_pthreads" 1>&6 - if test x$use_pthreads = xyes; then - CFLAGS="$CFLAGS -D_REENTRANT -DSDL_USE_PTHREADS" -- SDL_CFLAGS="$SDL_CFLAGS -D_REENTRANT" -+ SDL_CFLAGS="$SDL_CFLAGS -D_REENTRANT ${PTHREAD_CFLAGS}" - SDL_LIBS="$SDL_LIBS $pthread_lib" - fi - fi -@@ -4953,8 +4951,10 @@ - ;; - *-*-freebsd*) - ARCH=freebsd -+ CheckNASM - CheckESD - CheckX11 -+ CheckSVGA - CheckPTHREAD - # Set up files for the main() stub - diff --git a/devel/sdl/files/patch-ae b/devel/sdl/files/patch-ae deleted file mode 100644 index e879ae7decea..000000000000 --- a/devel/sdl/files/patch-ae +++ /dev/null @@ -1,82 +0,0 @@ ---- src/thread/SDL_thread.c.orig Fri Mar 3 01:24:35 2000 -+++ src/thread/SDL_thread.c Mon Apr 17 21:05:52 2000 -@@ -30,6 +30,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -+#include <unistd.h> - - #include "SDL_error.h" - #include "SDL_mutex.h" -@@ -175,7 +176,7 @@ - int (*func)(void *); - void *data; - SDL_Thread *info; -- SDL_mutex *wait; -+ int wait; - } thread_args; - - void SDL_RunThread(void *data) -@@ -199,8 +200,8 @@ - userdata = args->data; - statusloc = &args->info->status; - - /* Wake up the parent thread */ -- SDL_mutexV(args->wait); -+ args->wait = 1; - - /* Run the function */ - *statusloc = userfunc(userdata); -@@ -213,16 +214,16 @@ - int ret; - - /* Allocate memory for the thread info structure */ -- thread = (SDL_Thread *)malloc(sizeof(*thread)); -+ thread = (SDL_Thread *)malloc(sizeof(thread)); - if ( thread == NULL ) { - SDL_OutOfMemory(); - return(NULL); - } -- memset(thread, 0, (sizeof *thread)); -+ memset(thread, 0, (sizeof thread)); - thread->status = -1; - - /* Set up the arguments for the thread */ -- args = (thread_args *)malloc(sizeof(*args)); -+ args = (thread_args *)malloc(sizeof(args)); - if ( args == NULL ) { - SDL_OutOfMemory(); - free(thread); -@@ -231,14 +232,7 @@ - args->func = fn; - args->data = data; - args->info = thread; -- args->wait = SDL_CreateMutex(); -- if ( args->wait == NULL ) { -- free(thread); -- free(args); -- SDL_OutOfMemory(); -- return(NULL); -- } -- SDL_mutexP(args->wait); /* We will block later */ -+ args->wait = 0; - - /* Add the thread to the list of available threads */ - SDL_AddThread(thread); -@@ -247,14 +241,14 @@ - ret = SDL_SYS_CreateThread(thread, args); - if ( ret >= 0 ) { - /* Wait for the thread function to use arguments */ -- SDL_mutexP(args->wait); -+ while (args->wait == 0) -+ usleep(20000); - } else { - /* Oops, failed. Gotta free everything */ - SDL_DelThread(thread); - free(thread); - thread = NULL; - } -- SDL_DestroyMutex(args->wait); - free(args); - - /* Everything is running now */ diff --git a/devel/sdl/files/patch-af b/devel/sdl/files/patch-af deleted file mode 100644 index 28c3cfef4b85..000000000000 --- a/devel/sdl/files/patch-af +++ /dev/null @@ -1,45 +0,0 @@ ---- src/thread/linux/SDL_mutex.c.orig Tue Nov 23 20:01:41 1999 -+++ src/thread/linux/SDL_mutex.c Mon Apr 17 21:08:57 2000 -@@ -42,6 +42,7 @@ - - #ifdef SDL_USE_PTHREADS - -+#include <errno.h> - #include <stdlib.h> - #include <stdio.h> - #include <pthread.h> -@@ -60,14 +61,14 @@ - SDL_mutex *mutex; - - /* Allocate the structure */ -- mutex = (SDL_mutex *)malloc(sizeof(*mutex)); -+ mutex = (SDL_mutex *)malloc(sizeof(mutex)); - if ( mutex == NULL ) { - SDL_OutOfMemory(); - return(NULL); - } - - if ( pthread_mutex_init(&mutex->id, NULL) != 0 ) { -- SDL_SetError("Couldn't create mutex"); -+ SDL_SetError("Couldn't create mutex; reason: %d", errno); - free(mutex); - return(NULL); - } -@@ -82,7 +83,7 @@ - return(-1); - } - if ( pthread_mutex_lock(&mutex->id) != 0 ) { -- SDL_SetError("Couldn't lock mutex"); -+ SDL_SetError("Couldn't lock mutex; reason: %d", errno); - return(-1); - } - return(0); -@@ -96,7 +97,7 @@ - return(-1); - } - if ( pthread_mutex_unlock(&mutex->id) != 0 ) { -- SDL_SetError("Couldn't unlock mutex"); -+ SDL_SetError("Couldn't unlock mutex; reason: %d", errno); - return(-1); - } - return(0); diff --git a/devel/sdl/files/patch-an b/devel/sdl/files/patch-an deleted file mode 100644 index 25d170673525..000000000000 --- a/devel/sdl/files/patch-an +++ /dev/null @@ -1,147 +0,0 @@ ---- src/video/svga/SDL_svgaevents.c.orig Wed Nov 24 01:46:25 1999 -+++ src/video/svga/SDL_svgaevents.c Sun Sep 24 00:28:45 2000 -@@ -28,12 +28,14 @@ - /* Handle the event stream, converting X11 events into SDL events */ - - #include <stdio.h> -+#include <stdlib.h> - - #include <vga.h> - #include <vgamouse.h> - #include <vgakeyboard.h> - #include <linux/kd.h> - #include <linux/keyboard.h> -+#include <sys/kbio.h> - - #include "SDL.h" - #include "SDL_sysevents.h" -@@ -42,9 +44,8 @@ - #include "SDL_svgaevents_c.h" - - /* The translation tables from a console scancode to a SDL keysym */ --#define NUM_VGAKEYMAPS (1<<KG_CAPSSHIFT) --static Uint16 vga_keymap[NUM_VGAKEYMAPS][NR_KEYS]; - static SDLKey keymap[128]; -+keymap_t *vga_keymap = NULL; - static SDL_keysym *TranslateKey(int scancode, SDL_keysym *keysym); - - /* Ugh, we have to duplicate the kernel's keysym mapping code... -@@ -54,69 +55,10 @@ - */ - void SVGA_initkeymaps(int fd) - { -- struct kbentry entry; -- int map, i; -- -- /* Load all the keysym mappings */ -- for ( map=0; map<NUM_VGAKEYMAPS; ++map ) { -- memset(vga_keymap[map], 0, NR_KEYS*sizeof(Uint16)); -- for ( i=0; i<NR_KEYS; ++i ) { -- entry.kb_table = map; -- entry.kb_index = i; -- if ( ioctl(fd, KDGKBENT, &entry) == 0 ) { -- /* The "Enter" key is a special case */ -- if ( entry.kb_value == K_ENTER ) { -- entry.kb_value = K(KT_ASCII,13); -- } -- /* Handle numpad specially as well */ -- if ( KTYP(entry.kb_value) == KT_PAD ) { -- switch ( entry.kb_value ) { -- case K_P0: -- case K_P1: -- case K_P2: -- case K_P3: -- case K_P4: -- case K_P5: -- case K_P6: -- case K_P7: -- case K_P8: -- case K_P9: -- vga_keymap[map][i]=entry.kb_value; -- vga_keymap[map][i]+= '0'; -- break; -- case K_PPLUS: -- vga_keymap[map][i]=K(KT_ASCII,'+'); -- break; -- case K_PMINUS: -- vga_keymap[map][i]=K(KT_ASCII,'-'); -- break; -- case K_PSTAR: -- vga_keymap[map][i]=K(KT_ASCII,'*'); -- break; -- case K_PSLASH: -- vga_keymap[map][i]=K(KT_ASCII,'/'); -- break; -- case K_PENTER: -- vga_keymap[map][i]=K(KT_ASCII,'\r'); -- break; -- case K_PCOMMA: -- vga_keymap[map][i]=K(KT_ASCII,','); -- break; -- case K_PDOT: -- vga_keymap[map][i]=K(KT_ASCII,'.'); -- break; -- default: -- break; -- } -- } -- /* Do the normal key translation */ -- if ( (KTYP(entry.kb_value) == KT_LATIN) || -- (KTYP(entry.kb_value) == KT_ASCII) || -- (KTYP(entry.kb_value) == KT_LETTER) ) { -- vga_keymap[map][i] = entry.kb_value; -- } -- } -- } -+ vga_keymap = malloc(sizeof(keymap_t)); -+ if (ioctl(fd, GIO_KEYMAP, vga_keymap) == -1) { -+ free(vga_keymap); -+ vga_keymap = NULL; - } - } - -@@ -312,38 +254,24 @@ - keysym->sym = keymap[scancode]; - keysym->mod = KMOD_NONE; - -- /* If UNICODE is on, get the UNICODE value for the key */ - keysym->unicode = 0; -- if ( SDL_TranslateUNICODE ) { -+ if ( (SDL_TranslateUNICODE) && (vga_keymap != NULL) ) { - int map; - SDLMod modstate; - - modstate = SDL_GetModState(); - map = 0; - if ( modstate & KMOD_SHIFT ) { -- map |= (1<<KG_SHIFT); -+ map += 1; - } - if ( modstate & KMOD_CTRL ) { -- map |= (1<<KG_CTRL); -+ map += 2; - } - if ( modstate & KMOD_ALT ) { -- map |= (1<<KG_ALT); -- } -- if ( modstate & KMOD_MODE ) { -- map |= (1<<KG_ALTGR); -- } -- if ( KTYP(vga_keymap[map][scancode]) == KT_LETTER ) { -- if ( modstate & KMOD_CAPS ) { -- map ^= (1<<KG_SHIFT); -- } -- } -- if ( KTYP(vga_keymap[map][scancode]) == KT_PAD ) { -- if ( modstate & KMOD_NUM ) { -- keysym->unicode=KVAL(vga_keymap[map][scancode]); -- } -- } else { -- keysym->unicode = KVAL(vga_keymap[map][scancode]); -+ map += 4; - } -+ if ( !(vga_keymap->key[scancode].spcl & (0x80 >> map)) ) -+ keysym->unicode = vga_keymap->key[scancode].map[map]; - } - return(keysym); - } diff --git a/devel/sdl/files/patch-ao b/devel/sdl/files/patch-ao deleted file mode 100644 index d5c4f96f703d..000000000000 --- a/devel/sdl/files/patch-ao +++ /dev/null @@ -1,20 +0,0 @@ ---- src/video/svga/SDL_svgavideo.c.orig Wed Nov 24 01:46:25 1999 -+++ src/video/svga/SDL_svgavideo.c Wed Sep 6 13:32:37 2000 -@@ -33,7 +33,7 @@ - #include <unistd.h> - #include <sys/stat.h> - --#include <linux/vt.h> -+#include <sys/consio.h> - #include <vga.h> - #include <vgamouse.h> - #include <vgakeyboard.h> -@@ -328,7 +328,7 @@ - vga_modeinfo *modeinfo; - - /* Since SVGAlib 1.40 leaks the mouse here, we have to close it */ -- mouse_close(); -+ /* mouse_close(); */ - - /* Try to set the requested linear video mode */ - bpp = (bpp+7)/8-1; diff --git a/devel/sdl/pkg-comment b/devel/sdl/pkg-comment deleted file mode 100644 index 7ec4477ccf04..000000000000 --- a/devel/sdl/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -Cross-platform multi-media development API diff --git a/devel/sdl/pkg-descr b/devel/sdl/pkg-descr deleted file mode 100644 index 30cb7e9b4da6..000000000000 --- a/devel/sdl/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -This library is designed to make it easy to write games that run on UNIX, -Win32 and BeOS using the various native high-performance media interfaces, -(for video, audio, etc) and presenting a single source-code level API to -your application. This is a fairly low level API, but using this, completely -portable applications can be written with a great deal of flexibility. - -WWW: http://www.libsdl.org/ diff --git a/devel/sdl/pkg-plist b/devel/sdl/pkg-plist deleted file mode 100644 index e7ba24da25b2..000000000000 --- a/devel/sdl/pkg-plist +++ /dev/null @@ -1,106 +0,0 @@ -bin/sdl-config -include/SDL/SDL.h -include/SDL/SDL_active.h -include/SDL/SDL_audio.h -include/SDL/SDL_byteorder.h -include/SDL/SDL_cdrom.h -include/SDL/SDL_copying.h -include/SDL/SDL_endian.h -include/SDL/SDL_error.h -include/SDL/SDL_events.h -include/SDL/SDL_keyboard.h -include/SDL/SDL_keysym.h -include/SDL/SDL_main.h -include/SDL/SDL_mouse.h -include/SDL/SDL_mutex.h -include/SDL/SDL_quit.h -include/SDL/SDL_rwops.h -include/SDL/SDL_syswm.h -include/SDL/SDL_thread.h -include/SDL/SDL_timer.h -include/SDL/SDL_types.h -include/SDL/SDL_version.h -include/SDL/SDL_video.h -include/SDL/begin_code.h -include/SDL/close_code.h -lib/libSDL-1.0.so.2 -lib/libSDL.a -lib/libSDL.so -lib/libSDLmain.a -share/aclocal/sdl.m4 -share/doc/SDL/BUGS -share/doc/SDL/COPYING -share/doc/SDL/CREDITS -share/doc/SDL/README -share/doc/SDL/WhatsNew -share/doc/SDL/audio/examples.html -share/doc/SDL/audio/funclist.html -share/doc/SDL/audio/functions.html -share/doc/SDL/audio/index.html -share/doc/SDL/cdrom/examples.html -share/doc/SDL/cdrom/funclist.html -share/doc/SDL/cdrom/functions.html -share/doc/SDL/cdrom/index.html -share/doc/SDL/docs.html -share/doc/SDL/events/examples.html -share/doc/SDL/events/functions.html -share/doc/SDL/events/index.html -share/doc/SDL/events/keysym.html -share/doc/SDL/images/rainbow.gif -share/doc/SDL/index.html -share/doc/SDL/threads/index.html -share/doc/SDL/time/examples.html -share/doc/SDL/time/funclist.html -share/doc/SDL/time/functions.html -share/doc/SDL/time/index.html -share/doc/SDL/video/examples.html -share/doc/SDL/video/funclist.html -share/doc/SDL/video/functions.html -share/doc/SDL/video/index.html -share/examples/SDL/COPYING -share/examples/SDL/Makefile.am -share/examples/SDL/Makefile.in -share/examples/SDL/README -share/examples/SDL/acinclude.m4 -share/examples/SDL/aclocal.m4 -share/examples/SDL/autogen.sh -share/examples/SDL/checkkeys.c -share/examples/SDL/config.guess -share/examples/SDL/config.sub -share/examples/SDL/configure -share/examples/SDL/configure.in -share/examples/SDL/graywin.c -share/examples/SDL/icon.bmp -share/examples/SDL/install-sh -share/examples/SDL/loopwave.c -share/examples/SDL/missing -share/examples/SDL/mkinstalldirs -share/examples/SDL/picture.xbm -share/examples/SDL/sample.bmp -share/examples/SDL/sample.wav -share/examples/SDL/testalpha.c -share/examples/SDL/testbitmap.c -share/examples/SDL/testcdrom.c -share/examples/SDL/testerror.c -share/examples/SDL/testhread.c -share/examples/SDL/testkeys.c -share/examples/SDL/testlock.c -share/examples/SDL/testsprite.c -share/examples/SDL/testtimer.c -share/examples/SDL/testtypes.c -share/examples/SDL/testver.c -share/examples/SDL/testvidinfo.c -share/examples/SDL/testwin.c -share/examples/SDL/testwm.c -share/examples/SDL/threadwin.c -@dirrm share/examples/SDL -@dirrm share/doc/SDL/video -@dirrm share/doc/SDL/time -@dirrm share/doc/SDL/threads -@dirrm share/doc/SDL/opengl -@dirrm share/doc/SDL/images -@dirrm share/doc/SDL/events -@dirrm share/doc/SDL/cdrom -@dirrm share/doc/SDL/audio -@dirrm share/doc/SDL -@dirrm include/SDL diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile index ab91b1f8f142..706b15f922ce 100644 --- a/devel/sdl12/Makefile +++ b/devel/sdl12/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTNAME= sdl-devel +PORTNAME= sdl PORTVERSION= 1.2.0 CATEGORIES= devel MASTER_SITES= http://www.libsdl.org/release/ \ |