---
testing/flightgear/APKBUILD | 14 ++-----
testing/flightgear/musl-fixes.patch | 84 ++++++++++++++++++++++++++++---------
testing/simgear/APKBUILD | 8 +---
3 files changed, 70 insertions(+), 36 deletions(-)
diff --git a/testing/flightgear/APKBUILD b/testing/flightgear/APKBUILD
index f59944be97..8823e8e365 100644
--- a/testing/flightgear/APKBUILD
+++ b/testing/flightgear/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Leonardo Arena <rnarld@alpinelinux.org>
# Maintainer:
pkgname=flightgear
-_ver=2016.4
-_revision=4
+_ver=2017.1
+_revision=2
pkgver=${_ver}.$_revision
pkgrel=1
pkgdesc="Sophisticated flight simulator"
@@ -48,12 +48,6 @@ package() {
# install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
}
-md5sums="b1a1f12786debaaf8970595cad98d59f flightgear-2016.4.4.tar.bz2
-810ba3c0b87ed3c75d51007525f271a6 musl-fixes.patch
-38187621345f823ebaab50fdbc34a33b fix-link_with_x11.patch"
-sha256sums="d51992cbe40f1812f9821ab27b838d52e04c10551772d57fc2e815f4444dfafc flightgear-2016.4.4.tar.bz2
-26e773861007bd4c14bdcebcfc84d428fa99faec5cc2dac7128492800b7bce65 musl-fixes.patch
-e54f73160a2904428ec26a679cb70089dbae16753096e9470f42d22b6c718d4c fix-link_with_x11.patch"
-sha512sums="3f3d5a72adea9cb9a22b7b355a18492c1c58634e6203d6ae364d7a89f1af0fcc3df446c72c3c83ac9a1f51e05a6cd83c7d7af5f7bc3a5e8e75e3b80f709394a0 flightgear-2016.4.4.tar.bz2
-7b66d939578c96e493a974da97cbc3ffc322eea67691d1e87b65514c5b0aaabaddd7426d86560f3ccd43e6c5eb903fd5085c8e58ec07ea15d6d191031d8f3e49 musl-fixes.patch
+sha512sums="26466d6bd567c06cec7744dccba5c4a70d01c5169153c3c660175e9b400b9d1b5cc0d067e4d53d102ba5c20ceffb2217afcc54a0e86bf8aa7b3e7ee5a60aaf07 flightgear-2017.1.2.tar.bz2
+d7c4ab6020412c6853b73ed44ed25f3ee8dae0fc074a9f7c1698e2b48161cbb2aef02ebb96a2e4ebafa30886577b3cbf8001ade1761bd0c396acb48cb9f189ab musl-fixes.patch
49d359d213870ad71a3403e93951574b334d8281fbe9553fe259d65e1b0a8659c127cde11ffdf2ba3351c2af2dabe60657dab6dab3ff0c9fecad4a398fd6f2eb fix-link_with_x11.patch"
diff --git a/testing/flightgear/musl-fixes.patch b/testing/flightgear/musl-fixes.patch
index 36dce405db..00ef78d3b7 100644
--- a/testing/flightgear/musl-fixes.patch
+++ b/testing/flightgear/musl-fixes.patch
@@ -1,5 +1,23 @@
---- a/3rdparty/iaxclient/lib/libiax2/src/iax.c 2015-02-18 21:10:05.000000000 +0100
-+++ b/3rdparty/iaxclient/lib/libiax2/src/iax.c 2015-10-31 17:14:55.477461723 +0100
+diff --git a/3rdparty/hts_engine_API/lib/HTS_misc.c b/3rdparty/hts_engine_API/lib/HTS_misc.c
+index b0d112d..6de47ee 100644
+--- a/3rdparty/hts_engine_API/lib/HTS_misc.c
++++ b/3rdparty/hts_engine_API/lib/HTS_misc.c
+@@ -247,8 +247,10 @@ size_t HTS_ftell(HTS_File * fp)
+ fgetpos((FILE *) fp->pointer, &pos);
+ #if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__ANDROID__)
+ return (size_t) pos;
+-#else
++#elif defined(__GLIBC__)
+ return (size_t) pos.__pos;
++#else
++ return (size_t) ftell(fp->pointer);
+ #endif /* _WIN32 || __CYGWIN__ || __APPLE__ || __ANDROID__ */
+ } else if (fp->type == HTS_DATA) {
+ HTS_Data *d = (HTS_Data *) fp->pointer;
+diff --git a/3rdparty/iaxclient/lib/libiax2/src/iax.c b/3rdparty/iaxclient/lib/libiax2/src/iax.c
+index 0bfd2e4..39eea99 100644
+--- a/3rdparty/iaxclient/lib/libiax2/src/iax.c
++++ b/3rdparty/iaxclient/lib/libiax2/src/iax.c
@@ -75,7 +75,7 @@
// FlightGear: Modified to include FreeBSD
#if !defined(MACOSX) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
@@ -9,10 +27,25 @@
#include <error.h>
#endif
#endif
-
---- a/src/Main/bootstrap.cxx 2015-02-18 21:10:05.000000000 +0100
-+++ b/src/Main/bootstrap.cxx 2015-11-01 01:25:56.665212195 +0100
-@@ -96,8 +96,12 @@
+diff --git a/src/FDM/JSBSim/JSBSim.cpp b/src/FDM/JSBSim/JSBSim.cpp
+index 87b5e6e..ea39ca6 100644
+--- a/src/FDM/JSBSim/JSBSim.cpp
++++ b/src/FDM/JSBSim/JSBSim.cpp
+@@ -287,7 +287,7 @@ int main(int argc, char* argv[])
+ _clearfp();
+ _controlfp(_controlfp(0, 0) & ~(_EM_INVALID | _EM_ZERODIVIDE | _EM_OVERFLOW),
+ _MCW_EM);
+-#elif defined(__GNUC__) && !defined(sgi) && !defined(__APPLE__)
++#elif defined(__GLIBC__)
+ feenableexcept(FE_DIVBYZERO | FE_INVALID);
+ #endif
+
+diff --git a/src/Main/bootstrap.cxx b/src/Main/bootstrap.cxx
+index 550d028..db369ea 100644
+--- a/src/Main/bootstrap.cxx
++++ b/src/Main/bootstrap.cxx
+@@ -93,12 +93,16 @@ static void handleFPE(int);
+ static void
initFPE (bool fpeAbort)
{
+#if defined(__GLIBC__)
@@ -25,18 +58,29 @@
+#else
+ signal(SIGFPE, handleFPE);
+#endif
-
---- a/3rdparty/hts_engine_API/lib/HTS_misc.c 2015-02-18 21:10:05.000000000 +0100
-+++ b/3rdparty/hts_engine_API/lib/HTS_misc.c 2015-10-31 17:33:53.946349145 +0100
-@@ -247,8 +247,10 @@
- fgetpos((FILE *) fp->pointer, &pos);
- #if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__) || defined(__FreeBSD__)
- return (size_t) pos;
--#else
-+#elif defined(__GLIBC__)
- return (size_t) pos.__pos;
+ }
+
+ static void handleFPE(int)
+@@ -137,7 +141,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
+ }
+ #endif
+
+-#if defined(__GNUC__)
++#if defined(__GLIBC__)
+ #include <execinfo.h>
+ #include <cxxabi.h>
+ void segfault_handler(int signo) {
+@@ -182,7 +186,12 @@ void segfault_handler(int signo) {
+ free(fname);
+ free(list);
+ }
+-
++ exit(1);
++}
+#else
-+ return (size_t) ftell(fp->pointer);
- #endif /* _WIN32 || __CYGWIN__ || __APPLE__ || __ANDROID__ */
- }
- HTS_error(0, "HTS_ftell: Unknown file type.\n");
++/* musl doesn't have execinfo */
++void segfault_handler(int signo) {
++ fprintf(stderr, "Error: caught signal %d:\n", signo);
+ exit(1);
+ }
+ #endif
diff --git a/testing/simgear/APKBUILD b/testing/simgear/APKBUILD
index 099707a66b..528dad5bcf 100644
--- a/testing/simgear/APKBUILD
+++ b/testing/simgear/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=simgear
-pkgver=2016.4.4
+pkgver=2017.1.2
pkgrel=0
pkgdesc="Sim library for FlightGear"
url="https://github.com/FlightGear/simgear"
@@ -40,9 +40,5 @@ package() {
make DESTDIR="$pkgdir" install || return 1
}
-md5sums="a10e5b381910da3549cc81a6768a0a4b simgear-2016.4.4.tar.gz
-f82f0f46dbb53e87f2df467f82da9000 musl-fixes.patch"
-sha256sums="621c6b6acc9b93f6160ed292e88622fe65c38db70c79d9c8f71cd85a268ac780 simgear-2016.4.4.tar.gz
-d85530b21c8bec1980e9a4483b937d526daef4a3be347da2795ac98ef30bdd43 musl-fixes.patch"
-sha512sums="c30911ff3c45c9bb9882c12ba41fe345da133eb0ea4e19998c60c78e0b73c8838b2c99073834c22e1673b240febfcb416854626fe32928b2045ba64a607d1570 simgear-2016.4.4.tar.gz
+sha512sums="aff3fb4335afba14659ed1f8cd88443af67c4bb140c137d2753c1472bac05eeec4a7a7c4232a473e6ceb7e7e18c42cc8a88940b9a586e5064e93efe77ab7b410 simgear-2017.1.2.tar.gz
7efcf01c9328b0732ae9aa7af4edb52e14919663a8d3acbe429a0697f59a55e85a71628d9afaa3d38327d960dbf5dacc1f964e38dd6cb499b593ae2be918b140 musl-fixes.patch"
--
2.12.1
---
Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org
Help: alpine-aports+help@lists.alpinelinux.org
---