diff options
| author | arved <arved@FreeBSD.org> | 2011-01-20 20:04:56 +0800 |
|---|---|---|
| committer | arved <arved@FreeBSD.org> | 2011-01-20 20:04:56 +0800 |
| commit | fe02c9361f71054ec72aeb5007fb0ff5cf3357ab (patch) | |
| tree | 50f7c4ddd72b81147820426bf4e5cbe53297a763 /graphics | |
| parent | 2300d29203e620673af2630ba4300a5ba32fbc70 (diff) | |
| download | freebsd-ports-graphics-fe02c9361f71054ec72aeb5007fb0ff5cf3357ab.tar.gz freebsd-ports-graphics-fe02c9361f71054ec72aeb5007fb0ff5cf3357ab.tar.zst freebsd-ports-graphics-fe02c9361f71054ec72aeb5007fb0ff5cf3357ab.zip | |
Unbreak on amd64
Feature safe: yes
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/py-cgkit/Makefile | 4 | ||||
| -rw-r--r-- | graphics/py-cgkit/files/patch-supportlib-include-slot.h | 45 |
2 files changed, 45 insertions, 4 deletions
diff --git a/graphics/py-cgkit/Makefile b/graphics/py-cgkit/Makefile index a072f844a7d..4da4322e92c 100644 --- a/graphics/py-cgkit/Makefile +++ b/graphics/py-cgkit/Makefile @@ -42,10 +42,6 @@ RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/OpenGL:${PORTSDIR}/graphics/py-opengl \ .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 700042 && ${ARCH} == "amd64" -BROKEN= does not compile -.endif - .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" BROKEN= Does not compile on ia64, powerpc, or sparc64 .endif diff --git a/graphics/py-cgkit/files/patch-supportlib-include-slot.h b/graphics/py-cgkit/files/patch-supportlib-include-slot.h new file mode 100644 index 00000000000..1d1a368bcab --- /dev/null +++ b/graphics/py-cgkit/files/patch-supportlib-include-slot.h @@ -0,0 +1,45 @@ +--- supportlib/include/slot.h.orig 2011-01-20 12:26:58.000000000 +0100 ++++ supportlib/include/slot.h 2011-01-20 12:29:40.000000000 +0100 +@@ -729,7 +729,7 @@ + template<class T> + void Slot<T>::setController(ISlot* ctrl) + { +- DEBUGINFO1(this, "Slot<T>::setController(0x%x)", (unsigned int)(ctrl)); ++ DEBUGINFO1(this, "Slot<T>::setController(0x%x)", (uintptr_t)(ctrl)); + // Check if this slot can take input connections (but allow setting 0 + // as this can happen during destruction) + if ((flags & NO_INPUT_CONNECTIONS) && ctrl!=0) +@@ -738,7 +738,7 @@ + // If the new and old controller are the same, then there's nothing to do + if (controller==ctrl) + { +- DEBUGINFO1(this, "Slot<T>::setController(0x%x) --- end (new==old)", (unsigned int)(ctrl)); ++ DEBUGINFO1(this, "Slot<T>::setController(0x%x) --- end (new==old)", (uintptr_t)(ctrl)); + return; + } + +@@ -774,13 +774,13 @@ + ctrl->addDependent(this); + notifyDependents(); + } +- DEBUGINFO1(this, "Slot<T>::setController(0x%x) --- end", (unsigned int)(ctrl)); ++ DEBUGINFO1(this, "Slot<T>::setController(0x%x) --- end", (uintptr_t)(ctrl)); + } + + template<class T> + void Slot<T>::addDependent(Dependent* d) + { +- DEBUGINFO1(this, "Slot<T>::addDependent(0x%x)", (int)d); ++ DEBUGINFO1(this, "Slot<T>::addDependent(0x%x)", (intptr_t)d); + + // Do nothing if the dependent was already added before + if (std::find(dependents.begin(), dependents.end(), d)!=dependents.end()) +@@ -793,7 +793,7 @@ + template<class T> + void Slot<T>::removeDependent(Dependent* d) + { +- DEBUGINFO1(this, "Slot<T>::removeDependent(0x%x)", (int)d); ++ DEBUGINFO1(this, "Slot<T>::removeDependent(0x%x)", (intptr_t)d); + + // Remove the element (it is moved to the back) + std::vector<Dependent*>::iterator res = std::remove(dependents.begin(), dependents.end(), d); |