From 89274248edf1d08d536a6e825305b5e28761cbb7 Mon Sep 17 00:00:00 2001
From: scribam <scribam@users.noreply.github.com>
Date: Tue, 9 Feb 2021 21:47:38 +0100
Subject: [PATCH] Fix compilation on FreeBSD

---
 .cirrus.yml            |  8 ++++----
 CMakeLists.txt         | 30 ++++++++++++------------------
 core/hw/bba/rtl8139c.h | 16 ----------------
 3 files changed, 16 insertions(+), 38 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 35327873f..c3cb60ebb 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,8 +1,8 @@
 freebsd_instance:
-  image_family: freebsd-12-1
+  image_family: freebsd-12-2
 
 task:
-  install_script: pkg install -y alsa-lib cmake evdev-proto flac git libao libudev-devd libzip mesa-libs pkgconf png pulseaudio sdl2
+  install_script: pkg install -y alsa-lib cmake evdev-proto flac git libao libevdev libudev-devd libzip mesa-libs miniupnpc ninja pkgconf png pulseaudio sdl2
   script:
-    - cmake -B build -DCMAKE_BUILD_TYPE=Release
-    - cmake --build build --config Release --parallel 2
+    - cmake -B build -DCMAKE_BUILD_TYPE=Release -G Ninja
+    - cmake --build build --config Release
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 48ab96017..37373d7dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -182,44 +182,38 @@ endif()
 
 find_package(PkgConfig QUIET)
 if(PKG_CONFIG_FOUND AND NOT ANDROID AND NOT APPLE)
-    pkg_search_module(AO ao)
+    pkg_check_modules(AO IMPORTED_TARGET ao)
     if(AO_FOUND)
         target_compile_definitions(${PROJECT_NAME} PRIVATE USE_LIBAO)
-        target_include_directories(${PROJECT_NAME} PRIVATE ${AO_INCLUDE_DIRS})
-        target_link_libraries(${PROJECT_NAME} PRIVATE ${AO_LIBRARIES})
+        target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::AO)
     endif()
 
-    pkg_search_module(FLAC flac)
+    pkg_check_modules(FLAC IMPORTED_TARGET flac)
     if(FLAC_FOUND)
-        target_include_directories(${PROJECT_NAME} PRIVATE ${FLAC_INCLUDE_DIRS})
-        target_link_libraries(${PROJECT_NAME} PRIVATE ${FLAC_LIBRARIES})
+        target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::FLAC)
     endif()
 
-    pkg_search_module(LIBEVDEV libevdev)
+    pkg_check_modules(LIBEVDEV IMPORTED_TARGET libevdev)
     if(LIBEVDEV_FOUND)
         target_compile_definitions(${PROJECT_NAME} PRIVATE USE_EVDEV)
-        target_include_directories(${PROJECT_NAME} PRIVATE ${LIBEVDEV_INCLUDE_DIRS})
-        target_link_libraries(${PROJECT_NAME} PRIVATE ${LIBEVDEV_LIBRARIES})
+        target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::LIBEVDEV)
 
-        pkg_search_module(LIBUDEV libudev)
+        pkg_check_modules(LIBUDEV IMPORTED_TARGET libudev)
         if(LIBUDEV_FOUND)
             target_compile_definitions(${PROJECT_NAME} PRIVATE USE_UDEV)
-            target_include_directories(${PROJECT_NAME} PRIVATE ${LIBUDEV_INCLUDE_DIRS})
-            target_link_libraries(${PROJECT_NAME} PRIVATE ${LIBUDEV_LIBRARIES})
+            target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::LIBUDEV)
         endif()
     endif()
 
-    pkg_search_module(LIBPULSE libpulse)
+    pkg_check_modules(LIBPULSE IMPORTED_TARGET libpulse)
     if(LIBPULSE_FOUND)
         target_compile_definitions(${PROJECT_NAME} PRIVATE USE_PULSEAUDIO)
-        target_include_directories(${PROJECT_NAME} PRIVATE ${LIBPULSE_INCLUDE_DIRS})
-        target_link_libraries(${PROJECT_NAME} PRIVATE ${LIBPULSE_LIBRARIES})
+        target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::LIBPULSE)
     endif()
 
-    pkg_search_module(LIBZIP libzip)
+    pkg_check_modules(LIBZIP IMPORTED_TARGET libzip)
     if(LIBZIP_FOUND)
-        target_include_directories(${PROJECT_NAME} PRIVATE ${LIBZIP_INCLUDE_DIRS})
-        target_link_libraries(${PROJECT_NAME} PRIVATE ${LIBZIP_LIBRARIES})
+        target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::LIBZIP)
     endif()
 
     if(ENABLE_OPROFILE)
diff --git a/core/hw/bba/rtl8139c.h b/core/hw/bba/rtl8139c.h
index 333b0314a..05e377896 100644
--- a/core/hw/bba/rtl8139c.h
+++ b/core/hw/bba/rtl8139c.h
@@ -63,22 +63,6 @@ struct MemoryRegion {
     uint32_t size;
 };
 
-/*
- * Byte swapping utilities
- */
-static inline uint16_t bswap16(uint16_t x)
-{
-    return (((x & 0x00ff) << 8) |
-            ((x & 0xff00) >> 8));
-}
-
-static inline uint32_t bswap32(uint32_t x)
-{
-    return (((x & 0x000000ffU) << 24) |
-            ((x & 0x0000ff00U) <<  8) |
-            ((x & 0x00ff0000U) >>  8) |
-            ((x & 0xff000000U) >> 24));
-}
 #define glue(a, b) _glue(a, b)
 #define _glue(a, b) a ## b