<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a0e8659d34866fcd4c2339166bc822f7042d3165">https://github.com/macports/macports-ports/commit/a0e8659d34866fcd4c2339166bc822f7042d3165</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new a0e8659 ola: build with protobuf-3
</span>a0e8659 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a0e8659d34866fcd4c2339166bc822f7042d3165
</span>Author: Peter Newman <peterjnewman@gmail.com>
AuthorDate: Sun Sep 9 22:46:19 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> ola: build with protobuf-3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> closes: closes https://trac.macports.org/ticket/56387
</span>---
net/ola/Portfile | 41 +++++++++------
net/ola/files/patch-protobuf3.diff | 104 +++++++++++++++++++++++++++++++++++++
2 files changed, 128 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/ola/Portfile b/net/ola/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 33b4120..17c7901 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/ola/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/ola/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,28 +24,29 @@ checksums rmd160 b60d96f7c1504e5045ee333c39bef30185f12134 \
</span>
github.tarball_from releases
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-protobuf3.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Required while we're patching ola.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_test port:cppunit
# temporary workaround (else configure fails)
depends_build-append \
port:cppunit
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:protobuf-cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:protobuf3-cpp
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-fatal-warnings \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --disable-fatal-warnings \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-libftdi \
</span> --disable-http \
--disable-libusb \
--disable-osc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python26 conflicts python27 description {Enable the Python 2.6 API} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py26-protobuf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-python-libs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python2.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 conflicts python26 description {Enable the Python 2.7 API} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py27-protobuf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python27 description {Enable the Python 2.7 API} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python27 port:py27-protobuf3
</span> configure.args-append --enable-python-libs
configure.python ${prefix}/bin/python2.7
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,9 +61,14 @@ variant http description {Build with embedded web server} {
</span> configure.args-delete --disable-http
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant osc description {Build with OSC support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:liblo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-osc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant libftdi0 conflicts libftdi1 description {Build with libftdi0 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:libftdi0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable-libftdi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant libftdi1 conflicts libftdi0 description {Build with libftdi1 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:libftdi1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable-libftdi
</span> }
variant libusb description {Build with libusb support} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,11 +76,12 @@ variant libusb description {Build with libusb support} {
</span> configure.args-delete --disable-libusb
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +http +osc +libusb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python26]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant osc description {Build with OSC support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:liblo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable-osc
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +http +libftdi0 +libusb +osc +python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> test.run yes
test.target check
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/ola/files/patch-protobuf3.diff b/net/ola/files/patch-protobuf3.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ef48e96
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/ola/files/patch-protobuf3.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,104 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b129b22a3..3bcd7d0ba 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,21 +66,27 @@ AM_CONDITIONAL([SUPPORTS_GNU_PLUS_PLUS_11], [test "x$ac_cv_gnu_plus_plus_11" = x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # force us into gnu++98 mode if necessary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If gnu++11 and gnu++98 then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# If no unit tests, force to gnu++98
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# If unittests and cppunit < 1.14.0, force to gnu++98
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Else turn off deprecation messages for std::auto_ptr and run gnu++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# If protobuf < 3.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# If no unit tests, force to gnu++98
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Else we have unit tests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# If cppunit < 1.14.0, force to gnu++98
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Else turn off deprecation messages for std::auto_ptr and run gnu++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Else assume we have protobuf >= 3.6 (later checks will confirm that for certain), turn off deprecation messages for std::auto_ptr and run gnu++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_gnu_plus_plus_11="no"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS_IF([test "x$ac_cv_gnu_plus_plus_11" = xyes],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [AS_IF([test "x$ac_cv_gnu_plus_plus_98" = xyes],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [AS_IF([test "x$enable_unittests" = xno],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [CXXFLAGS="$CXXFLAGS -std=gnu++98"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [PKG_CHECK_MODULES([CPPUNIT1], [cppunit < 1.14.0],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [PKG_CHECK_MODULES([PROTOBUF1], [protobuf < 3.6],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [AS_IF([test "x$enable_unittests" = xno],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [CXXFLAGS="$CXXFLAGS -std=gnu++98"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [PKG_CHECK_MODULES([CPPUNIT2], [cppunit >= 1.14.0],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [require_gnu_plus_plus_11="yes"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [AC_MSG_WARN([OLA requires std::auto_ptr support.])])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [PKG_CHECK_MODULES([CPPUNIT1], [cppunit < 1.14.0],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [CXXFLAGS="$CXXFLAGS -std=gnu++98"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [PKG_CHECK_MODULES([CPPUNIT2], [cppunit >= 1.14.0],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [require_gnu_plus_plus_11="yes"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [AC_MSG_WARN([OLA requires std::auto_ptr support.])])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [require_gnu_plus_plus_11="yes"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS_IF([test "x$require_gnu_plus_plus_11" = xyes],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/config/ola.m4 b/config/ola.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6080932e9..d3b8cc8f8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/config/ola.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/config/ola.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,9 +24,6 @@ AC_DEFUN([PROTOBUF_SUPPORT],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_REQUIRE_CPP()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CHECK_MODULES(libprotobuf, [protobuf >= $1])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PKG_CHECK_MODULES(libprotobuf2, [protobuf < 3.2], [],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [AC_MSG_ERROR([OLA currently requires protobuf < 3.2, see issue 1192])])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST([libprotobuf_CFLAGS])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_ARG_WITH([protoc],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/protoc/CppFileGenerator.cpp b/protoc/CppFileGenerator.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 518c17879..e7dd95ccb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/protoc/CppFileGenerator.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/protoc/CppFileGenerator.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -196,14 +196,6 @@ void FileGenerator::GenerateBuildDescriptors(Printer* printer) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "assigndescriptorsname", GlobalAssignDescriptorsName(m_output_name));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printer->Indent();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // Make sure the file has found its way into the pool. If a descriptor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // is requested *during* static init then AddDescriptors() may not have
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // been called yet, so we call it manually. Note that it's fine if
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // AddDescriptors() is called multiple times.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- printer->Print(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "$adddescriptorsname$();\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "adddescriptorsname", GlobalAddDescriptorsName(m_file->name()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Get the file's descriptor from the pool.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printer->Print(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "const ::google::protobuf::FileDescriptor* file =\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/protoc/GeneratorHelpers.cpp b/protoc/GeneratorHelpers.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 19609181e..6f619b5c0 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/protoc/GeneratorHelpers.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/protoc/GeneratorHelpers.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -104,11 +104,6 @@ string FilenameIdentifier(const string& filename) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// Return the name of the AddDescriptors() function for a given file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-string GlobalAddDescriptorsName(const string& filename) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return "protobuf_AddDesc_" + FilenameIdentifier(filename);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Return the name of the AssignDescriptors() function for a given file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string GlobalAssignDescriptorsName(const string& filename) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "protobuf_AssignDesc_" + FilenameIdentifier(filename);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/protoc/GeneratorHelpers.h b/protoc/GeneratorHelpers.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 35efdbb04..fa91a915d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/protoc/GeneratorHelpers.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/protoc/GeneratorHelpers.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,9 +67,6 @@ string StripProto(const string& filename);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Convert a file name into a valid identifier.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string FilenameIdentifier(const string& filename);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// Return the name of the AddDescriptors() function for a given file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-string GlobalAddDescriptorsName(const string& filename);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Return the name of the AssignDescriptors() function for a given file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string GlobalAssignDescriptorsName(const string& filename);
</span></pre><pre style='margin:0'>
</pre>