* [PR PATCH] speed-dreams: fix build with cmake 3.20
@ 2021-04-03 8:12 sgn
2021-04-03 8:19 ` [PR PATCH] [Updated] " sgn
2021-04-03 8:37 ` [PR PATCH] [Merged]: " sgn
0 siblings, 2 replies; 3+ messages in thread
From: sgn @ 2021-04-03 8:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1609 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages speed-dreams-cmake-3.20
https://github.com/void-linux/void-packages/pull/29971
speed-dreams: fix build with cmake 3.20
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29971.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-speed-dreams-cmake-3.20-29971.patch --]
[-- Type: text/x-diff, Size: 17382 bytes --]
From c0b41856e488fa31f71daffac5fb9dffcae43953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 3 Apr 2021 15:08:33 +0700
Subject: [PATCH] speed-dreams: fix build with cmake 3.20
---
srcpkgs/speed-dreams/patches/cmake-3.20.patch | 356 ++++++++++++++++++
srcpkgs/speed-dreams/template | 3 +-
2 files changed, 357 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/speed-dreams/patches/cmake-3.20.patch
diff --git a/srcpkgs/speed-dreams/patches/cmake-3.20.patch b/srcpkgs/speed-dreams/patches/cmake-3.20.patch
new file mode 100644
index 000000000000..5e2334117d32
--- /dev/null
+++ b/srcpkgs/speed-dreams/patches/cmake-3.20.patch
@@ -0,0 +1,356 @@
+Index: cmake/robot.cmake
+===================================================================
+--- cmake/robot.cmake.orig
++++ 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
+===================================================================
+--- data/drivers/dandroid_36GP/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/dandroid_ls1/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/dandroid_ls2/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/dandroid_mpa1/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/dandroid_rs/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/dandroid_sc/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/dandroid_srw/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/dandroid_trb1/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/human/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/networkhuman/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/shadow_sc/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/simplix/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/simplix_36GP/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/simplix_ls1/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/simplix_ls2/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/simplix_mp5/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/simplix_mpa1/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/simplix_sc/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/simplix_srw/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/simplix_trb1/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/usr_36GP/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/usr_ls1/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/usr_ls2/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/usr_mpa1/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/usr_rs/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/usr_sc/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/usr_trb1/CMakeLists.txt.orig
++++ 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)
diff --git a/srcpkgs/speed-dreams/template b/srcpkgs/speed-dreams/template
index 73344d26ef39..b1b5cbd8ea37 100644
--- a/srcpkgs/speed-dreams/template
+++ b/srcpkgs/speed-dreams/template
@@ -7,7 +7,7 @@ _rev=r6553
create_wrksrc=yes
build_style=cmake
configure_args="-DSD_BINDIR=/usr/bin -DSD_DATADIR=/usr/share/speed-dreams-2
- -DSD_LIBDIR=/usr/lib/speed-dreams-2 -DOPTION_OFFICIAL_ONLY=ON"
+ -DSD_LIBDIR=/usr/lib/speed-dreams-2 -DOPTION_OFFICIAL_ONLY=ON -Wno-dev"
hostmakedepends="pkg-config"
makedepends="freealut-devel libenet-devel libfreeglut-devel libjpeg-turbo-devel
libpng-devel libvorbis-devel libXrandr-devel osg-devel plib-devel SDL2-devel
@@ -28,7 +28,6 @@ nocross=yes
replaces="speed-dreams-data>=0"
CFLAGS=-fpermissive
CXXFLAGS=-fpermissive
-broken="https://build.voidlinux.org/builders/x86_64_builder/builds/31603/steps/shell_3/logs/stdio"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
broken="Segmentation fault"
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] speed-dreams: fix build with cmake 3.20
2021-04-03 8:12 [PR PATCH] speed-dreams: fix build with cmake 3.20 sgn
@ 2021-04-03 8:19 ` sgn
2021-04-03 8:37 ` [PR PATCH] [Merged]: " sgn
1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2021-04-03 8:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1614 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages speed-dreams-cmake-3.20
https://github.com/void-linux/void-packages/pull/29971
speed-dreams: fix build with cmake 3.20
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29971.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-speed-dreams-cmake-3.20-29971.patch --]
[-- Type: text/x-diff, Size: 17401 bytes --]
From c5002a3cc4ad681f49a49520f6e569deba82ff3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 3 Apr 2021 15:08:33 +0700
Subject: [PATCH] speed-dreams: fix build with cmake 3.20
---
srcpkgs/speed-dreams/patches/cmake-3.20.patch | 356 ++++++++++++++++++
srcpkgs/speed-dreams/template | 4 +-
2 files changed, 358 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/speed-dreams/patches/cmake-3.20.patch
diff --git a/srcpkgs/speed-dreams/patches/cmake-3.20.patch b/srcpkgs/speed-dreams/patches/cmake-3.20.patch
new file mode 100644
index 000000000000..5e2334117d32
--- /dev/null
+++ b/srcpkgs/speed-dreams/patches/cmake-3.20.patch
@@ -0,0 +1,356 @@
+Index: cmake/robot.cmake
+===================================================================
+--- cmake/robot.cmake.orig
++++ 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
+===================================================================
+--- data/drivers/dandroid_36GP/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/dandroid_ls1/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/dandroid_ls2/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/dandroid_mpa1/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/dandroid_rs/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/dandroid_sc/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/dandroid_srw/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/dandroid_trb1/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/human/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/networkhuman/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/shadow_sc/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/simplix/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/simplix_36GP/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/simplix_ls1/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/simplix_ls2/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/simplix_mp5/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/simplix_mpa1/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/simplix_sc/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/simplix_srw/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/simplix_trb1/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/usr_36GP/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/usr_ls1/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/usr_ls2/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/usr_mpa1/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/usr_rs/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/usr_sc/CMakeLists.txt.orig
++++ 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
+===================================================================
+--- data/drivers/usr_trb1/CMakeLists.txt.orig
++++ 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)
diff --git a/srcpkgs/speed-dreams/template b/srcpkgs/speed-dreams/template
index 73344d26ef39..fadabc891c88 100644
--- a/srcpkgs/speed-dreams/template
+++ b/srcpkgs/speed-dreams/template
@@ -7,7 +7,7 @@ _rev=r6553
create_wrksrc=yes
build_style=cmake
configure_args="-DSD_BINDIR=/usr/bin -DSD_DATADIR=/usr/share/speed-dreams-2
- -DSD_LIBDIR=/usr/lib/speed-dreams-2 -DOPTION_OFFICIAL_ONLY=ON"
+ -DSD_LIBDIR=/usr/lib/speed-dreams-2 -DOPTION_OFFICIAL_ONLY=ON -Wno-dev"
hostmakedepends="pkg-config"
makedepends="freealut-devel libenet-devel libfreeglut-devel libjpeg-turbo-devel
libpng-devel libvorbis-devel libXrandr-devel osg-devel plib-devel SDL2-devel
@@ -28,7 +28,7 @@ nocross=yes
replaces="speed-dreams-data>=0"
CFLAGS=-fpermissive
CXXFLAGS=-fpermissive
-broken="https://build.voidlinux.org/builders/x86_64_builder/builds/31603/steps/shell_3/logs/stdio"
+lib32disabled=yes
if [ "$XBPS_TARGET_LIBC" = musl ]; then
broken="Segmentation fault"
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: speed-dreams: fix build with cmake 3.20
2021-04-03 8:12 [PR PATCH] speed-dreams: fix build with cmake 3.20 sgn
2021-04-03 8:19 ` [PR PATCH] [Updated] " sgn
@ 2021-04-03 8:37 ` sgn
1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2021-04-03 8:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1450 bytes --]
There's a merged pull request on the void-packages repository
speed-dreams: fix build with cmake 3.20
https://github.com/void-linux/void-packages/pull/29971
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-04-03 8:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-03 8:12 [PR PATCH] speed-dreams: fix build with cmake 3.20 sgn
2021-04-03 8:19 ` [PR PATCH] [Updated] " sgn
2021-04-03 8:37 ` [PR PATCH] [Merged]: " sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).