uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions

View file

@ -0,0 +1,53 @@
{ lib, stdenv, fetchurl, libGLU, libGL, SDL, sconsPackages, SDL_ttf, SDL_image, zlib, SDL_net
, speex, libvorbis, libogg, boost, fribidi, bsdiff
, fetchpatch
}:
let
version = "0.9.4";
patchlevel = "4";
tutorial4patch = fetchurl {
url = "http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=34;filename=tutorial-part4.map.bspatch;att=1;bug=595448";
name = "globulation2-tutorial4-map-patch-debian.bspatch";
sha256 = "d3511ac0f822d512c42abd34b3122f2990862d3d0af6ce464ff372f5bd7f35e9";
};
in
stdenv.mkDerivation rec {
name = "glob2-${version}.${patchlevel}";
src = fetchurl {
url = "mirror://savannah/glob2/${version}/${name}.tar.gz";
sha256 = "1f0l2cqp2g3llhr9jl6jj15k0wb5q8n29vqj99xy4p5hqs78jk8g";
};
patches = [ ./header-order.patch ./public-buildproject.patch
(fetchpatch {
url = "https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a/raw";
sha256 = "0017xg5agj3dy0hx71ijdcrxb72bjqv7x6aq7c9zxzyyw0mkxj0k";
})
];
postPatch = ''
cp campaigns/tutorial-part4.map{,.orig}
bspatch campaigns/tutorial-part4.map{.orig,} ${tutorial4patch}
sed -i -e "s@env = Environment()@env = Environment( ENV = os.environ )@" SConstruct
'';
nativeBuildInputs = [ sconsPackages.scons_3_0_1 ];
buildInputs = [ libGLU libGL SDL SDL_ttf SDL_image zlib SDL_net speex libvorbis libogg boost fribidi bsdiff ];
postConfigure = ''
sconsFlags+=" BINDIR=$out/bin"
sconsFlags+=" INSTALLDIR=$out/share/globulation2"
sconsFlags+=" DATADIR=$out/share/globulation2/glob2"
'';
NIX_LDFLAGS = "-lboost_system";
meta = with lib; {
description = "RTS without micromanagement";
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
license = licenses.gpl3;
};
passthru.updateInfo.downloadPage = "http://globulation2.org/wiki/Download_and_Install";
}

View file

@ -0,0 +1,23 @@
With gcc 4.4, compilation of libgag/src/TextStream.cpp fails with the error:
'class GAGCore::StreamBackend' has no member named 'getc'. Reordering
#include's solves the problem.
Patch from Debian.
Index: glob2-0.9.4.1/libgag/src/TextStream.cpp
===================================================================
--- glob2-0.9.4.1.orig/libgag/src/TextStream.cpp 2009-06-27 20:19:38.000000000 +0400
+++ glob2-0.9.4.1/libgag/src/TextStream.cpp 2009-06-27 20:20:22.000000000 +0400
@@ -17,11 +17,11 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <TextStream.h>
#include <assert.h>
#include <fstream>
#include <iostream>
#include <stack>
+#include <TextStream.h>
#ifdef WIN32
#define snprintf _snprintf
#define vsnprintf _vsnprintf

View file

@ -0,0 +1,21 @@
diff -Nru glob2-0.9.4.4/src/Game.h glob2-0.9.4.4.new/src/Game.h
--- glob2-0.9.4.4/src/Game.h 2009-08-29 16:39:06.000000000 -0400
+++ glob2-0.9.4.4.new/src/Game.h 2015-08-29 00:59:07.843398596 -0400
@@ -148,7 +148,7 @@
TOP_TO_BOTTOM,
BOTTOM_TO_TOP
};
-
+public:
struct BuildProject
{
int posX;
@@ -158,7 +158,7 @@
int unitWorking;
int unitWorkingFuture;
};
-
+private:
///Initiates Game
void init(GameGUI *gui, MapEdit* edit);