From 09b022305f3fd365d5d0424ff51982bcca5a572f Mon Sep 17 00:00:00 2001
From: Ahmad Fatoum <ahmad@a3f.at>
Date: Sun, 11 Feb 2018 11:59:36 +0100
Subject: mini_al: Support {Net,Open}BSD OSS

Fixes this build failure:
http://www.cpantesters.org/cpan/report/a069fade-0e1f-11e8-a1cf-bb670eaac09d
---
 utils.cmake | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'utils.cmake')

diff --git a/utils.cmake b/utils.cmake
index 68fd1f76..dd4160d3 100644
--- a/utils.cmake
+++ b/utils.cmake
@@ -32,7 +32,11 @@ else()
     find_library(XCURSOR_LIBRARY Xcursor)
     include_directories(${OPENGL_INCLUDE_DIR})
 
-    set(LIBS_PRIVATE m ${pthread} ${OPENGL_LIBRARIES} ${X11_LIBRARIES} ${XRANDR_LIBRARY} ${XINERAMA_LIBRARY} ${XI_LIBRARY} ${XXF86VM_LIBRARY} ${XCURSOR_LIBRARY})
+    if ("${CMAKE_SYSTEM_NAME}" MATCHES "(Net|Open)BSD")
+      find_library(OSS_LIBRARY ossaudio)
+    endif()
+
+    set(LIBS_PRIVATE m ${pthread} ${OPENGL_LIBRARIES} ${X11_LIBRARIES} ${XRANDR_LIBRARY} ${XINERAMA_LIBRARY} ${XI_LIBRARY} ${XXF86VM_LIBRARY} ${XCURSOR_LIBRARY} ${OSS_LIBRARY})
   endif()
 endif()
 
-- 
cgit v1.2.3


From 1be72a2e72bcae18241d4a6dd6427aeaaf54e4d5 Mon Sep 17 00:00:00 2001
From: Ahmad Fatoum <ahmad@a3f.at>
Date: Sun, 11 Feb 2018 20:00:04 +0100
Subject: pkg-config: Empty Requires.private on shared-only build

If user doesn't build the static library,
`pkg-config --static --libs raylib` should be equivalent to
`pkg-config --libs raylib`.
---
 raylib.pc.in       | 2 +-
 src/CMakeLists.txt | 4 +++-
 utils.cmake        | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'utils.cmake')

diff --git a/raylib.pc.in b/raylib.pc.in
index 93984363..d71a5e2c 100644
--- a/raylib.pc.in
+++ b/raylib.pc.in
@@ -8,6 +8,6 @@ Description: Simple and easy-to-use library to learn videogames programming
 URL: http://github.com/raysan5/raylib
 Version: @PROJECT_VERSION@
 Libs: -L${libdir} -lraylib
-Libs.private:@PKG_CONFIG_LIBS_PRIVATE@
+Libs.private: @PKG_CONFIG_LIBS_PRIVATE@
 Requires.private:
 Cflags: -I${includedir}
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e9784ff4..40871455 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -137,6 +137,8 @@ if(${PLATFORM} MATCHES "PLATFORM_DESKTOP")
         PUBLIC ${GRAPHICS}
     )
 
+    set(PKG_CONFIG_LIBS_PRIVATE ${__PKG_CONFIG_LIBS_PRIVATE})
+
     if (WITH_PIC)
       set_property(TARGET ${RAYLIB} PROPERTY POSITION_INDEPENDENT_CODE ON)
     endif()
@@ -149,7 +151,7 @@ if(${PLATFORM} MATCHES "PLATFORM_DESKTOP")
 
   configure_file(../raylib.pc.in raylib.pc @ONLY)
   install(FILES ${CMAKE_BINARY_DIR}/release/raylib.pc DESTINATION lib/pkgconfig)
-  
+
   # Copy the header files to the build directory
   file(COPY "raylib.h" DESTINATION ".")
   file(COPY "rlgl.h" DESTINATION ".")
diff --git a/utils.cmake b/utils.cmake
index dd4160d3..2c6a3771 100644
--- a/utils.cmake
+++ b/utils.cmake
@@ -74,8 +74,8 @@ foreach(L ${LIBS_PRIVATE})
 
   set(LASTDIR ${DIR})
 
-  set(PKG_CONFIG_LIBS_PRIVATE ${PKG_CONFIG_LIBS_PRIVATE} ${DIR_OPT} ${FILE_OPT})
-  string (REPLACE ";" " " PKG_CONFIG_LIBS_PRIVATE "${PKG_CONFIG_LIBS_PRIVATE}")
+  set(__PKG_CONFIG_LIBS_PRIVATE ${__PKG_CONFIG_LIBS_PRIVATE} ${DIR_OPT} ${FILE_OPT})
+  string (REPLACE ";" " " __PKG_CONFIG_LIBS_PRIVATE "${__PKG_CONFIG_LIBS_PRIVATE}")
 endforeach(L)
 
 
@@ -86,7 +86,7 @@ function(link_libraries_to_executable executable)
   if (TARGET raylib_shared)
     target_link_libraries(${executable} raylib_shared)
   else()
-    target_link_libraries(${executable} raylib ${PKG_CONFIG_LIBS_PRIVATE})
+    target_link_libraries(${executable} raylib ${__PKG_CONFIG_LIBS_PRIVATE})
   endif()
 endfunction()
 
-- 
cgit v1.2.3