Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=imgrebuild.git;a=commitdiff;h=8bbf518c86ec8c111554272f8760ddddb461b19a

commit 8bbf518c86ec8c111554272f8760ddddb461b19a
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Fri May 14 21:57:43 2010 +0200

scorched3d-43.1-1-x86_64
*version bump

diff --git a/source/games-extra/scorched3d/FrugalBuild 
b/source/games-extra/scorched3d/FrugalBuild
index af49cb8..20e8a7b 100644
--- a/source/games-extra/scorched3d/FrugalBuild
+++ b/source/games-extra/scorched3d/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Devil505 <devil505li...@gmail.com>

pkgname=scorched3d
-pkgver=42.1
+pkgver=43.1
pkgrel=1
pkgdesc="Scorched3D is a 3D remake of the popular 2D artillery game Scorched 
Earth."
depends=('wxgtk-u8' 'libvorbis' 'libogg' 'sdl_net' 'openal' 'freealut' 'fftw' 
'freetype2' \
@@ -14,19 +14,28 @@ _F_sourceforge_prefix="Version "
_F_sourceforge_sep="-"
Finclude sourceforge
groups=('games-extra')
+source=($source  fixup.diff)
archs=('i686' 'x86_64')
-sha1sums=('041e3b3dd47a7881738eb5d66885d7f339eb01ce')
_F_cd_path="scorched"
-Fconfopts="${fconfop...@]} --disable-dependency-tracking  \
---datadir=/usr/share/$pkgname"
+Fconfopts="--disable-dependency-tracking  --disable-openaltest \
+       --datadir=/usr/share/$pkgname ${fconfop...@]}"

_F_desktop_name="Scorched 3D"
_F_desktop_categories="Game;ArcadeGame;"

+export LD_LIBRARY_PATH="/usr/lib"
+export LIBS="-lalut"
build()
{
-       Fbuild
+       Fcd
+       Fsed "png_infopp_NULL" "NULL" src/common/image/ImagePng.cpp
+       Fpatchall
+       sh ./autogen.sh || Fdie
+       Fmake
+       Fmakeinstall
Fdesktop2
}
+sha1sums=('80f02669ef62cbb17a8d9c66d545a004ddcbbe78' \
+          'ddccd862acd2230262eb11299bc64e29ba5a3b44')

# optimization OK
diff --git a/source/games-extra/scorched3d/fixup.diff 
b/source/games-extra/scorched3d/fixup.diff
new file mode 100644
index 0000000..828ffc2
--- /dev/null
+++ b/source/games-extra/scorched3d/fixup.diff
@@ -0,0 +1,59 @@
+diff -ru scorched.orig/configure-al.m4 scorched/configure-al.m4
+--- scorched.orig/configure-al.m4      2008-03-03 16:17:18.000000000 -0500
++++ scorched/configure-al.m4   2009-02-15 20:43:35.000000000 -0500
+@@ -7,25 +7,9 @@
+       [  --disable-openaltest    Do not try to compile and run a test OpenAL 
program],
+                   , enable_openaltest=yes)
+ AC_MSG_CHECKING(for OpenAL support)
+-AC_PATH_PROG(OPENAL_CONFIG, openal-config, no)
+-if test x$OPENAL_CONFIG = xno; then
+-      echo "*** The openal-config script installed by OpenAL could not be 
found"
+-      echo "*** Make sure openal-config is in your path, or set the 
OPENAL_CONFIG"
+-      echo "*** environment variable to the full path to openal-config."
+-
+-      AC_MSG_ERROR([*** Can't find the openal library. Try: 
http://www.openal.org/])
+-else
+-
+-      if test x"$use_static_openal" = x"yes"; then
+-              AL_LIBS="/usr/local/lib/libopenal.a"
+-      else
+-              AL_LIBS="`$OPENAL_CONFIG --libs`"
+-      fi
+-
+-      AL_CFLAGS="`$OPENAL_CONFIG --cflags`"
+-
+-      AC_MSG_RESULT(yes)
+-fi
++AL_LIBS="-lopenal"
++AL_CFLAGS="-I/usr/include/AL"
++AC_MSG_RESULT(yes)
+
+ AC_MSG_CHECKING(for Freealut support)
+ AC_PATH_PROG(FREEALUT_CONFIG, freealut-config, no)
+diff -ru scorched.orig/configure.ac scorched/configure.ac
+--- scorched.orig/configure.ac 2008-03-03 16:17:18.000000000 -0500
++++ scorched/configure.ac      2009-02-15 20:40:30.000000000 -0500
+@@ -13,22 +13,6 @@
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+
+-LDFLAGS="-L/usr/X11R6/lib -L/usr/X11R6"
+-CPPFLAGS="-I/usr/X11R6/include -I/usr/X11R6"
+-
+-if test `uname` == Darwin; then
+-LDFLAGS="$LDFLAGS -lmx"
+-CPPFLAGS="$CPPFLAGS -DFFTW_USE_DOUBLE -D__DARWIN__ -D__MACOSX__"
+-else
+-LDFLAGS="$LDFLAGS -L/usr/local/lib"
+-CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+-fi
+-
+-AC_CHECK_LIB(fridge, beer, echo "Hmm?!",[
+-      echo "Warning: No beer found in fridge!";
+-      echo "We highly suggest that you rectify this situation immediately."
+-])
+-
+ AC_ARG_ENABLE(serveronly,
+       [  --enable-serveronly Enable server only compilation],
+                   , enable_serveronly=no,
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to