* [PR PATCH] renderdoc: update to 1.10.
@ 2020-10-15 20:41 faulesocke
2020-10-20 10:27 ` [PR PATCH] [Updated] " faulesocke
2020-10-25 21:22 ` [PR PATCH] [Merged]: " Duncaen
0 siblings, 2 replies; 3+ messages in thread
From: faulesocke @ 2020-10-15 20:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 319 bytes --]
There is a new pull request by faulesocke against master on the void-packages repository
https://github.com/faulesocke/void-packages renderdoc
https://github.com/void-linux/void-packages/pull/25641
renderdoc: update to 1.10.
A patch file from https://github.com/void-linux/void-packages/pull/25641.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-renderdoc-25641.patch --]
[-- Type: text/x-diff, Size: 7343 bytes --]
From 125bec51aeab44a75f2ebba38844867b12a22b24 Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Fri, 25 Sep 2020 13:11:26 +0200
Subject: [PATCH] renderdoc: update to 1.10.
---
srcpkgs/renderdoc/files/swig-py38.patch | 28 ------------
srcpkgs/renderdoc/patches/QPainterPath.patch | 40 ----------------
srcpkgs/renderdoc/patches/cmake-py38.patch | 48 --------------------
srcpkgs/renderdoc/template | 10 ++--
4 files changed, 4 insertions(+), 122 deletions(-)
delete mode 100644 srcpkgs/renderdoc/files/swig-py38.patch
delete mode 100644 srcpkgs/renderdoc/patches/QPainterPath.patch
delete mode 100644 srcpkgs/renderdoc/patches/cmake-py38.patch
diff --git a/srcpkgs/renderdoc/files/swig-py38.patch b/srcpkgs/renderdoc/files/swig-py38.patch
deleted file mode 100644
index 0595599c658..00000000000
--- a/srcpkgs/renderdoc/files/swig-py38.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From dbe955dd0300d55a32fd73a4eef730b3e30ed5c4 Mon Sep 17 00:00:00 2001
-From: Christian Kellner <christian@kellner.me>
-Date: Thu, 11 Jul 2019 20:32:03 +0200
-Subject: [PATCH] swig: avoid use of _PyObject_GC_UNTRACK
-
-It is deprecated[1]. Use PyObject_GC_UnTrack instead.
-
-[1] https://docs.python.org/3/c-api/gcsupport.html#c._PyObject_GC_UNTRACK
----
- Lib/python/builtin.swg | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Lib/python/builtin.swg b/Lib/python/builtin.swg
-index 9597653b7..6af45a9d1 100644
---- a/Lib/python/builtin.swg
-+++ b/Lib/python/builtin.swg
-@@ -120,7 +120,7 @@ SwigPyBuiltin_FunpackSetterClosure (PyObject *obj, PyObject *val, void *closure)
-
- SWIGINTERN void
- SwigPyStaticVar_dealloc(PyDescrObject *descr) {
-- _PyObject_GC_UNTRACK(descr);
-+ PyObject_GC_UnTrack(descr);
- Py_XDECREF(PyDescr_TYPE(descr));
- Py_XDECREF(PyDescr_NAME(descr));
- PyObject_GC_Del(descr);
---
-2.21.0
-
diff --git a/srcpkgs/renderdoc/patches/QPainterPath.patch b/srcpkgs/renderdoc/patches/QPainterPath.patch
deleted file mode 100644
index 139930a77b4..00000000000
--- a/srcpkgs/renderdoc/patches/QPainterPath.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/qrenderdoc/Widgets/RangeHistogram.cpp 2019-04-29 11:50:14.000000000 +0200
-+++ b/qrenderdoc/Widgets/RangeHistogram.cpp 2020-08-31 19:10:09.169423623 +0200
-@@ -27,6 +27,7 @@
- #include <math.h>
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
-
- RangeHistogram::RangeHistogram(QWidget *parent) : QWidget(parent)
- {
---- a/qrenderdoc/Styles/RDTweakedNativeStyle/RDTweakedNativeStyle.cpp.orig 2019-04-29 11:50:14.000000000 +0200
-+++ b/qrenderdoc/Styles/RDTweakedNativeStyle/RDTweakedNativeStyle.cpp 2020-08-31 19:14:26.336436890 +0200
-@@ -26,6 +26,7 @@
- #include <QDebug>
- #include <QFontMetrics>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPen>
- #include <QStyleOption>
-
---- a/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp 2019-04-29 11:50:14.000000000 +0200
-+++ b/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp 2020-08-31 19:15:33.841440372 +0200
-@@ -32,6 +32,7 @@
- #include <QMimeData>
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QScreen>
- #include <QSplitter>
- #include <QTabBar>
---- a/qrenderdoc/Windows/TimelineBar.cpp 2019-04-29 11:50:14.000000000 +0200
-+++ b/qrenderdoc/Windows/TimelineBar.cpp 2020-08-31 19:16:36.087443584 +0200
-@@ -25,6 +25,7 @@
- #include "TimelineBar.h"
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QScrollBar>
- #include <QWheelEvent>
- #include "Code/QRDUtils.h"
diff --git a/srcpkgs/renderdoc/patches/cmake-py38.patch b/srcpkgs/renderdoc/patches/cmake-py38.patch
deleted file mode 100644
index fc1adb9ddbc..00000000000
--- a/srcpkgs/renderdoc/patches/cmake-py38.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 56769d3e2cc12670b73a1ddd9dfaab959340c2e2 Mon Sep 17 00:00:00 2001
-From: Christian Kellner <christian@kellner.me>
-Date: Thu, 11 Jul 2019 21:27:02 +0200
-Subject: [PATCH] CMake: py3.8 support, ability to patch swig
-
-Add 3.8 to list of python versions and ability to patch the custom
-swig, also needed for 3.8
----
- CMakeLists.txt | 2 +-
- qrenderdoc/CMakeLists.txt | 2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 13818e5b8..00feda2ad 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -308,7 +308,7 @@ add_subdirectory(renderdoc)
- # are handled in common
- if(ENABLE_QRENDERDOC OR ENABLE_PYRENDERDOC)
- # Make sure Python 3 is found
-- set(Python_ADDITIONAL_VERSIONS 3.4 3.5 3.6 3.7)
-+ set(Python_ADDITIONAL_VERSIONS 3.4 3.5 3.6 3.7 3.8)
- find_package(PythonInterp 3 REQUIRED)
- find_package(PythonLibs 3 REQUIRED)
- # we also need python3-config for swig
-diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt
-index 9fd65b2d3..1ef284349 100644
---- a/qrenderdoc/CMakeLists.txt
-+++ b/qrenderdoc/CMakeLists.txt
-@@ -7,6 +7,7 @@ endif()
-
- set(QMAKE_QT5_COMMAND ${QT_QMAKE_EXECUTABLE} CACHE STRING "Command to run to invoke Qt5's qmake. Normally this is qmake, possibly with qtchooser, but might be qmake-qt5")
- set(RENDERDOC_SWIG_PACKAGE https://github.com/baldurk/swig/archive/renderdoc-modified-6.zip CACHE STRING "The location where RenderDoc's swig fork source can be found. By default points to the URL on github but can be pointed to a local file.")
-+set(RENDERDOC_SWIG_PATCH "" CACHE STRING "The location for the patch to apply to swig.")
-
- set(QMAKE_CONFIG "debug")
- set(QMAKE_LDFLAGS "")
-@@ -99,6 +100,7 @@ ExternalProject_Add(custom_swig
- # using an URL to a zip directly so we don't clone the history etc
- URL ${RENDERDOC_SWIG_PACKAGE}
- BUILD_IN_SOURCE 1
-+ PATCH_COMMAND patch -p1 -i ${RENDERDOC_SWIG_PATCH} > /dev/null
- CONFIGURE_COMMAND ./autogen.sh > /dev/null 2>&1
- COMMAND CC=${SWIG_CONFIGURE_CC} CXX=${SWIG_CONFIGURE_CXX} CFLAGS=-fPIC CXXFLAGS=-fPIC ./configure --with-pcre=yes --prefix=${CMAKE_BINARY_DIR} > /dev/null
- BUILD_COMMAND ${GENERATOR_MAKE} > /dev/null 2>&1
---
-2.21.0
-
diff --git a/srcpkgs/renderdoc/template b/srcpkgs/renderdoc/template
index 96594d02f22..bb13d4f8898 100644
--- a/srcpkgs/renderdoc/template
+++ b/srcpkgs/renderdoc/template
@@ -1,12 +1,11 @@
# Template file for 'renderdoc'
pkgname=renderdoc
-version=1.4
-revision=3
+version=1.10
+revision=1
build_style=cmake
configure_args="-DENABLE_GL=ON -DENABLE_GLES=ON -DENABLE_QRENDERDOC=ON
-DENABLE_RENDERDOCCMD=ON -DENABLE_VULKAN=ON -DENABLE_XCB=ON -DENABLE_XLIB=ON
- -DENABLE_PYRENDERDOC=ON
- -DRENDERDOC_SWIG_PATCH=${XBPS_SRCPKGDIR}/${pkgname}/files/swig-py38.patch"
+ -DENABLE_PYRENDERDOC=ON"
hostmakedepends="bison autoconf automake pkg-config python3"
makedepends="libX11-devel libxcb-devel xcb-util-keysyms-devel qt5-devel
qt5-svg-devel qt5-x11extras-devel pcre-devel python3-devel"
@@ -15,8 +14,7 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
license="MIT"
homepage="https://github.com/baldurk/renderdoc"
distfiles="https://github.com/baldurk/${pkgname}/archive/v${version}.tar.gz"
-checksum=9a78951f386fb7c3ecf7df6919d300db59719d14f0621438963ae30a75d33677
-patch_args="-p1"
+checksum=6200099987c7cfc52360d24845742883dcfe6cb31b71c6f85372a543a9608486
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel"
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] renderdoc: update to 1.10.
2020-10-15 20:41 [PR PATCH] renderdoc: update to 1.10 faulesocke
@ 2020-10-20 10:27 ` faulesocke
2020-10-25 21:22 ` [PR PATCH] [Merged]: " Duncaen
1 sibling, 0 replies; 3+ messages in thread
From: faulesocke @ 2020-10-20 10:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 324 bytes --]
There is an updated pull request by faulesocke against master on the void-packages repository
https://github.com/faulesocke/void-packages renderdoc
https://github.com/void-linux/void-packages/pull/25641
renderdoc: update to 1.10.
A patch file from https://github.com/void-linux/void-packages/pull/25641.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-renderdoc-25641.patch --]
[-- Type: text/x-diff, Size: 7662 bytes --]
From 1f6c974261edeec276b97f81b9b9d49db936808a Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Fri, 25 Sep 2020 13:11:26 +0200
Subject: [PATCH] renderdoc: update to 1.10.
---
srcpkgs/renderdoc/files/swig-py38.patch | 28 ------------
srcpkgs/renderdoc/patches/QPainterPath.patch | 40 ----------------
srcpkgs/renderdoc/patches/cmake-py38.patch | 48 --------------------
srcpkgs/renderdoc/template | 11 ++---
4 files changed, 5 insertions(+), 122 deletions(-)
delete mode 100644 srcpkgs/renderdoc/files/swig-py38.patch
delete mode 100644 srcpkgs/renderdoc/patches/QPainterPath.patch
delete mode 100644 srcpkgs/renderdoc/patches/cmake-py38.patch
diff --git a/srcpkgs/renderdoc/files/swig-py38.patch b/srcpkgs/renderdoc/files/swig-py38.patch
deleted file mode 100644
index 0595599c658..00000000000
--- a/srcpkgs/renderdoc/files/swig-py38.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From dbe955dd0300d55a32fd73a4eef730b3e30ed5c4 Mon Sep 17 00:00:00 2001
-From: Christian Kellner <christian@kellner.me>
-Date: Thu, 11 Jul 2019 20:32:03 +0200
-Subject: [PATCH] swig: avoid use of _PyObject_GC_UNTRACK
-
-It is deprecated[1]. Use PyObject_GC_UnTrack instead.
-
-[1] https://docs.python.org/3/c-api/gcsupport.html#c._PyObject_GC_UNTRACK
----
- Lib/python/builtin.swg | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Lib/python/builtin.swg b/Lib/python/builtin.swg
-index 9597653b7..6af45a9d1 100644
---- a/Lib/python/builtin.swg
-+++ b/Lib/python/builtin.swg
-@@ -120,7 +120,7 @@ SwigPyBuiltin_FunpackSetterClosure (PyObject *obj, PyObject *val, void *closure)
-
- SWIGINTERN void
- SwigPyStaticVar_dealloc(PyDescrObject *descr) {
-- _PyObject_GC_UNTRACK(descr);
-+ PyObject_GC_UnTrack(descr);
- Py_XDECREF(PyDescr_TYPE(descr));
- Py_XDECREF(PyDescr_NAME(descr));
- PyObject_GC_Del(descr);
---
-2.21.0
-
diff --git a/srcpkgs/renderdoc/patches/QPainterPath.patch b/srcpkgs/renderdoc/patches/QPainterPath.patch
deleted file mode 100644
index 139930a77b4..00000000000
--- a/srcpkgs/renderdoc/patches/QPainterPath.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/qrenderdoc/Widgets/RangeHistogram.cpp 2019-04-29 11:50:14.000000000 +0200
-+++ b/qrenderdoc/Widgets/RangeHistogram.cpp 2020-08-31 19:10:09.169423623 +0200
-@@ -27,6 +27,7 @@
- #include <math.h>
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
-
- RangeHistogram::RangeHistogram(QWidget *parent) : QWidget(parent)
- {
---- a/qrenderdoc/Styles/RDTweakedNativeStyle/RDTweakedNativeStyle.cpp.orig 2019-04-29 11:50:14.000000000 +0200
-+++ b/qrenderdoc/Styles/RDTweakedNativeStyle/RDTweakedNativeStyle.cpp 2020-08-31 19:14:26.336436890 +0200
-@@ -26,6 +26,7 @@
- #include <QDebug>
- #include <QFontMetrics>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPen>
- #include <QStyleOption>
-
---- a/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp 2019-04-29 11:50:14.000000000 +0200
-+++ b/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp 2020-08-31 19:15:33.841440372 +0200
-@@ -32,6 +32,7 @@
- #include <QMimeData>
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QScreen>
- #include <QSplitter>
- #include <QTabBar>
---- a/qrenderdoc/Windows/TimelineBar.cpp 2019-04-29 11:50:14.000000000 +0200
-+++ b/qrenderdoc/Windows/TimelineBar.cpp 2020-08-31 19:16:36.087443584 +0200
-@@ -25,6 +25,7 @@
- #include "TimelineBar.h"
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QScrollBar>
- #include <QWheelEvent>
- #include "Code/QRDUtils.h"
diff --git a/srcpkgs/renderdoc/patches/cmake-py38.patch b/srcpkgs/renderdoc/patches/cmake-py38.patch
deleted file mode 100644
index fc1adb9ddbc..00000000000
--- a/srcpkgs/renderdoc/patches/cmake-py38.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 56769d3e2cc12670b73a1ddd9dfaab959340c2e2 Mon Sep 17 00:00:00 2001
-From: Christian Kellner <christian@kellner.me>
-Date: Thu, 11 Jul 2019 21:27:02 +0200
-Subject: [PATCH] CMake: py3.8 support, ability to patch swig
-
-Add 3.8 to list of python versions and ability to patch the custom
-swig, also needed for 3.8
----
- CMakeLists.txt | 2 +-
- qrenderdoc/CMakeLists.txt | 2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 13818e5b8..00feda2ad 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -308,7 +308,7 @@ add_subdirectory(renderdoc)
- # are handled in common
- if(ENABLE_QRENDERDOC OR ENABLE_PYRENDERDOC)
- # Make sure Python 3 is found
-- set(Python_ADDITIONAL_VERSIONS 3.4 3.5 3.6 3.7)
-+ set(Python_ADDITIONAL_VERSIONS 3.4 3.5 3.6 3.7 3.8)
- find_package(PythonInterp 3 REQUIRED)
- find_package(PythonLibs 3 REQUIRED)
- # we also need python3-config for swig
-diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt
-index 9fd65b2d3..1ef284349 100644
---- a/qrenderdoc/CMakeLists.txt
-+++ b/qrenderdoc/CMakeLists.txt
-@@ -7,6 +7,7 @@ endif()
-
- set(QMAKE_QT5_COMMAND ${QT_QMAKE_EXECUTABLE} CACHE STRING "Command to run to invoke Qt5's qmake. Normally this is qmake, possibly with qtchooser, but might be qmake-qt5")
- set(RENDERDOC_SWIG_PACKAGE https://github.com/baldurk/swig/archive/renderdoc-modified-6.zip CACHE STRING "The location where RenderDoc's swig fork source can be found. By default points to the URL on github but can be pointed to a local file.")
-+set(RENDERDOC_SWIG_PATCH "" CACHE STRING "The location for the patch to apply to swig.")
-
- set(QMAKE_CONFIG "debug")
- set(QMAKE_LDFLAGS "")
-@@ -99,6 +100,7 @@ ExternalProject_Add(custom_swig
- # using an URL to a zip directly so we don't clone the history etc
- URL ${RENDERDOC_SWIG_PACKAGE}
- BUILD_IN_SOURCE 1
-+ PATCH_COMMAND patch -p1 -i ${RENDERDOC_SWIG_PATCH} > /dev/null
- CONFIGURE_COMMAND ./autogen.sh > /dev/null 2>&1
- COMMAND CC=${SWIG_CONFIGURE_CC} CXX=${SWIG_CONFIGURE_CXX} CFLAGS=-fPIC CXXFLAGS=-fPIC ./configure --with-pcre=yes --prefix=${CMAKE_BINARY_DIR} > /dev/null
- BUILD_COMMAND ${GENERATOR_MAKE} > /dev/null 2>&1
---
-2.21.0
-
diff --git a/srcpkgs/renderdoc/template b/srcpkgs/renderdoc/template
index 96594d02f22..5aff40ecaec 100644
--- a/srcpkgs/renderdoc/template
+++ b/srcpkgs/renderdoc/template
@@ -1,12 +1,11 @@
# Template file for 'renderdoc'
pkgname=renderdoc
-version=1.4
-revision=3
+version=1.10
+revision=1
build_style=cmake
configure_args="-DENABLE_GL=ON -DENABLE_GLES=ON -DENABLE_QRENDERDOC=ON
-DENABLE_RENDERDOCCMD=ON -DENABLE_VULKAN=ON -DENABLE_XCB=ON -DENABLE_XLIB=ON
- -DENABLE_PYRENDERDOC=ON
- -DRENDERDOC_SWIG_PATCH=${XBPS_SRCPKGDIR}/${pkgname}/files/swig-py38.patch"
+ -DENABLE_PYRENDERDOC=ON"
hostmakedepends="bison autoconf automake pkg-config python3"
makedepends="libX11-devel libxcb-devel xcb-util-keysyms-devel qt5-devel
qt5-svg-devel qt5-x11extras-devel pcre-devel python3-devel"
@@ -15,8 +14,7 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
license="MIT"
homepage="https://github.com/baldurk/renderdoc"
distfiles="https://github.com/baldurk/${pkgname}/archive/v${version}.tar.gz"
-checksum=9a78951f386fb7c3ecf7df6919d300db59719d14f0621438963ae30a75d33677
-patch_args="-p1"
+checksum=6200099987c7cfc52360d24845742883dcfe6cb31b71c6f85372a543a9608486
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel"
@@ -26,6 +24,7 @@ case "$XBPS_TARGET_MACHINE" in
*-musl) broken="uses RTLD_DL_LINKMAP, RTLD_DEEPBIND, _r_debug" ;;
ppc64*) ;;
ppc*) broken="undefined reference to '__sync_add_and_fetch_8'" ;;
+ i686) broken="undefined reference to 'rdcstr DoStringise<long>(long const&)'" ;;
esac
if [ "$CROSS_BUILD" ]; then
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: renderdoc: update to 1.10.
2020-10-15 20:41 [PR PATCH] renderdoc: update to 1.10 faulesocke
2020-10-20 10:27 ` [PR PATCH] [Updated] " faulesocke
@ 2020-10-25 21:22 ` Duncaen
1 sibling, 0 replies; 3+ messages in thread
From: Duncaen @ 2020-10-25 21:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 160 bytes --]
There's a merged pull request on the void-packages repository
renderdoc: update to 1.10.
https://github.com/void-linux/void-packages/pull/25641
Description:
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-25 21:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-15 20:41 [PR PATCH] renderdoc: update to 1.10 faulesocke
2020-10-20 10:27 ` [PR PATCH] [Updated] " faulesocke
2020-10-25 21:22 ` [PR PATCH] [Merged]: " Duncaen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).