jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

OpenCPN: update to 5.2.0.

Browse source
This commit is contained in:
John 2020-07-25 17:03:41 +02:00
parent e1b1183dcd
commit e0ff70d3af
5 changed files with 64 additions and 171 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
srcpkgs/OpenCPN/patches/actually-set-arch.patch
View file

@ -1,37 +1,28 @@
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -93,6 +93,25 @@ IF (NOT WIN32)
# default
SET (ARCH "i386")
SET (LIB_INSTALL_DIR "lib")
+ IF (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
+ IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
+ SET (ARCH "aarch64")
+ ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8")
+ SET (ARCH "armhf")
+ ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8")
+ ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "ppc*" OR CMAKE_SYSTEM_PROCESSOR MATCHES "powerpc*")
+ IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
+ SET (ARCH "ppc64")
+ ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8")
+ SET (ARCH "powerpc")
+ ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8")
+ ELSE (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
+ IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
+ SET (ARCH "x86_64")
+ ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8")
+ SET (ARCH "i386")
+ ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8")
+ ENDIF (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
IF (EXISTS /etc/debian_version)
SET (PACKAGE_FORMAT "DEB")
SET (PACKAGE_DEPS "libc6, libwxgtk3.0-0, wx3.0-i18n, libglu1-mesa (>= 7.0.0), libgl1-mesa-glx (>= 7.0.0), zlib1g, bzip2, libtinyxml2.6.2, libportaudio2")
@@ -1579,7 +1579,7 @@ IF (OPENGL_FOUND)
ENDIF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
ELSE ()
- IF(NOT (ARCH MATCHES "arm64" OR ARCH MATCHES "aarch64"))
+ IF(ARCH MATCHES "armhf")
set_source_files_properties(src/mipmap/mipmap_neon.c PROPERTIES COMPILE_FLAGS "-mfpu=neon")
ENDIF()
ENDIF ()
--- cmake/GetArch.cmake 2020-07-15 20:02:29.000000000 +0200
+++ - 2020-07-25 17:12:30.624868454 +0200
@@ -14,6 +14,25 @@
# default
set (ARCH "i386")
set (LIB_INSTALL_DIR "lib")
+ IF (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
+ IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
+ SET (ARCH "aarch64")
+ ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8")
+ SET (ARCH "armhf")
+ ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8")
+ ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "ppc*" OR CMAKE_SYSTEM_PROCESSOR MATCHES "powerpc*")
+ IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
+ SET (ARCH "ppc64")
+ ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8")
+ SET (ARCH "powerpc")
+ ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8")
+ ELSE (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
+ IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
+ SET (ARCH "x86_64")
+ ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8")
+ SET (ARCH "i386")
+ ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8")
+ ENDIF (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
if (EXISTS /etc/debian_version)
set (PACKAGE_FORMAT "DEB")
set (PACKAGE_RECS "xcalib,xdg-utils")

26
srcpkgs/OpenCPN/patches/glshim-musl.patch
View file

@ -1,26 +0,0 @@
--- src/glshim/src/glx/glx.c 2018-11-07 04:14:41.000000000 +0100
+++ - 2019-01-30 20:49:46.097821225 +0100
@@ -1,4 +1,6 @@
+#ifdef __GLIBC__
#include <execinfo.h>
+#endif
#include <fcntl.h>
#include <linux/fb.h>
#include <signal.h>
@@ -168,7 +170,7 @@
bcm_host_deinit();
}
#endif
-
+#ifdef __GLIBC__
if (g_stacktrace) {
switch (sig) {
case SIGBUS:
@@ -187,6 +189,7 @@
}
}
}
+#endif
signal(sig, SIG_DFL);
raise(sig);
}

49
srcpkgs/OpenCPN/patches/musl.patch
View file

@ -1,25 +1,30 @@
--- src/chart1.cpp 2019-03-23 02:25:59.000000000 +0100
+++ - 2019-03-29 07:24:46.107362311 +0100
@@ -8002,7 +8002,7 @@
}
}
--- include/zeroconf-detail.hpp 2020-07-15 20:02:29.000000000 +0200
+++ - 2020-07-25 18:04:24.579351335 +0200
@@ -20,9 +20,7 @@
#define WIN32_LEAN_AND_MEAN
#include <winsock2.h>
#else
- #ifndef __WXOSX__
- #include <error.h>
- #else
+ #ifdef __WXOSX__
#include <mach/error.h>
#endif
@@ -424,4 +422,4 @@
}
-
+#ifdef __GLIBC__
struct mallinfo mi;
}
mi = mallinfo();
@@ -8018,11 +8018,11 @@
//printf("Total free space (fordblks): %d\n", mi.fordblks);
//printf("Topmost releasable block (keepcost): %d\n", mi.keepcost);
-#endif // ZEROCONF_DETAIL_HPP
\ No newline at end of file
+#endif // ZEROCONF_DETAIL_HPP
--- include/zeroconf-detail.hpp 2020-07-25 18:05:08.714098962 +0200
+++ - 2020-07-25 18:10:40.700768834 +0200
@@ -27,6 +27,7 @@
#include <string.h>
#include <unistd.h>
#include <sys/socket.h>
+#include <sys/time.h>
#include <netinet/in.h>
#endif
- printf("\n");
if(mem_used)
*mem_used = mi.uordblks / 1024;
-
+#endif
+ printf("\n");
//printf("mem_used (Mb): %d\n", *mem_used / 1024);
return true;
#endif /* linux */

79
srcpkgs/OpenCPN/patches/wxWidgets-cmake.patch
View file

@ -1,79 +0,0 @@
diff --git CMakeLists.txt CMakeLists.txt
index fcec1191a..8df2a9e21 100644
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -408,9 +408,9 @@ IF((_wx_selected_config MATCHES "qt-armv7"))
ENDIF()
IF((_wx_selected_config MATCHES "qt-armv7"))
- SET(wxWidgets_USE_LIBS base core xml html adv aui)
+ SET(wxWidgets_FIND_COMPONENTS base core xml html adv aui)
ELSE()
- SET(wxWidgets_USE_LIBS net xml html adv aui core base webview)
+ SET(wxWidgets_FIND_COMPONENTS net xml html adv aui core base webview)
ENDIF()
OPTION (USE_GL "Enable OpenGL support" ON)
@@ -436,7 +436,7 @@ IF (ARCH MATCHES "arm*" AND (NOT QT_ANDROID) AND CMAKE_SYSTEM_NAME MATCHES ".*Li
SET(OPENGLES_FOUND "YES")
SET(OPENGL_FOUND "YES")
- SET(wxWidgets_USE_LIBS ${wxWidgets_USE_LIBS} gl )
+ SET(wxWidgets_FIND_COMPONENTS ${wxWidgets_FIND_COMPONENTS} gl )
add_subdirectory(src/glshim)
SET(OPENGL_LIBRARIES "GL_static" "EGL" "X11" "drm" )
@@ -455,7 +455,7 @@ IF(QT_ANDROID)
SET(OPENGLES_FOUND "YES")
SET(OPENGL_FOUND "YES")
- SET(wxWidgets_USE_LIBS ${wxWidgets_USE_LIBS} gl )
+ SET(wxWidgets_FIND_COMPONENTS ${wxWidgets_FIND_COMPONENTS} gl )
add_subdirectory(src/glshim)
ENDIF(QT_ANDROID)
@@ -468,7 +468,7 @@ IF ((NOT OPENGLES_FOUND) AND (NOT QT_ANDROID))
ENDIF(USE_GL)
IF(OPENGL_FOUND)
- SET(wxWidgets_USE_LIBS gl ${wxWidgets_USE_LIBS} )
+ SET(wxWidgets_FIND_COMPONENTS gl ${wxWidgets_FIND_COMPONENTS} )
INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
MESSAGE (STATUS "Found OpenGL...." )
@@ -529,14 +529,14 @@ IF(NOT QT_ANDROID)
ENDIF(MSVC)
IF(WIN32 OR APPLE OR QT_ANDROID)
- FIND_PACKAGE(wxWidgets)
+ FIND_PACKAGE(wxWidgets COMPONENTS ${wxWidgets_FIND_COMPONENTS})
if (wxWidgets_FOUND)
message(STATUS "Found wxWidgets webview add-on")
add_definitions(-DOCPN_USE_WEBVIEW)
else ()
- list(REMOVE_ITEM wxWidgets_USE_LIBS webview)
+ list(REMOVE_ITEM wxWidgets_FIND_COMPONENTS webview)
message(STATUS "Could not find wxWidgets webview add-on")
- FIND_PACKAGE(wxWidgets REQUIRED)
+ FIND_PACKAGE(wxWidgets REQUIRED COMPONENTS ${wxWidgets_FIND_COMPONENTS})
endif ()
IF(MSYS)
# this is to convert msys to windows paths, and handle the missing /usr
@@ -1053,14 +1053,14 @@ IF(NOT WIN32 AND NOT APPLE AND NOT QT_ANDROID)
set(wxWidgets_CONFIG_OPTIONS ${wxWidgets_CONFIG_OPTIONS} --toolkit=gtk3)
MESSAGE(STATUS "Building against GTK3...")
ENDIF(GTK2_FOUND)
- FIND_PACKAGE(wxWidgets)
+ FIND_PACKAGE(wxWidgets COMPONENTS ${wxWidgets_FIND_COMPONENTS})
if (wxWidgets_FOUND)
message(STATUS "Found wxWidgets webview add-on")
add_definitions(-DOCPN_USE_WEBVIEW)
else ()
- list(REMOVE_ITEM wxWidgets_USE_LIBS webview)
+ list(REMOVE_ITEM wxWidgets_FIND_COMPONENTS webview)
message(STATUS "Could not find wxWidgets webview add-on")
- FIND_PACKAGE(wxWidgets REQUIRED)
+ FIND_PACKAGE(wxWidgets REQUIRED COMPONENTS ${wxWidgets_FIND_COMPONENTS})
endif ()
MESSAGE (STATUS "Found wxWidgets..." )
MESSAGE (STATUS " wxWidgets Include: ${wxWidgets_INCLUDE_DIRS}")

16
srcpkgs/OpenCPN/template
View file

@ -1,12 +1,12 @@
# Template file for 'OpenCPN'
pkgname=OpenCPN
version=5.0.0
version=5.2.0
revision=1
build_style=cmake
configure_args="-DBUNDLE_GSHHS=NONE -DBUNDLE_TCDATA=ON
-DBUNDLE_DOCS=ON -DOCPN_FORCE_GTK3=ON
configure_args="-DOCPN_BUNDLE_GSHHS=NONE -DOCPN_BUNDLE_TCDATA=ON
-DOCPN_BUNDLE_DOCS=ON -DOCPN_FORCE_GTK3=ON
-DOCPN_USE_CRASHREPORT=$(vopt_if crashreport ON OFF)
-DUSE_BUNDLED_LIBS=OFF"
-DOCPN_USE_BUNDLED_LIBS=OFF"
hostmakedepends="gettext pkg-config"
makedepends="gtk+3-devel libcurl-devel portaudio-devel tinyxml-devel
wxWidgets-gtk3-devel $(vopt_if exif 'libexif-devel') glu-devel
@ -15,10 +15,10 @@ depends="gpsd hicolor-icon-theme OpenCPN-tcdata-${version}_${revision}
OpenCPN-gshhs-crude"
short_desc="Concise ChartPlotter/Navigator"
maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.0-or-later, MIT, wxWidgets, JasPer-2.0, BSD-3-Clause"
license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.0-or-later, MIT, wxWidgets, JasPer-2.0, BSD-3-Clause, SGI-B-2.0"
homepage="https://opencpn.org/"
distfiles="https://github.com/OpenCPN/OpenCPN/archive/v${version}.tar.gz"
checksum=e58755fd9781c1a0f2da1244b75358c8d03d8f79ec2aa9633e5f6b5af98978b4
checksum=f6ec38989bc38f5a7f63234c5e0230adeb73f5626b4e3d3dfa680f0c240badc7
build_options="lzma libarchive exif crashreport"
build_options_default="lzma libarchive exif"
@ -39,7 +39,9 @@ fi
CFLAGS="-fcommon"
post_install() {
vlicense src/glshim/LICENSE LICENSE.glshim
vlicense libs/glshim/LICENSE LICENSE.glshim
vlicense libs/SQLiteCpp/LICENSE.txt LICENSE.SQLiteCpp
vlicense libs/libtess2/LICENSE.txt LICENSE.libtess
}
OpenCPN-doc_package() {