* [PR PATCH] supertuxkart: update to 1.2.
@ 2020-08-28 22:37 ericonr
2020-08-28 23:22 ` [PR PATCH] [Updated] " ericonr
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: ericonr @ 2020-08-28 22:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 380 bytes --]
There is a new pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages tux
https://github.com/void-linux/void-packages/pull/24527
supertuxkart: update to 1.2.
The `archs` line is still a bit sketchy, so I'm testing that out a bit.
A patch file from https://github.com/void-linux/void-packages/pull/24527.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tux-24527.patch --]
[-- Type: text/x-diff, Size: 3308 bytes --]
From b7082571c23770d23828f26f0558608919288062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 28 Aug 2020 19:36:26 -0300
Subject: [PATCH] supertuxkart: update to 1.2.
---
srcpkgs/supertuxkart/patches/ns_name_ntop.patch | 17 +++++++++++++++++
srcpkgs/supertuxkart/template | 16 ++++++++--------
2 files changed, 25 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/supertuxkart/patches/ns_name_ntop.patch
diff --git a/srcpkgs/supertuxkart/patches/ns_name_ntop.patch b/srcpkgs/supertuxkart/patches/ns_name_ntop.patch
new file mode 100644
index 00000000000..24d4555c5d5
--- /dev/null
+++ b/srcpkgs/supertuxkart/patches/ns_name_ntop.patch
@@ -0,0 +1,17 @@
+Patch from https://github.com/supertuxkart/stk-code/pull/4361
+
+Necessary because musl does not (yet?) implement ns_name_ntop.
+
+diff --git a/src/network/network_config.cpp b/src/network/network_config.cpp
+index 605254808..fd4fd5d24 100644
+--- src/network/network_config.cpp
++++ src/network/network_config.cpp
+@@ -587,7 +587,7 @@ void NetworkConfig::fillStunList(std::vector<std::pair<std::string, int> >* l,
+ for (unsigned i = 0; i < srv.size(); i++)
+ {
+ char server_name[512] = {};
+- if (ns_name_ntop(srv[i] + SRV_SERVER, server_name, 512) < 0)
++ if (ns_name_uncompress(response, response + response_len, srv[i] + SRV_SERVER, server_name, 512) < 0)
+ continue;
+ uint16_t port = ns_get16(srv[i] + SRV_PORT);
+ uint16_t weight = ns_get16(srv[i] + SRV_WEIGHT);
diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index 664c79b2529..57e5ca186bb 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,26 +1,26 @@
# Template file for 'supertuxkart'
pkgname=supertuxkart
-version=1.1
-revision=3
+version=1.2
+revision=1
archs="i686* x86_64* ppc64* aarch64*"
-wrksrc="${pkgname}-${version}-src"
+wrksrc="SuperTuxKart-${version}-src"
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
libopenal-devel fribidi-devel libcurl-devel freetype-devel
- libopenglrecorder-devel wayland-devel harfbuzz-devel"
+ libopenglrecorder-devel wayland-devel harfbuzz-devel
+ libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel"
depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
short_desc="Kart racing game featuring Tux and his friends"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="http://supertuxkart.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-src.tar.xz"
-checksum=e9b02b0b11ab68aacaec38306903feffe59a501224805cd3645cebf10e880ae8
+homepage="https://supertuxkart.net"
+distfiles="https://github.com/${pkgname}/stk-code/releases/download/${version}/SuperTuxKart-${version}-src.tar.xz"
+checksum=052edf0afdbeb99583fe8676fb0ab80ecb6103fb88b7540f858d1b5fa1297d37
supertuxkart-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
# these script only serve a prupose for developing, not to the package
rm "${DESTDIR}/usr/share/supertuxkart/data/po/extract_strings_from_XML.py"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] supertuxkart: update to 1.2.
2020-08-28 22:37 [PR PATCH] supertuxkart: update to 1.2 ericonr
@ 2020-08-28 23:22 ` ericonr
2020-08-28 23:31 ` ericonr
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2020-08-28 23:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 385 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages tux
https://github.com/void-linux/void-packages/pull/24527
supertuxkart: update to 1.2.
The `archs` line is still a bit sketchy, so I'm testing that out a bit.
A patch file from https://github.com/void-linux/void-packages/pull/24527.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tux-24527.patch --]
[-- Type: text/x-diff, Size: 3497 bytes --]
From 7a8934d66456083e1189b9081eb7089f14357667 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 28 Aug 2020 19:36:26 -0300
Subject: [PATCH] supertuxkart: update to 1.2.
Add patch for ns_name_ntop, which doesn't exist for musl.
Remove archs restriction, it needed atomics support.
---
.../supertuxkart/patches/ns_name_ntop.patch | 17 +++++++++++++++
srcpkgs/supertuxkart/template | 21 +++++++++++--------
2 files changed, 29 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/supertuxkart/patches/ns_name_ntop.patch
diff --git a/srcpkgs/supertuxkart/patches/ns_name_ntop.patch b/srcpkgs/supertuxkart/patches/ns_name_ntop.patch
new file mode 100644
index 00000000000..24d4555c5d5
--- /dev/null
+++ b/srcpkgs/supertuxkart/patches/ns_name_ntop.patch
@@ -0,0 +1,17 @@
+Patch from https://github.com/supertuxkart/stk-code/pull/4361
+
+Necessary because musl does not (yet?) implement ns_name_ntop.
+
+diff --git a/src/network/network_config.cpp b/src/network/network_config.cpp
+index 605254808..fd4fd5d24 100644
+--- src/network/network_config.cpp
++++ src/network/network_config.cpp
+@@ -587,7 +587,7 @@ void NetworkConfig::fillStunList(std::vector<std::pair<std::string, int> >* l,
+ for (unsigned i = 0; i < srv.size(); i++)
+ {
+ char server_name[512] = {};
+- if (ns_name_ntop(srv[i] + SRV_SERVER, server_name, 512) < 0)
++ if (ns_name_uncompress(response, response + response_len, srv[i] + SRV_SERVER, server_name, 512) < 0)
+ continue;
+ uint16_t port = ns_get16(srv[i] + SRV_PORT);
+ uint16_t weight = ns_get16(srv[i] + SRV_WEIGHT);
diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index 664c79b2529..027194dd8d0 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,26 +1,29 @@
# Template file for 'supertuxkart'
pkgname=supertuxkart
-version=1.1
-revision=3
-archs="i686* x86_64* ppc64* aarch64*"
-wrksrc="${pkgname}-${version}-src"
+version=1.2
+revision=1
+wrksrc="SuperTuxKart-${version}-src"
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
libopenal-devel fribidi-devel libcurl-devel freetype-devel
- libopenglrecorder-devel wayland-devel harfbuzz-devel"
+ libopenglrecorder-devel wayland-devel harfbuzz-devel
+ libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel"
depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
short_desc="Kart racing game featuring Tux and his friends"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="http://supertuxkart.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-src.tar.xz"
-checksum=e9b02b0b11ab68aacaec38306903feffe59a501224805cd3645cebf10e880ae8
+homepage="https://supertuxkart.net"
+distfiles="https://github.com/${pkgname}/stk-code/releases/download/${version}/SuperTuxKart-${version}-src.tar.xz"
+checksum=052edf0afdbeb99583fe8676fb0ab80ecb6103fb88b7540f858d1b5fa1297d37
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
supertuxkart-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
# these script only serve a prupose for developing, not to the package
rm "${DESTDIR}/usr/share/supertuxkart/data/po/extract_strings_from_XML.py"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: supertuxkart: update to 1.2.
2020-08-28 22:37 [PR PATCH] supertuxkart: update to 1.2 ericonr
2020-08-28 23:22 ` [PR PATCH] [Updated] " ericonr
@ 2020-08-28 23:31 ` ericonr
2020-08-28 23:48 ` [PR PATCH] [Updated] " ericonr
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2020-08-28 23:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 206 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/24527#issuecomment-683189394
Comment:
Still need to figure out how to force it to use more system deps.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] supertuxkart: update to 1.2.
2020-08-28 22:37 [PR PATCH] supertuxkart: update to 1.2 ericonr
2020-08-28 23:22 ` [PR PATCH] [Updated] " ericonr
2020-08-28 23:31 ` ericonr
@ 2020-08-28 23:48 ` ericonr
2020-08-29 17:09 ` ericonr
2020-08-29 19:59 ` [PR PATCH] [Merged]: " abenson
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2020-08-28 23:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 385 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages tux
https://github.com/void-linux/void-packages/pull/24527
supertuxkart: update to 1.2.
The `archs` line is still a bit sketchy, so I'm testing that out a bit.
A patch file from https://github.com/void-linux/void-packages/pull/24527.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tux-24527.patch --]
[-- Type: text/x-diff, Size: 3553 bytes --]
From ebc8440ade98999e1698325267163aab3f692802 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 28 Aug 2020 19:36:26 -0300
Subject: [PATCH] supertuxkart: update to 1.2.
Add patch for ns_name_ntop, which doesn't exist for musl.
Remove archs restriction, it needed atomics support.
Add more system dependencies.
---
.../supertuxkart/patches/ns_name_ntop.patch | 17 +++++++++++++++
srcpkgs/supertuxkart/template | 21 +++++++++++--------
2 files changed, 29 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/supertuxkart/patches/ns_name_ntop.patch
diff --git a/srcpkgs/supertuxkart/patches/ns_name_ntop.patch b/srcpkgs/supertuxkart/patches/ns_name_ntop.patch
new file mode 100644
index 00000000000..24d4555c5d5
--- /dev/null
+++ b/srcpkgs/supertuxkart/patches/ns_name_ntop.patch
@@ -0,0 +1,17 @@
+Patch from https://github.com/supertuxkart/stk-code/pull/4361
+
+Necessary because musl does not (yet?) implement ns_name_ntop.
+
+diff --git a/src/network/network_config.cpp b/src/network/network_config.cpp
+index 605254808..fd4fd5d24 100644
+--- src/network/network_config.cpp
++++ src/network/network_config.cpp
+@@ -587,7 +587,7 @@ void NetworkConfig::fillStunList(std::vector<std::pair<std::string, int> >* l,
+ for (unsigned i = 0; i < srv.size(); i++)
+ {
+ char server_name[512] = {};
+- if (ns_name_ntop(srv[i] + SRV_SERVER, server_name, 512) < 0)
++ if (ns_name_uncompress(response, response + response_len, srv[i] + SRV_SERVER, server_name, 512) < 0)
+ continue;
+ uint16_t port = ns_get16(srv[i] + SRV_PORT);
+ uint16_t weight = ns_get16(srv[i] + SRV_WEIGHT);
diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index 664c79b2529..11a12a1dd85 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,26 +1,29 @@
# Template file for 'supertuxkart'
pkgname=supertuxkart
-version=1.1
-revision=3
-archs="i686* x86_64* ppc64* aarch64*"
-wrksrc="${pkgname}-${version}-src"
+version=1.2
+revision=1
+wrksrc="SuperTuxKart-${version}-src"
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
libopenal-devel fribidi-devel libcurl-devel freetype-devel
- libopenglrecorder-devel wayland-devel harfbuzz-devel"
+ libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
+ libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
short_desc="Kart racing game featuring Tux and his friends"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="http://supertuxkart.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-src.tar.xz"
-checksum=e9b02b0b11ab68aacaec38306903feffe59a501224805cd3645cebf10e880ae8
+homepage="https://supertuxkart.net"
+distfiles="https://github.com/${pkgname}/stk-code/releases/download/${version}/SuperTuxKart-${version}-src.tar.xz"
+checksum=052edf0afdbeb99583fe8676fb0ab80ecb6103fb88b7540f858d1b5fa1297d37
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
supertuxkart-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
# these script only serve a prupose for developing, not to the package
rm "${DESTDIR}/usr/share/supertuxkart/data/po/extract_strings_from_XML.py"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] supertuxkart: update to 1.2.
2020-08-28 22:37 [PR PATCH] supertuxkart: update to 1.2 ericonr
` (2 preceding siblings ...)
2020-08-28 23:48 ` [PR PATCH] [Updated] " ericonr
@ 2020-08-29 17:09 ` ericonr
2020-08-29 19:59 ` [PR PATCH] [Merged]: " abenson
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2020-08-29 17:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 385 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages tux
https://github.com/void-linux/void-packages/pull/24527
supertuxkart: update to 1.2.
The `archs` line is still a bit sketchy, so I'm testing that out a bit.
A patch file from https://github.com/void-linux/void-packages/pull/24527.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tux-24527.patch --]
[-- Type: text/x-diff, Size: 3553 bytes --]
From 43039eef66d9d58b2d84f1672fb93dc67b0ba325 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 28 Aug 2020 19:36:26 -0300
Subject: [PATCH] supertuxkart: update to 1.2.
Add patch for ns_name_ntop, which doesn't exist for musl.
Remove archs restriction, it needed atomics support.
Add more system dependencies.
---
.../supertuxkart/patches/ns_name_ntop.patch | 17 +++++++++++++++
srcpkgs/supertuxkart/template | 21 +++++++++++--------
2 files changed, 29 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/supertuxkart/patches/ns_name_ntop.patch
diff --git a/srcpkgs/supertuxkart/patches/ns_name_ntop.patch b/srcpkgs/supertuxkart/patches/ns_name_ntop.patch
new file mode 100644
index 00000000000..24d4555c5d5
--- /dev/null
+++ b/srcpkgs/supertuxkart/patches/ns_name_ntop.patch
@@ -0,0 +1,17 @@
+Patch from https://github.com/supertuxkart/stk-code/pull/4361
+
+Necessary because musl does not (yet?) implement ns_name_ntop.
+
+diff --git a/src/network/network_config.cpp b/src/network/network_config.cpp
+index 605254808..fd4fd5d24 100644
+--- src/network/network_config.cpp
++++ src/network/network_config.cpp
+@@ -587,7 +587,7 @@ void NetworkConfig::fillStunList(std::vector<std::pair<std::string, int> >* l,
+ for (unsigned i = 0; i < srv.size(); i++)
+ {
+ char server_name[512] = {};
+- if (ns_name_ntop(srv[i] + SRV_SERVER, server_name, 512) < 0)
++ if (ns_name_uncompress(response, response + response_len, srv[i] + SRV_SERVER, server_name, 512) < 0)
+ continue;
+ uint16_t port = ns_get16(srv[i] + SRV_PORT);
+ uint16_t weight = ns_get16(srv[i] + SRV_WEIGHT);
diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index 664c79b2529..11a12a1dd85 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,26 +1,29 @@
# Template file for 'supertuxkart'
pkgname=supertuxkart
-version=1.1
-revision=3
-archs="i686* x86_64* ppc64* aarch64*"
-wrksrc="${pkgname}-${version}-src"
+version=1.2
+revision=1
+wrksrc="SuperTuxKart-${version}-src"
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
libopenal-devel fribidi-devel libcurl-devel freetype-devel
- libopenglrecorder-devel wayland-devel harfbuzz-devel"
+ libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
+ libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
short_desc="Kart racing game featuring Tux and his friends"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="http://supertuxkart.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-src.tar.xz"
-checksum=e9b02b0b11ab68aacaec38306903feffe59a501224805cd3645cebf10e880ae8
+homepage="https://supertuxkart.net"
+distfiles="https://github.com/${pkgname}/stk-code/releases/download/${version}/SuperTuxKart-${version}-src.tar.xz"
+checksum=052edf0afdbeb99583fe8676fb0ab80ecb6103fb88b7540f858d1b5fa1297d37
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
supertuxkart-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
# these script only serve a prupose for developing, not to the package
rm "${DESTDIR}/usr/share/supertuxkart/data/po/extract_strings_from_XML.py"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: supertuxkart: update to 1.2.
2020-08-28 22:37 [PR PATCH] supertuxkart: update to 1.2 ericonr
` (3 preceding siblings ...)
2020-08-29 17:09 ` ericonr
@ 2020-08-29 19:59 ` abenson
4 siblings, 0 replies; 6+ messages in thread
From: abenson @ 2020-08-29 19:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 233 bytes --]
There's a merged pull request on the void-packages repository
supertuxkart: update to 1.2.
https://github.com/void-linux/void-packages/pull/24527
Description:
The `archs` line is still a bit sketchy, so I'm testing that out a bit.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-08-29 19:59 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-28 22:37 [PR PATCH] supertuxkart: update to 1.2 ericonr
2020-08-28 23:22 ` [PR PATCH] [Updated] " ericonr
2020-08-28 23:31 ` ericonr
2020-08-28 23:48 ` [PR PATCH] [Updated] " ericonr
2020-08-29 17:09 ` ericonr
2020-08-29 19:59 ` [PR PATCH] [Merged]: " abenson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).