Date: Sun, 25 Apr 2021 05:08:56 GMT From: Emanuel Haupt <ehaupt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: ce144dc8c7b3 - main - graphics/delaboratory: fix build with LLVM 11 libc++ Message-ID: <202104250508.13P58us4042926@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=ce144dc8c7b36f15dc9d1fd4cba1226c776f3e77 commit ce144dc8c7b36f15dc9d1fd4cba1226c776f3e77 Author: Emanuel Haupt <ehaupt@FreeBSD.org> AuthorDate: 2021-04-25 05:00:05 +0000 Commit: Emanuel Haupt <ehaupt@FreeBSD.org> CommitDate: 2021-04-25 05:00:05 +0000 graphics/delaboratory: fix build with LLVM 11 libc++ Rename local semaphore.h to keep it from accidentally being picked up by libc++ headers in place of the system <semaphore.h>. Obtained from: OpenBSD --- graphics/delaboratory/Makefile | 12 ++++++------ .../files/patch-core_base__layer__with__properties.cc | 11 +++++++++++ graphics/delaboratory/files/patch-core_layer__processor.h | 11 +++++++++++ .../files/patch-gui__wx_layer__processor__threads.h | 11 +++++++++++ .../delaboratory/files/patch-gui__wx_mutex__read__write.h | 11 +++++++++++ graphics/delaboratory/files/patch-gui__wx_semaphore.cc | 11 +++++++++++ graphics/delaboratory/files/patch-gui__wx_update__blend.cc | 11 +++++++++++ .../files/patch-gui__wx_update__main__layer__image.cc | 11 +++++++++++ 8 files changed, 83 insertions(+), 6 deletions(-) diff --git a/graphics/delaboratory/Makefile b/graphics/delaboratory/Makefile index 49acd3e294ab..d2d6013ced38 100644 --- a/graphics/delaboratory/Makefile +++ b/graphics/delaboratory/Makefile @@ -2,7 +2,7 @@ PORTNAME= delaboratory PORTVERSION= 0.8 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics MASTER_SITES= https://BSDforge.com/projects/source/graphics/delaboratory/ @@ -14,18 +14,18 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libtiff.so:graphics/tiff -BROKEN_FreeBSD_13= does not build: error: unknown type name 'sem_t' -BROKEN_FreeBSD_14= does not build: error: unknown type name 'sem_t' - USES= compiler:c++11-lib gmake gnome -MAKE_ARGS= CXX="${CXX}" WXCONFIG="${WX_CONFIG}" -USE_WX= 3.0 USE_CXXSTD= c++11 USE_GNOME= libxml2 +USE_WX= 3.0 + +MAKE_ARGS= CXX="${CXX}" \ + WXCONFIG="${WX_CONFIG}" PLIST_FILES= bin/${PORTNAME} post-patch: + @${MV} ${WRKSRC}/gui_wx/semaphore.h ${WRKSRC}/gui_wx/desemaphore.h @${REINPLACE_CMD} -e 's|-Ofast.*}|${CXXFLAGS}| ; \ s|CXXFLAGS_WX +=|& ${CXXFLAGS} -I${LOCALBASE}/include| ;\ s|LDFLAGS=|LDFLAGS+=|' \ diff --git a/graphics/delaboratory/files/patch-core_base__layer__with__properties.cc b/graphics/delaboratory/files/patch-core_base__layer__with__properties.cc new file mode 100644 index 000000000000..06b0b4d95aa8 --- /dev/null +++ b/graphics/delaboratory/files/patch-core_base__layer__with__properties.cc @@ -0,0 +1,11 @@ +--- core/base_layer_with_properties.cc.orig 2012-07-10 23:38:22 UTC ++++ core/base_layer_with_properties.cc +@@ -19,7 +19,7 @@ + #include "base_layer_with_properties.h" + #include "color_space_utils.h" + #include "logger.h" +-#include "semaphore.h" ++#include "desemaphore.h" + #include "str.h" + #include "property_numeric.h" + #include "property_boolean.h" diff --git a/graphics/delaboratory/files/patch-core_layer__processor.h b/graphics/delaboratory/files/patch-core_layer__processor.h new file mode 100644 index 000000000000..d0c9d761c37a --- /dev/null +++ b/graphics/delaboratory/files/patch-core_layer__processor.h @@ -0,0 +1,11 @@ +--- core/layer_processor.h.orig 2012-06-27 18:13:03 UTC ++++ core/layer_processor.h +@@ -32,7 +32,7 @@ class deGUI; + #include <map> + #include "size.h" + #include "renderer.h" +-#include "semaphore.h" ++#include "desemaphore.h" + #include "base_layer.h" + + enum diff --git a/graphics/delaboratory/files/patch-gui__wx_layer__processor__threads.h b/graphics/delaboratory/files/patch-gui__wx_layer__processor__threads.h new file mode 100644 index 000000000000..4d9b7e44769c --- /dev/null +++ b/graphics/delaboratory/files/patch-gui__wx_layer__processor__threads.h @@ -0,0 +1,11 @@ +--- gui_wx/layer_processor_threads.h.orig 2012-06-08 22:38:01 UTC ++++ gui_wx/layer_processor_threads.h +@@ -31,7 +31,7 @@ class wxThread; + #include <map> + #include "size.h" + #include "renderer.h" +-#include "semaphore.h" ++#include "desemaphore.h" + #include "base_layer.h" + + diff --git a/graphics/delaboratory/files/patch-gui__wx_mutex__read__write.h b/graphics/delaboratory/files/patch-gui__wx_mutex__read__write.h new file mode 100644 index 000000000000..6f6de75757ac --- /dev/null +++ b/graphics/delaboratory/files/patch-gui__wx_mutex__read__write.h @@ -0,0 +1,11 @@ +--- gui_wx/mutex_read_write.h.orig 2012-06-08 22:38:01 UTC ++++ gui_wx/mutex_read_write.h +@@ -20,7 +20,7 @@ + #define _DE_MUTEX_READ_WRITE_H + + #include "mutex.h" +-#include "semaphore.h" ++#include "desemaphore.h" + + class deMutexReadWrite + { diff --git a/graphics/delaboratory/files/patch-gui__wx_semaphore.cc b/graphics/delaboratory/files/patch-gui__wx_semaphore.cc new file mode 100644 index 000000000000..306e4925f16c --- /dev/null +++ b/graphics/delaboratory/files/patch-gui__wx_semaphore.cc @@ -0,0 +1,11 @@ +--- gui_wx/semaphore.cc.orig 2012-06-08 22:38:01 UTC ++++ gui_wx/semaphore.cc +@@ -16,7 +16,7 @@ + along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +-#include "semaphore.h" ++#include "desemaphore.h" + #include <wx/wx.h> + + class deSemaphoreImpl diff --git a/graphics/delaboratory/files/patch-gui__wx_update__blend.cc b/graphics/delaboratory/files/patch-gui__wx_update__blend.cc new file mode 100644 index 000000000000..1aa894cfd80d --- /dev/null +++ b/graphics/delaboratory/files/patch-gui__wx_update__blend.cc @@ -0,0 +1,11 @@ +--- gui_wx/update_blend.cc.orig 2012-06-12 00:31:57 UTC ++++ gui_wx/update_blend.cc +@@ -20,7 +20,7 @@ + #include <wx/wx.h> + #include "color_space_utils.h" + #include "layer_with_blending.h" +-#include "semaphore.h" ++#include "desemaphore.h" + + class deUpdateBlendThread:public wxThread + { diff --git a/graphics/delaboratory/files/patch-gui__wx_update__main__layer__image.cc b/graphics/delaboratory/files/patch-gui__wx_update__main__layer__image.cc new file mode 100644 index 000000000000..576e31090180 --- /dev/null +++ b/graphics/delaboratory/files/patch-gui__wx_update__main__layer__image.cc @@ -0,0 +1,11 @@ +--- gui_wx/update_main_layer_image.cc.orig 2012-07-26 00:53:58 UTC ++++ gui_wx/update_main_layer_image.cc +@@ -19,7 +19,7 @@ + #include "update_main_layer_image.h" + #include <wx/wx.h> + #include "base_layer.h" +-#include "semaphore.h" ++#include "desemaphore.h" + #include "logger.h" + #include "color_space_utils.h" + #include "str.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104250508.13P58us4042926>