Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
cookbook
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
redox-os
cookbook
Commits
90f9bdc9
Verified
Commit
90f9bdc9
authored
6 years ago
by
Jeremy Soller
Browse files
Options
Downloads
Patches
Plain Diff
openttd: Fix issue with opening /dev/null
parent
c56c96e0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
recipes/openttd/01_redox.patch
+27
-24
27 additions, 24 deletions
recipes/openttd/01_redox.patch
recipes/openttd/recipe.sh
+9
-2
9 additions, 2 deletions
recipes/openttd/recipe.sh
with
36 additions
and
26 deletions
recipes/openttd/01_redox.patch
+
27
−
24
View file @
90f9bdc9
diff -rup
N
w source
-original
/config.lib source/config.lib
--- source
-original
/config.lib 2018-1
1
-2
3 19:25:11.000000000 +01
00
+++ source/config.lib 2018-1
1
-2
3 21:37:19.956620161 +01
00
diff -rupw
N
source/config.lib source
-new
/config.lib
--- source/config.lib 2018-1
2
-2
9 07:28:58.975290421 -07
00
+++ source
-new
/config.lib 2018-1
2
-2
9 10:11:42.310241717 -07
00
@@ -1486,7 +1486,7 @@
make_cflags_and_ldflags() {
# Special CXXFlags for HOST
CXXFLAGS="$CXXFLAGS"
...
...
@@ -19,21 +19,24 @@ diff -rupNw source-original/config.lib source/config.lib
fi
if [ "$os" != "CYGWIN" ] && [ "$os" != "HAIKU" ] && [ "$os" != "MINGW" ] && [ "$os" != "DOS" ] && [ "$os" != "WINCE" ]; then
diff -rupNw source-original/src/os/unix/unix.cpp source/src/os/unix/unix.cpp
--- source-original/src/os/unix/unix.cpp 2018-11-23 19:25:12.000000000 +0100
+++ source/src/os/unix/unix.cpp 2018-11-23 21:37:19.956620161 +0100
@@ -28,7 +28,7 @@
#ifdef __APPLE__
#include <sys/mount.h>
#elif (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L) || defined(__GLIBC__)
- #define HAS_STATVFS
+ //#define HAS_STATVFS
#endif
#if defined(OPENBSD) || defined(__NetBSD__) || defined(__FreeBSD__)
diff -rupNw source-original/src/rev.cpp.in source/src/rev.cpp.in
--- source-original/src/rev.cpp.in 2018-11-23 19:25:12.000000000 +0100
+++ source/src/rev.cpp.in 2018-11-23 21:37:19.956620161 +0100
diff -rupwN source/src/music/extmidi.cpp source-new/src/music/extmidi.cpp
--- source/src/music/extmidi.cpp 2018-12-29 07:28:59.143295501 -0700
+++ source-new/src/music/extmidi.cpp 2018-12-29 10:14:06.637357598 -0700
@@ -115,7 +115,11 @@
void MusicDriver_ExtMidi::DoPlay()
switch (this->pid) {
case 0: {
close(0);
+#if defined(__redox__)
+ int d = open("null:", O_RDONLY);
+#else
int d = open("/dev/null", O_RDONLY);
+#endif
if (d != -1 && dup2(d, 1) != -1 && dup2(d, 2) != -1) {
execvp(this->params[0], this->params);
}
diff -rupwN source/src/rev.cpp.in source-new/src/rev.cpp.in
--- source/src/rev.cpp.in 2018-12-29 07:28:59.167296226 -0700
+++ source-new/src/rev.cpp.in 2018-12-29 10:11:42.314241804 -0700
@@ -57,7 +57,7 @@
const char _openttd_build_date[] = __DAT
* (compiling from sources without any version control software)
* and 2 is for modified revision.
...
...
@@ -43,9 +46,9 @@ diff -rupNw source-original/src/rev.cpp.in source/src/rev.cpp.in
/**
* The NewGRF revision of OTTD:
diff -rup
N
w source
-original
/src/stdafx.h source/src/stdafx.h
--- source
-original
/src/stdafx.h 2018-1
1
-2
3 19:25:12.000000000 +01
00
+++ source/src/stdafx.h 2018-1
1
-2
3
1
9:49:25.000000000 +01
00
diff -rupw
N
source/src/stdafx.h source
-new
/src/stdafx.h
--- source/src/stdafx.h 2018-1
2
-2
9 07:28:59.203297314 -07
00
+++ source
-new
/src/stdafx.h 2018-1
2
-2
9
1
0:11:42.314241804 -07
00
@@ -12,6 +12,9 @@
#ifndef STDAFX_H
#define STDAFX_H
...
...
@@ -56,9 +59,9 @@ diff -rupNw source-original/src/stdafx.h source/src/stdafx.h
#if defined(__APPLE__)
#include "os/macosx/osx_stdafx.h"
#endif /* __APPLE__ */
diff -rup
N
w source
-original
/src/string.cpp source/src/string.cpp
--- source
-original
/src/string.cpp 2018-1
1
-2
3 19:25:12.000000000 +01
00
+++ source/src/string.cpp 2018-1
1
-2
3 20:01:10.000000000 +01
00
diff -rupw
N
source/src/string.cpp source
-new
/src/string.cpp
--- source/src/string.cpp 2018-1
2
-2
9 07:28:59.207297436 -07
00
+++ source
-new
/src/string.cpp 2018-1
2
-2
9 10:11:42.314241804 -07
00
@@ -528,7 +528,7 @@
size_t Utf8TrimString(char *s, size_t ma
return length;
}
...
...
This diff is collapsed.
Click to expand it.
recipes/openttd/recipe.sh
+
9
−
2
View file @
90f9bdc9
VERSION
=
1.8
GIT
=
https://github.com/OpenTTD/OpenTTD.git
BRANCH
=
release/
$VERSION
BUILD_DEPENDS
=(
sdl
liborbital
z
lib
xz
)
BUILD_DEPENDS
=(
freetype
liborbital lib
png sdl xz zlib
)
function
recipe_version
{
echo
"
$VERSION
"
...
...
@@ -14,7 +14,14 @@ function recipe_update {
}
function
recipe_build
{
./configure
--build
=
`
gcc
-dumpmachine
`
--host
=
${
HOST
}
--prefix
=
''
--enable-static
--without-liblzo2
--disable-network
--without-threads
./configure
\
--build
=
`
gcc
-dumpmachine
`
\
--host
=
${
HOST
}
\
--prefix
=
''
\
--enable-static
\
--without-liblzo2
\
--disable-network
\
--without-threads
make
VERBOSE
=
1
-j
"
$(
nproc
)
"
skip
=
1
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment