gdash: update to 20180104.

This commit is contained in:
Enno Boland 2018-01-16 15:27:25 +01:00
parent 900a899a26
commit 1ca50ad0de
No known key found for this signature in database
GPG Key ID: D09964719BDE9971
2 changed files with 28 additions and 11 deletions

View File

@ -0,0 +1,24 @@
--- src/main.cpp.orig 2018-01-16 15:16:49.734345298 +0100
+++ src/main.cpp 2018-01-16 15:16:53.344330897 +0100
@@ -35,7 +35,7 @@
/* on windows, sdl does some hack on the main function.
* therefore we need to include this file, even if it seems
* to do nothing. */
-#include <SDL/SDL.h>
+#include <SDL2/SDL.h>
#endif
#include "cave/caveset.hpp"
--- src/sound/sound.cpp.orig 2018-01-04 08:29:26.000000000 +0100
+++ src/sound/sound.cpp 2018-01-16 15:19:51.462620349 +0100
@@ -23,8 +23,8 @@
#include "config.h"
#ifdef HAVE_SDL
- #include <SDL/SDL.h>
- #include <SDL/SDL_mixer.h>
+ #include <SDL2/SDL.h>
+ #include <SDL2/SDL_mixer.h>
#endif
#include <glib.h>

View File

@ -1,11 +1,11 @@
# Template file for 'gdash' # Template file for 'gdash'
pkgname=gdash pkgname=gdash
version=20130427 version=20180104
revision=1 revision=1
wrksrc=${pkgname}-${version}unstable wrksrc=${pkgname}-${version}unstable
build_style=gnu-configure build_style=gnu-configure
hostmakedepends="automake libtool gettext-devel glib-devel gtk+-devel SDL-devel pkg-config" hostmakedepends="gettext-devel glib-devel gtk+-devel SDL2-devel pkg-config"
makedepends="glu-devel gtk+-devel SDL_image-devel SDL_mixer-devel" makedepends="glu-devel gtk+-devel SDL2_image-devel SDL2_mixer-devel"
depends="gdash-data>=${version}_${revision}" depends="gdash-data>=${version}_${revision}"
configure_args="--with-sdl-prefix=${XBPS_CROSS_BASE}/usr" configure_args="--with-sdl-prefix=${XBPS_CROSS_BASE}/usr"
@ -14,20 +14,13 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="MIT" license="MIT"
homepage="https://bitbucket.org/czirkoszoltan/gdash" homepage="https://bitbucket.org/czirkoszoltan/gdash"
distfiles="https://bitbucket.org/czirkoszoltan/${pkgname}/downloads/${pkgname}-${version}unstable.tar.gz" distfiles="https://bitbucket.org/czirkoszoltan/${pkgname}/downloads/${pkgname}-${version}unstable.tar.gz"
checksum="e50d18bcd0d08fcfd07a6a213f7e93be5e56154214de83623f6247ca6e98ac21" checksum=a4cfa99b74253837b9dc9d7a6f759e59f96f8e976031b557182cd160498482a1
if [ -n "$CROSS_BUILD" ]; then if [ -n "$CROSS_BUILD" ]; then
# Make sure SDL_opengl.h finds GL/gl.h # Make sure SDL_opengl.h finds GL/gl.h
CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include" CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include"
fi fi
pre_configure() {
mv configure.{in,ac}
sed -i Makefile.am -e "/ACLOCAL_AMFLAGS = -Im4/a AUTOMAKE_OPTIONS = subdir-objects"
sed -i src/Makefile.am -e "1a AUTOMAKE_OPTIONS = subdir-objects"
autoreconf -if
}
pre_build() { pre_build() {
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
cd ${wrksrc}/include cd ${wrksrc}/include