You've already forked macports-ports
mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
ola: Fix compile errors
Apply upstream patches which fix compile errors that were introduced due to non-backwards-compatible changes in OLA's dependencies. Closes: https://trac.macports.org/ticket/68672
This commit is contained in:
+30
-2
@@ -5,7 +5,7 @@ PortGroup github 1.0
|
||||
|
||||
github.setup OpenLightingProject ola 0.10.9
|
||||
github.tarball_from releases
|
||||
revision 0
|
||||
revision 1
|
||||
|
||||
categories net comms
|
||||
license GPL-2+ LGPL-2.1+
|
||||
@@ -31,7 +31,35 @@ depends_build-append \
|
||||
depends_lib port:protobuf3-cpp
|
||||
depends_test port:cppunit
|
||||
|
||||
# Required while we're patching ola.m4
|
||||
post-patch {
|
||||
# Work around compile error:
|
||||
# cannot initialize a variable of type 'lo_blob' (aka
|
||||
# 'lo_blob_ *') with an lvalue of type 'lo_arg *'.
|
||||
# Reported upstream in
|
||||
# https://github.com/OpenLightingProject/ola/issues/1949.
|
||||
# The below fix was implemented as a part of
|
||||
# https://github.com/OpenLightingProject/ola/pull/1954.
|
||||
# The following statement will probably need to be removed when
|
||||
# updating this port to version 0.10.10.
|
||||
reinplace "s/lo_blob blob = argv/lo_blob blob = (lo_blob)argv/" \
|
||||
${worksrcpath}/plugins/osc/OSCNode.cpp
|
||||
|
||||
# Work around compile error:
|
||||
# no matching function for call to 'lo_server_add_method'
|
||||
# note: candidate function not viable: no known conversion from
|
||||
# 'int (const char *, const char *, lo_arg **, int, void *,
|
||||
# void *)' to 'lo_method_handler' (aka 'int (*)(const char *,
|
||||
# const char *, lo_arg **, int, lo_message_ *, void *)')
|
||||
# for 4th argument
|
||||
# The below fix was also implemented as a part of
|
||||
# https://github.com/OpenLightingProject/ola/pull/1954.
|
||||
# The following statement will probably need to be removed when
|
||||
# updating this port to version 0.10.10.
|
||||
reinplace \
|
||||
"/int OSCDataHandler/,/OLA_DEBUG <</s/int argc, void \\*,/int argc, lo_message,/" \
|
||||
${worksrcpath}/plugins/osc/OSCNode.cpp
|
||||
}
|
||||
|
||||
use_autoreconf yes
|
||||
|
||||
compiler.cxx_standard 2011
|
||||
|
||||
Reference in New Issue
Block a user