[-- Attachment #1: Type: text/plain, Size: 1569 bytes --] There is a new pull request by 4ricci against master on the void-packages repository https://github.com/4ricci/void-packages speed-dreams https://github.com/void-linux/void-packages/pull/32474 speed-dreams: update to 2.2.3. <!-- 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? - [x] 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/32474.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-speed-dreams-32474.patch --] [-- Type: text/x-diff, Size: 19075 bytes --] From 585e6372082876e823c7295164b75077ffc86fbb Mon Sep 17 00:00:00 2001 From: Roberto Ricci <ricci@disroot.org> Date: Fri, 13 Aug 2021 00:38:01 +0200 Subject: [PATCH] speed-dreams: update to 2.2.3. --- srcpkgs/speed-dreams/patches/cmake-3.20.patch | 356 ------------------ srcpkgs/speed-dreams/patches/ppc64le.patch | 13 - srcpkgs/speed-dreams/template | 17 +- 3 files changed, 8 insertions(+), 378 deletions(-) delete mode 100644 srcpkgs/speed-dreams/patches/cmake-3.20.patch delete mode 100644 srcpkgs/speed-dreams/patches/ppc64le.patch diff --git a/srcpkgs/speed-dreams/patches/cmake-3.20.patch b/srcpkgs/speed-dreams/patches/cmake-3.20.patch deleted file mode 100644 index 6162f4a1d80e..000000000000 --- a/srcpkgs/speed-dreams/patches/cmake-3.20.patch +++ /dev/null @@ -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) diff --git a/srcpkgs/speed-dreams/patches/ppc64le.patch b/srcpkgs/speed-dreams/patches/ppc64le.patch deleted file mode 100644 index fc52d65830a2..000000000000 --- a/srcpkgs/speed-dreams/patches/ppc64le.patch +++ /dev/null @@ -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__) diff --git a/srcpkgs/speed-dreams/template b/srcpkgs/speed-dreams/template index fadabc891c88..239555917ae6 100644 --- a/srcpkgs/speed-dreams/template +++ b/srcpkgs/speed-dreams/template @@ -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,14 +20,13 @@ 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" lib32disabled=yes if [ "$XBPS_TARGET_LIBC" = musl ]; then
[-- Attachment #1: Type: text/plain, Size: 1574 bytes --] There is an updated pull request by 4ricci against master on the void-packages repository https://github.com/4ricci/void-packages speed-dreams https://github.com/void-linux/void-packages/pull/32474 speed-dreams: update to 2.2.3. <!-- 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? - [x] 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/32474.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-speed-dreams-32474.patch --] [-- Type: text/x-diff, Size: 19786 bytes --] From 993e00f4b853b26424d50d5d5f40011322451656 Mon Sep 17 00:00:00 2001 From: Roberto Ricci <ricci@disroot.org> Date: Fri, 13 Aug 2021 00:38:01 +0200 Subject: [PATCH] speed-dreams: update to 2.2.3. --- srcpkgs/speed-dreams/patches/cmake-3.20.patch | 356 ------------------ srcpkgs/speed-dreams/patches/musl.diff | 12 + srcpkgs/speed-dreams/patches/ppc64le.patch | 13 - srcpkgs/speed-dreams/template | 21 +- 4 files changed, 20 insertions(+), 382 deletions(-) delete mode 100644 srcpkgs/speed-dreams/patches/cmake-3.20.patch create mode 100644 srcpkgs/speed-dreams/patches/musl.diff delete mode 100644 srcpkgs/speed-dreams/patches/ppc64le.patch diff --git a/srcpkgs/speed-dreams/patches/cmake-3.20.patch b/srcpkgs/speed-dreams/patches/cmake-3.20.patch deleted file mode 100644 index 6162f4a1d80e..000000000000 --- a/srcpkgs/speed-dreams/patches/cmake-3.20.patch +++ /dev/null @@ -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) diff --git a/srcpkgs/speed-dreams/patches/musl.diff b/srcpkgs/speed-dreams/patches/musl.diff new file mode 100644 index 000000000000..eacb4d35134b --- /dev/null +++ b/srcpkgs/speed-dreams/patches/musl.diff @@ -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; diff --git a/srcpkgs/speed-dreams/patches/ppc64le.patch b/srcpkgs/speed-dreams/patches/ppc64le.patch deleted file mode 100644 index fc52d65830a2..000000000000 --- a/srcpkgs/speed-dreams/patches/ppc64le.patch +++ /dev/null @@ -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__) diff --git a/srcpkgs/speed-dreams/template b/srcpkgs/speed-dreams/template index fadabc891c88..32a8d4f48fef 100644 --- a/srcpkgs/speed-dreams/template +++ b/srcpkgs/speed-dreams/template @@ -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" lib32disabled=yes - -if [ "$XBPS_TARGET_LIBC" = musl ]; then - broken="Segmentation fault" -fi
[-- Attachment #1: Type: text/plain, Size: 204 bytes --] New comment by 4ricci on void-packages repository https://github.com/void-linux/void-packages/pull/32474#issuecomment-898392882 Comment: On `x86_64-musl` it segfaults in a chroot but works in a VM.
[-- Attachment #1: Type: text/plain, Size: 239 bytes --] New review comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/32474#discussion_r688484656 Comment: Can you add a comment explaining this? I suppose it depends on some library's constructor...
[-- Attachment #1: Type: text/plain, Size: 207 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/32474#issuecomment-898432946 Comment: And document in the commit the x86_64-musl crash, for posterity :p
[-- Attachment #1: Type: text/plain, Size: 458 bytes --] New review comment by 4ricci on void-packages repository https://github.com/void-linux/void-packages/pull/32474#discussion_r688548191 Comment: > Can you add a comment explaining this? I suppose it depends on some library's constructor... Honestly I don't know why `--as-needed` is not supported, I just know it makes the build fail. I will report it to upstream. I see they had the same problem in the past and then it was fixed, this is a regression.
[-- Attachment #1: Type: text/plain, Size: 1580 bytes --] There is an updated pull request by 4ricci against master on the void-packages repository https://github.com/4ricci/void-packages speed-dreams https://github.com/void-linux/void-packages/pull/32474 [WIP] speed-dreams: update to 2.2.3. <!-- 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? - [x] 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/32474.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-speed-dreams-32474.patch --] [-- Type: text/x-diff, Size: 19887 bytes --] From a8d9416318e4b3a6b5fe499378e8174897a9eb70 Mon Sep 17 00:00:00 2001 From: Roberto Ricci <ricci@disroot.org> Date: Fri, 13 Aug 2021 00:38:01 +0200 Subject: [PATCH] speed-dreams: update to 2.2.3. On x86_64-musl it's broken in the xbps chroot, but works in a VM, so it shoud work on real hardware. --- srcpkgs/speed-dreams/patches/cmake-3.20.patch | 356 ------------------ srcpkgs/speed-dreams/patches/musl.diff | 12 + srcpkgs/speed-dreams/patches/ppc64le.patch | 13 - srcpkgs/speed-dreams/template | 21 +- 4 files changed, 20 insertions(+), 382 deletions(-) delete mode 100644 srcpkgs/speed-dreams/patches/cmake-3.20.patch create mode 100644 srcpkgs/speed-dreams/patches/musl.diff delete mode 100644 srcpkgs/speed-dreams/patches/ppc64le.patch diff --git a/srcpkgs/speed-dreams/patches/cmake-3.20.patch b/srcpkgs/speed-dreams/patches/cmake-3.20.patch deleted file mode 100644 index 6162f4a1d80e..000000000000 --- a/srcpkgs/speed-dreams/patches/cmake-3.20.patch +++ /dev/null @@ -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) diff --git a/srcpkgs/speed-dreams/patches/musl.diff b/srcpkgs/speed-dreams/patches/musl.diff new file mode 100644 index 000000000000..eacb4d35134b --- /dev/null +++ b/srcpkgs/speed-dreams/patches/musl.diff @@ -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; diff --git a/srcpkgs/speed-dreams/patches/ppc64le.patch b/srcpkgs/speed-dreams/patches/ppc64le.patch deleted file mode 100644 index fc52d65830a2..000000000000 --- a/srcpkgs/speed-dreams/patches/ppc64le.patch +++ /dev/null @@ -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__) diff --git a/srcpkgs/speed-dreams/template b/srcpkgs/speed-dreams/template index fadabc891c88..32a8d4f48fef 100644 --- a/srcpkgs/speed-dreams/template +++ b/srcpkgs/speed-dreams/template @@ -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" lib32disabled=yes - -if [ "$XBPS_TARGET_LIBC" = musl ]; then - broken="Segmentation fault" -fi
[-- Attachment #1: Type: text/plain, Size: 1580 bytes --] There is an updated pull request by 4ricci against master on the void-packages repository https://github.com/4ricci/void-packages speed-dreams https://github.com/void-linux/void-packages/pull/32474 [WIP] speed-dreams: update to 2.2.3. <!-- 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? - [x] 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/32474.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-speed-dreams-32474.patch --] [-- Type: text/x-diff, Size: 19888 bytes --] From 69227f555a49d33b57e105e3dda83d6f50992189 Mon Sep 17 00:00:00 2001 From: Roberto Ricci <ricci@disroot.org> Date: Fri, 13 Aug 2021 00:38:01 +0200 Subject: [PATCH] speed-dreams: update to 2.2.3. On x86_64-musl it's broken in the xbps chroot, but works in a VM, so it should work on real hardware. --- srcpkgs/speed-dreams/patches/cmake-3.20.patch | 356 ------------------ srcpkgs/speed-dreams/patches/musl.diff | 12 + srcpkgs/speed-dreams/patches/ppc64le.patch | 13 - srcpkgs/speed-dreams/template | 21 +- 4 files changed, 20 insertions(+), 382 deletions(-) delete mode 100644 srcpkgs/speed-dreams/patches/cmake-3.20.patch create mode 100644 srcpkgs/speed-dreams/patches/musl.diff delete mode 100644 srcpkgs/speed-dreams/patches/ppc64le.patch diff --git a/srcpkgs/speed-dreams/patches/cmake-3.20.patch b/srcpkgs/speed-dreams/patches/cmake-3.20.patch deleted file mode 100644 index 6162f4a1d80e..000000000000 --- a/srcpkgs/speed-dreams/patches/cmake-3.20.patch +++ /dev/null @@ -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) diff --git a/srcpkgs/speed-dreams/patches/musl.diff b/srcpkgs/speed-dreams/patches/musl.diff new file mode 100644 index 000000000000..eacb4d35134b --- /dev/null +++ b/srcpkgs/speed-dreams/patches/musl.diff @@ -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; diff --git a/srcpkgs/speed-dreams/patches/ppc64le.patch b/srcpkgs/speed-dreams/patches/ppc64le.patch deleted file mode 100644 index fc52d65830a2..000000000000 --- a/srcpkgs/speed-dreams/patches/ppc64le.patch +++ /dev/null @@ -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__) diff --git a/srcpkgs/speed-dreams/template b/srcpkgs/speed-dreams/template index fadabc891c88..32a8d4f48fef 100644 --- a/srcpkgs/speed-dreams/template +++ b/srcpkgs/speed-dreams/template @@ -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" lib32disabled=yes - -if [ "$XBPS_TARGET_LIBC" = musl ]; then - broken="Segmentation fault" -fi
[-- Attachment #1: Type: text/plain, Size: 207 bytes --] New review comment by paper42 on void-packages repository https://github.com/void-linux/void-packages/pull/32474#discussion_r688683543 Comment: this file should probably be named musl.patch, not musl.diff
[-- Attachment #1: Type: text/plain, Size: 310 bytes --] New review comment by 4ricci on void-packages repository https://github.com/void-linux/void-packages/pull/32474#discussion_r688702561 Comment: Aren't diff and patch synonyms? (I mean the files, not the programs). ".diff" is my personal preference, but I'll rename it if that's preferred to keep consistency.
[-- Attachment #1: Type: text/plain, Size: 218 bytes --] New review comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/32474#discussion_r688840125 Comment: I think we don't really use `diff` in the repo, even if it's supported.
[-- Attachment #1: Type: text/plain, Size: 276 bytes --] New review comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/32474#discussion_r688840189 Comment: Can you mention in the commit message as well, then? Or even add a comment on top, that removal should be attempted when updated.
[-- Attachment #1: Type: text/plain, Size: 368 bytes --] New review comment by 4ricci on void-packages repository https://github.com/void-linux/void-packages/pull/32474#discussion_r688993710 Comment: When cmake policy [CMP0072](https://cmake.org/cmake/help/v3.21/policy/CMP0072.html) is set to `NEW`, linking with `--as-needed` fails. Should I patch `CMakeLists.txt` to use the legacy library or just use `--no-as-needed`?
[-- Attachment #1: Type: text/plain, Size: 1580 bytes --] There is an updated pull request by 4ricci against master on the void-packages repository https://github.com/4ricci/void-packages speed-dreams https://github.com/void-linux/void-packages/pull/32474 [WIP] speed-dreams: update to 2.2.3. <!-- 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? - [x] 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/32474.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-speed-dreams-32474.patch --] [-- Type: text/x-diff, Size: 19892 bytes --] From b65f268713872cad8df303986b57218481721a05 Mon Sep 17 00:00:00 2001 From: Roberto Ricci <ricci@disroot.org> Date: Fri, 13 Aug 2021 00:38:01 +0200 Subject: [PATCH] speed-dreams: update to 2.2.3. On x86_64-musl it's broken in the xbps chroot, but works in a VM, so it should work on real hardware. --- srcpkgs/speed-dreams/patches/cmake-3.20.patch | 356 ------------------ srcpkgs/speed-dreams/patches/musl.patch | 12 + srcpkgs/speed-dreams/patches/ppc64le.patch | 13 - srcpkgs/speed-dreams/template | 21 +- 4 files changed, 20 insertions(+), 382 deletions(-) delete mode 100644 srcpkgs/speed-dreams/patches/cmake-3.20.patch create mode 100644 srcpkgs/speed-dreams/patches/musl.patch delete mode 100644 srcpkgs/speed-dreams/patches/ppc64le.patch diff --git a/srcpkgs/speed-dreams/patches/cmake-3.20.patch b/srcpkgs/speed-dreams/patches/cmake-3.20.patch deleted file mode 100644 index 6162f4a1d80e..000000000000 --- a/srcpkgs/speed-dreams/patches/cmake-3.20.patch +++ /dev/null @@ -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) diff --git a/srcpkgs/speed-dreams/patches/musl.patch b/srcpkgs/speed-dreams/patches/musl.patch new file mode 100644 index 000000000000..eacb4d35134b --- /dev/null +++ b/srcpkgs/speed-dreams/patches/musl.patch @@ -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; diff --git a/srcpkgs/speed-dreams/patches/ppc64le.patch b/srcpkgs/speed-dreams/patches/ppc64le.patch deleted file mode 100644 index fc52d65830a2..000000000000 --- a/srcpkgs/speed-dreams/patches/ppc64le.patch +++ /dev/null @@ -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__) diff --git a/srcpkgs/speed-dreams/template b/srcpkgs/speed-dreams/template index fadabc891c88..32a8d4f48fef 100644 --- a/srcpkgs/speed-dreams/template +++ b/srcpkgs/speed-dreams/template @@ -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" lib32disabled=yes - -if [ "$XBPS_TARGET_LIBC" = musl ]; then - broken="Segmentation fault" -fi
[-- Attachment #1: Type: text/plain, Size: 289 bytes --] New review comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/32474#discussion_r689024739 Comment: Huh, I didn't expect that. Theoretically we should pass it for all Cmake builds, since they are eventually going to start using that policy...
[-- Attachment #1: Type: text/plain, Size: 358 bytes --] New review comment by 4ricci on void-packages repository https://github.com/void-linux/void-packages/pull/32474#discussion_r689115641 Comment: I don't know if other packages are affected. Anyway, another workaround could be to pass `-lGL` only when linking the problematic files (I tested this and it works), but mixing legacy and new libraries is ugly.
[-- Attachment #1: Type: text/plain, Size: 1580 bytes --] There is an updated pull request by 4ricci against master on the void-packages repository https://github.com/4ricci/void-packages speed-dreams https://github.com/void-linux/void-packages/pull/32474 [WIP] speed-dreams: update to 2.2.3. <!-- 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? - [x] 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/32474.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-speed-dreams-32474.patch --] [-- Type: text/x-diff, Size: 20010 bytes --] From a892ac681ea7393f51d26a9bd2e20dcba59859a3 Mon Sep 17 00:00:00 2001 From: Roberto Ricci <ricci@disroot.org> Date: Fri, 13 Aug 2021 00:38:01 +0200 Subject: [PATCH] speed-dreams: update to 2.2.3 LDFLAGS="-Wl,--no-as-needed" is required to avoid a linker error which occurs when linking with `-lOpenGL`. On x86_64-musl the package is broken in the xbps chroot, but works in a VM, so it should work on real hardware. --- srcpkgs/speed-dreams/patches/cmake-3.20.patch | 356 ------------------ srcpkgs/speed-dreams/patches/musl.patch | 12 + srcpkgs/speed-dreams/patches/ppc64le.patch | 13 - srcpkgs/speed-dreams/template | 21 +- 4 files changed, 20 insertions(+), 382 deletions(-) delete mode 100644 srcpkgs/speed-dreams/patches/cmake-3.20.patch create mode 100644 srcpkgs/speed-dreams/patches/musl.patch delete mode 100644 srcpkgs/speed-dreams/patches/ppc64le.patch diff --git a/srcpkgs/speed-dreams/patches/cmake-3.20.patch b/srcpkgs/speed-dreams/patches/cmake-3.20.patch deleted file mode 100644 index 6162f4a1d80e..000000000000 --- a/srcpkgs/speed-dreams/patches/cmake-3.20.patch +++ /dev/null @@ -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) diff --git a/srcpkgs/speed-dreams/patches/musl.patch b/srcpkgs/speed-dreams/patches/musl.patch new file mode 100644 index 000000000000..eacb4d35134b --- /dev/null +++ b/srcpkgs/speed-dreams/patches/musl.patch @@ -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; diff --git a/srcpkgs/speed-dreams/patches/ppc64le.patch b/srcpkgs/speed-dreams/patches/ppc64le.patch deleted file mode 100644 index fc52d65830a2..000000000000 --- a/srcpkgs/speed-dreams/patches/ppc64le.patch +++ /dev/null @@ -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__) diff --git a/srcpkgs/speed-dreams/template b/srcpkgs/speed-dreams/template index fadabc891c88..32a8d4f48fef 100644 --- a/srcpkgs/speed-dreams/template +++ b/srcpkgs/speed-dreams/template @@ -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" lib32disabled=yes - -if [ "$XBPS_TARGET_LIBC" = musl ]; then - broken="Segmentation fault" -fi
[-- Attachment #1: Type: text/plain, Size: 430 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/32474#issuecomment-907978877 Comment: How far does it get for you in a musl VM? It segfaults here, right after complaining that shadow.xml is missing: ``` 00:00:00.647 Default Error No usable 'shadow' driver (shadow.xml not found or not readable) ``` It even gets to play the startup sound and show the first screen.
[-- Attachment #1: Type: text/plain, Size: 197 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/32474#issuecomment-907984080 Comment: Found it, I think. Seems to be due to thread stack size.
[-- Attachment #1: Type: text/plain, Size: 1574 bytes --] There is an updated pull request by ericonr against master on the void-packages repository https://github.com/4ricci/void-packages speed-dreams https://github.com/void-linux/void-packages/pull/32474 speed-dreams: update to 2.2.3 <!-- 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? - [x] 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/32474.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-speed-dreams-32474.patch --] [-- Type: text/x-diff, Size: 20286 bytes --] From e16d5d610ecf3dfeeb91f84fb41b8d1b35379abf Mon Sep 17 00:00:00 2001 From: Roberto Ricci <ricci@disroot.org> Date: Fri, 13 Aug 2021 00:38:01 +0200 Subject: [PATCH] speed-dreams: update to 2.2.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit "-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> --- srcpkgs/speed-dreams/patches/cmake-3.20.patch | 356 ------------------ srcpkgs/speed-dreams/patches/musl.patch | 12 + srcpkgs/speed-dreams/patches/ppc64le.patch | 13 - srcpkgs/speed-dreams/template | 21 +- 4 files changed, 20 insertions(+), 382 deletions(-) delete mode 100644 srcpkgs/speed-dreams/patches/cmake-3.20.patch create mode 100644 srcpkgs/speed-dreams/patches/musl.patch delete mode 100644 srcpkgs/speed-dreams/patches/ppc64le.patch diff --git a/srcpkgs/speed-dreams/patches/cmake-3.20.patch b/srcpkgs/speed-dreams/patches/cmake-3.20.patch deleted file mode 100644 index 6162f4a1d80e..000000000000 --- a/srcpkgs/speed-dreams/patches/cmake-3.20.patch +++ /dev/null @@ -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) diff --git a/srcpkgs/speed-dreams/patches/musl.patch b/srcpkgs/speed-dreams/patches/musl.patch new file mode 100644 index 000000000000..eacb4d35134b --- /dev/null +++ b/srcpkgs/speed-dreams/patches/musl.patch @@ -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; diff --git a/srcpkgs/speed-dreams/patches/ppc64le.patch b/srcpkgs/speed-dreams/patches/ppc64le.patch deleted file mode 100644 index fc52d65830a2..000000000000 --- a/srcpkgs/speed-dreams/patches/ppc64le.patch +++ /dev/null @@ -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__) diff --git a/srcpkgs/speed-dreams/template b/srcpkgs/speed-dreams/template index fadabc891c88..ba808ced2721 100644 --- a/srcpkgs/speed-dreams/template +++ b/srcpkgs/speed-dreams/template @@ -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
[-- Attachment #1: Type: text/plain, Size: 166 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/32474#issuecomment-907987075 Comment: That was it. Merging now.
[-- Attachment #1: Type: text/plain, Size: 1414 bytes --] There's a merged pull request on the void-packages repository speed-dreams: update to 2.2.3 https://github.com/void-linux/void-packages/pull/32474 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? - [x] 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 -->