diff options
author | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-03-30 14:12:29 +0000 |
---|---|---|
committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-03-30 14:12:29 +0000 |
commit | 5ccb6f19c2da84940988196a2b292ab725e15f2f (patch) | |
tree | 1dc2200f611b3def4284010bcb9cd7bdb8b66e18 /devel/sdl12 | |
parent | o Update to version 2.1 (diff) |
o Use PTHREAD_CFLAGS/PTHREAD_LIBS;
o don't apply bitwise shift to components when setting palette - vgl don't
need it unlike fbcon (after which libvgl driver was modelled). Bump
PORTREVISION as a result of bugfix.
Notes
Notes:
svn path=/head/; revision=40589
Diffstat (limited to 'devel/sdl12')
-rw-r--r-- | devel/sdl12/Makefile | 5 | ||||
-rw-r--r-- | devel/sdl12/files/patch-ac | 36 | ||||
-rw-r--r-- | devel/sdl12/files/patch-src_video_vgl_SDL__vglvideo.c | 6 |
3 files changed, 27 insertions, 20 deletions
diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile index f25238362a95..111608faa758 100644 --- a/devel/sdl12/Makefile +++ b/devel/sdl12/Makefile @@ -7,6 +7,7 @@ PORTNAME= sdl-devel PORTVERSION= 1.1.8 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://www.libsdl.org/release/ \ http://www.devolution.com/~slouken/SDL/release/ @@ -22,7 +23,9 @@ USE_XLIB= yes USE_ESOUND= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes -CONFIGURE_ENV= NASM="${LOCALBASE}/bin/nasm" +CONFIGURE_ENV= NASM="${LOCALBASE}/bin/nasm" \ + PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ + PTHREAD_LIBS="${PTHREAD_LIBS}" CONFIGURE_ARGS= --enable-video-aalib \ --enable-video-svga \ --disable-arts \ diff --git a/devel/sdl12/files/patch-ac b/devel/sdl12/files/patch-ac index c29d74064651..3d11707cc27a 100644 --- a/devel/sdl12/files/patch-ac +++ b/devel/sdl12/files/patch-ac @@ -1,9 +1,9 @@ $FreeBSD$ ---- configure.orig Fri Jan 5 22:18:22 2001 -+++ configure Sun Jan 21 23:03:55 2001 -@@ -80,6 +80,8 @@ +--- configure.orig Tue Feb 13 00:29:56 2001 ++++ configure Fri Mar 30 16:26:42 2001 +@@ -82,6 +82,8 @@ ac_help="$ac_help --enable-video-svga use SVGAlib video driver [default=no]" ac_help="$ac_help @@ -12,7 +12,7 @@ $FreeBSD$ --enable-video-aalib use AAlib video driver [default=no]" ac_help="$ac_help --enable-video-opengl include OpenGL context creation [default=yes]" -@@ -630,9 +632,9 @@ +@@ -632,9 +634,9 @@ # libtool versioning LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION @@ -24,7 +24,7 @@ $FreeBSD$ -@@ -3022,7 +3024,7 @@ +@@ -3032,7 +3034,7 @@ SDL_CFLAGS="" @@ -33,7 +33,7 @@ $FreeBSD$ case "$target" in -@@ -5144,6 +5146,57 @@ +@@ -5213,6 +5215,57 @@ fi } @@ -91,7 +91,18 @@ $FreeBSD$ CheckAAlib() { # Check whether --enable-video-aalib or --disable-video-aalib was given. -@@ -5883,6 +5936,7 @@ +@@ -5434,8 +5487,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" +@@ -6029,6 +6082,7 @@ CheckX11 CheckDGA CheckSVGA @@ -99,7 +110,7 @@ $FreeBSD$ CheckAAlib CheckOpenGL CheckPTHREAD -@@ -5899,10 +5953,10 @@ +@@ -6214,10 +6268,10 @@ cat >>$new <$old # Set up files for the audio library @@ -114,18 +125,11 @@ $FreeBSD$ # Set up files for the joystick library # (No joystick support yet) if test x$enable_joystick = xyes; then -@@ -8412,6 +8466,7 @@ +@@ -8689,6 +8743,8 @@ 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 -@@ -8621,6 +8676,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 diff --git a/devel/sdl12/files/patch-src_video_vgl_SDL__vglvideo.c b/devel/sdl12/files/patch-src_video_vgl_SDL__vglvideo.c index e98aed5ce760..d08442068f7d 100644 --- a/devel/sdl12/files/patch-src_video_vgl_SDL__vglvideo.c +++ b/devel/sdl12/files/patch-src_video_vgl_SDL__vglvideo.c @@ -437,9 +437,9 @@ $FreeBSD$ + + for(i = 0; i < ncolors; i++) { + VGLSetPaletteIndex(firstcolor + i, -+ colors[i].r>>2, -+ colors[i].g>>2, -+ colors[i].b>>2); ++ colors[i].r, ++ colors[i].g, ++ colors[i].b); + } + return 1; +} |