astromenace: update to 1.4.0.

This commit is contained in:
John 2018-12-25 23:48:12 +01:00 committed by maxice8
parent 5d5229226c
commit b1f7c97c4e
3 changed files with 38 additions and 13 deletions

View File

@ -1,8 +1,7 @@
case "$ACTION" in case "$ACTION" in
post) # Pack the game data post) # Pack the game data
echo "AstroMenace: packaging game data..." echo "AstroMenace: packaging game data..."
/usr/bin/astromenace --pack --rawdata=/usr/share/astromenace/RAW_VFS_DATA \ /usr/bin/astromenace --pack --rawdata=/usr/share/astromenace/gamedata \
> usr/share/astromenace/gamedata.log > usr/share/astromenace/gamedata.log
mv usr/bin/gamedata.vfs usr/share/astromenace
;; ;;
esac esac

View File

@ -0,0 +1,25 @@
From 3fd6b79895ea20ec0681799be43d94662ad31192 Mon Sep 17 00:00:00 2001
From: Mikhail Kurinnoi <viewizard@viewizard.com>
Date: Wed, 21 Nov 2018 10:27:15 +0300
Subject: [PATCH] Fix compilation warnings.
Looks like some gl.h don't care about __glext_h_, forced to use
GL_GLEXT_LEGACY for Linux too.
---
src/core/graphics/opengl.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git src/core/graphics/opengl.h src/core/graphics/opengl.h
index 25a524ba..c01c026e 100755
--- src/core/graphics/opengl.h
+++ src/core/graphics/opengl.h
@@ -37,7 +37,8 @@
#include <OpenGL/gl.h>
#include <OpenGL/glu.h>
#else
- #define __glext_h_ // don't let gl.h include glext.h
+ #define GL_GLEXT_LEGACY
+ #define __glext_h_
#include <GL/gl.h>
#include <GL/glu.h>
#undef __glext_h_

View File

@ -1,19 +1,19 @@
# Template file for 'astromenace' # Template file for 'astromenace'
pkgname=astromenace pkgname=astromenace
version=1.3.2 version=1.4.0
revision=4 revision=1
wrksrc=AstroMenace
build_style=cmake build_style=cmake
configure_args="-DDATADIR=/usr/share/astromenace -DDONTCREATEVFS=TRUE"
hostmakedepends="pkg-config" hostmakedepends="pkg-config"
makedepends="SDL-devel glu-devel libopenal-devel freealut-devel libvorbis-devel makedepends="SDL2-devel glu-devel libopenal-devel freealut-devel libvorbis-devel
fontconfig-devel freetype-devel libXinerama-devel" fontconfig-devel freetype-devel libXinerama-devel"
depends="astromenace-data>=${version}_${revision}" depends="astromenace-data>=${version}_${revision}"
short_desc="Hardcore 3D space shooter" short_desc="Hardcore 3D space shooter"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>" maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="GPL-3.0-or-later, OFL-1.1, CC-BY-SA-3.0" license="GPL-3.0-or-later, OFL-1.1, CC-BY-SA-3.0"
homepage="http://www.viewizard.com/" homepage="http://www.viewizard.com/"
distfiles="${SOURCEFORGE_SITE}/openastromenace/${version}/${pkgname}-src-${version}.tar.bz2" distfiles="https://github.com/viewizard/astromenace/archive/v${version}.tar.gz"
checksum=9b775df2b157565b97aca008dd879b867cd3377c07b829cee6b5342639357fe6 checksum=6ebbb14d7b2e066a4f35b104185562560614e125498a63631402fbc77d899f35
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
configure_args+=" -DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/GL" configure_args+=" -DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/GL"
@ -21,14 +21,15 @@ if [ "$CROSS_BUILD" ]; then
fi fi
do_install() { do_install() {
vbin build/AstroMenace ${pkgname} vbin build/astromenace ${pkgname}
vdoc ReadMe.txt README vdoc README.md README
vlicense License.txt LICENSE vlicense LICENSE.md LICENSE
for size in 64 128; do for size in 64 128; do
vinstall ${wrksrc}/${pkgname}_${size}.png 644 \ vinstall share/${pkgname}_${size}.png 644 \
usr/share/icons/hicolor/${size}x${size}/apps ${pkgname}.png usr/share/icons/hicolor/${size}x${size}/apps ${pkgname}.png
done done
vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications
vinstall share/astromenace.appdata.xml 644 usr/share/appdata
} }
astromenace-data_package() { astromenace-data_package() {
@ -36,6 +37,6 @@ astromenace-data_package() {
noarch="yes" noarch="yes"
pkg_install() { pkg_install() {
vmkdir usr/share/astromenace vmkdir usr/share/astromenace
vcopy ${wrksrc}/RAW_VFS_DATA usr/share/astromenace vcopy ${wrksrc}/gamedata usr/share/astromenace
} }
} }