Date: Sat, 8 Jan 2000 14:10:02 -0800 (PST) From: Maxim Sobolev <sobomax@altavista.net> To: freebsd-ports@FreeBSD.org Subject: Re: ports/15944: [PATCH] update of SDL port (devel/sdl) to version 1.0.1 Message-ID: <200001082210.OAA77798@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/15944; it has been noted by GNATS. From: Maxim Sobolev <sobomax@altavista.net> To: freebsd-gnats-submit@FreeBSD.org, sobomax@altavista.net Cc: Subject: Re: ports/15944: [PATCH] update of SDL port (devel/sdl) to version 1.0.1 Date: Sun, 09 Jan 2000 00:03:13 +0200 This is a multi-part message in MIME format. --------------FA2B4136C478B407DFB268F3 Content-Type: text/plain; charset=koi8-r Content-Transfer-Encoding: 7bit After some additional testing I've found that SDL really is very unhappy with BSD pthreads (you know - random crashes, lockups etc.), so I've switched to linuxthreads which solved problems. Also it seems that DGA is now broken at least for recent XFree 3.3.5 running on 4.0-Current, so I've disabled it by that time when it will work again... I'm attaching updated patch against original SDL 0.10 port. -Maxim --------------FA2B4136C478B407DFB268F3 Content-Type: text/plain; charset=koi8-r; name="sdl-0.10-1.0.1.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="sdl-0.10-1.0.1.diff" diff -ruN /usr/ports/devel/sdl/Makefile sdl/Makefile --- /usr/ports/devel/sdl/Makefile Wed Aug 25 23:42:13 1999 +++ sdl/Makefile Sat Jan 8 23:47:53 2000 @@ -1,30 +1,36 @@ # New ports collection makefile for: SDL -# Version required: 0.10.0 +# Version required: 1.0.1 # Date created: 8 August 1999 # Whom: Andrey Zakhvatov # # $FreeBSD: ports/devel/sdl/Makefile,v 1.2 1999/08/25 05:50:11 obrien Exp $ # -DISTNAME= SDL-0.10.0 -PKGNAME= sdl-0.10.0 -CATEGORIES= devel -MASTER_SITES= http://www.devolution.com/~slouken/SDL/SDL-0.10/src/ +DISTNAME= SDL-1.0.1 +PKGNAME= sdl-1.0.1 +CATEGORIES= devel audio +MASTER_SITES= http://www.devolution.com/~slouken/SDL/release/ MAINTAINER= andy@icc.surw.chel.su +#This port doesn't love FreeBSD pthread :( +LIB_DEPENDS= lthread.2:${PORTSDIR}/devel/linuxthreads \ + esd.2:${PORTSDIR}/audio/esound BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm USE_GMAKE= yes USE_XLIB= yes +GNU_CONFIGURE= yes -do-build: - @ cd ${WRKSRC}; ${GMAKE} - @ cd ${WRKSRC}; ${GMAKE} +#DGA seems hosed, at least on my two 4.0 boxes (XFree86 3.3.5) +CONFIGURE_ARGS= --disable-video-x11-dga + +CONFIGURE_ENV= NASM="${LOCALBASE}/bin/nasm" \ + LOCALBASE="${LOCALBASE}" + +CFLAGS+= -I${LOCALBASE}/include/pthread/linuxthreads post-install: - @ cd ${PREFIX}/lib; ${LN} -sf libSDLx11.so.0.10.0 libSDL.so.0 - @ cd ${PREFIX}/lib; ${LN} -sf libSDLx11.so.0.10.0 libSDLx11.so.0 @ ${MKDIR} ${PREFIX}/share/examples/SDL @ ${INSTALL_DATA} ${WRKSRC}/test/* ${PREFIX}/share/examples/SDL .if !defined(NOPORTDOCS) @@ -32,9 +38,8 @@ .for file in BUGS COPYING CREDITS README TODO WhatsNew docs.html @ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/SDL .endfor - @ cd ${WRKSRC}/docs; tar cf - * | \ + @ cd ${WRKSRC}/docs; tar cf - audio cdrom events images index.html threads video | \ (cd ${PREFIX}/share/doc/SDL; tar --unlink -xf - ) .endif - @ ${LDCONFIG} -m ${PREFIX}/lib .include <bsd.port.mk> diff -ruN /usr/ports/devel/sdl/files/md5 sdl/files/md5 --- /usr/ports/devel/sdl/files/md5 Fri Aug 13 08:18:16 1999 +++ sdl/files/md5 Fri Jan 7 00:44:39 2000 @@ -1 +1 @@ -MD5 (SDL-0.10.0.tar.gz) = 7e468488d0c7d0b3e9af6c4a5a897b97 +MD5 (SDL-1.0.1.tar.gz) = 0bc636a2f96c6451a5046c5f20fa0536 diff -ruN /usr/ports/devel/sdl/patches/patch-aa sdl/patches/patch-aa --- /usr/ports/devel/sdl/patches/patch-aa Fri Aug 13 08:18:17 1999 +++ sdl/patches/patch-aa Thu Jan 1 03:00:00 1970 @@ -1,38 +0,0 @@ ---- bin_dist/install-sdl.sh.orig Sun Aug 8 17:13:44 1999 -+++ bin_dist/install-sdl.sh Thu Aug 12 01:32:54 1999 -@@ -17,7 +17,7 @@ - ;; - *) - # Default to UNIX standard -- base=/usr/local -+ base=${PREFIX} - ;; - esac - -@@ -33,22 +33,12 @@ - } - - # Prompt the user to change the default directory --if [ "$lib_dir" = "" -o "$hdr_dir" = "" ]; then -- prompt "Enter installation directory: [$base] " -- read newbase -- if [ "$newbase" != "" ]; then -- base=$newbase -- fi -- if [ "$lib_dir" = "" ]; then -- lib_dir="$base/lib" -- fi -- if [ "$hdr_dir" = "" ]; then -- hdr_dir="$base/include/SDL" -- fi --fi -+ -+lib_dir="$base/lib" -+hdr_dir="$base/include/SDL" - - # Final installation prompting --okay="n" -+okay="y" - while [ "$okay" = "n" -o "$okay" = "N" ]; do - echo "SDL library files will be installed in" - echo " $lib_dir" diff -ruN /usr/ports/devel/sdl/patches/patch-ab sdl/patches/patch-ab --- /usr/ports/devel/sdl/patches/patch-ab Fri Aug 13 08:18:17 1999 +++ sdl/patches/patch-ab Thu Jan 1 03:00:00 1970 @@ -1,29 +0,0 @@ ---- make/Configure.sh.orig Thu Aug 12 01:24:10 1999 -+++ make/Configure.sh Thu Aug 12 01:24:13 1999 -@@ -48,25 +48,7 @@ - SelectSubsystems() - { - choice="$*" -- while [ "$choice" != "" ]; do -- if [ "$choice" = "?" ]; then -- echo "" >&3 -- for dir in `echo $subsystems | tr '[A-Z]' '[a-z]'` -- do if [ -r "src/$target/$dir/.help" ]; then -- echo $dir: >&3 -- cat src/$target/$dir/.help >&3 -- echo "" >&3 -- else -- echo "No help available for $dir on $target" >&3 -- fi -- done -- else -- subsystems=$choice -- fi -- echo "Choose $target interface methods (or ? for help)" >&3 -- prompt "[$subsystems] " -- read choice -- done -+ subsystems=$choice - echo $subsystems | tr '[A-Z]' '[a-z]' - } - diff -ruN /usr/ports/devel/sdl/patches/patch-ac sdl/patches/patch-ac --- /usr/ports/devel/sdl/patches/patch-ac Thu Jan 1 03:00:00 1970 +++ sdl/patches/patch-ac Sat Jan 8 23:24:20 2000 @@ -0,0 +1,42 @@ +--- configure.orig Tue Dec 14 01:33:42 1999 ++++ configure Sat Jan 8 23:23:37 2000 +@@ -3030,7 +3030,7 @@ + echo "$ac_t""yes" 1>&6 + + CFLAGS="$CFLAGS -DESD_SUPPORT $ESD_CFLAGS" +- SYSTEM_LIBS="$SYSTEM_LIBS -lesd" ++ SYSTEM_LIBS="$SYSTEM_LIBS $ESD_LIBS" + + else + echo "$ac_t""no" 1>&6 +@@ -4333,11 +4333,11 @@ + + ac_save_libs="$LIBS" + case "$target" in +- *-*-freebsd*) ++ *-*-frebsd*) + pthread_lib="-lc_r" + ;; + *) +- pthread_lib="-lpthread" ++ pthread_lib="-L""$LOCALBASE""/lib -llthread" + ;; + esac + LIBS="$LIBS $pthread_lib" +@@ -4371,7 +4371,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 -I""$LOCALBASE""/include/pthread/linuxthreads" + SDL_LIBS="$SDL_LIBS $pthread_lib" + fi + fi +@@ -4851,6 +4851,7 @@ + ;; + *-*-freebsd*) + ARCH=freebsd ++ CheckNASM + CheckESD + CheckX11 + CheckPTHREAD diff -ruN /usr/ports/devel/sdl/pkg/PLIST sdl/pkg/PLIST --- /usr/ports/devel/sdl/pkg/PLIST Fri Aug 13 08:18:16 1999 +++ sdl/pkg/PLIST Sat Jan 8 22:38:03 2000 @@ -1,3 +1,4 @@ +bin/sdl-config include/SDL/SDL.h include/SDL/SDL_active.h include/SDL/SDL_audio.h @@ -9,7 +10,7 @@ include/SDL/SDL_events.h include/SDL/SDL_keyboard.h include/SDL/SDL_keysym.h -include/SDL/SDL_mangle.h +include/SDL/SDL_main.h include/SDL/SDL_mouse.h include/SDL/SDL_mutex.h include/SDL/SDL_quit.h @@ -22,19 +23,21 @@ include/SDL/SDL_video.h include/SDL/begin_code.h include/SDL/close_code.h +lib/libSDL-1.0.so +lib/libSDL-1.0.so.0 lib/libSDL.a -lib/libSDL.so.0 -lib/libSDLx11.so.0.10 -lib/libSDLx11.so.0.10.0 +lib/libSDL.la +lib/libSDL.so +lib/libSDLmain.a @exec /sbin/ldconfig -m %B @unexec /sbin/ldconfig -R +share/aclocal/sdl.m4 share/doc/SDL/BUGS share/doc/SDL/COPYING share/doc/SDL/CREDITS share/doc/SDL/README share/doc/SDL/TODO share/doc/SDL/WhatsNew -share/doc/SDL/docs.html share/doc/SDL/audio/examples.html share/doc/SDL/audio/funclist.html share/doc/SDL/audio/functions.html @@ -43,11 +46,11 @@ 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/SDL_title.gif share/doc/SDL/images/rainbow.gif share/doc/SDL/index.html share/doc/SDL/threads/index.html @@ -56,14 +59,21 @@ share/doc/SDL/video/functions.html share/doc/SDL/video/index.html share/examples/SDL/COPYING -share/examples/SDL/GNUC.sh -share/examples/SDL/GNUmake -share/examples/SDL/Makefile +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/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 @@ -82,12 +92,12 @@ share/examples/SDL/testwin.c share/examples/SDL/testwm.c share/examples/SDL/threadwin.c -@dirrm include/SDL -@dirrm share/doc/SDL/audio -@dirrm share/doc/SDL/cdrom -@dirrm share/doc/SDL/events -@dirrm share/doc/SDL/images -@dirrm share/doc/SDL/threads +@dirrm share/examples/SDL @dirrm share/doc/SDL/video +@dirrm share/doc/SDL/threads +@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 share/examples/SDL +@dirrm include/SDL --------------FA2B4136C478B407DFB268F3-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200001082210.OAA77798>