diff --git a/recipes-games/etr/etr/sdl_config.patch b/recipes-games/etr/etr/sdl_config.patch new file mode 100644 index 0000000..aa969da --- /dev/null +++ b/recipes-games/etr/etr/sdl_config.patch @@ -0,0 +1,24 @@ +diff -Nurd -X.diff_ignore etr/m4/sdl.m4 etr/m4/sdl.m4 +--- etr/m4/sdl.m4 2013-04-17 13:54:01.642150470 +0300 ++++ etr/m4/sdl.m4 2013-08-15 10:24:11.957364160 +0300 +@@ -14,6 +14,8 @@ + [dnl + dnl Get the cflags and libraries from the sdl-config script + dnl ++AC_ARG_WITH(sdl-prefix,[ --with-sdl-config=path Path to sdl-config], ++ sdl_config="$withval", sdl_config="") + AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], + sdl_prefix="$withval", sdl_prefix="") + AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], +@@ -27,6 +29,11 @@ + SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config + fi + fi ++ if test x$sdl_config != x ; then ++ if test x${SDL_CONFIG+set} != xset ; then ++ SDL_CONFIG=$sdl_config ++ fi ++ fi + if test x$sdl_prefix != x ; then + sdl_config_args="$sdl_config_args --prefix=$sdl_prefix" + if test x${SDL_CONFIG+set} != xset ; then diff --git a/recipes-games/etr/etr_svn.bb b/recipes-games/etr/etr_svn.bb index 4a63089..dfb2087 100644 --- a/recipes-games/etr/etr_svn.bb +++ b/recipes-games/etr/etr_svn.bb @@ -6,16 +6,24 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" SECTION = "games" -SRCREV = "261" -SRC_URI = "svn://svn.code.sf.net/p/extremetuxracer/code/;module=trunk" -PV = "0.5+r${SRCREV}" +SRCREV = "401" + +SRC_URI = "svn://svn.code.sf.net/p/extremetuxracer/code/;module=trunk \ + file://sdl_config.patch \ + " + +PV = "0.6-beta1+r${SRCREV}" SRC_URI[md5sum] = "178290b29a776f8f9da5309a2d379596" SRC_URI[sha256sum] = "b20c0c0d6138e589b359be49546a034ca4f8deeba2c0b99a894333d306d2234b" -DEPENDS = "libsdl libglu libsdl-image libsdl-mixer" +DEPENDS = "libsdl virtual/libgl libglu libsdl-image libsdl-mixer" S = "${WORKDIR}/trunk" B = "${WORKDIR}/build" +EXTRA_OECONF = "\ +--with-sdl-config=${STAGING_BINDIR_CROSS}/sdl-config \ +" + inherit autotools