Fix OpenBSD build

3rdparty/Vc/Vc/scalar/math.h

@@ -115,7 +115,12 @@ template<> Vc_ALWAYS_INLINE void sincos(const Scalar::Vector<double> &x, Scalar:
 #elif Vc_HAS_BUILTIN(__builtin_sincos) || defined Vc_GCC
     __builtin_sincos(x.data(), &sin->data(), &cos->data());
 #else
-    ::sincos(x.data(), &sin->data(), &cos->data());
+    #if defined(__OpenBSD__)
+        sin->data() = ::sin(x.data());
+        cos->data() = ::cos(x.data());
+    #else /* OpenBSD */
+        ::sincos(x.data(), &sin->data(), &cos->data());
+    #endif /* OpenBSD */
 #endif
 }
 

cmake/Conky.cmake

@@ -96,13 +96,13 @@ set(conky_includes ${CMAKE_BINARY_DIR})
 # enabled! Thus disable this and _LARGEFILE64_SOURCE isnt needed, it is already
 # used on macOS.
 #
-if(NOT OS_DARWIN)
+if(NOT OS_DARWIN AND NOT OS_OPENBSD)
   add_definitions(-D_LARGEFILE64_SOURCE -D_POSIX_C_SOURCE=200809L) # Standard definitions
   set(
     CMAKE_REQUIRED_DEFINITIONS
     "${CMAKE_REQUIRED_DEFINITIONS} -D_LARGEFILE64_SOURCE -D_POSIX_C_SOURCE=200809L"
   )
-endif(NOT OS_DARWIN)
+endif(NOT OS_DARWIN AND NOT OS_OPENBSD)
 
 if(OS_FREEBSD)
   add_definitions(-D__BSD_VISIBLE=1 -D_XOPEN_SOURCE=700)
@@ -117,6 +117,15 @@ if(OS_DRAGONFLY)
   set(conky_includes ${conky_includes} -I/usr/pkg/include)
 endif(OS_DRAGONFLY)
 
+if(OS_OPENBSD)
+  # For asprintf
+  add_definitions(-D_GNU_SOURCE) # Standard definitions
+  set(
+    CMAKE_REQUIRED_DEFINITIONS
+    "${CMAKE_REQUIRED_DEFINITIONS} -D_GNU_SOURCE"
+  )
+endif(OS_OPENBSD)
+
 if(OS_SOLARIS)
   set(conky_libs ${conky_libs} -L/usr/local/lib)
 endif(OS_SOLARIS)

cmake/ConkyBuildOptions.cmake

@@ -50,12 +50,17 @@ if(MAINTAINER_MODE)
   set(BUILD_TESTS true)
 endif(MAINTAINER_MODE)
 
-# Always use libc++ when compiling w/ clang
+if(NOT OS_OPENBSD)
+  # Always use libc++ when compiling w/ clang
+  # Not on OpenBSD because that's the default for its vendored Clang
+  add_compile_options(
+    $<$<COMPILE_LANG_AND_ID:CXX,Clang>:-stdlib=libc++>)
+  add_link_options($<$<COMPILE_LANG_AND_ID:CXX,Clang>:-stdlib=libc++>)
+endif(NOT OS_OPENBSD)
+
 add_compile_options(
-  $<$<COMPILE_LANG_AND_ID:CXX,Clang>:-stdlib=libc++>
   $<$<COMPILE_LANG_AND_ID:CXX,Clang>:-Wno-unknown-warning-option>
   $<$<COMPILE_LANG_AND_ID:CXX,GCC>:-Wno-unknown-warning>)
-add_link_options($<$<COMPILE_LANG_AND_ID:CXX,Clang>:-stdlib=libc++>)
 
 option(CHECK_CODE_QUALITY "Check code formatting/quality with clang" false)
 
@@ -228,6 +233,8 @@ dependent_option(BUILD_LUA_RSVG "Build rsvg bindings for Lua" false
   "BUILD_GUI" false
   "RSVG Lua bindings depend on BUILD_GUI")
 
+option(BUILD_OPENSOUNDSYS "Build with Open Sound System support" true)
+
 option(BUILD_AUDACIOUS "Build audacious (music player) support" false)
 
 option(BUILD_MPD "Enable if you want MPD (music player) support" true)

cmake/ConkyPlatformChecks.cmake

@@ -65,7 +65,7 @@ endif(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
   set(OS_FREEBSD true)
-  set(conky_libs ${conky_libs} -lkvm -ldevstat -lintl -linotify)
+  set(conky_libs ${conky_libs} -lkvm -ldevstat -linotify)
 
   if(BUILD_IRC)
     set(conky_libs ${conky_libs} -lssl -lcrypto)
@@ -83,6 +83,7 @@ endif(CMAKE_SYSTEM_NAME MATCHES "DragonFly")
 
 if(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
   set(OS_OPENBSD true)
+  set(conky_libs ${conky_libs} -lkvm)
 else(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
   set(OS_OPENBSD false)
 endif(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
@@ -102,7 +103,7 @@ endif(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
 
 if(CMAKE_SYSTEM_NAME MATCHES "Haiku")
   set(OS_HAIKU true)
-  set(conky_libs ${conky_libs} -lnetwork -lintl)
+  set(conky_libs ${conky_libs} -lnetwork)
 else(CMAKE_SYSTEM_NAME MATCHES "Haiku")
   set(OS_HAIKU false)
 endif(CMAKE_SYSTEM_NAME MATCHES "Haiku")
@@ -145,42 +146,45 @@ endif(NOT
   NOT
   OS_DARWIN)
 
-# Check for soundcard header
 if(OS_LINUX)
-  check_include_files("linux/soundcard.h" HAVE_SOME_SOUNDCARD_H)
-  check_include_files("linux/soundcard.h" HAVE_LINUX_SOUNDCARD_H)
   check_include_files("linux/sockios.h" HAVE_LINUX_SOCKIOS_H)
-elseif(OS_OPENBSD)
-  check_include_files("soundcard.h" HAVE_SOME_SOUNDCARD_H)
-else(OS_LINUX)
-  check_include_files("sys/soundcard.h" HAVE_SOME_SOUNDCARD_H)
 endif(OS_LINUX)
 
-if(BUILD_I18N AND OS_DRAGONFLY)
-  set(conky_libs ${conky_libs} -lintl)
-endif(BUILD_I18N AND OS_DRAGONFLY)
-
-if(BUILD_I18N AND OS_DARWIN)
-  find_path(LIBINTL_H_N libintl.h
-    PATHS /usr/local/opt/gettext/include
-    /usr/include
-    /usr/local/include
-    /usr/local/opt/include)
-
-  if(LIBINTL_H_N)
-    include_directories(${LIBINTL_H_N})
-  else(LIBINTL_H_N)
-    message(FATAL_ERROR "Unable to find libintl.h (try `brew install gettext`)")
-  endif(LIBINTL_H_N)
-
-  find_library(INTL_LIB
-    NAMES intl
-    PATHS /usr/local/opt/gettext/lib
-    /usr/lib
-    /usr/local/lib
-    /usr/local/opt/lib)
-  set(conky_libs ${conky_libs} ${INTL_LIB})
-endif(BUILD_I18N AND OS_DARWIN)
+# Handle Open Sound System
+if(BUILD_OPENSOUNDSYS)
+  if(OS_LINUX)
+    check_include_files("linux/soundcard.h" HAVE_SOUNDCARD_H)
+  elseif(OS_OPENBSD)
+    check_include_files("soundcard.h" HAVE_SOUNDCARD_H)
+    # OpenBSD (and FreeBSD?) provide emulation layer on top of sndio.
+    if(HAVE_SOUNDCARD_H)
+      find_library(OSS_AUDIO_LIB
+        NAMES ossaudio
+        PATHS /usr/lib
+        /usr/local/lib)
+      set(conky_libs ${conky_libs} ${OSS_AUDIO_LIB})
+    endif(HAVE_SOUNDCARD_H)
+  else(OS_LINUX)
+    check_include_files("sys/soundcard.h" HAVE_SOUNDCARD_H)
+  endif(OS_LINUX)
+endif(BUILD_OPENSOUNDSYS)
+
+
+if(BUILD_I18N)
+  include(FindIntl)
+  find_package(Intl)
+
+  if(NOT Intl_FOUND)
+    if(OS_DARWIN)
+      message(WARNING "Try running `brew install gettext` for I18N support")
+      # Should be present by default everywhere else
+    endif(OS_DARWIN)
+    message(FATAL_ERROR "Unable to find libintl")
+  endif(NOT Intl_FOUND)
+
+  include_directories(${Intl_INCLUDE_DIRS})
+  set(conky_libs ${conky_libs} ${Intl_LIBRARIES})
+endif(BUILD_I18N)
 
 if(BUILD_NCURSES AND OS_DARWIN)
   set(conky_libs ${conky_libs} -lncurses)
@@ -239,7 +243,7 @@ endif(BUILD_IPV6)
 
 if(BUILD_HTTP)
   pkg_check_modules(MICROHTTPD REQUIRED libmicrohttpd>=0.9.25)
-  set(conky_libs ${conky_libs} ${MICROHTTPD_LIBRARIES})
+  set(conky_libs ${conky_libs} ${MICROHTTPD_LINK_LIBRARIES})
   set(conky_includes ${conky_includes} ${MICROHTTPD_INCLUDE_DIRS})
 endif(BUILD_HTTP)
 
@@ -468,28 +472,28 @@ if(BUILD_WAYLAND)
 
   if(OS_DARWIN OR OS_DRAGONFLY OR OS_FREEBSD OR OS_NETBSD OR OS_OPENBSD)
     pkg_check_modules(EPOLL REQUIRED epoll-shim)
-    set(conky_libs ${conky_libs} ${EPOLL_LIBRARIES})
+    set(conky_libs ${conky_libs} ${EPOLL_LINK_LIBRARIES})
     set(conky_includes ${conky_includes} ${EPOLL_INCLUDE_DIRS})
   endif(OS_DARWIN OR OS_DRAGONFLY OR OS_FREEBSD OR OS_NETBSD OR OS_OPENBSD)
 
   pkg_check_modules(CAIRO REQUIRED cairo)
-  set(conky_libs ${conky_libs} ${CAIRO_LIBRARIES})
+  set(conky_libs ${conky_libs} ${CAIRO_LINK_LIBRARIES})
   set(conky_includes ${conky_includes} ${CAIRO_INCLUDE_DIR})
 
   pkg_check_modules(PANGO REQUIRED pango)
-  set(conky_libs ${conky_libs} ${PANGO_LIBRARIES})
+  set(conky_libs ${conky_libs} ${PANGO_LINK_LIBRARIES})
   set(conky_includes ${conky_includes} ${PANGO_INCLUDE_DIRS})
 
   pkg_check_modules(PANGOCAIRO pangocairo)
-  set(conky_libs ${conky_libs} ${PANGOCAIRO_LIBRARIES})
+  set(conky_libs ${conky_libs} ${PANGOCAIRO_LINK_LIBRARIES})
   set(conky_includes ${conky_includes} ${PANGOCAIRO_INCLUDE_DIRS})
 
   pkg_check_modules(PANGOFC pangofc)
-  set(conky_libs ${conky_libs} ${PANGOFC_LIBRARIES})
+  set(conky_libs ${conky_libs} ${PANGOFC_LINK_LIBRARIES})
   set(conky_includes ${conky_includes} ${PANGOFC_INCLUDE_DIRS})
 
   pkg_check_modules(PANGOFT2 pangoft2)
-  set(conky_libs ${conky_libs} ${PANGOFT2_LIBRARIES})
+  set(conky_libs ${conky_libs} ${PANGOFT2_LINK_LIBRARIES})
   set(conky_includes ${conky_includes} ${PANGOFT2_INCLUDE_DIRS})
 endif(BUILD_WAYLAND)
 
@@ -502,12 +506,12 @@ include_directories(3rdparty/toluapp/include)
 # Check for libraries used by Lua bindings
 if(BUILD_LUA_CAIRO)
   pkg_check_modules(CAIRO REQUIRED cairo>=1.14)
-  set(luacairo_libs ${CAIRO_LIBRARIES} ${LUA_LIBRARIES})
+  set(luacairo_libs ${CAIRO_LINK_LIBRARIES} ${LUA_LIBRARIES})
   set(luacairo_includes ${CAIRO_INCLUDE_DIRS} ${LUA_INCLUDE_DIR})
 
   if(BUILD_LUA_CAIRO_XLIB)
     pkg_check_modules(CAIROXLIB REQUIRED cairo-xlib)
-    set(luacairo_libs ${CAIROXLIB_LIBRARIES} ${luacairo_libs})
+    set(luacairo_libs ${CAIROXLIB_LINK_LIBRARIES} ${luacairo_libs})
     set(luacairo_includes ${CAIROXLIB_INCLUDE_DIRS} ${luacairo_includes})
   endif(BUILD_LUA_CAIRO_XLIB)
 
@@ -529,7 +533,7 @@ endif(BUILD_LUA_IMLIB2)
 
 if(BUILD_LUA_RSVG)
   pkg_check_modules(RSVG REQUIRED librsvg-2.0>=2.52)
-  set(luarsvg_libs ${RSVG_LIBRARIES} ${LUA_LIBRARIES})
+  set(luarsvg_libs ${RSVG_LINK_LIBRARIES} ${LUA_LIBRARIES})
   set(luarsvg_includes ${RSVG_INCLUDE_DIRS} ${LUA_INCLUDE_DIR})
 endif(BUILD_LUA_RSVG)
 
@@ -544,7 +548,7 @@ if(BUILD_AUDACIOUS)
     pkg_check_modules(AUDACIOUS REQUIRED audacious<1.4.0)
   endif(NEW_AUDACIOUS_FOUND)
 
-  set(conky_libs ${conky_libs} ${AUDACIOUS_LIBRARIES} ${DBUS_GLIB_LIBRARIES})
+  set(conky_libs ${conky_libs} ${AUDACIOUS_LINK_LIBRARIES} ${DBUS_GLIB_LIBRARIES})
   set(conky_includes
     ${conky_includes}
     ${AUDACIOUS_INCLUDE_DIRS}
@@ -553,7 +557,7 @@ endif(BUILD_AUDACIOUS)
 
 if(BUILD_XMMS2)
   pkg_check_modules(XMMS2 REQUIRED xmms2-client>=0.6)
-  set(conky_libs ${conky_libs} ${XMMS2_LIBRARIES})
+  set(conky_libs ${conky_libs} ${XMMS2_LINK_LIBRARIES})
   set(conky_includes ${conky_includes} ${XMMS2_INCLUDE_DIRS})
 endif(BUILD_XMMS2)
 
@@ -593,26 +597,26 @@ endif(BUILD_JOURNAL)
 
 if(BUILD_PULSEAUDIO)
   pkg_check_modules(PULSEAUDIO REQUIRED libpulse)
-  set(conky_libs ${conky_libs} ${PULSEAUDIO_LIBRARIES})
+  set(conky_libs ${conky_libs} ${PULSEAUDIO_LINK_LIBRARIES})
   set(conky_includes ${conky_includes} ${PULSEAUDIO_INCLUDE_DIRS})
 endif(BUILD_PULSEAUDIO)
 
 if(WANT_CURL)
   pkg_check_modules(CURL REQUIRED libcurl)
-  set(conky_libs ${conky_libs} ${CURL_LIBRARIES})
+  set(conky_libs ${conky_libs} ${CURL_LINK_LIBRARIES})
   set(conky_includes ${conky_includes} ${CURL_INCLUDE_DIRS})
 endif(WANT_CURL)
 
 # Common libraries
 if(WANT_GLIB)
   pkg_check_modules(GLIB REQUIRED glib-2.0>=2.36)
-  set(conky_libs ${conky_libs} ${GLIB_LIBRARIES})
+  set(conky_libs ${conky_libs} ${GLIB_LINK_LIBRARIES})
   set(conky_includes ${conky_includes} ${GLIB_INCLUDE_DIRS})
 endif(WANT_GLIB)
 
 if(WANT_CURL)
   pkg_check_modules(CURL REQUIRED libcurl)
-  set(conky_libs ${conky_libs} ${CURL_LIBRARIES})
+  set(conky_libs ${conky_libs} ${CURL_LINK_LIBRARIES})
   set(conky_includes ${conky_includes} ${CURL_INCLUDE_DIRS})
 endif(WANT_CURL)
 

cmake/config.h.in

@@ -29,8 +29,7 @@
 #cmakedefine HAVE_SYS_INOTIFY_H 1
 #cmakedefine HAVE_DIRENT_H 1
 
-#cmakedefine HAVE_SOME_SOUNDCARD_H 1
-#cmakedefine HAVE_LINUX_SOUNDCARD_H 1
+#cmakedefine HAVE_SOUNDCARD_H 1
 
 #cmakedefine HAVE_STRNDUP 1
 

src/CMakeLists.txt

@@ -189,10 +189,10 @@ if(OS_DARWIN)
 endif(OS_DARWIN)
 
 # Optional sources
-if(HAVE_SOME_SOUNDCARD_H)
+if(HAVE_SOUNDCARD_H)
   set(mixer mixer.cc mixer.h)
   set(optional_sources ${optional_sources} ${mixer})
-endif(HAVE_SOME_SOUNDCARD_H)
+endif(HAVE_SOUNDCARD_H)
 
 if(BUILD_AUDACIOUS)
   set(audacious audacious.cc audacious.h)