From 6d9443a32478ddbe97e3a227c01b364741146951 Mon Sep 17 00:00:00 2001 From: Larry Hajali Date: Fri, 5 Aug 2016 10:12:01 -0700 Subject: games/megaglest: Updated for version 3.12.0 Signed-off-by: Larry Hajali --- games/megaglest/megaglest-3.9.0-help2man.patch | 12 ------------ games/megaglest/megaglest-help2man.patch | 12 ++++++++++++ games/megaglest/megaglest-underlink.patch | 12 ++++++++++++ games/megaglest/megaglest.SlackBuild | 14 ++++++++------ games/megaglest/megaglest.info | 14 +++++++------- 5 files changed, 39 insertions(+), 25 deletions(-) delete mode 100644 games/megaglest/megaglest-3.9.0-help2man.patch create mode 100644 games/megaglest/megaglest-help2man.patch create mode 100644 games/megaglest/megaglest-underlink.patch (limited to 'games') diff --git a/games/megaglest/megaglest-3.9.0-help2man.patch b/games/megaglest/megaglest-3.9.0-help2man.patch deleted file mode 100644 index 78598b8729..0000000000 --- a/games/megaglest/megaglest-3.9.0-help2man.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur megaglest-3.9.0.orig/source/g3d_viewer/CMakeLists.txt megaglest-3.9.0/source/g3d_viewer/CMakeLists.txt ---- megaglest-3.9.0.orig/source/g3d_viewer/CMakeLists.txt 2013-11-18 23:10:38.000000000 +0000 -+++ megaglest-3.9.0/source/g3d_viewer/CMakeLists.txt 2013-11-19 07:19:28.601093314 +0000 -@@ -167,7 +167,7 @@ - MESSAGE("***-- Found xvfb-run: ${XVFB_EXEC} about to build manpage with it.") - - add_custom_target(${TARGET_NAME_MANPAGE} ALL -- COMMAND ${XVFB_EXEC} --auto-servernum --server-num=770 ${HELP2MAN} --name='${MG_MANPAGE_DESCRIPTION}' --section=6 -N -o ${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE} ${HELP2MAN_OUT_PATH}${TARGET_NAME} -+ COMMAND ${XVFB_EXEC} --auto-servernum ${HELP2MAN} --name='${MG_MANPAGE_DESCRIPTION}' --section=6 -N -o ${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE} ${HELP2MAN_OUT_PATH}${TARGET_NAME} - DEPENDS ${TARGET_NAME}) - ELSE() - add_custom_target(${TARGET_NAME_MANPAGE} ALL diff --git a/games/megaglest/megaglest-help2man.patch b/games/megaglest/megaglest-help2man.patch new file mode 100644 index 0000000000..77a312f0b6 --- /dev/null +++ b/games/megaglest/megaglest-help2man.patch @@ -0,0 +1,12 @@ +diff -up megaglest-3.12.0/source/g3d_viewer/CMakeLists.txt.orig megaglest-3.12.0/source/g3d_viewer/CMakeLists.txt +--- megaglest-3.12.0/source/g3d_viewer/CMakeLists.txt.orig 2016-06-24 07:36:58.912496205 -0300 ++++ megaglest-3.12.0/source/g3d_viewer/CMakeLists.txt 2016-06-24 07:37:24.409497821 -0300 +@@ -174,7 +174,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER) + MESSAGE(STATUS "***-- Found xvfb-run: ${XVFB_EXEC} about to build manpage with it.") + + add_custom_target(${TARGET_NAME_MANPAGE} ALL +- COMMAND ${XVFB_EXEC} --auto-servernum --server-num=770 ${HELP2MAN} --no-discard-stderr --name='${MG_MANPAGE_DESCRIPTION}' --section=6 -N -o ${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE} ${HELP2MAN_OUT_PATH}${TARGET_NAME} ++ COMMAND ${XVFB_EXEC} --auto-servernum ${HELP2MAN} --name='${MG_MANPAGE_DESCRIPTION}' --section=6 -N -o ${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE} ${HELP2MAN_OUT_PATH}${TARGET_NAME} + DEPENDS ${TARGET_NAME}) + ELSE() + add_custom_target(${TARGET_NAME_MANPAGE} ALL diff --git a/games/megaglest/megaglest-underlink.patch b/games/megaglest/megaglest-underlink.patch new file mode 100644 index 0000000000..0a03f693fb --- /dev/null +++ b/games/megaglest/megaglest-underlink.patch @@ -0,0 +1,12 @@ +diff -up megaglest-3.12.0/source/shared_lib/CMakeLists.txt.orig megaglest-3.12.0/source/shared_lib/CMakeLists.txt +--- megaglest-3.12.0/source/shared_lib/CMakeLists.txt.orig 2016-06-24 07:40:18.704508869 -0300 ++++ megaglest-3.12.0/source/shared_lib/CMakeLists.txt 2016-06-24 07:40:49.689510832 -0300 +@@ -76,7 +76,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD + FIND_PACKAGE(OpenGL REQUIRED) + INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}) + IF(UNIX) +- SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENGL_LIBRARY}) ++ SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENGL_LIBRARY} -lX11) + ENDIF() + + FIND_PACKAGE(X11 REQUIRED) diff --git a/games/megaglest/megaglest.SlackBuild b/games/megaglest/megaglest.SlackBuild index a2db4a23a3..39def44f6d 100644 --- a/games/megaglest/megaglest.SlackBuild +++ b/games/megaglest/megaglest.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for megaglest -# Copyright 2011-2015 Larry Hajali +# Copyright 2011-2016 Larry Hajali # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=megaglest -VERSION=${VERSION:-3.11.1} +VERSION=${VERSION:-3.12.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -62,9 +62,9 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-source-$VERSION.tar.xz tar xvf $CWD/$PRGNAM-source-embedded-$VERSION.tar.xz -tar xvf $CWD/$PRGNAM-data-$VERSION.tar.xz -C $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-data-$VERSION.b1.tar.xz -C $PRGNAM-$VERSION cd $PRGNAM-$VERSION -find . -type l -exec rm -f '{}' \; +#find . -type l -exec rm -f '{}' \; chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -76,7 +76,8 @@ find -L . \ # script from upstream for Xvfb that creates a temporary *fake* framebuffer. install -D -m 0755 $CWD/xvfb-run $TMP/$SRCDIR/bin/xvfb-run export PATH="$PATH:$TMP/$SRCDIR/bin" -patch -p1 < $CWD/megaglest-3.9.0-help2man.patch +patch -p1 < $CWD/megaglest-help2man.patch +patch -p1 < $CWD/megaglest-underlink.patch mkdir build cd build @@ -85,8 +86,9 @@ cd build -DWANT_GIT_STAMP=OFF \ -DMEGAGLEST_BIN_INSTALL_PATH:PATH="games/" \ -DMEGAGLEST_MANPAGE_INSTALL_PATH:PATH="man/man6/" \ + -DWANT_USE_XercesC:BOOL=ON \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -lX11" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release .. make VERBOSE=1 diff --git a/games/megaglest/megaglest.info b/games/megaglest/megaglest.info index 8102c62959..f12941ac3d 100644 --- a/games/megaglest/megaglest.info +++ b/games/megaglest/megaglest.info @@ -1,12 +1,12 @@ PRGNAM="megaglest" -VERSION="3.11.1" +VERSION="3.12.0" HOMEPAGE="http://megaglest.org/" -DOWNLOAD="https://github.com/MegaGlest/megaglest-source/releases/download/3.11.1/megaglest-source-3.11.1.tar.xz \ - https://github.com/MegaGlest/megaglest-data/releases/download/3.11.1/megaglest-data-3.11.1.tar.xz \ - https://github.com/MegaGlest/megaglest-source/releases/download/3.11.1/megaglest-source-embedded-3.11.1.tar.xz" -MD5SUM="d7570bc1fd329a6c15e36df81c8eab28 \ - a3082747837c1049f4a5083f18b93e47 \ - afdd91e3415aa0e08c08915c26694166" +DOWNLOAD="https://github.com/MegaGlest/megaglest-source/releases/download/3.12.0/megaglest-source-3.12.0.tar.xz \ + https://github.com/MegaGlest/megaglest-data/releases/download/3.12.0/megaglest-data-3.12.0.b1.tar.xz \ + https://github.com/MegaGlest/megaglest-source/releases/download/3.12.0/megaglest-source-embedded-3.12.0.tar.xz" +MD5SUM="59a7ecda1be967fd005607519d6e320c \ + 394697e65dad9807ec9d4a1962e225c6 \ + 16f28a95b13940dcbaf29d06763c0e57" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="xerces-c OpenAL lua ftgl wxPython" -- cgit v1.2.3