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

Update to SDL-1.2.4

Browse Source
This commit is contained in:
pvalchev 2002-04-21 00:20:08 +00:00
parent 4fecaeb271
commit 102383a81f
4 changed files with 19 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devel/sdl/Makefile
View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.22 2002/02/25 22:33:59 pvalchev Exp $
# $OpenBSD: Makefile,v 1.23 2002/04/21 00:20:08 pvalchev Exp $
# Uses pthreads
COMMENT= "cross-platform multimedia library"
VERSION= 1.2.3
VERSION= 1.2.4
DISTNAME= SDL-${VERSION}
PKGNAME= ${DISTNAME:L}
CATEGORIES= devel
NEED_VERSION= 1.504
NEED_VERSION= 1.524
HOMEPAGE= http://www.libsdl.org
@ -70,7 +70,7 @@ USE_X11= Yes
NO_REGRESS= Yes
MAKE_FLAGS= libSDL_la_LDFLAGS="-version-info 0:4:0"
MAKE_FLAGS= libSDL_la_LDFLAGS="-version-info 1:0:0"
post-patch:
@touch ${WRKSRC}/aclocal.m4 ${WRKSRC}/configure

6
devel/sdl/distinfo
View File

@ -1,3 +1,3 @@
MD5 (SDL-1.2.3.tar.gz) = a942c605c0f36752a4df5709a449ae7a
RMD160 (SDL-1.2.3.tar.gz) = 59867f1ef88a85c14511b09b51e7d5908d41728d
SHA1 (SDL-1.2.3.tar.gz) = f74f5bf47a472083da8700d2354cb90062e2a845
MD5 (SDL-1.2.4.tar.gz) = 116c083aad99faae691c6ca8dcdf406d
RMD160 (SDL-1.2.4.tar.gz) = d12b77ae09743812f9711fe733f1797ff6ee948a
SHA1 (SDL-1.2.4.tar.gz) = d30fb2cfb2455e14cc9e0116ee2c154da6475e10

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

@ -1,6 +1,7 @@
--- configure.in.orig Thu Nov 8 03:28:00 2001
+++ configure.in Wed Jan 23 07:03:39 2002
@@ -432,7 +432,13 @@
$OpenBSD: patch-configure_in,v 1.15 2002/04/21 00:20:08 pvalchev Exp $
--- configure.in.orig Sat Apr 13 17:57:24 2002
+++ configure.in Sat Apr 20 01:19:21 2002
@@ -468,7 +468,12 @@ CheckNASM()
NASMFLAGS="-f elf"
;;
esac
@ -11,55 +12,14 @@
+ ;;
+ esac
+ AC_SUBST(NASMFLAGS)
+
CFLAGS="$CFLAGS -I\$(top_srcdir)/src/hermes"
SDL_EXTRADIRS="$SDL_EXTRADIRS hermes"
SDL_EXTRALIBS="$SDL_EXTRALIBS hermes/libhermes.la"
@@ -1530,22 +1536,15 @@
CheckPTHREAD
# Set up files for the main() stub
COPY_ARCH_SRC(src/main, linux, SDL_main.c)
- # Set up files for the audio library
- # We use the OSS and native API's, not the Sun audio API
- #if test x$enable_audio = xyes; then
- # CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
- # AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun"
- # AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la"
- #fi
- # OpenBSD needs linking with ossaudio emulation library
if test x$have_oss = xyes; then
+ # OpenBSD needs linking with ossaudio emulation library
SYSTEM_LIBS="$SYSTEM_LIBS -lossaudio"
fi
# Set up files for the joystick library
- # (No joystick support yet)
@@ -1681,6 +1686,7 @@ case "$target" in
if test x$enable_joystick = xyes; then
- JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS dummy"
- JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS dummy/libjoystick_dummy.la"
+ JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS bsd"
+ JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS bsd/libjoystick_bsd.la"
JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS bsd"
JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS bsd/libjoystick_bsd.la"
+ SYSTEM_LIBS="$SYSTEM_LIBS -lusbhid"
fi
# Set up files for the cdrom library
if test x$enable_cdrom = xyes; then
@@ -2160,7 +2159,11 @@
fi
if test $ARCH = openbsd; then
- 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
@@ -2277,6 +2280,7 @@
src/joystick/Makefile
src/joystick/amigaos/Makefile
src/joystick/beos/Makefile
+src/joystick/bsd/Makefile
src/joystick/darwin/Makefile
src/joystick/dummy/Makefile
src/joystick/linux/Makefile

76
devel/sdl/patches/patch-ltconfig
View File

@ -1,76 +0,0 @@
$OpenBSD: patch-ltconfig,v 1.5 2001/12/28 23:42:27 pvalchev Exp $
--- ltconfig.orig Thu Oct 25 00:08:18 2001
+++ ltconfig Thu Dec 27 01:26:30 2001
@@ -501,7 +501,14 @@ fi
if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ case "$host_os" in
+ openbsd*)
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+ ;;
+ *)
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ ;;
+ esac
fi
# Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin.
@@ -1444,19 +1451,23 @@ else
openbsd*)
hardcode_direct=yes
hardcode_shlibpath_var=no
- case "$host_os" in
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.
+8-powerpc"; then
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ export_dynamic_flag_spec='${wl}-E'
+ else
+ case "$host_os" in
openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
- hardcode_libdir_flag_spec='-R$libdir'
- ;;
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
*)
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" -o "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- export_dynamic_flag_spec='${wl}-E'
- fi
- ;;
- esac
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ ;;
+ esac
+ fi
;;
os2*)
@@ -2083,11 +2094,20 @@ openbsd*)
version_type=sunos
need_lib_prefix=no
need_version=no
+ sys_lib_search_path_spec="/usr/lib"
+ sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib"
file_magic_cmd=/usr/bin/file
file_magic_test_file=`echo /usr/lib/libc.so.*`
if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" -o "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
- shlibpath_overrides_runpath=no
+ case "$host_os" in
+ openbsd2.[89] | openbsd2.[89].*)
+ shlibpath_overrides_runpath=no
+ ;;
+ *)
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
else
deplibs_check_method='file_magic OpenBSD.* shared library'
shlibpath_overrides_runpath=yes