Add MacOS support

[hyperblast]

[fijam]

Just to get started...

Building with homebrew on MacOS Monterey:

https://github.com/hyperblast/beefweb/blob/master/cpp/server/file_system_posix.cpp#L114
lseek64 is not available on MacOS

https://github.com/hyperblast/beefweb/blob/master/cpp/server/system_posix.cpp#L10
strerror_r on MacOS uses the XSI compliant version (https://linux.die.net/man/3/strerror_r) so it fails with error:invalid conversion from 'int' to 'const char*'

this is only as far as I got...

[hyperblast]

Just to get started...

Thanks for investigation!

I need some time to borrow some Apple hardware for testing however

[caner-cetin]

Hi, @hyperblast any updates on this issue? Or is there anyway I could help with development // testing?

e: (if im not blind) deadbeef doesnt support plugins on osx, but f2k supports adding components. with the error

[caner-cetin]

Some updates. System headers are making this impossible to compile.

First of all, Switch enum's values clashes with the OSX system headers.

In file included from /Users/canercetin/Git/beefweb/cpp/server/artwork_controller.cpp:1:
In file included from /Users/canercetin/Git/beefweb/cpp/server/artwork_controller.hpp:5:
/Users/canercetin/Git/beefweb/cpp/server/player_api.hpp:307:30: error: expected unqualified-id
  307 |         if (value == Switch::FALSE)
      |                              ^
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.5.sdk/usr/include/mach/boolean.h:85:17: note: expanded from macro 'FALSE'
   85 | #define FALSE   0
      |                 ^
In file included from /Users/canercetin/Git/beefweb/cpp/server/artwork_controller.cpp:1:
In file included from /Users/canercetin/Git/beefweb/cpp/server/artwork_controller.hpp:5:
/Users/canercetin/Git/beefweb/cpp/server/player_api.hpp:311:35: error: expected unqualified-id
  311 |         else if (value == Switch::TRUE)
      |                                   ^
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.5.sdk/usr/include/mach/boolean.h:81:17: note: expanded from macro 'TRUE'
   81 | #define TRUE    1
      |                 ^

leading to not compiling this project at all. I have tried using https://www.boost.org/doc/libs/1_74_0/libs/predef/doc/index.html#_boost_comp_clang with #if defined(BOOST_COMP_MSVC) then changing the code to

void setValue(Switch value) {
#if defined(BOOST_COMP_MSVC)
    switch (value) {
        case Switch::FALSE:
            setValue(false);
            break;
        case Switch::TRUE:
            setValue(true);
            break;
        case Switch::TOGGLE:
            setValue(!getValue());
            break;
    }
#else
    int val = static_cast<int>(value);
    switch (val) {
        case 0:  // FALSE
            setValue(false);
            break;
        case 1:  // TRUE
            setValue(true);
            break;
        case 2:  // TOGGLE
            setValue(!getValue());
            break;
    }
#endif
}

but the compiler tries to compile the MSVC path anyways, you cant dodge the macro clash. And even if I could dodge, Switch::TRUE is used in so many places.

It is not related with Clang. Tried GCC.

gcc-14 (Homebrew GCC 14.2.0_1) 14.2.0

g++-14 (Homebrew GCC 14.2.0_1) 14.2.0

then forced the compiler for modern C++ because boost build was failing

export CC=gcc-14  
export CXX=g++-1
export CXXFLAGS="-std=c++11"

even then, build failed again because macro kept clashing so I added the

#ifdef TRUE
#undef TRUE
#endif

#ifdef FALSE
#undef FALSE
#endif

on top of the Switch enum and again, I cannot dodge the

mach/boolean.h

TRUE // FALSE definition in this system header. This is not a problem with MSVC and Visual Studio, because the system doesnt have an aggressive macro definition.

I will edit this message if I can find a way to compile. Outside of this, everything is going superb. External dependencies are configured and installed in one shot, I only had to change the apply_patches.sh under external libs folder

if [ -d "$files_dir" ]; then
    # see https://stackoverflow.com/a/62122320/22757599
    if [[ "$(uname)" == "Darwin" ]]; then
        (cd "$files_dir" && cp -rv * "$build_dir/")
    else
        (cd "$files_dir" && cp -r -v -t "$build_dir" *)
    fi
fi

It is just, Switch::TRUE is clashing with system macros and I cannot avoid it all.

yet another update: renamed the FALSE to OFF and TRUE to ON. then issue cycles back to the fijam's errors

/Users/canercetin/Git/beefweb/cpp/server/system_posix.cpp: In function 'const char* msrv::formatError(ErrorCode, char*, size_t)':
/Users/canercetin/Git/beefweb/cpp/server/system_posix.cpp:10:24: error: invalid conversion from 'int' to 'const char*' [-fpermissive]
   10 |     return ::strerror_r(errorCode, buffer, size);
      |            ~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~
      |                        |
      |                        int
make[2]: *** [cpp/server/CMakeFiles/core.dir/system_posix.cpp.o] Error 1
make[2]: *** Waiting for unfinished jobs....
/Users/canercetin/Git/beefweb/cpp/server/file_system_posix.cpp: In function 'void msrv::file_io::setPosition(msrv::Handle<msrv::PosixHandleTraits>::Type, int64_t)':
/Users/canercetin/Git/beefweb/cpp/server/file_system_posix.cpp:116:18: error: '::lseek64' has not been declared; did you mean 'lseek'?
  116 |     auto ret = ::lseek64(handle, position, SEEK_SET);
      |                  ^~~~~~~

for strerror

changed to

const char* formatError(ErrorCode errorCode, char* buffer, size_t size) noexcept
{
#ifdef __APPLE__
    if (::strerror_r(errorCode, buffer, size) == 0)
        return buffer;
    return "unknown error";
#else
    return ::strerror_r(errorCode, buffer, size);
#endif
}

for lseek

changed to

void setPosition(Handle<PosixHandleTraits>::Type handle, int64_t position)
{
#ifdef __APPLE__
    auto ret = ::lseek(handle, position, SEEK_SET);
#else
    auto ret = ::lseek64(handle, position, SEEK_SET);
#endif
    if (ret < 0)
        throwIfFailed("lseek64", ret >= 0);
}

and then

beefweb ➤ scripts/build.sh --release --all                                                                                                                                                                                                              

>> Building plugin <<

-- The C compiler identification is GNU 14.2.0
-- The CXX compiler identification is GNU 14.2.0

it will build fine. BUT. without building any plugins // releases. so it builds. I have to change some more places...

beefweb ➤ cat /Users/canercetin/Git/beefweb/build/Release/cpp/extlibs-root/src/ext_foosdk-stamp/ext_foosdk-configure-*.log                                                                                                                               git:osx*
CMake Error at CMakeLists.txt:6 (message):
  This project requires WIN32 target.

[hyperblast]

@caner-cetin

Hi, thanks for your investigation, I'm still looking for apple hardware to play with. Never touched one in my life, but it could be an interesting experience.

Regarding Switch definitions probably I could add some prefix to avoid such situation.
Other issues look like a regular build system PITA.

UPD: renamed Switch members to have SW_ prefix.

[caner-cetin]

@hyperblast that worked perfect, now there is only two changes needed:

diff --git a/cpp/server/file_system_posix.cpp b/cpp/server/file_system_posix.cpp
index b65cb24..7977857 100644
--- a/cpp/server/file_system_posix.cpp
+++ b/cpp/server/file_system_posix.cpp
@@ -1,10 +1,10 @@
 #include "file_system.hpp"
 
 #include <dlfcn.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 namespace msrv {
 
@@ -24,7 +24,7 @@ void statToFileInfo(const struct ::stat& st, FileInfo& info)
     info.timestamp = st.st_mtime;
 }
 
-}
+}// namespace
 
 Path getModulePath(void* symbol)
 {
@@ -111,12 +111,18 @@ size_t read(FileHandle::Type handle, void* buffer, size_t bytes)
     return static_cast<size_t>(bytesRead);
 }
 
-void setPosition(FileHandle::Type handle, int64_t position)
+void setPosition(Handle<PosixHandleTraits>::Type handle, int64_t position)
 {
+#ifdef __APPLE__
+    auto ret = ::lseek(handle, position, SEEK_SET);
+#else
     auto ret = ::lseek64(handle, position, SEEK_SET);
-    throwIfFailed("lseek64", ret >= 0);
+#endif
+    if (ret < 0)
+        throwIfFailed("lseek64", ret >= 0);
 }
 
+
 void write(const Path& path, const void* buffer, size_t bytes)
 {
     constexpr auto mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH;
@@ -126,6 +132,6 @@ void write(const Path& path, const void* buffer, size_t bytes)
     throwIfFailed("write", written == static_cast<ssize_t>(bytes));
 }
 
-}
+}// namespace file_io
 
-}
+}// namespace msrv
diff --git a/cpp/server/system_posix.cpp b/cpp/server/system_posix.cpp
index 8531ce7..56f2f11 100644
--- a/cpp/server/system_posix.cpp
+++ b/cpp/server/system_posix.cpp
@@ -1,13 +1,19 @@
 #include "system.hpp"
 
-#include <unistd.h>
 #include <string.h>
+#include <unistd.h>
 
 namespace msrv {
 
 const char* formatError(ErrorCode errorCode, char* buffer, size_t size) noexcept
 {
+#ifdef __APPLE__
+    if (::strerror_r(errorCode, buffer, size) == 0)
+        return buffer;
+    return "Unknown error";
+#else
     return ::strerror_r(errorCode, buffer, size);
+#endif
 }
 
 void PosixHandleTraits::destroy(Type value) noexcept
@@ -15,4 +21,4 @@ void PosixHandleTraits::destroy(Type value) noexcept
     ::close(value);
 }
 
-}
+}// namespace msrv

sorry for the // namespace comments I dont know how to disable with VSCode.

There is promising progress with deadbeef, with the only error being in the linker stage

[100%] Linking CXX shared module beefweb.so
ld: unknown options: -version-script --no-undefined --as-needed 

due to Apple using different linkers. See this: https://stackoverflow.com/questions/26971333/what-is-clangs-equivalent-to-no-undefined-gcc-flag

foobar2000 does not build at all, I get This project requires WIN32 target. from a CMake file that I am not sure what it is.

still building with gcc 14

ps: https://www.boost.org/doc/libs/1_74_0/libs/predef/doc/index.html#_boost_os_macos can also be used (if (BOOST_OS_MACOS) instead of #ifdef __APPLE__, up to your preferences

[hyperblast]

foobar2000 does not build at all, I get This project requires WIN32 target. from a CMake file that I am not sure what it is.

foosdk currently is not tailored to build on MacOS.

There are plenty of windows specific source files there, some adjustments are needed there as well.

[caner-cetin]

taking a look at it... i hope not many changes are required lol

[hyperblast]

taking a look at it... i hope not many changes are required lol

Preferences page is still Win32, probably we could live without it for a while, but some development is required for professional solution.

[caner-cetin]

Mhm mhm, sdk itself requires a lot of work and the official Mac sdk is a bit confusing. I will take a look at it, tho, as you said, serious development needed for something stable. At least the beefweb builds, so thats a progress lol.

thank you for your attention :3, i will comeback in future if i have any updates.

edit: or lmk when you have ARM device in hand