speed-dreams: update to 2.2.3
"-Wl,--no-as-needed" is required to avoid a linker error which occurs when linking with `-lOpenGL`. "-Wl,-z,stack-size=2097152" is required to avoid a stack overflow on threads, when running on musl. Without it, overflow happens in the openalmusicplayer::streambuffer() function, which allocates a sound buffer on the stack. Co-authored-by: Érico Nogueira <erico.erc@gmail.com>
This commit is contained in:
parent
b2a8ed5a3b
commit
6faa59aaed
4 changed files with 20 additions and 382 deletions
|
@ -1,356 +0,0 @@
|
|||
Index: cmake/robot.cmake
|
||||
===================================================================
|
||||
--- a/cmake/robot.cmake
|
||||
+++ b/cmake/robot.cmake
|
||||
@@ -229,7 +229,7 @@ ENDMACRO(ROBOT_MODULE)
|
||||
#
|
||||
MACRO(ROBOT_DATA)
|
||||
|
||||
- SET(RBD_SYNTAX "NAME,1,1,RBD_HAS_NAME,RBD_NAME")
|
||||
+ SET(RBD_SYNTAX "RNAME,1,1,RBD_HAS_NAME,RBD_NAME")
|
||||
SET(RBD_SYNTAX ${RBD_SYNTAX} "PREFIX,0,1,RBD_HAS_PREFIX,RBD_PREFIX")
|
||||
SET(RBD_SYNTAX ${RBD_SYNTAX} "FILES,0,-1,RBD_HAS_FILES,RBD_FILES")
|
||||
SET(RBD_SYNTAX ${RBD_SYNTAX} "SUBDIRS,0,-1,RBD_HAS_SUBDIRS,RBD_SUBDIRS")
|
||||
@@ -311,6 +311,6 @@ MACRO(ROBOT)
|
||||
|
||||
ROBOT_MODULE(NAME ${RB_NAME} INTERFACE ${RB_INTERFACE} SOURCES ${RB_SOURCES})
|
||||
|
||||
- ROBOT_DATA(NAME ${RB_NAME} PREFIX ${RB_PREFIX} FILES ${RB_FILES} SUBDIRS ${RB_SUBDIRS})
|
||||
+ ROBOT_DATA(RNAME ${RB_NAME} PREFIX ${RB_PREFIX} FILES ${RB_FILES} SUBDIRS ${RB_SUBDIRS})
|
||||
|
||||
ENDMACRO(ROBOT)
|
||||
Index: data/drivers/dandroid_36GP/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/data/drivers/dandroid_36GP/CMakeLists.txt
|
||||
+++ b/data/drivers/dandroid_36GP/CMakeLists.txt
|
||||
@@ -6,6 +6,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10
|
||||
36gp-tridenti-6c34 36gp-tridenti-v8ri
|
||||
tracks)
|
||||
|
||||
-ROBOT_DATA(NAME dandroid_36GP
|
||||
+ROBOT_DATA(RNAME dandroid_36GP
|
||||
FILES dandroid_36GP.xml default.xml logo.rgb readme.txt
|
||||
SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg *.csv)
|
||||
Index: data/drivers/dandroid_ls1/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/data/drivers/dandroid_ls1/CMakeLists.txt
|
||||
+++ b/data/drivers/dandroid_ls1/CMakeLists.txt
|
||||
@@ -6,6 +6,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10
|
||||
ls1-taipan-ltsr ls1-marisatech-gt4r
|
||||
tracks)
|
||||
|
||||
-ROBOT_DATA(NAME dandroid_ls1
|
||||
+ROBOT_DATA(RNAME dandroid_ls1
|
||||
FILES dandroid_ls1.xml default.xml logo.rgb readme.txt
|
||||
SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg *.csv)
|
||||
Index: data/drivers/dandroid_ls2/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/data/drivers/dandroid_ls2/CMakeLists.txt
|
||||
+++ b/data/drivers/dandroid_ls2/CMakeLists.txt
|
||||
@@ -5,6 +5,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10
|
||||
ls2-cavallo-360r ls2-morley-r900 ls2-vulture-v6rs2
|
||||
tracks)
|
||||
|
||||
-ROBOT_DATA(NAME dandroid_ls2
|
||||
+ROBOT_DATA(RNAME dandroid_ls2
|
||||
FILES dandroid_ls2.xml default.xml logo.rgb readme.txt
|
||||
SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg *.csv)
|
||||
Index: data/drivers/dandroid_mpa1/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/data/drivers/dandroid_mpa1/CMakeLists.txt
|
||||
+++ b/data/drivers/dandroid_mpa1/CMakeLists.txt
|
||||
@@ -5,6 +5,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9
|
||||
mpa1-team-lynx mpa1-ffr
|
||||
tracks)
|
||||
|
||||
-ROBOT_DATA(NAME dandroid_mpa1
|
||||
+ROBOT_DATA(RNAME dandroid_mpa1
|
||||
FILES dandroid_mpa1.xml default.xml logo.rgb readme.txt
|
||||
SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg *.csv)
|
||||
Index: data/drivers/dandroid_rs/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/data/drivers/dandroid_rs/CMakeLists.txt
|
||||
+++ b/data/drivers/dandroid_rs/CMakeLists.txt
|
||||
@@ -5,6 +5,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9
|
||||
rs2-fai-dot rs2-lion-2m
|
||||
tracks)
|
||||
|
||||
-ROBOT_DATA(NAME dandroid_rs
|
||||
+ROBOT_DATA(RNAME dandroid_rs
|
||||
FILES dandroid_rs.xml default.xml logo.rgb readme.txt
|
||||
SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg *.csv)
|
||||
Index: data/drivers/dandroid_sc/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/data/drivers/dandroid_sc/CMakeLists.txt
|
||||
+++ b/data/drivers/dandroid_sc/CMakeLists.txt
|
||||
@@ -5,6 +5,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10
|
||||
sc-lynx-220 sc-murasama-nsx sc-kanagawa-z35gts sc-kongei-kk8s
|
||||
tracks)
|
||||
|
||||
-ROBOT_DATA(NAME dandroid_sc
|
||||
+ROBOT_DATA(RNAME dandroid_sc
|
||||
FILES dandroid_sc.xml default.xml logo.rgb readme.txt
|
||||
SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg *.csv)
|
||||
Index: data/drivers/dandroid_srw/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/data/drivers/dandroid_srw/CMakeLists.txt
|
||||
+++ b/data/drivers/dandroid_srw/CMakeLists.txt
|
||||
@@ -9,6 +9,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7
|
||||
srw-kanagawa-gtr
|
||||
tracks)
|
||||
|
||||
-ROBOT_DATA(NAME dandroid_srw
|
||||
+ROBOT_DATA(RNAME dandroid_srw
|
||||
FILES dandroid_srw.xml default.xml logo.rgb readme.txt
|
||||
SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
|
||||
Index: data/drivers/dandroid_trb1/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/data/drivers/dandroid_trb1/CMakeLists.txt
|
||||
+++ b/data/drivers/dandroid_trb1/CMakeLists.txt
|
||||
@@ -6,6 +6,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10
|
||||
trb1-zaxxon-rb trb1-vieringe-5rb
|
||||
tracks)
|
||||
|
||||
-ROBOT_DATA(NAME dandroid_trb1
|
||||
+ROBOT_DATA(RNAME dandroid_trb1
|
||||
FILES dandroid_trb1.xml default.xml logo.rgb readme.txt
|
||||
SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg *.csv)
|
||||
Index: data/drivers/human/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/data/drivers/human/CMakeLists.txt
|
||||
+++ b/data/drivers/human/CMakeLists.txt
|
||||
@@ -2,10 +2,10 @@ INCLUDE(../../../cmake/macros.cmake)
|
||||
|
||||
SET(ROBOT_NAME "human")
|
||||
|
||||
-ROBOT_DATA(NAME ${ROBOT_NAME}
|
||||
+ROBOT_DATA(RNAME ${ROBOT_NAME}
|
||||
FILES logo.png logo.rgb
|
||||
SUBDIRS cars PATTERNS *.xml)
|
||||
|
||||
-ROBOT_DATA(NAME ${ROBOT_NAME}
|
||||
+ROBOT_DATA(RNAME ${ROBOT_NAME}
|
||||
FILES ${ROBOT_NAME}.xml preferences.xml car.xml
|
||||
USER)
|
||||
Index: data/drivers/networkhuman/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/data/drivers/networkhuman/CMakeLists.txt
|
||||
+++ b/data/drivers/networkhuman/CMakeLists.txt
|
||||
@@ -2,10 +2,10 @@ INCLUDE(../../../cmake/macros.cmake)
|
||||
|
||||
SET(ROBOT_NAME "networkhuman")
|
||||
|
||||
-ROBOT_DATA(NAME ${ROBOT_NAME}
|
||||
+ROBOT_DATA(RNAME ${ROBOT_NAME}
|
||||
FILES logo.png)
|
||||
# SUBDIRS cars PATTERNS *.xml)
|
||||
|
||||
-ROBOT_DATA(NAME ${ROBOT_NAME}
|
||||
+ROBOT_DATA(RNAME ${ROBOT_NAME}
|
||||
FILES ${ROBOT_NAME}.xml preferences.xml car.xml
|
||||
USER)
|
||||
Index: data/drivers/shadow_sc/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/data/drivers/shadow_sc/CMakeLists.txt
|
||||
+++ b/data/drivers/shadow_sc/CMakeLists.txt
|
||||
@@ -7,6 +7,6 @@ SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9
|
||||
sc-lynx-220 sc-murasama-nsx sc-spirit-300
|
||||
tracks)
|
||||
|
||||
-ROBOT_DATA(NAME shadow_sc
|
||||
+ROBOT_DATA(RNAME shadow_sc
|
||||
FILES shadow_sc.xml default.xml logo.rgb readme.txt
|
||||
SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
|
||||
Index: data/drivers/simplix/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/data/drivers/simplix/CMakeLists.txt
|
||||
+++ b/data/drivers/simplix/CMakeLists.txt
|
||||
@@ -10,6 +10,6 @@ SET(ROBOT_SUBDIRS trb1-cavallo-360rb
|
||||
tracks
|
||||
0)
|
||||
|
||||
-ROBOT_DATA(NAME simplix
|
||||
+ROBOT_DATA(RNAME simplix
|
||||
FILES simplix.xml default.xml logo.rgb readme.txt
|
||||
SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml *.rgb)
|
||||
Index: data/drivers/simplix_36GP/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/data/drivers/simplix_36GP/CMakeLists.txt
|
||||
+++ b/data/drivers/simplix_36GP/CMakeLists.txt
|
||||
@@ -7,6 +7,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9
|
||||
36gp-tridenti-6c34 36gp-tridenti-v8ri
|
||||
tracks)
|
||||
|
||||
-ROBOT_DATA(NAME simplix_36GP
|
||||
+ROBOT_DATA(RNAME simplix_36GP
|
||||
FILES simplix_36GP.xml default.xml logo.rgb readme.txt
|
||||
SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
|
||||
Index: data/drivers/simplix_ls1/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/data/drivers/simplix_ls1/CMakeLists.txt
|
||||
+++ b/data/drivers/simplix_ls1/CMakeLists.txt
|
||||
@@ -8,6 +8,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10
|
||||
ls1-taipan-ltsr
|
||||
tracks)
|
||||
|
||||
-ROBOT_DATA(NAME simplix_ls1
|
||||
+ROBOT_DATA(RNAME simplix_ls1
|
||||
FILES simplix_ls1.xml default.xml logo.rgb readme.txt
|
||||
SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
|
||||
Index: data/drivers/simplix_ls2/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/data/drivers/simplix_ls2/CMakeLists.txt
|
||||
+++ b/data/drivers/simplix_ls2/CMakeLists.txt
|
||||
@@ -6,6 +6,6 @@ SET(ROBOT_SUBDIRS 0
|
||||
ls2-bavaria-g3gtr
|
||||
tracks)
|
||||
|
||||
-ROBOT_DATA(NAME simplix_ls2
|
||||
+ROBOT_DATA(RNAME simplix_ls2
|
||||
FILES simplix_ls2.xml default.xml logo.rgb readme.txt
|
||||
SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
|
||||
Index: data/drivers/simplix_mp5/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/data/drivers/simplix_mp5/CMakeLists.txt
|
||||
+++ b/data/drivers/simplix_mp5/CMakeLists.txt
|
||||
@@ -6,6 +6,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5
|
||||
mp5-fmc mp5-fmc-drift mp5-fmc-speedy
|
||||
tracks)
|
||||
|
||||
-ROBOT_DATA(NAME simplix_mp5
|
||||
+ROBOT_DATA(RNAME simplix_mp5
|
||||
FILES simplix_mp5.xml default.xml logo.rgb readme.txt
|
||||
SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
|
||||
Index: data/drivers/simplix_mpa1/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/data/drivers/simplix_mpa1/CMakeLists.txt
|
||||
+++ b/data/drivers/simplix_mpa1/CMakeLists.txt
|
||||
@@ -7,6 +7,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9
|
||||
mpa1-team-lynx mpa1-ffr
|
||||
tracks)
|
||||
|
||||
-ROBOT_DATA(NAME simplix_mpa1
|
||||
+ROBOT_DATA(RNAME simplix_mpa1
|
||||
FILES simplix_mpa1.xml default.xml logo.rgb readme.txt
|
||||
SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
|
||||
Index: data/drivers/simplix_sc/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/data/drivers/simplix_sc/CMakeLists.txt
|
||||
+++ b/data/drivers/simplix_sc/CMakeLists.txt
|
||||
@@ -7,6 +7,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10
|
||||
sc-lynx-220 sc-murasama-nsx
|
||||
tracks)
|
||||
|
||||
-ROBOT_DATA(NAME simplix_sc
|
||||
+ROBOT_DATA(RNAME simplix_sc
|
||||
FILES simplix_sc.xml default.xml logo.rgb readme.txt
|
||||
SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
|
||||
Index: data/drivers/simplix_srw/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/data/drivers/simplix_srw/CMakeLists.txt
|
||||
+++ b/data/drivers/simplix_srw/CMakeLists.txt
|
||||
@@ -9,6 +9,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7
|
||||
srw-kanagawa-gtr
|
||||
tracks)
|
||||
|
||||
-ROBOT_DATA(NAME simplix_srw
|
||||
+ROBOT_DATA(RNAME simplix_srw
|
||||
FILES simplix_srw.xml default.xml logo.rgb readme.txt
|
||||
SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
|
||||
Index: data/drivers/simplix_trb1/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/data/drivers/simplix_trb1/CMakeLists.txt
|
||||
+++ b/data/drivers/simplix_trb1/CMakeLists.txt
|
||||
@@ -8,6 +8,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10
|
||||
trb1-zaxxon-rb trb1-vieringe-5rb
|
||||
tracks)
|
||||
|
||||
-ROBOT_DATA(NAME simplix_trb1
|
||||
+ROBOT_DATA(RNAME simplix_trb1
|
||||
FILES simplix_trb1.xml default.xml logo.rgb readme.txt
|
||||
SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
|
||||
Index: data/drivers/usr_36GP/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/data/drivers/usr_36GP/CMakeLists.txt
|
||||
+++ b/data/drivers/usr_36GP/CMakeLists.txt
|
||||
@@ -8,7 +8,7 @@ SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9 10 1
|
||||
36gp-tridenti-v8ri
|
||||
tracks)
|
||||
|
||||
-ROBOT_DATA(NAME usr_36GP
|
||||
+ROBOT_DATA(RNAME usr_36GP
|
||||
FILES usr_36GP.xml default.xml logo.rgb readme.txt
|
||||
SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
|
||||
|
||||
Index: data/drivers/usr_ls1/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/data/drivers/usr_ls1/CMakeLists.txt
|
||||
+++ b/data/drivers/usr_ls1/CMakeLists.txt
|
||||
@@ -8,6 +8,6 @@ SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9 10 1
|
||||
ls1-taipan-ltsr ls1-toro-rgt
|
||||
tracks)
|
||||
|
||||
-ROBOT_DATA(NAME usr_ls1
|
||||
+ROBOT_DATA(RNAME usr_ls1
|
||||
FILES usr_ls1.xml default.xml logo.rgb readme.txt
|
||||
SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
|
||||
Index: data/drivers/usr_ls2/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/data/drivers/usr_ls2/CMakeLists.txt
|
||||
+++ b/data/drivers/usr_ls2/CMakeLists.txt
|
||||
@@ -9,6 +9,6 @@ SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8
|
||||
ls2-vortex-gt ls2-lynx-xkr
|
||||
)
|
||||
|
||||
-ROBOT_DATA(NAME usr_ls2
|
||||
+ROBOT_DATA(RNAME usr_ls2
|
||||
FILES usr_ls2.xml default.xml logo.rgb readme.txt
|
||||
SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
|
||||
Index: data/drivers/usr_mpa1/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/data/drivers/usr_mpa1/CMakeLists.txt
|
||||
+++ b/data/drivers/usr_mpa1/CMakeLists.txt
|
||||
@@ -6,6 +6,6 @@ SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 #9 10
|
||||
mpa1-ffr mpa1-furia mpa1-hartbill-2002
|
||||
mpa1-murasama mpa1-team-lynx)
|
||||
|
||||
-ROBOT_DATA(NAME usr_mpa1
|
||||
+ROBOT_DATA(RNAME usr_mpa1
|
||||
FILES usr_mpa1.xml default.xml logo.rgb readme.txt
|
||||
SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
|
||||
Index: data/drivers/usr_rs/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/data/drivers/usr_rs/CMakeLists.txt
|
||||
+++ b/data/drivers/usr_rs/CMakeLists.txt
|
||||
@@ -6,6 +6,6 @@ SET(ROBOT_SUBDIRS 1
|
||||
rs1-kenji-08
|
||||
)
|
||||
|
||||
-ROBOT_DATA(NAME usr_rs
|
||||
+ROBOT_DATA(RNAME usr_rs
|
||||
FILES usr_rs.xml default.xml logo.rgb readme.txt
|
||||
SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
|
||||
Index: data/drivers/usr_sc/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/data/drivers/usr_sc/CMakeLists.txt
|
||||
+++ b/data/drivers/usr_sc/CMakeLists.txt
|
||||
@@ -7,6 +7,6 @@ SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9 10 1
|
||||
sc-lynx-220 sc-murasama-nsx sc-spirit-300
|
||||
tracks)
|
||||
|
||||
-ROBOT_DATA(NAME usr_sc
|
||||
+ROBOT_DATA(RNAME usr_sc
|
||||
FILES usr_sc.xml default.xml logo.rgb readme.txt
|
||||
SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
|
||||
Index: data/drivers/usr_trb1/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/data/drivers/usr_trb1/CMakeLists.txt
|
||||
+++ b/data/drivers/usr_trb1/CMakeLists.txt
|
||||
@@ -8,6 +8,6 @@ SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9 10 1
|
||||
trb1-zaxxon-rb
|
||||
tracks)
|
||||
|
||||
-ROBOT_DATA(NAME usr_trb1
|
||||
+ROBOT_DATA(RNAME usr_trb1
|
||||
FILES usr_trb1.xml default.xml logo.rgb readme.txt
|
||||
SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg)
|
12
srcpkgs/speed-dreams/patches/musl.patch
Normal file
12
srcpkgs/speed-dreams/patches/musl.patch
Normal file
|
@ -0,0 +1,12 @@
|
|||
--- a/src/modules/simu/simuv2.1/SOLID-2.0/src/C-api.cpp
|
||||
+++ b/src/modules/simu/simuv2.1/SOLID-2.0/src/C-api.cpp
|
||||
@@ -60,9 +60,7 @@
|
||||
typedef map<DtObjectRef, Object *> ObjectList;
|
||||
typedef set<Encounter> ProxList;
|
||||
|
||||
-#if defined( WIN32) || (__APPLE__)
|
||||
#define uint unsigned int
|
||||
-#endif
|
||||
|
||||
PointBuf pointBuf;
|
||||
IndexBuf indexBuf;
|
|
@ -1,13 +0,0 @@
|
|||
Index: src/modules/graphic/osggraph/Utils/OsgAtomic.h
|
||||
===================================================================
|
||||
--- a/src/modules/graphic/osggraph/Utils/OsgAtomic.h (revision 6789)
|
||||
+++ b/src/modules/graphic/osggraph/Utils/OsgAtomic.h (working copy)
|
||||
@@ -20,7 +20,7 @@
|
||||
#ifndef OsgAtomic_H
|
||||
#define OsgAtomic_H
|
||||
|
||||
-#if defined(__GNUC__) && ((4 < __GNUC__)||(4 == __GNUC__ && 1 <= __GNUC_MINOR__)) && defined(__x86_64__)
|
||||
+#if defined(__GNUC__) && ((4 < __GNUC__)||(4 == __GNUC__ && 1 <= __GNUC_MINOR__)) && (defined(__x86_64__) || defined(__powerpc64__))
|
||||
// No need to include something. Is a Compiler API ...
|
||||
# define SDATOMIC_USE_GCC4_BUILTINS
|
||||
#elif defined(__GNUC__) && defined(__i386__)
|
|
@ -1,9 +1,9 @@
|
|||
# Template file for 'speed-dreams'
|
||||
pkgname=speed-dreams
|
||||
version=2.2.2
|
||||
revision=3
|
||||
version=2.2.3
|
||||
revision=1
|
||||
archs="i686* x86_64* ppc64le*"
|
||||
_rev=r6553
|
||||
_rev=r7616
|
||||
create_wrksrc=yes
|
||||
build_style=cmake
|
||||
configure_args="-DSD_BINDIR=/usr/bin -DSD_DATADIR=/usr/share/speed-dreams-2
|
||||
|
@ -20,16 +20,11 @@ distfiles="${SOURCEFORGE_SITE}/speed-dreams/speed-dreams-src-base-${version}-${_
|
|||
${SOURCEFORGE_SITE}/speed-dreams/speed-dreams-src-wip-cars-and-tracks-${version}-${_rev}.tar.xz
|
||||
${SOURCEFORGE_SITE}/speed-dreams/speed-dreams-src-hq-cars-and-tracks-${version}-${_rev}.tar.xz
|
||||
${SOURCEFORGE_SITE}/speed-dreams/speed-dreams-src-more-hq-cars-and-tracks-${version}-${_rev}.tar.xz"
|
||||
checksum="32aa55c17f8dafc1c54fb0d0b7b993d2688d431899cfc5db9eeece148c6887d0
|
||||
9808d6d77b27cba2ca21943d1cff3c1f4022428cca4f76a2873eabe6954f4df1
|
||||
d8ebe92ebeb88bdf4339de9da5fa20da3d0873a6c2776f23f18e61fc6f510b51
|
||||
0b7b417d007ab3b7f0f4dcfdc868aafee1722150b81af519e1cd4c082b408183"
|
||||
checksum="c67e48a083cd86f6c0062f0b38ed91a5d25274ea8aa656ee182f3f5074e96ff0
|
||||
aff20e49ff94660d9ef962079f640d0ceeaa414869209be1ec41768d0ee5cb20
|
||||
06eaf2094bc10fbaca980a4236c4e444dd14275aba3f7b1d62b4b3a53a9d4c77
|
||||
19208761b252df9db200c733cecb3bb584905f02d057af2bbff5e4c86cbe1a86"
|
||||
nocross=yes
|
||||
replaces="speed-dreams-data>=0"
|
||||
CFLAGS=-fpermissive
|
||||
CXXFLAGS=-fpermissive
|
||||
LDFLAGS="-Wl,--no-as-needed -Wl,-z,stack-size=2097152"
|
||||
lib32disabled=yes
|
||||
|
||||
if [ "$XBPS_TARGET_LIBC" = musl ]; then
|
||||
broken="Segmentation fault"
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue