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

- Fix clients statically linked to libQFrenderer_sw being unable to load

Browse Source 
console_client.so (the game menus) by making it a dynamic library [1].
- Change INSTALLS_SHLIB to USE_LDCONFIG.
- Remove STATIC_PLUGINS option.
- Bump PORTREVISION.

Reported by:	scalopus@gmail.com
Obtained from:	https://bugzilla.altlinux.org/show_bug.cgi?id=8853 [1]
This commit is contained in:
Alejandro Pulver 2006-12-29 21:12:42 +00:00
parent 3d8063ef94
commit 7fb227f871
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=181003
4 changed files with 58 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
games/quakeforge/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= quakeforge
PORTVERSION= 0.5.5
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:sf/}
MASTER_SITE_SUBDIR= quake/:sf
@ -19,13 +19,15 @@ MAINTAINER= alepulver@FreeBSD.org
COMMENT= Cleaned up copy of the GPLd Quake 1 source code
NOT_FOR_ARCHS= sparc64
GNU_CONFIGURE= yes
NOT_FOR_ARCHS_REASON= generated Quake C compiler (qfcc) does not work
USE_BZIP2= yes
USE_BISON= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
WANT_SDL= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS+=--with-global-cfg=${PREFIX}/etc/quakeforge.conf \
--with-sharepath=${DATADIR} \
--disable-optimize
@ -35,13 +37,11 @@ OPTIONS= CLIENTS "Build clients" on \
SDL "Build SDL client" off \
SERVERS "Build dedicated servers" on \
SKYBOXES "Install skyboxes pak" off \
STATIC_PLUGINS "Build plugins into executable" off \
VORBIS "Enable Ogg Vorbis support in clients" off \
XMMS "Enable XMMS support in clients" off
MAN1= pak.1 qfcc.1 qflight.1 qfvis.1 wad.1
SUB_FILES= pkg-message
INSTALLS_SHLIB= yes
DATADIR= ${Q1DIR}
@ -108,13 +108,6 @@ PLIST_SUB+= SKYBOXES=""
PLIST_SUB+= SKYBOXES="@comment "
.endif
.if defined(WITH_STATIC_PLUGINS)
CONFIGURE_ARGS+=--with-static-plugins
PLIST_SUB+= PLUGINS="@comment "
.else
PLIST_SUB+= PLUGINS=""
.endif
post-install:
.if defined(WITH_SKYBOXES)
${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/skyboxes.pak ${DATADIR}/QF

13
games/quakeforge/files/patch-configure
View File

@ -1,5 +1,5 @@
--- ./configure.orig Sun May 2 17:53:17 2004
+++ ./configure Sun Dec 17 15:50:06 2006
--- configure.orig Sun May 2 17:53:17 2004
+++ configure Fri Dec 29 17:54:22 2006
@@ -22733,7 +22733,7 @@
int
main ()
@ -9,3 +9,12 @@
;
return 0;
}
@@ -32304,7 +32304,7 @@
if test "x$BUILD_SW" = xyes; then
- VID_REND_NOINST_TARGETS="$VID_REND_NOINST_TARGETS libQFrenderer_sw.la"
+ VID_REND_TARGETS="$VID_REND_TARGETS libQFrenderer_sw.la"
VID_MODEL_TARGETS="$VID_MODEL_TARGETS libQFmodels_sw.la"
fi
if test "x$BUILD_SW32" = xyes; then

11
games/quakeforge/files/patch-libs__video__renderer__Makefile.in Normal file
View File

@ -0,0 +1,11 @@
--- ./libs/video/renderer/Makefile.in.orig Sun May 2 17:52:09 2004
+++ ./libs/video/renderer/Makefile.in Fri Dec 29 17:41:47 2006
@@ -409,7 +409,7 @@
libQFrenderer_gl_la_LIBADD = gl/libgl.la
libQFrenderer_gl_la_SOURCES = $(common_sources)
libQFrenderer_gl_la_DEPENDENCIES = gl/libgl.la
-libQFrenderer_sw_la_LDFLAGS = @STATIC@
+libQFrenderer_sw_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir)
libQFrenderer_sw_la_LIBADD = sw/libsw.la
libQFrenderer_sw_la_SOURCES = $(common_sources)
libQFrenderer_sw_la_DEPENDENCIES = sw/libsw.la

58
games/quakeforge/pkg-plist
View File

@ -69,6 +69,10 @@ lib/libQFmodels.so.1
%%CLIENTS%%lib/libQFrenderer_gl.la
%%CLIENTS%%lib/libQFrenderer_gl.so
%%CLIENTS%%lib/libQFrenderer_gl.so.1
%%CLIENTS%%lib/libQFrenderer_sw.a
%%CLIENTS%%lib/libQFrenderer_sw.la
%%CLIENTS%%lib/libQFrenderer_sw.so
%%CLIENTS%%lib/libQFrenderer_sw.so.1
%%CLIENTS%%%%SDL%%lib/libQFrenderer_sw32.a
%%CLIENTS%%%%SDL%%lib/libQFrenderer_sw32.la
%%CLIENTS%%%%SDL%%lib/libQFrenderer_sw32.so
@ -85,33 +89,33 @@ lib/libQFutil.a
lib/libQFutil.la
lib/libQFutil.so
lib/libQFutil.so.1
%%PLUGINS%%%%CLIENTS%%lib/quakeforge/cd_file.a
%%PLUGINS%%%%CLIENTS%%lib/quakeforge/cd_file.la
%%PLUGINS%%%%CLIENTS%%lib/quakeforge/cd_file.so
%%PLUGINS%%%%CLIENTS%%%%SDL%%lib/quakeforge/cd_sdl.a
%%PLUGINS%%%%CLIENTS%%%%SDL%%lib/quakeforge/cd_sdl.la
%%PLUGINS%%%%CLIENTS%%%%SDL%%lib/quakeforge/cd_sdl.so
%%PLUGINS%%%%CLIENTS%%%%XMMS%%lib/quakeforge/cd_xmms.a
%%PLUGINS%%%%CLIENTS%%%%XMMS%%lib/quakeforge/cd_xmms.la
%%PLUGINS%%%%CLIENTS%%%%XMMS%%lib/quakeforge/cd_xmms.so
%%PLUGINS%%lib/quakeforge/console_client.a
%%PLUGINS%%lib/quakeforge/console_client.la
%%PLUGINS%%lib/quakeforge/console_client.so
%%PLUGINS%%lib/quakeforge/console_server.a
%%PLUGINS%%lib/quakeforge/console_server.la
%%PLUGINS%%lib/quakeforge/console_server.so
%%PLUGINS%%%%CLIENTS%%lib/quakeforge/snd_output_disk.a
%%PLUGINS%%%%CLIENTS%%lib/quakeforge/snd_output_disk.la
%%PLUGINS%%%%CLIENTS%%lib/quakeforge/snd_output_disk.so
%%PLUGINS%%%%CLIENTS%%lib/quakeforge/snd_output_oss.a
%%PLUGINS%%%%CLIENTS%%lib/quakeforge/snd_output_oss.la
%%PLUGINS%%%%CLIENTS%%lib/quakeforge/snd_output_oss.so
%%PLUGINS%%%%CLIENTS%%%%SDL%%lib/quakeforge/snd_output_sdl.a
%%PLUGINS%%%%CLIENTS%%%%SDL%%lib/quakeforge/snd_output_sdl.la
%%PLUGINS%%%%CLIENTS%%%%SDL%%lib/quakeforge/snd_output_sdl.so
%%PLUGINS%%%%CLIENTS%%lib/quakeforge/snd_render_default.a
%%PLUGINS%%%%CLIENTS%%lib/quakeforge/snd_render_default.la
%%PLUGINS%%%%CLIENTS%%lib/quakeforge/snd_render_default.so
%%CLIENTS%%lib/quakeforge/cd_file.a
%%CLIENTS%%lib/quakeforge/cd_file.la
%%CLIENTS%%lib/quakeforge/cd_file.so
%%CLIENTS%%%%SDL%%lib/quakeforge/cd_sdl.a
%%CLIENTS%%%%SDL%%lib/quakeforge/cd_sdl.la
%%CLIENTS%%%%SDL%%lib/quakeforge/cd_sdl.so
%%CLIENTS%%%%XMMS%%lib/quakeforge/cd_xmms.a
%%CLIENTS%%%%XMMS%%lib/quakeforge/cd_xmms.la
%%CLIENTS%%%%XMMS%%lib/quakeforge/cd_xmms.so
lib/quakeforge/console_client.a
lib/quakeforge/console_client.la
lib/quakeforge/console_client.so
lib/quakeforge/console_server.a
lib/quakeforge/console_server.la
lib/quakeforge/console_server.so
%%CLIENTS%%lib/quakeforge/snd_output_disk.a
%%CLIENTS%%lib/quakeforge/snd_output_disk.la
%%CLIENTS%%lib/quakeforge/snd_output_disk.so
%%CLIENTS%%lib/quakeforge/snd_output_oss.a
%%CLIENTS%%lib/quakeforge/snd_output_oss.la
%%CLIENTS%%lib/quakeforge/snd_output_oss.so
%%CLIENTS%%%%SDL%%lib/quakeforge/snd_output_sdl.a
%%CLIENTS%%%%SDL%%lib/quakeforge/snd_output_sdl.la
%%CLIENTS%%%%SDL%%lib/quakeforge/snd_output_sdl.so
%%CLIENTS%%lib/quakeforge/snd_render_default.a
%%CLIENTS%%lib/quakeforge/snd_render_default.la
%%CLIENTS%%lib/quakeforge/snd_render_default.so
lib/ruamoko/libcsqc.a
lib/ruamoko/libgui.a
lib/ruamoko/libnq.a