diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | CMakeLists.patch | 31 | ||||
| -rw-r--r-- | GetArch.cmake.patch | 16 | ||||
| -rw-r--r-- | PKGBUILD | 13 |
4 files changed, 25 insertions, 41 deletions
@@ -1,6 +1,6 @@ pkgbase = opencpn-plugin-oesenc-git pkgdesc = O-charts.org plugin for OpenCPN - pkgver = 4.0.5.r117.ga6e904c + pkgver = 4.0.5.r229.g5594ae3 pkgrel = 1 url = https://opencpn.org/OpenCPN/plugins/oesenc.html arch = x86_64 @@ -11,9 +11,9 @@ pkgbase = opencpn-plugin-oesenc-git depends = opencpn conflicts = opencpn-plugin-oesenc source = opencpn-plugin-oesenc-git::git+https://github.com/bdbcat/oesenc_pi.git - source = CMakeLists.patch + source = GetArch.cmake.patch sha1sums = SKIP - sha1sums = ef99cd55434a26699a6a35a78bbcd357719ac430 + sha1sums = 4610b7215572c45ad0f8e696a1920053bdee32ad pkgname = opencpn-plugin-oesenc-git diff --git a/CMakeLists.patch b/CMakeLists.patch deleted file mode 100644 index d7decc5ecdb5..000000000000 --- a/CMakeLists.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ac9f5b3..247aaae 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -155,6 +155,26 @@ IF (NOT WIN32) - ENDIF (EXISTS /etc/os-release OR EXISTS /etc/sysconfig/SuSEfirewall2.d OR EXISTS /etc/suse-release OR EXISTS /etc/SuSE-release) - ENDIF(NOT DEFINED PACKAGE_FORMAT) - -+ IF (EXISTS /etc/arch-release) -+ IF (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*") -+ IF (CMAKE_SIZEOF_VOID_P MATCHES "8") -+ SET (ARCH "arm64") -+ ADD_DEFINITIONS( -DOCPN_ARM64 ) -+ ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8") -+ SET (ARCH "armhf") -+ ADD_DEFINITIONS( -DOCPN_ARMHF ) -+ ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8") -+ ELSE (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*") -+ IF (CMAKE_SIZEOF_VOID_P MATCHES "8") -+ SET (ARCH "x86_64") -+ SET (LIB_INSTALL_DIR "lib") -+ ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8") -+ SET (ARCH "i386") -+ SET (LIB_INSTALL_DIR "lib") -+ ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8") -+ ENDIF (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*") -+ ENDIF (EXISTS /etc/arch-release) -+ - ENDIF (UNIX AND NOT APPLE) - - IF(APPLE) diff --git a/GetArch.cmake.patch b/GetArch.cmake.patch new file mode 100644 index 000000000000..1b9607496497 --- /dev/null +++ b/GetArch.cmake.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/GetArch.cmake b/cmake/GetArch.cmake +index 0a5d7b1..97a8f9a 100644 +--- a/cmake/GetArch.cmake ++++ b/cmake/GetArch.cmake +@@ -30,6 +30,11 @@ function (GetArch) + set(ARCH "aarch64") + endif () + endif () ++ if (EXISTS /etc/arch-release) ++ if (ARCH STREQUAL "arm64") ++ set(ARCH "aarch64") ++ endif () ++ endif () + else (NOT WIN32) + # Should really be i386 since we are on win32. However, it's x86_64 for now, + # see #2027 @@ -3,7 +3,7 @@ # --------------------------------------------------------------- pkgname=opencpn-plugin-oesenc-git -pkgver=4.0.5.r117.ga6e904c +pkgver=4.0.5.r229.g5594ae3 pkgrel=1 pkgdesc="O-charts.org plugin for OpenCPN" arch=('x86_64' 'aarch64') @@ -12,9 +12,9 @@ depends=('opencpn') conflicts=('opencpn-plugin-oesenc') makedepends=('cmake' 'git') url="https://opencpn.org/OpenCPN/plugins/oesenc.html" -source=("$pkgname::git+https://github.com/bdbcat/oesenc_pi.git" "CMakeLists.patch") +source=("$pkgname::git+https://github.com/bdbcat/oesenc_pi.git" "GetArch.cmake.patch") sha1sums=('SKIP' - 'ef99cd55434a26699a6a35a78bbcd357719ac430') + '4610b7215572c45ad0f8e696a1920053bdee32ad') pkgver() { cd $pkgname @@ -23,16 +23,15 @@ pkgver() { build() { cd $pkgname - patch --strip=1 --binary -i $srcdir/CMakeLists.patch + patch --strip=1 --binary -i $srcdir/GetArch.cmake.patch mkdir -p build cd build cmake -DCMAKE_INSTALL_PREFIX=/usr -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3 .. - make + make pkg } package() { cd "$pkgname/build" DESTDIR="$pkgdir" make install - mkdir -p $pkgdir/etc/udev/rules.d - install -m 644 $srcdir/$pkgname/buildlinux/oeserverd/98-sglock.rules $pkgdir/etc/udev/rules.d/ + mv $pkgdir/usr/etc $pkgdir/ } |