From bb13bf253ec78650f81e40887000b705af67f65b Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 8 Apr 2020 07:59:01 +0300 Subject: [PATCH] etr: Update to version 0.8.0 Signed-off-by: Marko Lindqvist --- recipes-games/etr/etr/simple-configure.patch | 20 +++++++++---------- .../etr/{etr_0.7.5.bb => etr_0.8.0.bb} | 3 +-- 2 files changed, 11 insertions(+), 12 deletions(-) rename recipes-games/etr/{etr_0.7.5.bb => etr_0.8.0.bb} (77%) diff --git a/recipes-games/etr/etr/simple-configure.patch b/recipes-games/etr/etr/simple-configure.patch index e516c34..fe0233c 100644 --- a/recipes-games/etr/etr/simple-configure.patch +++ b/recipes-games/etr/etr/simple-configure.patch @@ -1,32 +1,32 @@ -diff -Nurd -X.diff_ignore etr/configure.ac etr/configure.ac ---- etr/configure.ac 2016-07-22 19:15:31.414693938 +0300 -+++ etr/configure.ac 2016-07-26 00:00:28.539114721 +0300 -@@ -41,33 +41,7 @@ +diff -Nurd etr-0.8.0/configure.ac etr-0.8.0/configure.ac +--- etr-0.8.0/configure.ac 2020-03-07 11:14:34.000000000 +0200 ++++ etr-0.8.0/configure.ac 2020-04-08 07:51:25.585431938 +0300 +@@ -42,33 +42,7 @@ AC_FUNC_MALLOC AC_CHECK_FUNCS([floor getcwd memmove memset mkdir pow sqrt strchr strdup]) --PKG_CHECK_MODULES([SFML_SYSTEM], [sfml-system >= 2.2], +-PKG_CHECK_MODULES([SFML_SYSTEM], [sfml-system >= 2.4], -[ - CPPFLAGS="${CPPFLAGS} $SFML_SYSTEM_CFLAGS" - LIBS="${LIBS} $SFML_SYSTEM_LIBS" -], -[AC_MSG_ERROR([sfml-system not found])]) - --PKG_CHECK_MODULES([SFML_AUDIO], [sfml-audio >= 2.2], +-PKG_CHECK_MODULES([SFML_AUDIO], [sfml-audio >= 2.4], -[ - CPPFLAGS="${CPPFLAGS} $SFML_AUDIO_CFLAGS" - LIBS="${LIBS} $SFML_AUDIO_LIBS" -], -[AC_MSG_ERROR([sfml-audio not found])]) - --PKG_CHECK_MODULES([SFML_WINDOW], [sfml-window >= 2.2], +-PKG_CHECK_MODULES([SFML_WINDOW], [sfml-window >= 2.4], -[ - CPPFLAGS="${CPPFLAGS} $SFML_WINDOW_CFLAGS" - LIBS="${LIBS} $SFML_WINDOW_LIBS" -], -[AC_MSG_ERROR([sfml-window not found])]) - --PKG_CHECK_MODULES([SFML_GRAPHICS], [sfml-graphics >= 2.2], +-PKG_CHECK_MODULES([SFML_GRAPHICS], [sfml-graphics >= 2.4], -[ - CPPFLAGS="${CPPFLAGS} $SFML_GRAPHICS_CFLAGS" - LIBS="${LIBS} $SFML_GRAPHICS_LIBS" @@ -34,5 +34,5 @@ diff -Nurd -X.diff_ignore etr/configure.ac etr/configure.ac -[AC_MSG_ERROR([sfml-graphics not found])]) +LIBS="${LIBS} -lsfml-system -lsfml-audio -lsfml-window -lsfml-graphics" - AC_CHECK_LIB([GL], [glBegin], [], - [AC_MSG_ERROR([libGL not found])]) + AC_CHECK_LIB([GL], [glBegin], + [ diff --git a/recipes-games/etr/etr_0.7.5.bb b/recipes-games/etr/etr_0.8.0.bb similarity index 77% rename from recipes-games/etr/etr_0.7.5.bb rename to recipes-games/etr/etr_0.8.0.bb index d1ba0e1..cf29433 100644 --- a/recipes-games/etr/etr_0.7.5.bb +++ b/recipes-games/etr/etr_0.8.0.bb @@ -11,8 +11,7 @@ SRC_URI = " \ file://simple-configure.patch \ " -SRC_URI[md5sum] = "210a9aa0ac6e348b7f4e3141f383e5e0" -SRC_URI[sha256sum] = "4fd39c52a426ba22deb26bcceb807d7eebe7b7d7df578cfd03f10066c218c6d3" +SRC_URI[sha256sum] = "4b2899314eda8d0826504ab274acb13ab0dab58b6d0641587749dfa77757da17" DEPENDS = "sfml virtual/libgl libglu"