mirror of
https://git.freebsd.org/ports.git
synced 2025-05-24 23:16:33 -04:00
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
This commit is contained in:
parent
8393f46d7f
commit
ce144dc8c7
8 changed files with 83 additions and 6 deletions
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
PORTNAME= delaboratory
|
PORTNAME= delaboratory
|
||||||
PORTVERSION= 0.8
|
PORTVERSION= 0.8
|
||||||
PORTREVISION= 10
|
PORTREVISION= 11
|
||||||
CATEGORIES= graphics
|
CATEGORIES= graphics
|
||||||
MASTER_SITES= https://BSDforge.com/projects/source/graphics/delaboratory/
|
MASTER_SITES= https://BSDforge.com/projects/source/graphics/delaboratory/
|
||||||
|
|
||||||
|
@ -14,18 +14,18 @@ LICENSE_FILE= ${WRKSRC}/COPYING
|
||||||
|
|
||||||
LIB_DEPENDS= libtiff.so:graphics/tiff
|
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
|
USES= compiler:c++11-lib gmake gnome
|
||||||
MAKE_ARGS= CXX="${CXX}" WXCONFIG="${WX_CONFIG}"
|
|
||||||
USE_WX= 3.0
|
|
||||||
USE_CXXSTD= c++11
|
USE_CXXSTD= c++11
|
||||||
USE_GNOME= libxml2
|
USE_GNOME= libxml2
|
||||||
|
USE_WX= 3.0
|
||||||
|
|
||||||
|
MAKE_ARGS= CXX="${CXX}" \
|
||||||
|
WXCONFIG="${WX_CONFIG}"
|
||||||
|
|
||||||
PLIST_FILES= bin/${PORTNAME}
|
PLIST_FILES= bin/${PORTNAME}
|
||||||
|
|
||||||
post-patch:
|
post-patch:
|
||||||
|
@${MV} ${WRKSRC}/gui_wx/semaphore.h ${WRKSRC}/gui_wx/desemaphore.h
|
||||||
@${REINPLACE_CMD} -e 's|-Ofast.*}|${CXXFLAGS}| ; \
|
@${REINPLACE_CMD} -e 's|-Ofast.*}|${CXXFLAGS}| ; \
|
||||||
s|CXXFLAGS_WX +=|& ${CXXFLAGS} -I${LOCALBASE}/include| ;\
|
s|CXXFLAGS_WX +=|& ${CXXFLAGS} -I${LOCALBASE}/include| ;\
|
||||||
s|LDFLAGS=|LDFLAGS+=|' \
|
s|LDFLAGS=|LDFLAGS+=|' \
|
||||||
|
|
|
@ -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"
|
11
graphics/delaboratory/files/patch-core_layer__processor.h
Normal file
11
graphics/delaboratory/files/patch-core_layer__processor.h
Normal file
|
@ -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
|
|
@ -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"
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
{
|
11
graphics/delaboratory/files/patch-gui__wx_semaphore.cc
Normal file
11
graphics/delaboratory/files/patch-gui__wx_semaphore.cc
Normal file
|
@ -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
|
11
graphics/delaboratory/files/patch-gui__wx_update__blend.cc
Normal file
11
graphics/delaboratory/files/patch-gui__wx_update__blend.cc
Normal file
|
@ -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
|
||||||
|
{
|
|
@ -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"
|
Loading…
Add table
Reference in a new issue