From b1f7c97c4e4802bd370343d97ca032f1a072c329 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 25 Dec 2018 23:48:12 +0100 Subject: [PATCH] astromenace: update to 1.4.0. --- srcpkgs/astromenace/INSTALL | 3 +-- ...b79895ea20ec0681799be43d94662ad31192.patch | 25 +++++++++++++++++++ srcpkgs/astromenace/template | 23 +++++++++-------- 3 files changed, 38 insertions(+), 13 deletions(-) create mode 100644 srcpkgs/astromenace/patches/3fd6b79895ea20ec0681799be43d94662ad31192.patch diff --git a/srcpkgs/astromenace/INSTALL b/srcpkgs/astromenace/INSTALL index 470f2733089..12fdfea89b8 100644 --- a/srcpkgs/astromenace/INSTALL +++ b/srcpkgs/astromenace/INSTALL @@ -1,8 +1,7 @@ case "$ACTION" in post) # Pack the 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 - mv usr/bin/gamedata.vfs usr/share/astromenace ;; esac diff --git a/srcpkgs/astromenace/patches/3fd6b79895ea20ec0681799be43d94662ad31192.patch b/srcpkgs/astromenace/patches/3fd6b79895ea20ec0681799be43d94662ad31192.patch new file mode 100644 index 00000000000..d8252a23a4c --- /dev/null +++ b/srcpkgs/astromenace/patches/3fd6b79895ea20ec0681799be43d94662ad31192.patch @@ -0,0 +1,25 @@ +From 3fd6b79895ea20ec0681799be43d94662ad31192 Mon Sep 17 00:00:00 2001 +From: Mikhail Kurinnoi +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 + #include + #else +- #define __glext_h_ // don't let gl.h include glext.h ++ #define GL_GLEXT_LEGACY ++ #define __glext_h_ + #include + #include + #undef __glext_h_ diff --git a/srcpkgs/astromenace/template b/srcpkgs/astromenace/template index 54ce20ea4e3..c4e0ecfdf75 100644 --- a/srcpkgs/astromenace/template +++ b/srcpkgs/astromenace/template @@ -1,19 +1,19 @@ # Template file for 'astromenace' pkgname=astromenace -version=1.3.2 -revision=4 -wrksrc=AstroMenace +version=1.4.0 +revision=1 build_style=cmake +configure_args="-DDATADIR=/usr/share/astromenace -DDONTCREATEVFS=TRUE" 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" depends="astromenace-data>=${version}_${revision}" short_desc="Hardcore 3D space shooter" maintainer="Jürgen Buchmüller " license="GPL-3.0-or-later, OFL-1.1, CC-BY-SA-3.0" homepage="http://www.viewizard.com/" -distfiles="${SOURCEFORGE_SITE}/openastromenace/${version}/${pkgname}-src-${version}.tar.bz2" -checksum=9b775df2b157565b97aca008dd879b867cd3377c07b829cee6b5342639357fe6 +distfiles="https://github.com/viewizard/astromenace/archive/v${version}.tar.gz" +checksum=6ebbb14d7b2e066a4f35b104185562560614e125498a63631402fbc77d899f35 if [ "$CROSS_BUILD" ]; then configure_args+=" -DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/GL" @@ -21,14 +21,15 @@ if [ "$CROSS_BUILD" ]; then fi do_install() { - vbin build/AstroMenace ${pkgname} - vdoc ReadMe.txt README - vlicense License.txt LICENSE + vbin build/astromenace ${pkgname} + vdoc README.md README + vlicense LICENSE.md LICENSE 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 done vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications + vinstall share/astromenace.appdata.xml 644 usr/share/appdata } astromenace-data_package() { @@ -36,6 +37,6 @@ astromenace-data_package() { noarch="yes" pkg_install() { vmkdir usr/share/astromenace - vcopy ${wrksrc}/RAW_VFS_DATA usr/share/astromenace + vcopy ${wrksrc}/gamedata usr/share/astromenace } }