multimedia/uavs3d: Updated for version 20220911_0133ee4.

Signed-off-by: bedlam <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 61 insertions, 19 deletions

diff --git a/multimedia/uavs3d/changelog b/multimedia/uavs3d/changelog
new file mode 100644
index 0000000000..72ca012f62
--- /dev/null
+++ b/multimedia/uavs3d/changelog
@@ -0,0 +1,13 @@
+Changelog for uavs3d SlackBuild Script
+--------------------------------------------------------------------
+
+27/08/2022:
+
+Added to SBo
+
+05/02/2023:
+
+Updated to Github commit 0133ee4
+Patched the cmakelist file to build in i586 and i686 platforms.
+Also patched the file to set the correct lib dir in 64 bit
+platforms.
diff --git a/multimedia/uavs3d/cmakelist.patch b/multimedia/uavs3d/cmakelist.patch
new file mode 100644
index 0000000000..d3420525b0
--- /dev/null
+++ b/multimedia/uavs3d/cmakelist.patch
@@ -0,0 +1,34 @@
+--- CMakeLists.txt	2022-09-11 07:28:37.000000000 +0530
++++ CMakeListsn.txt	2023-02-05 13:56:32.245000000 +0530
+@@ -1,4 +1,3 @@
+-
+ set(LIBNAME uavs3d)
+ 
+ # check cpu
+@@ -13,6 +12,8 @@
+               " Unexpected pointer size ${CMAKE_SIZEOF_VOID_P} for ${CMAKE_SYSTEM_PROCESSOR}\n")
+   endif()
+ elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i386" OR
++       "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i586" OR
++       "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686" OR
+        "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86")
+   set(UAVS3D_TARGET_CPU "x86")
+ elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "aarch64")
+@@ -104,7 +105,17 @@
+ find_package(Threads REQUIRED)
+ set(prefix "${CMAKE_INSTALL_PREFIX}")
+ set(includedir "include")
++if(${CMAKE_SIZEOF_VOID_P} EQUAL 4)
++set(libdir "lib")
++elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "^arm")
+ set(libdir "lib")
++elseif(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
++set(libdir "lib64")
++elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "aarch64")
++set(libdir "lib64")
++else()
++message(FATAL_ERROR " Compiling for wrong architecture in Slackware GNU/Linux \n")
++endif()
+ set(pc_file "${CONFIG_DIR}/${LIBNAME}.pc")
+ 
+ set(CMAKE_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${includedir}")
diff --git a/multimedia/uavs3d/uavs3d.SlackBuild b/multimedia/uavs3d/uavs3d.SlackBuild
index a644965d59..775da93379 100644
--- a/multimedia/uavs3d/uavs3d.SlackBuild
+++ b/multimedia/uavs3d/uavs3d.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for uavs3d
 
-# Copyright 2022 Vijay Marcel
+# Copyright 2022-23 Vijay Marcel
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,8 +25,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=uavs3d
-VERSION=${VERSION:-20220705_818a0cb}
-COMMIT=${COMMIT:-818a0cb719c0cd012f21ad0b9c5d83669e36f861}
+VERSION=${VERSION:-20220911_0133ee4}
+COMMIT=${COMMIT:-0133ee4b4bbbef7b88802e7ad019b14b9b852c2b}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -45,20 +45,19 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  SLKCFLAGS="-march=i586 -mtune=i686 -O2 -pipe -fPIC"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  SLKCFLAGS="-march=i686 -mtune=i686 -O2 -pipe -fPIC"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-march=x86-64 -mtune=native -O2 -pipe -fPIC"
   LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
-
 # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
 # the name of the created package would be, and then exit. This information
 # could be useful to other scripts.
@@ -84,11 +83,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-
-sed -i '107 i set(libdir "lib64")'  source/CMakeLists.txt
-sed -i.bak '108d' source/CMakeLists.txt
+cd source
+patch --verbose --unified < $CWD/cmakelist.patch
+cd ..
 
 mkdir -pv build/linux
 
@@ -98,12 +95,10 @@ cmake -B build/linux -S $TMP/$PRGNAM-$COMMIT \
         -DCMAKE_BUILD_TYPE:STRING=Release \
         -DCMAKE_INSTALL_PREFIX:PATH=/usr \
         -DCMAKE_INSTALL_LIB_DIR:PATH=/usr/lib${LIBDIRSUFFIX} \
-        -DCMAKE_SKIP_RPATH:BOOL=YES \
         -DBUILD_SHARED_LIBS:BOOL=ON \
-        -DCOMPILE_10BIT=1 \
-        -Wno-dev
+        -DCOMPILE_10BIT=1
 
-make -C build/linux
+cmake --build  build/linux
 
 make -C $TMP/$PRGNAM-$COMMIT/build/linux DESTDIR="$PKG" install
 
diff --git a/multimedia/uavs3d/uavs3d.info b/multimedia/uavs3d/uavs3d.info
index ba212fb9cb..5582757b68 100644
--- a/multimedia/uavs3d/uavs3d.info
+++ b/multimedia/uavs3d/uavs3d.info
@@ -1,8 +1,8 @@
 PRGNAM="uavs3d"
-VERSION="20220705_818a0cb"
+VERSION="20220911_0133ee4"
 HOMEPAGE="https://github.com/uavs3/uavs3d"
-DOWNLOAD="https://github.com/uavs3/uavs3d/archive/818a0cb/uavs3d-818a0cb719c0cd012f21ad0b9c5d83669e36f861.tar.gz"
-MD5SUM="060ac51c4bb7b8d1a7fda5cc6dc0a7f3"
+DOWNLOAD="https://github.com/uavs3/uavs3d/archive/0133ee4/uavs3d-0133ee4b4bbbef7b88802e7ad019b14b9b852c2b.tar.gz"
+MD5SUM="bf9b1d5d85e6f89e0953572e43a26c33"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""