On Sat, Mar 31, 2012 at 04:08:04PM +0300, Antti Harri wrote:
> Update to 0.6.3.
>
> - upstream fixed their sound code
> - new shader renderers enabled (nq-glslx and nq-sglsl)
works good on i386 cur, no glsl for me though:
could not resolve uniform texture
could not resolve uniform palette
could not resolve uniform mvp_mat
could not resolve attribute vertex
could not resolve attribute vcolor
could not resolve attribute char
could not resolve uniform texture
could not resolve uniform palette
could not resolve uniform mvp_mat
could not resolve attribute vertex
could not resolve attribute vcolor
Received signal 11, exiting...
pthread_mutex_destroy on mutex with waiters!
zsh: segmentation fault nq-sglsl
same with nq-glslx. cheers!
-ryan
>
> --
> Antti Harri
>
> diff --git games/quake/Makefile games/quake/Makefile
> index ab9c27b..9900cfc 100644
> --- games/quake/Makefile
> +++ games/quake/Makefile
> @@ -5,9 +5,9 @@ COMMENT-libs = Quake common libs
> COMMENT-server = QuakeWorld server
>
> # .so.1.0
> -SOMAJOR = 0
> +SOMAJOR = 1
> SOMINOR = 0
> -V = 0.6.0
> +V = 0.6.3
> DISTNAME = quakeforge-$V
> PKGNAME-main = quake-$V
> PKGNAME-libs = quake-libs-$V
> @@ -21,15 +21,13 @@ MULTI_PACKAGES = -main -libs -server
>
> SHARED_LIBS += QFcd ${SOMAJOR}.${SOMINOR}
> SHARED_LIBS += QFconsole ${SOMAJOR}.${SOMINOR}
> -SHARED_LIBS += QFgamecode ${SOMAJOR}.${SOMINOR}
> SHARED_LIBS += QFgib ${SOMAJOR}.${SOMINOR}
> SHARED_LIBS += QFimage ${SOMAJOR}.${SOMINOR}
> SHARED_LIBS += QFjs ${SOMAJOR}.${SOMINOR}
> SHARED_LIBS += QFmodels ${SOMAJOR}.${SOMINOR}
> SHARED_LIBS += QFmodels_gl ${SOMAJOR}.${SOMINOR}
> +SHARED_LIBS += QFmodels_glsl ${SOMAJOR}.${SOMINOR}
> SHARED_LIBS += QFmodels_sw ${SOMAJOR}.${SOMINOR}
> -SHARED_LIBS += QFrenderer_gl ${SOMAJOR}.${SOMINOR}
> -SHARED_LIBS += QFrenderer_sw32 ${SOMAJOR}.${SOMINOR}
> SHARED_LIBS += QFruamoko ${SOMAJOR}.${SOMINOR}
> SHARED_LIBS += QFsound ${SOMAJOR}.${SOMINOR}
> SHARED_LIBS += QFutil ${SOMAJOR}.${SOMINOR}
> @@ -46,8 +44,8 @@ PERMIT_PACKAGE_FTP = Yes
> PERMIT_DISTFILES_CDROM =Yes
> PERMIT_DISTFILES_FTP = Yes
>
> -WANTLIB-main += QFcd QFconsole QFgamecode QFgib QFimage QFjs QFmodels
> -WANTLIB-main += QFmodels_gl QFmodels_sw QFrenderer_gl QFrenderer_sw32
> +WANTLIB-main += QFcd QFconsole QFgib QFimage QFjs QFmodels
> +WANTLIB-main += QFmodels_gl QFmodels_sw QFmodels_glsl
> WANTLIB-main += QFruamoko QFsound QFutil SDL X11 Xext Xxf86dga Xxf86vm
> WANTLIB-main += c crypto idn m ncurses png pthread sndio ssl usbhid
> WANTLIB-main += xcb z curl ${MODGETTEXT_WANTLIB}
> @@ -55,7 +53,7 @@ WANTLIB-main += xcb z curl ${MODGETTEXT_WANTLIB}
> WANTLIB-libs += FLAC SDL m ncurses ogg png samplerate sndio usbhid
> WANTLIB-libs += vorbis vorbisfile z iconv
>
> -WANTLIB-server += QFconsole QFgamecode QFgib QFimage QFmodels QFruamoko
> +WANTLIB-server += QFconsole QFgib QFimage QFmodels QFruamoko
> WANTLIB-server += QFutil c m ncurses png pthread z
>
> MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=quake/}
> @@ -65,7 +63,6 @@ MODULES = devel/gettext
> BUILD_DEPENDS = devel/bison
> LIB_DEPENDS-server = ${FULLPKGNAME-libs}:${BUILD_PKGPATH},-libs
> LIB_DEPENDS-main = ${FULLPKGNAME-libs}:${BUILD_PKGPATH},-libs \
> - audio/flac \
> devel/libidn \
> devel/sdl \
> graphics/png \
> @@ -78,9 +75,7 @@ LIB_DEPENDS-libs = audio/flac \
>
> USE_LIBTOOL = Yes
> CONFIGURE_STYLE = gnu
> -CONFIGURE_ARGS += --with-clients=glx,sdl,sdl32,sgl,x11 \
> - --with-gl-driver=libGL.so \
> - --with-cd-default=SDL \
> +CONFIGURE_ARGS += --with-cd-default=sdl \
> --with-sharepath=${PREFIX}/share/quakeforge \
> --enable-version-info=${SOMAJOR}:${SOMINOR} \
> --disable-asmopt \
> diff --git games/quake/distinfo games/quake/distinfo
> index 8cfba69..a5d8dc9 100644
> --- games/quake/distinfo
> +++ games/quake/distinfo
> @@ -1,5 +1,5 @@
> -MD5 (quakeforge-0.6.0.tar.bz2) = rWDVwttQ0xh0EV+ysCU/Cg==
> -RMD160 (quakeforge-0.6.0.tar.bz2) = efr4st5ns8ls6PBvAju+NlT2oQM=
> -SHA1 (quakeforge-0.6.0.tar.bz2) = eikQ/v2bJJZX/lfPX57oT+xjJnA=
> -SHA256 (quakeforge-0.6.0.tar.bz2) =
> xXIK4lcevztUR6LIdkq/MSDKbzlJAx6M7fOFiRmE6uo=
> -SIZE (quakeforge-0.6.0.tar.bz2) = 2507190
> +MD5 (quakeforge-0.6.3.tar.bz2) = JyI6wle2Gbh2rXt4IKC3mQ==
> +RMD160 (quakeforge-0.6.3.tar.bz2) = 1OYR5EmLXd518uUvYP6FeRhjbFw=
> +SHA1 (quakeforge-0.6.3.tar.bz2) = O0pUe+C9xIicTRe3wbz91zbPipc=
> +SHA256 (quakeforge-0.6.3.tar.bz2) =
> /s4nY64ovwjAQE1DTvCGNxkZbxMARzNllH1jaGGNUeg=
> +SIZE (quakeforge-0.6.3.tar.bz2) = 2653135
> diff --git games/quake/pkg/PFRAG.shared-libs games/quake/pkg/PFRAG.shared-libs
> index 5733955..d2a9469 100644
> --- games/quake/pkg/PFRAG.shared-libs
> +++ games/quake/pkg/PFRAG.shared-libs
> @@ -1,15 +1,13 @@
> @comment $OpenBSD: ports/games/quake/pkg/PFRAG.shared-libs,v 1.1 2011/07/11
> 16:33:06 jasper Exp $
> @lib lib/libQFcd.so.${LIBQFcd_VERSION}
> @lib lib/libQFconsole.so.${LIBQFconsole_VERSION}
> -@lib lib/libQFgamecode.so.${LIBQFgamecode_VERSION}
> @lib lib/libQFgib.so.${LIBQFgib_VERSION}
> @lib lib/libQFimage.so.${LIBQFimage_VERSION}
> @lib lib/libQFjs.so.${LIBQFjs_VERSION}
> @lib lib/libQFmodels.so.${LIBQFmodels_VERSION}
> @lib lib/libQFmodels_gl.so.${LIBQFmodels_gl_VERSION}
> +@lib lib/libQFmodels_glsl.so.${LIBQFmodels_glsl_VERSION}
> @lib lib/libQFmodels_sw.so.${LIBQFmodels_sw_VERSION}
> -@lib lib/libQFrenderer_gl.so.${LIBQFrenderer_gl_VERSION}
> -@lib lib/libQFrenderer_sw32.so.${LIBQFrenderer_sw32_VERSION}
> @lib lib/libQFruamoko.so.${LIBQFruamoko_VERSION}
> @lib lib/libQFsound.so.${LIBQFsound_VERSION}
> @lib lib/libQFutil.so.${LIBQFutil_VERSION}
> @@ -17,4 +15,4 @@ lib/quakeforge/plugins/cd_file.so
> lib/quakeforge/plugins/cd_sdl.so
> lib/quakeforge/plugins/console_client.so
> lib/quakeforge/plugins/console_server.so
> -lib/quakeforge/plugins/snd_output_disk.so
> +@comment lib/quakeforge/plugins/snd_output_disk.so
> diff --git games/quake/pkg/PLIST-libs games/quake/pkg/PLIST-libs
> index 38558f9..f87fb2e 100644
> --- games/quake/pkg/PLIST-libs
> +++ games/quake/pkg/PLIST-libs
> @@ -10,7 +10,6 @@ include/QF/GL/funcs.h
> include/QF/GL/qf_explosions.h
> include/QF/GL/qf_funcs_list.h
> include/QF/GL/qf_lightmap.h
> -include/QF/GL/qf_noisetextures.h
> include/QF/GL/qf_rlight.h
> include/QF/GL/qf_rmain.h
> include/QF/GL/qf_rsurf.h
> @@ -18,6 +17,17 @@ include/QF/GL/qf_sky.h
> include/QF/GL/qf_textures.h
> include/QF/GL/qf_vid.h
> include/QF/GL/types.h
> +include/QF/GLSL/
> +include/QF/GLSL/defines.h
> +include/QF/GLSL/funcs.h
> +include/QF/GLSL/qf_alias.h
> +include/QF/GLSL/qf_bsp.h
> +include/QF/GLSL/qf_funcs_list.h
> +include/QF/GLSL/qf_lightmap.h
> +include/QF/GLSL/qf_particles.h
> +include/QF/GLSL/qf_textures.h
> +include/QF/GLSL/qf_vid.h
> +include/QF/GLSL/types.h
> include/QF/bspfile.h
> include/QF/cbuf.h
> include/QF/cdaudio.h
> @@ -89,6 +99,7 @@ include/QF/va.h
> include/QF/ver_check.h
> include/QF/vid.h
> include/QF/view.h
> +include/QF/vrect.h
> include/QF/wad.h
> include/QF/wadfile.h
> include/QF/winding.h
> @@ -127,6 +138,7 @@ lib/qfcc/include/infokey.h
> lib/qfcc/include/key.h
> lib/qfcc/include/math.h
> lib/qfcc/include/message.h
> +lib/qfcc/include/msgbuf.h
> lib/qfcc/include/nq_message.h
> lib/qfcc/include/physics.h
> lib/qfcc/include/plist.h
> @@ -159,8 +171,6 @@ lib/quakeforge/plugins/console_client.a
> lib/quakeforge/plugins/console_client.la
> lib/quakeforge/plugins/console_server.a
> lib/quakeforge/plugins/console_server.la
> -lib/quakeforge/plugins/snd_output_disk.a
> -lib/quakeforge/plugins/snd_output_disk.la
> lib/quakeforge/plugins/snd_output_sdl.a
> lib/quakeforge/plugins/snd_output_sdl.la
> lib/quakeforge/plugins/snd_output_sdl.so
> diff --git games/quake/pkg/PLIST-main games/quake/pkg/PLIST-main
> index 42f67aa..3f53084 100644
> --- games/quake/pkg/PLIST-main
> +++ games/quake/pkg/PLIST-main
> @@ -2,10 +2,12 @@
> @pkgpath ${BASE_PKGPATH},-main[,sdl][,ggi][,x11][,gl]
> @bin bin/bsp2img
> @comment @bin bin/hw-master
> +@bin bin/nq-glslx
> @bin bin/nq-glx
> @bin bin/nq-sdl
> @bin bin/nq-sdl32
> @bin bin/nq-sgl
> +@bin bin/nq-sglsl
> @bin bin/nq-x11
> @bin bin/pak
> @bin bin/qfbsp
> @@ -19,10 +21,12 @@ bin/qfpreqcc
> @bin bin/qfvis
> @bin bin/qfwavinfo
> @bin bin/qtv
> +@bin bin/qw-client-glslx
> @bin bin/qw-client-glx
> @bin bin/qw-client-sdl
> @bin bin/qw-client-sdl32
> @bin bin/qw-client-sgl
> +@bin bin/qw-client-sglsl
> @bin bin/qw-client-x11
> @bin bin/qw-master
> @bin bin/wad
> @@ -31,8 +35,6 @@ lib/libQFcd.a
> lib/libQFcd.la
> lib/libQFconsole.a
> lib/libQFconsole.la
> -lib/libQFgamecode.a
> -lib/libQFgamecode.la
> lib/libQFgib.a
> lib/libQFgib.la
> lib/libQFimage.a
> @@ -43,12 +45,10 @@ lib/libQFmodels.a
> lib/libQFmodels.la
> lib/libQFmodels_gl.a
> lib/libQFmodels_gl.la
> +lib/libQFmodels_glsl.a
> +lib/libQFmodels_glsl.la
> lib/libQFmodels_sw.a
> lib/libQFmodels_sw.la
> -lib/libQFrenderer_gl.a
> -lib/libQFrenderer_gl.la
> -lib/libQFrenderer_sw32.a
> -lib/libQFrenderer_sw32.la
> lib/libQFruamoko.a
> lib/libQFruamoko.la
> lib/libQFsound.a
>
