cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to SDL-1.2.2

Browse Source 
Includes OpenBSD fixes and cleanups.
Other changes that concern us:
* Now gets correct keyboard state when starting up on X11
* Improved X11 fullscreen support, works better with KDE
This commit is contained in:
pvalchev 2001-07-25 07:58:32 +00:00
parent c4df17bf58
commit c1cb058582
12 changed files with 51 additions and 1227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devel/sdl/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.13 2001/07/20 03:10:10 pvalchev Exp $
# $OpenBSD: Makefile,v 1.14 2001/07/25 07:58:32 pvalchev Exp $
COMMENT= "cross-platform multimedia library"
VERSION= 1.2.1
VERSION= 1.2.2
DISTNAME= SDL-${VERSION}
PKGNAME= ${DISTNAME:L}p1
PKGNAME= ${DISTNAME:L}
CATEGORIES= devel
NEED_VERSION= 1.422
NEED_VERSION= 1.427
HOMEPAGE= http://www.libsdl.org

6
devel/sdl/files/md5
View File

@ -1,3 +1,3 @@
MD5 (SDL-1.2.1.tar.gz) = 72c9058de7a9277693585660cc1876ae
RMD160 (SDL-1.2.1.tar.gz) = 9a92c21180b0f8e0ddd9e9339e73910add1e5b08
SHA1 (SDL-1.2.1.tar.gz) = c2968bfd3dc4f5b3c8a2b0f541796390ce90d0a5
MD5 (SDL-1.2.2.tar.gz) = d27e0cd39388e2ff927823577f6c935f
RMD160 (SDL-1.2.2.tar.gz) = a0a8c742f827bdefd35b3ebf64bbb5972cf53865
SHA1 (SDL-1.2.2.tar.gz) = 1699bd6094847d5465035ac5c4211e182a4a9dd9

1085
devel/sdl/patches/patch-configure
View File

File diff suppressed because it is too large Load Diff

60
devel/sdl/patches/patch-configure_in
View File

@ -1,58 +1,40 @@
$OpenBSD: patch-configure_in,v 1.10 2001/07/20 03:07:07 pvalchev Exp $
--- configure.in.orig Mon Jun 18 09:21:38 2001
+++ configure.in Thu Jul 19 20:38:01 2001
@@ -14,9 +14,9 @@ dnl Set various version strings - taken
$OpenBSD: patch-configure_in,v 1.11 2001/07/25 07:58:32 pvalchev Exp $
--- configure.in.orig Mon Jul 23 13:54:03 2001
+++ configure.in Tue Jul 24 23:05:55 2001
@@ -13,10 +13,10 @@ dnl Set various version strings - taken
# set SDL_BINARY_AGE and SDL_INTERFACE_AGE to 0.
#
SDL_MAJOR_VERSION=1
SDL_MINOR_VERSION=2
-SDL_MICRO_VERSION=1
-SDL_INTERFACE_AGE=1
-SDL_BINARY_AGE=1
+SDL_MICRO_VERSION=2
+SDL_INTERFACE_AGE=2
+SDL_BINARY_AGE=2
-SDL_MINOR_VERSION=2
-SDL_MICRO_VERSION=2
-SDL_INTERFACE_AGE=2
-SDL_BINARY_AGE=2
+SDL_MINOR_VERSION=3
+SDL_MICRO_VERSION=3
+SDL_INTERFACE_AGE=3
+SDL_BINARY_AGE=3
SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
AC_SUBST(SDL_MAJOR_VERSION)
@@ -246,7 +246,11 @@ CheckOSS()
AC_MSG_CHECKING(for OSS audio support)
have_oss=no
AC_TRY_COMPILE([
+ #ifdef __OpenBSD__
+ #include <soundcard.h>
+ #else
#include <sys/soundcard.h>
+ #endif
],[
int arg = SNDCTL_DSP_SETFRAGMENT;
],[
@@ -289,6 +293,7 @@ CheckOPENBSDAUDIO()
[ --enable-openbsdaudio OpenBSD native audio support [default=no]],
, enable_openbsdaudio=no)
if test x$enable_audio = xyes -a x$enable_openbsdaudio = xyes; then
+ CFLAGS="$CFLAGS -DOPENBSD_SUPPORT"
SYSTEM_LIBS="$SYSTEM_LIBS $ESD_LIBS"
AUDIO_SUBDIRS="$AUDIO_SUBDIRS openbsd"
AUDIO_DRIVERS="$AUDIO_DRIVERS openbsd/libaudio_openbsd.la"
@@ -1385,8 +1390,10 @@ case "$target" in
@@ -1450,8 +1450,6 @@ case "$target" in
if test x$enable_timers = xyes; then
COPY_ARCH_SRC(src/timer, linux, SDL_systimer.c)
fi
- # OpenBSD does not define "unix"
- CFLAGS="$CFLAGS -Dunix"
+ # OpenBSD needs linking with ossaudio emulation library
+ if test x$enable_oss = xyes; then
+ LIBS="$LIBS -lossaudio"
+ fi
;;
*-*-sysv5*)
ARCH=sysv5
@@ -1959,7 +1966,7 @@ if test $ARCH = solaris; then
@@ -2024,7 +2022,11 @@ if test $ARCH = solaris; then
fi
if test $ARCH = openbsd; then
- SDL_RLD_FLAGS="-L${X11BASE}/lib -Wl,-rpath,\${exec_prefix}/lib -Wl,-rpath,${X11BASE}/lib"
+ SDL_RLD_FLAGS="-Wl,-rpath,${X11BASE}/lib"
- SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib $SYSTEM_LIBS"
+ if test x$have_x = xyes; then
+ SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib -Wl,-rpath,${X11BASE}/lib $SYSTEM_LIBS"
+ else
+ SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib $SYSTEM_LIBS"
+ fi
fi
dnl Output the video drivers we use

14
devel/sdl/patches/patch-sdl-config_in
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-sdl-config_in,v 1.1 2001/06/23 19:05:37 pvalchev Exp $
--- sdl-config.in.orig Thu Jun 21 22:28:44 2001
+++ sdl-config.in Thu Jun 21 22:29:29 2001
@@ -48,8 +48,8 @@ while test $# -gt 0; do
echo $includes -I@includedir@/SDL @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@ libdirs="-L@libdir@ -Wl,-R@libdir@ @SDL_RLD_FLAGS@"
+@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)

12
devel/sdl/patches/patch-src_audio_SDL_audio_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_audio_SDL_audio_c,v 1.7 2001/07/20 03:07:07 pvalchev Exp $
--- src/audio/SDL_audio.c.orig Fri Jun 15 19:51:42 2001
+++ src/audio/SDL_audio.c Thu Jul 19 20:38:34 2001
@@ -47,7 +47,7 @@ static AudioBootStrap *bootstrap[] = {
#ifdef ALSA_SUPPORT
&ALSA_bootstrap,
#endif
-#ifdef __OpenBSD__
+#ifdef OPENBSD_SUPPORT
&OBSD_bootstrap,
#endif
#if (defined(unix) && !defined(__CYGWIN32__)) && \

15
devel/sdl/patches/patch-src_audio_SDL_audiodev_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_audio_SDL_audiodev_c,v 1.1 2001/06/23 19:05:38 pvalchev Exp $
--- src/audio/SDL_audiodev.c.orig Fri Jun 22 14:13:36 2001
+++ src/audio/SDL_audiodev.c Fri Jun 22 14:14:04 2001
@@ -39,7 +39,11 @@ static char rcsid =
#include "SDL_audiodev_c.h"
#ifndef _PATH_DEV_DSP
+#ifdef __OpenBSD__
+#define _PATH_DEV_DSP "/dev/audio"
+#else
#define _PATH_DEV_DSP "/dev/dsp"
+#endif
#endif
#ifndef _PATH_DEV_DSP24
#define _PATH_DEV_DSP24 "/dev/sound/dsp"

15
devel/sdl/patches/patch-src_audio_dma_SDL_dmaaudio_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_audio_dma_SDL_dmaaudio_c,v 1.2 2001/06/23 19:05:39 pvalchev Exp $
--- src/audio/dma/SDL_dmaaudio.c.orig Fri Jun 22 15:48:59 2001
+++ src/audio/dma/SDL_dmaaudio.c Fri Jun 22 15:49:16 2001
@@ -39,7 +39,11 @@ static char rcsid =
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <sys/mman.h>
+#ifdef __OpenBSD__
+#include <soundcard.h>
+#else
#include <sys/soundcard.h>
+#endif
#ifndef MAP_FAILED
#define MAP_FAILED ((Uint8 *)-1)

15
devel/sdl/patches/patch-src_audio_dsp_SDL_dspaudio_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_audio_dsp_SDL_dspaudio_c,v 1.2 2001/06/23 19:05:39 pvalchev Exp $
--- src/audio/dsp/SDL_dspaudio.c.orig Fri Jun 22 15:48:03 2001
+++ src/audio/dsp/SDL_dspaudio.c Fri Jun 22 15:48:21 2001
@@ -37,7 +37,11 @@ static char rcsid =
#include <sys/time.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
+#ifdef __OpenBSD__
+#include <soundcard.h>
+#else
#include <sys/soundcard.h>
+#endif
#include "SDL_audio.h"
#include "SDL_error.h"

31
devel/sdl/patches/patch-src_video_x11_SDL_x11gl_c
View File

@ -1,31 +0,0 @@
$OpenBSD: patch-src_video_x11_SDL_x11gl_c,v 1.3 2001/07/13 21:36:00 pvalchev Exp $
--- src/video/x11/SDL_x11gl.c.orig Thu May 10 18:35:31 2001
+++ src/video/x11/SDL_x11gl.c Fri Jul 13 15:19:15 2001
@@ -393,7 +393,9 @@ int X11_GL_LoadLibrary(_THIS, const char
void *X11_GL_GetProcAddress(_THIS, const char* proc)
{
+ static char procname[1024];
void* handle;
+ void* retval;
handle = this->gl_config.dll_handle;
#if 0 /* This doesn't work correctly yet */
@@ -407,7 +409,16 @@ fprintf(stderr, "glXGetProcAddress retur
return this->gl_data->glXGetProcAddress(proc);
}
#endif
- return dlsym(handle, proc);
+#if defined(__OpenBSD__) && !defined(__ELF__)
+#undef dlsym(x,y);
+#endif
+ retval = dlsym(handle, proc);
+ if (!retval && strlen(proc) <= 1022) {
+ procname[0] = "_";
+ strcpy(procname + 1, proc);
+ retval = dlsym(handle, procname);
+ }
+ return retval;
}
#endif /* HAVE_OPENGL */

13
devel/sdl/patches/patch-src_video_x11_SDL_x11gl_c_h
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-src_video_x11_SDL_x11gl_c_h,v 1.1 2001/07/13 21:36:01 pvalchev Exp $
--- src/video/x11/SDL_x11gl_c.h.orig Fri Jul 13 13:53:44 2001
+++ src/video/x11/SDL_x11gl_c.h Fri Jul 13 13:54:39 2001
@@ -28,6 +28,9 @@ static char rcsid =
#ifdef HAVE_OPENGL
#include <GL/glx.h>
#include <dlfcn.h>
+#if defined(__OpenBSD__) && !defined(__ELF__)
+#define dlsym(x,y) dlsym(x, "_" y)
+#endif
#endif
#include "SDL_sysvideo.h"

4
devel/sdl/pkg/PFRAG.shared
View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2001/07/11 16:45:45 pvalchev Exp $
lib/libSDL.so.0.2
@comment $OpenBSD: PFRAG.shared,v 1.4 2001/07/25 07:58:32 pvalchev Exp $
lib/libSDL.so.0.3
DYNLIBDIR(%B)