[gentoo-commits] repo/gentoo:master commit in: games-arcade/crack-attack/, games-arcade/crack-attack/files/
commit: 134264fb9054bed12073bc06ccd633e7edea44b3
Author: Sam James gentoo org>
AuthorDate: Wed Apr 7 08:07:41 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Apr 7 08:10:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=134264fb
games-arcade/crack-attack: add SDL macro
Fixes eautoreconf without SDL installed.
Closes: https://bugs.gentoo.org/779745
Signed-off-by: Sam James gentoo.org>
.../crack-attack/crack-attack-1.1.14-r2.ebuild | 7 +-
games-arcade/crack-attack/files/sdl.m4 | 180 +
2 files changed, 186 insertions(+), 1 deletion(-)
diff --git a/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild
b/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild
index 24ca982cd26..8d7f8c43bd2 100644
--- a/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild
+++ b/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild
@@ -34,7 +34,12 @@ PATCHES=(
src_prepare() {
default
- eautoreconf
+
+ # SDL macro not bundled
+ # bug #779745
+ cp "${FILESDIR}/sdl.m4" . || die
+ AT_M4DIR="." eautoreconf
+
sed -i 's/-lXmu//' src/gtk-gui/Makefile.in src/Makefile.in || die
touch -r . * */*
}
diff --git a/games-arcade/crack-attack/files/sdl.m4
b/games-arcade/crack-attack/files/sdl.m4
new file mode 100644
index 000..30e1f2144ee
--- /dev/null
+++ b/games-arcade/crack-attack/files/sdl.m4
@@ -0,0 +1,180 @@
+# Configure paths for SDL
+# Sam Lantinga 9/21/99
+# stolen from Manish Singh
+# stolen back from Frank Belew
+# stolen from Manish Singh
+# Shamelessly stolen from Owen Taylor
+
+# serial 2
+
+dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
+dnl
+AC_DEFUN([AM_PATH_SDL],
+[dnl
+dnl Get the cflags and libraries from the sdl-config script
+dnl
+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)],
+sdl_exec_prefix="$withval", sdl_exec_prefix="")
+AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and
run a test SDL program],
+ , enable_sdltest=yes)
+
+ min_sdl_version=ifelse([$1], ,1.2.0,$1)
+
+ if test "x$sdl_prefix$sdl_exec_prefix" = x ; then
+PKG_CHECK_MODULES([SDL], [sdl >= $min_sdl_version],
+ [sdl_pc=yes],
+ [sdl_pc=no])
+ else
+sdl_pc=no
+if test x$sdl_exec_prefix != x ; then
+ sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
+ if test x${SDL_CONFIG+set} != xset ; then
+SDL_CONFIG=$sdl_exec_prefix/bin/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
+SDL_CONFIG=$sdl_prefix/bin/sdl-config
+ fi
+fi
+ fi
+
+ if test "x$sdl_pc" = xyes ; then
+no_sdl=""
+SDL_CONFIG="pkg-config sdl"
+ else
+as_save_PATH="$PATH"
+if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then
+ PATH="$prefix/bin:$prefix/usr/bin:$PATH"
+fi
+AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
+PATH="$as_save_PATH"
+AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
+no_sdl=""
+
+if test "$SDL_CONFIG" = "no" ; then
+ no_sdl=yes
+else
+ SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
+ SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
+
+ sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ if test "x$enable_sdltest" = "xyes" ; then
+ac_save_CFLAGS="$CFLAGS"
+ac_save_CXXFLAGS="$CXXFLAGS"
+ac_save_LIBS="$LIBS"
+CFLAGS="$CFLAGS $SDL_CFLAGS"
+CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+LIBS="$LIBS $SDL_LIBS"
+dnl
+dnl Now check if the installed SDL is sufficiently new. (Also sanity
+dnl checks the results of sdl-config to some extent
+dnl
+ rm -f conf.sdltest
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include
+#include
+#include "SDL.h"
+
+int main (int argc, char *argv[])
+{
+ int major, minor, micro;
+ FILE *fp = fopen("conf.sdltest", "w");
+
+ if (fp) fclose(fp);
+
+ if (sscanf("$min_sdl_version", "%d.%d.%d", , , ) != 3) {
+ printf("%s, bad version string\n", "$min_sdl_version");
+ exit(1);
+ }
+
+ if (($sdl_major_version > major) ||
+ (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
+ (($sdl_major_version == major) &&
[gentoo-commits] repo/gentoo:master commit in: games-arcade/crack-attack/files/, games-arcade/crack-attack/
commit: b81af92480950d7d5454f5d632f6123e5f97c4af
Author: Lars Wendler gentoo org>
AuthorDate: Tue Mar 9 08:34:41 2021 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue Mar 9 08:35:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b81af924
games-arcade/crack-attack: EAPI-7 bump. Avoid bashisms.
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Lars Wendler gentoo.org>
.../crack-attack/crack-attack-1.1.14-r2.ebuild | 33 ++
.../files/crack-attack-1.1.14-avoid_bashisms.patch | 15 ++
2 files changed, 36 insertions(+), 12 deletions(-)
diff --git a/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild
b/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild
index eded2a71ead..24ca982cd26 100644
--- a/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild
+++ b/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit desktop
+EAPI=7
+inherit autotools desktop
DESCRIPTION="Addictive OpenGL-based block game"
HOMEPAGE="http://www.nongnu.org/crack-attack/;
@@ -15,28 +15,37 @@ IUSE="gtk sdl"
RDEPEND="
media-libs/freeglut
- sdl? ( media-libs/libsdl
- media-libs/sdl-mixer )
+ sdl? (
+ media-libs/libsdl
+ media-libs/sdl-mixer
+ )
gtk? ( >=x11-libs/gtk+-2.6:2 )
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/${P}-glut.patch
+ "${FILESDIR}"/${P}-gcc43.patch
+ "${FILESDIR}"/${P}-avoid_bashisms.patch
+)
+
src_prepare() {
default
- eapply \
- "${FILESDIR}"/${P}-glut.patch \
- "${FILESDIR}"/${P}-gcc43.patch
+ eautoreconf
sed -i 's/-lXmu//' src/gtk-gui/Makefile.in src/Makefile.in || die
touch -r . * */*
}
src_configure() {
- econf \
- --disable-binreloc \
- $(use_enable sdl sound) \
+ local myeconfargs=(
+ --disable-binreloc
+ $(use_enable sdl sound)
$(use_enable gtk)
+ )
+ econf "${myeconfargs[@]}"
}
src_install() {
diff --git
a/games-arcade/crack-attack/files/crack-attack-1.1.14-avoid_bashisms.patch
b/games-arcade/crack-attack/files/crack-attack-1.1.14-avoid_bashisms.patch
new file mode 100644
index 000..8f405710dae
--- /dev/null
+++ b/games-arcade/crack-attack/files/crack-attack-1.1.14-avoid_bashisms.patch
@@ -0,0 +1,15 @@
+--- crack-attack-1.1.14/configure.ac
crack-attack-1.1.14/configure.ac
+@@ -75,10 +75,10 @@
+ ],[found_sound=no]
+ )
+
+- if test "$enable_sound" == "yes" -a "$found_sound" == "no"; then
++ if test "$enable_sound" = "yes" -a "$found_sound" = "no"; then
+ AC_MSG_ERROR(libSDL and SDL_mixer are required for sound)
+ fi
+- if test "$found_sound" == "yes"; then
++ if test "$found_sound" = "yes"; then
+ AUDIO_CFLAGS="$SDL_CFLAGS"
+ AUDIO_LIBS="$SDL_LIBS -lSDL_mixer"
+ AC_DEFINE(AUDIO_ENABLED, 1, [Has audio support])
[gentoo-commits] repo/gentoo:master commit in: games-arcade/crack-attack/, games-arcade/crack-attack/files/
commit: cfa7edda87c169223d0aa33b1e417e7aec6aca77
Author: Pacho Ramos gentoo org>
AuthorDate: Sun Apr 15 18:44:26 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sun Apr 15 19:00:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfa7edda
games-arcade/crack-attack: Stop using games.eclass
Package-Manager: Portage-2.3.28, Repoman-2.3.9
.../crack-attack/crack-attack-1.1.14-r2.ebuild | 47 ++
.../files/crack-attack-1.1.14-gcc43.patch | 4 +-
.../files/crack-attack-1.1.14-glut.patch | 4 +-
3 files changed, 51 insertions(+), 4 deletions(-)
diff --git a/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild
b/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild
new file mode 100644
index 000..eded2a71ead
--- /dev/null
+++ b/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+DESCRIPTION="Addictive OpenGL-based block game"
+HOMEPAGE="http://www.nongnu.org/crack-attack/;
+SRC_URI="https://savannah.nongnu.org/download/crack-attack/${P}.tar.bz2;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
+IUSE="gtk sdl"
+
+RDEPEND="
+ media-libs/freeglut
+ sdl? ( media-libs/libsdl
+ media-libs/sdl-mixer )
+ gtk? ( >=x11-libs/gtk+-2.6:2 )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ default
+ eapply \
+ "${FILESDIR}"/${P}-glut.patch \
+ "${FILESDIR}"/${P}-gcc43.patch
+ sed -i 's/-lXmu//' src/gtk-gui/Makefile.in src/Makefile.in || die
+ touch -r . * */*
+}
+
+src_configure() {
+ econf \
+ --disable-binreloc \
+ $(use_enable sdl sound) \
+ $(use_enable gtk)
+}
+
+src_install() {
+ HTML_DOCS="doc/*"
+ default
+ doicon data/crack-attack.xpm
+ make_desktop_entry crack-attack Crack-attack
+}
diff --git a/games-arcade/crack-attack/files/crack-attack-1.1.14-gcc43.patch
b/games-arcade/crack-attack/files/crack-attack-1.1.14-gcc43.patch
index 009d062f2ea..8cabe7eb257 100644
--- a/games-arcade/crack-attack/files/crack-attack-1.1.14-gcc43.patch
+++ b/games-arcade/crack-attack/files/crack-attack-1.1.14-gcc43.patch
@@ -1,5 +1,5 @@
src/Game.h
-+++ src/Game.h
+--- a/src/Game.h
b/src/Game.h
@@ -34,6 +34,7 @@
#include
#include
diff --git a/games-arcade/crack-attack/files/crack-attack-1.1.14-glut.patch
b/games-arcade/crack-attack/files/crack-attack-1.1.14-glut.patch
index fc16c1b8bc4..430d4e742f3 100644
--- a/games-arcade/crack-attack/files/crack-attack-1.1.14-glut.patch
+++ b/games-arcade/crack-attack/files/crack-attack-1.1.14-glut.patch
@@ -2,8 +2,8 @@ Fix from upstream to work with newer freegluts.
http://bugs.gentoo.org/97954
src/Attack.cxx
-+++ src/Attack.cxx
+--- a/src/Attack.cxx
b/src/Attack.cxx
@@ -83,6 +83,7 @@
int height = -1, width = -1;
[gentoo-commits] repo/gentoo:master commit in: games-arcade/crack-attack/
commit: 9ed9f6c1a676961619ada433521bf677bf59fccd
Author: Pacho Ramos gentoo org>
AuthorDate: Sun Apr 15 18:44:35 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sun Apr 15 19:00:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ed9f6c1
games-arcade/crack-attack: Drop old
Package-Manager: Portage-2.3.28, Repoman-2.3.9
.../crack-attack/crack-attack-1.1.14-r1.ebuild | 44 --
1 file changed, 44 deletions(-)
diff --git a/games-arcade/crack-attack/crack-attack-1.1.14-r1.ebuild
b/games-arcade/crack-attack/crack-attack-1.1.14-r1.ebuild
deleted file mode 100644
index b91f0af19a7..000
--- a/games-arcade/crack-attack/crack-attack-1.1.14-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Addictive OpenGL-based block game"
-HOMEPAGE="http://www.nongnu.org/crack-attack/;
-SRC_URI="https://savannah.nongnu.org/download/crack-attack/${P}.tar.bz2;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
-IUSE="gtk sdl"
-
-RDEPEND="media-libs/freeglut
- sdl? ( media-libs/libsdl
- media-libs/sdl-mixer )
- gtk? ( >=x11-libs/gtk+-2.6:2 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-glut.patch \
- "${FILESDIR}"/${P}-gcc43.patch
- sed -i 's/-lXmu//' src/gtk-gui/Makefile.in src/Makefile.in || die
- touch -r . * */*
-}
-
-src_configure() {
- egamesconf \
- --disable-binreloc \
- $(use_enable sdl sound) \
- $(use_enable gtk)
-}
-
-src_install() {
- default
- dohtml -A xpm doc/*
- doicon data/crack-attack.xpm
- make_desktop_entry crack-attack Crack-attack
- prepgamesdirs
-}
