--- /dev/null
+--- CMakeLists.txt 2008-01-31 22:32:53.000000000 +0100
++++ CMakeLists.txt 2008-01-31 22:45:47.000000000 +0100
+@@ -16,7 +16,13 @@
+ add_definitions(-DHAVE_INTTYPES_H=1)
+ endif(INTTYPES_INCLUDE_DIR)
+
+-set(DATADIR share/vavoom)
++IF(NOT DEFINED DATADIR)
++ set(DATADIR share/vavoom)
++ENDIF(NOT DEFINED DATADIR)
++
++IF(NOT DEFINED BINDIR)
++ set(BINDIR bin)
++ENDIF(NOT DEFINED BINDIR)
+
+ add_subdirectory(utils)
+ add_subdirectory(source)
+--- source/CMakeLists.txt 2008-01-31 22:34:28.000000000 +0100
++++ source/CMakeLists.txt 2008-01-31 23:00:17.000000000 +0100
+@@ -845,8 +845,6 @@
+
+ add_executable(vavoom ${MAIN_SOURCES})
+ if(UNIX)
+-set_target_properties(vavoom PROPERTIES OUTPUT_NAME ../vavoom.i686)
+-else(UNIX)
+ set_target_properties(vavoom PROPERTIES OUTPUT_NAME ../vavoom)
+ endif(UNIX)
+ if (MAIN_COMPILE_FLAGS)
+@@ -855,21 +853,7 @@
+ target_link_libraries(vavoom ${MAIN_LIBS})
+ add_dependencies(vavoom timidity glbsp libglvis)
+
+-install(TARGETS vavoom DESTINATION bin)
+-
+-install(FILES vavoom.png DESTINATION ${DATADIR})
+-
+-if(UNIX)
+- file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/vavoom
+-"#!/bin/sh
+-# Needed to make symlinks/shortcuts work.
+-# the binaries must run with correct working directory
+-cd \"${CMAKE_INSTALL_PREFIX}/${DATADIR}\"
+-\"${CMAKE_INSTALL_PREFIX}/bin/vavoom.i686\" $* ${IWADDIR}
+-exit $?
+-")
+- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vavoom DESTINATION bin)
+-endif(UNIX)
++install(TARGETS vavoom DESTINATION ${BINDIR})
+
+ endif(ENABLE_CLIENT)
+
+@@ -889,27 +873,13 @@
+
+ add_executable(vavoom-dedicated ${SERVER_SOURCES})
+ if(UNIX)
+-set_target_properties(vavoom-dedicated PROPERTIES OUTPUT_NAME ../vavoom-dedicated.i686)
+-else(UNIX)
+-set_target_properties(vavoom-dedicated PROPERTIES OUTPUT_NAME ../vavoom-dedicated)
++set_target_properties(vavoom-dedicated PROPERTIES OUTPUT_NAME ../vavoom-ded)
+ endif(UNIX)
+ set_target_properties(vavoom-dedicated PROPERTIES COMPILE_FLAGS -DSERVER)
+ target_link_libraries(vavoom-dedicated glbsp ${ZLIB_LIBRARY} ${NET_LIBRARIES})
+ add_dependencies(vavoom-dedicated glbsp)
+
+-install(TARGETS vavoom-dedicated DESTINATION bin)
+-
+-if(UNIX)
+- file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/vavoom-dedicated
+-"#!/bin/sh
+-# Needed to make symlinks/shortcuts work.
+-# the binaries must run with correct working directory
+-cd \"${CMAKE_INSTALL_PREFIX}/${DATADIR}\"
+-\"${CMAKE_INSTALL_PREFIX}/bin/vavoom-dedicated.i686\" $* ${IWADDIR}
+-exit $?
+-")
+- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vavoom-dedicated DESTINATION bin)
+-endif(UNIX)
++install(TARGETS vavoom-dedicated DESTINATION ${BINDIR})
+
+ endif(ENABLE_SERVER)
+
+--- utils/vlaunch/CMakeLists.txt 2008-01-31 22:53:37.000000000 +0100
++++ utils/vlaunch/CMakeLists.txt 2008-01-31 22:53:56.000000000 +0100
+@@ -9,7 +9,7 @@
+ )
+ target_link_libraries(vlaunch ${wxWidgets_LIBRARIES})
+
+- install(TARGETS vlaunch DESTINATION bin)
++ install(TARGETS vlaunch DESTINATION ${BINDIR})
+
+ #EXTRA_DIST = \
+ # vavoom.xpm \
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-WX_GTK_VER="2.6"
-inherit autotools eutils flag-o-matic subversion wxwidgets games
+WX_GTK_VER="2.8"
+inherit cmake-utils eutils subversion wxwidgets games
DESCRIPTION="Advanced source port for Doom/Heretic/Hexen/Strife"
HOMEPAGE="http://www.vavoom-engine.com/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="allegro asm debug dedicated external-glbsp flac mad mikmod models music
-openal opengl sdl textures tools wxwindows"
+IUSE="allegro asm debug dedicated flac mad mikmod models music openal opengl
+sdl textures tools vorbis wxwindows"
QA_EXECSTACK="${GAMES_BINDIR:1}/${PN}"
mikmod? ( media-libs/libmikmod )
openal? ( media-libs/openal )
external-glbsp? ( games-util/glbsp )
- wxwindows? ( =x11-libs/wxGTK-2.6* )"
+ wxwindows? ( =x11-libs/wxGTK-2.8* )"
RDEPEND="${DEPEND}
allegro? ( media-sound/timidity++ )"
PDEPEND="models? ( >=games-fps/vavoom-models-1.4.2 )
subversion_src_unpack
cd "${S}"
- ./autogen.sh
-
- # Patch Makefiles to get rid of executable wrappers
- epatch "${FILESDIR}/${PN}-makefile_nowrapper.patch"
+ # Patch CMakelists.txt to
+ # - get rid of executable wrappers
+ # - permit custom {bin,dat}dir
+ # - set custom binary names
+ epatch "${FILESDIR}/${PN}_cmake_build.patch"
# Set shared directory
sed -i \
-e "s:fl_basedir = \".\":fl_basedir = \"${dir}\":" \
source/files.cpp || die "sed files.cpp failed"
-
- eautoreconf
-
- # Set executable filenames
- for m in $(find . -type f -name Makefile.in) ; do
- sed -i \
- -e "s:MAIN_EXE = @MAIN_EXE@:MAIN_EXE=${PN}:" \
- -e "s:SERVER_EXE = @SERVER_EXE@:SERVER_EXE=${PN}-ded:" \
- "${m}" || die "sed ${m} failed"
- done
}
src_compile() {
local \
- allegro="--without-allegro" \
- sdl="--without-sdl"
+ with_allegro="-DWITH_ALLEGRO=OFF" \
+ with_sdl="-DWITH_SDL=OFF" \
+ with_vorbis=$(cmake-utils_use_with vorbis)
# Sdl is the default, unless sdl=off & allegro=on
if ! use sdl && use allegro ; then
- allegro="--with-allegro"
+ with_allegro="-DWITH_ALLEGRO=ON"
else
- sdl="--with-sdl"
+ with_sdl="-DWITH_SDL=ON"
fi
- use debug && append-flags -g2
-
- egamesconf \
- --enable-client \
- ${sdl} \
- ${allegro} \
- $(use_with opengl) \
- $(use_with openal) \
- $(use_with external-glbsp) \
- $(use_with music vorbis) \
- $(use_with mad libmad) \
- $(use_with mikmod) \
- $(use_with flac) \
- $(use_enable asm) \
- $(use_enable dedicated server) \
- $(use_enable debug) \
- $(use_enable debug zone-debug) \
- $(use_enable wxwindows launcher) \
- --with-wx-config=${WX_CONFIG} \
- --with-iwaddir="${dir}" \
- --disable-dependency-tracking \
- --disable-maintainer-mode \
- || die "egamesconf failed"
-
- emake || die "emake failed"
+ # Forcibly enable vorbis support if "music" USE flag is enabled
+ if ! use vorbis && use music ; then
+ ewarn "\"music\" USE flag requires Vorbis support enabled."
+ ewarn "Forced enabling of \"vorbis\" USE flag"
+ with_vorbis="-DWITH_VORBIS=ON"
+ fi
+
+ mycmakeargs="${mycmakeargs}
+ -DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG
+ -DCMAKE_CXX_FLAGS_DEBUG=-g2
+ -DDATADIR=${GAMES_DATADIR}/${PN}
+ -DBINDIR=${GAMES_BINDIR}
+ -DENABLE_CLIENT=ON
+ ${with_allegro}
+ ${with_sdl}
+ ${with_vorbis}
+ $(cmake-utils_use_with opengl OPENGL)
+ $(cmake-utils_use_with openal OPENAL)
+ $(cmake-utils_use_with mad LIBMAD)
+ $(cmake-utils_use_with mikmod MIKMOD)
+ $(cmake-utils_use_with flac FLAC)
+ $(cmake-utils_use_enable debug ZONE_DEBUG)
+ $(cmake-utils_use_enable dedicated SERVER)
+ $(cmake-utils_use_enable asm ASM)
+ $(cmake-utils_use_enable wxwindows LAUNCHER)
+ -DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG}"
+
+ cmake-utils_src_configurein
+
+ cmake-utils_src_make -j1
}
src_install() {
local de_cmd="${PN}"
- emake DESTDIR="${D}" install || die "emake install failed"
-
- # Remove unneeded icon
- rm -f "${D}/${dir}/${PN}.png"
+ cmake-utils_src_install
# Enable OpenGL in desktop entry, if relevant USE flag is enabled
use opengl && de_cmd="${PN} -opengl"
- doicon source/${PN}.png || die "doicon ${PN}.png failed"
+ doicon "source/${PN}.png" || die "doicon ${PN}.png failed"
make_desktop_entry "${de_cmd}" "Vavoom"
- dodoc docs/${PN}.txt || die "dodoc vavoom.txt failed"
+ dodoc "docs/${PN}.txt" || die "dodoc vavoom.txt failed"
if use tools ; then
# The tools are always built
- dobin utils/bin/{acc,fixmd2,vcc,vlumpy} || die "dobin utils failed"
+ dogamesbin utils/bin/{acc,fixmd2,vcc,vlumpy} || die "dobin utils failed"
dodoc utils/vcc/vcc.txt || die "dodoc vcc.txt failed"
fi
if use wxwindows ; then
- # Install graphical launcher
+ # Install graphical launcher shortcut
doicon utils/vlaunch/vlaunch.xpm || die "doicon vlaunch.xpm failed"
- dogamesbin utils/bin/vlaunch || die "dogamesbin vlaunch failed"
make_desktop_entry "vlaunch" "Vavoom Launcher" "vlaunch.xpm"
fi
projects / ~andy / sunrise / commitdiff