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

Update to SDL-1.2.7; based on work by jsg@

Browse Source
This commit is contained in:
pvalchev 2004-10-25 02:34:21 +00:00
parent 2c174a00d2
commit 521b9c626b
9 changed files with 87 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
devel/sdl/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.32 2004/04/23 12:09:18 robert Exp $
# $OpenBSD: Makefile,v 1.33 2004/10/25 02:34:21 pvalchev Exp $
# Uses pthreads
COMMENT= "cross-platform multimedia library"
VERSION= 1.2.6
VERSION= 1.2.7
DISTNAME= SDL-${VERSION}
PKGNAME= ${DISTNAME:L}p0
PKGNAME= ${DISTNAME:L}
CATEGORIES= devel
HOMEPAGE= http://www.libsdl.org/
@ -26,6 +26,7 @@ MASTER_SITES0= http://dev.beastie.hu/ \
FLAVORS= sun esd arts aa caca no_x11
FLAVOR?= sun
AUTOCONF_VERSION= 2.59
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= autoconf
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/test
@ -41,7 +42,7 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
USE_GCC3?=No
# XXX gcc 3/nasm issue.
.if (${MACHINE_ARCH} == "i386") && (${CC} != "egcc" && ${USE_GCC3:L} != "yes")
BUILD_DEPENDS= nasm::devel/nasm
BUILD_DEPENDS+= nasm::devel/nasm
CONFIGURE_ARGS+= --enable-nasm
.else
CONFIGURE_ARGS+= --disable-nasm
@ -90,6 +91,6 @@ USE_X11= Yes
NO_REGRESS= Yes
MAKE_FLAGS= libSDL_la_LDFLAGS="-version-info 2:0:0"
MAKE_FLAGS= libSDL_la_LDFLAGS="-version-info 3:0:0"
.include <bsd.port.mk>

6
devel/sdl/distinfo
View File

@ -1,6 +1,6 @@
MD5 (SDL-1.2.6.tar.gz) = 9011f147f23ec535515291d0c9c6904c
MD5 (SDL-1.2.7.tar.gz) = d29b34b6ba3ed213893fc9d8d35e357a
MD5 (patch-libsd1.2.6-libcaca0.9.diff) = a485a74daf1684397000940366e0cc54
RMD160 (SDL-1.2.6.tar.gz) = 881e4d635ae29ddccb5eb0786e5969075b8ffe96
RMD160 (SDL-1.2.7.tar.gz) = 2e19851fca8dac81c8d07cb39b8757aa54093023
RMD160 (patch-libsd1.2.6-libcaca0.9.diff) = bbae0fce638b6f4f340042e7d4d4d9e901bb5555
SHA1 (SDL-1.2.6.tar.gz) = 6f64b79427ea279e5ae18ea07d9fe353fd138422
SHA1 (SDL-1.2.7.tar.gz) = 1a840c50668f230df9e9163ef1a282d9f3355383
SHA1 (patch-libsd1.2.6-libcaca0.9.diff) = 551a5a9e2f485cbc86bfa9b657891997a5e94185

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

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.22 2003/12/07 19:45:43 espie Exp $
--- configure.in.orig 2003-08-30 21:13:18.000000000 +0200
+++ configure.in 2003-12-07 19:43:19.000000000 +0100
@@ -492,9 +492,6 @@ CheckNASM()
$OpenBSD: patch-configure_in,v 1.23 2004/10/25 02:34:21 pvalchev Exp $
--- configure.in.orig Mon Feb 23 08:31:47 2004
+++ configure.in Mon Sep 27 12:01:55 2004
@@ -501,9 +501,6 @@ CheckNASM()
win32)
NASMFLAGS="-f win32"
;;
@ -11,7 +11,7 @@ $OpenBSD: patch-configure_in,v 1.22 2003/12/07 19:45:43 espie Exp $
*)
NASMFLAGS="-f elf"
;;
@@ -1030,9 +1027,6 @@ CheckOpenGL()
@@ -1040,9 +1037,6 @@ CheckOpenGL()
AC_MSG_RESULT($video_opengl)
if test x$video_opengl = xyes; then
CFLAGS="$CFLAGS -DHAVE_OPENGL"
@ -21,7 +21,7 @@ $OpenBSD: patch-configure_in,v 1.22 2003/12/07 19:45:43 espie Exp $
fi
fi
}
@@ -1053,9 +1047,6 @@ CheckOpenGLQNX()
@@ -1063,9 +1057,6 @@ CheckOpenGLQNX()
if test x$video_opengl = xyes; then
CFLAGS="$CFLAGS -DHAVE_OPENGL"
SYSTEM_LIBS="$SYSTEM_LIBS -lGL"
@ -31,26 +31,26 @@ $OpenBSD: patch-configure_in,v 1.22 2003/12/07 19:45:43 espie Exp $
fi
fi
}
@@ -1559,6 +1550,9 @@ CheckDLOPEN()
AC_ARG_ENABLE(dlopen,
[ --enable-dlopen use dlopen for shared object loading [default=no]],
, enable_dlopen=yes)
@@ -1595,6 +1586,9 @@ CheckDLOPEN()
AC_ARG_ENABLE(sdl-dlopen,
[ --enable-sdl-dlopen use dlopen for shared object loading [default=yes]],
, enable_sdl_dlopen=yes)
+ AC_ARG_ENABLE(ltdl,
+[ --enable-ltdl use libtool for shared object loading [default=no]],
+ , enable_ltdl=yes)
if test x$enable_dlopen = xyes; then
+ , enable_ltdl=yes)
if test x$enable_sdl_dlopen = xyes; then
AC_MSG_CHECKING(for dlopen)
use_dlopen=no
@@ -1570,7 +1564,7 @@ CheckDLOPEN()
@@ -1606,7 +1600,7 @@ CheckDLOPEN()
])
AC_MSG_RESULT($use_dlopen)
- if test x$use_dlopen = xyes; then
+ if test x$use_dlopen = xyes -a x$enable_ltdl = xyes; then
CFLAGS="$CFLAGS -DUSE_DLOPEN"
AC_CHECK_LIB(dl, dlopen, SYSTEM_LIBS="$SYSTEM_LIBS -ldl", AC_CHECK_LIB(ltdl, dlopen, SYSTEM_LIBS="$SYSTEM_LIBS -lltdl"))
fi
@@ -2549,6 +2543,9 @@ fi
AC_CHECK_LIB(c, dlopen, SYSTEM_LIBS="$SYSTEM_LIBS",
AC_CHECK_LIB(dl, dlopen, SYSTEM_LIBS="$SYSTEM_LIBS -ldl",
@@ -2612,6 +2606,9 @@ fi
if test $ARCH = solaris; then
SDL_RLD_FLAGS="-R\${exec_prefix}/lib"
fi
@ -60,7 +60,7 @@ $OpenBSD: patch-configure_in,v 1.22 2003/12/07 19:45:43 espie Exp $
case "$ARCH" in
openbsd | netbsd | bsdi)
@@ -2571,7 +2568,7 @@ esac
@@ -2645,7 +2642,7 @@ esac
STATIC_SYSTEM_LIBS="$SYSTEM_LIBS"
dnl Output the video drivers we use

46
devel/sdl/patches/patch-ltmain_sh
View File

@ -1,44 +1,44 @@
$OpenBSD: patch-ltmain_sh,v 1.5 2003/09/29 05:41:37 pvalchev Exp $
--- ltmain.sh.orig 2003-08-30 21:13:00.000000000 +0200
+++ ltmain.sh 2003-09-21 14:43:28.000000000 +0200
@@ -3626,40 +3626,6 @@ libdir='$install_libdir'\
$OpenBSD: patch-ltmain_sh,v 1.6 2004/10/25 02:34:21 pvalchev Exp $
--- ltmain.sh.orig Mon Sep 27 11:41:42 2004
+++ ltmain.sh Mon Sep 27 11:42:18 2004
@@ -5885,40 +5885,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit 0
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
- $echo "----------------------------------------------------------------------"
- $echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- echo " $libdir"
- $echo " $libdir"
- done
- echo
- echo "If you ever happen to want to link against installed libraries"
- echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use \`-LLIBDIR'"
- echo "flag during linking and do at least one of the following:"
- $echo
- $echo "If you ever happen to want to link against installed libraries"
- $echo "in a given directory, LIBDIR, you must either use libtool, and"
- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- $echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- echo " during execution"
- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- $echo " during execution"
- fi
- if test -n "$runpath_var"; then
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
- echo " during linking"
- $echo " - add LIBDIR to the \`$runpath_var' environment variable"
- $echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- echo " - use the \`$flag' linker flag"
- $echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- echo " - have your system administrator run these commands:$admincmds"
- $echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- echo
- echo "See any operating system documentation about shared libraries for"
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
- echo "----------------------------------------------------------------------"
- $echo
- $echo "See any operating system documentation about shared libraries for"
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
- $echo "----------------------------------------------------------------------"
exit 0
;;

19
devel/sdl/patches/patch-src_Makefile_in
View File

@ -1,12 +1,11 @@
$OpenBSD: patch-src_Makefile_in,v 1.6 2003/09/29 05:41:37 pvalchev Exp $
--- src/Makefile.in.orig 2003-08-30 21:13:19.000000000 +0200
+++ src/Makefile.in 2003-09-21 14:43:28.000000000 +0200
@@ -140,7 +140,7 @@ DIST_SUBDIRS = $(CORE_SUBDIRS) $(EXTRA_S
lib_LTLIBRARIES = libSDL.la
$OpenBSD: patch-src_Makefile_in,v 1.7 2004/10/25 02:34:21 pvalchev Exp $
--- src/Makefile.in.orig Mon Sep 27 12:29:59 2004
+++ src/Makefile.in Mon Sep 27 12:31:03 2004
@@ -300,7 +300,6 @@ lib_LTLIBRARIES = libSDL.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@
libSDL_la_LDFLAGS = \
-no-undefined \
- -release $(LT_RELEASE) \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
libSDL_la_LIBADD = \

21
devel/sdl/patches/patch-src_joystick_bsd_SDL_sysjoystick_c Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-src_joystick_bsd_SDL_sysjoystick_c,v 1.5 2004/10/25 02:34:21 pvalchev Exp $
--- src/joystick/bsd/SDL_sysjoystick.c.orig Tue Oct 19 23:52:14 2004
+++ src/joystick/bsd/SDL_sysjoystick.c Tue Oct 19 23:53:37 2004
@@ -60,7 +60,7 @@ static char rcsid =
#include <sys/joystick.h>
#endif
-#if defined(__NetBSD__) || defined(__OpenBSD__)
+#if defined(__NetBSD__) || (defined(__OpenBSD__) && defined(__i386__))
#include <machine/joystick.h>
#endif
@@ -369,7 +369,7 @@ SDL_SYS_JoystickUpdate(SDL_Joystick *joy
int nbutton, naxe = -1;
Sint32 v;
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || (defined(__OpenBSD__) && defined(__i386__))
struct joystick gameport;
static int x, y, xmin = 0xffff, ymin = 0xffff, xmax = 0, ymax = 0;

8
devel/sdl/patches/patch-src_video_x11_SDL_x11modes_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_video_x11_SDL_x11modes_c,v 1.3 2003/09/29 05:41:37 pvalchev Exp $
--- src/video/x11/SDL_x11modes.c.orig 2003-08-30 21:13:12.000000000 +0200
+++ src/video/x11/SDL_x11modes.c 2003-09-21 14:51:18.000000000 +0200
$OpenBSD: patch-src_video_x11_SDL_x11modes_c,v 1.4 2004/10/25 02:34:21 pvalchev Exp $
--- src/video/x11/SDL_x11modes.c.orig Thu Feb 19 04:22:09 2004
+++ src/video/x11/SDL_x11modes.c Mon Sep 27 12:09:45 2004
@@ -44,6 +44,8 @@ static char rcsid =
#endif
@ -116,7 +116,7 @@ $OpenBSD: patch-src_video_x11_SDL_x11modes_c,v 1.3 2003/09/29 05:41:37 pvalchev
goto match;
}
qsort(modes, nmodes, sizeof *modes, cmpmodes);
for ( i = nmodes-1; i >= 0 ; i-- ) {
for ( i = nmodes-1; i > 0 ; i-- ) {
if ( ! best_width ) {
if ( (modes[i]->hdisplay >= width) &&
- (modes[i]->vdisplay >= height) ) {

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

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.8 2004/08/09 15:58:46 espie Exp $
@lib lib/libSDL.so.2.0
@comment $OpenBSD: PFRAG.shared,v 1.9 2004/10/25 02:34:21 pvalchev Exp $
@lib lib/libSDL.so.3.0

3
devel/sdl/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.8 2004/08/09 15:58:46 espie Exp $
@comment $OpenBSD: PLIST,v 1.9 2004/10/25 02:34:21 pvalchev Exp $
bin/sdl-config
include/SDL/
include/SDL/SDL.h
@ -7,6 +7,7 @@ include/SDL/SDL_audio.h
include/SDL/SDL_byteorder.h
include/SDL/SDL_cdrom.h
include/SDL/SDL_copying.h
include/SDL/SDL_cpuinfo.h
include/SDL/SDL_endian.h
include/SDL/SDL_error.h
include/SDL/SDL_events.h