diff --git a/packaging/sunshine.rb b/packaging/sunshine.rb index ce8c7e81..f13a5a38 100644 --- a/packaging/sunshine.rb +++ b/packaging/sunshine.rb @@ -33,6 +33,7 @@ class @PROJECT_NAME@ < Formula depends_on "node" => :build depends_on "pkg-config" => :build depends_on "curl" + depends_on "miniupnpc" depends_on "openssl" depends_on "opus" depends_on "icu4c" => :recommended @@ -198,11 +199,6 @@ index 5b3638d..aca9481 100644 end end - resource "miniupnpc" do - url "https://github.com/miniupnp/miniupnp.git", - revision: "e263ab6f56c382e10fed31347ec68095d691a0e8" - end - def install ENV["BRANCH"] = "@GITHUB_BRANCH@" ENV["BUILD_VERSION"] = "@BUILD_VERSION@" @@ -305,23 +301,6 @@ index 5b3638d..aca9481 100644 end end - # Build miniupnpc - resource("miniupnpc").stage do - # Change to the miniupnpc directory within the repo - cd "miniupnpc" do - system "make", "INSTALLPREFIX=#{prefix}/miniupnpc", "install" - end - - # Copy the shared libraries to the main lib directory - # This ensures they're in the library search path at runtime - cp Dir["#{prefix}/miniupnpc/lib/libminiupnpc.so*"], "#{lib}/" if OS.linux? - - # Set include and library paths for the custom miniupnpc - ENV.prepend_path "PKG_CONFIG_PATH", "#{prefix}/miniupnpc/lib/pkgconfig" - ENV.prepend "CPPFLAGS", "-I#{prefix}/miniupnpc/include" - ENV.prepend "LDFLAGS", "-L#{prefix}/miniupnpc/lib" - end - system "cmake", "-S", ".", "-B", "build", "-G", "Unix Makefiles", *std_cmake_args, *args diff --git a/src/upnp.cpp b/src/upnp.cpp index 14103ad5..625a7a69 100644 --- a/src/upnp.cpp +++ b/src/upnp.cpp @@ -2,6 +2,9 @@ * @file src/upnp.cpp * @brief Definitions for UPnP port mapping. */ +// standard includes +#include // workaround for type_t error in miniupnpc 2.3.3, see https://github.com/miniupnp/miniupnp/commit/e263ab6f56c382e10fed31347ec68095d691a0e8 + // lib includes #include #include