git: eaeb6e42e3a6 - main - graphics/radiance: Update 0.6.1 -> 0.6.1.20200216; Unbreak; Add the PORTSCOUT tag
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 17 Oct 2021 03:35:38 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=eaeb6e42e3a64c90c8e252fb729242cf1322e16a
commit eaeb6e42e3a64c90c8e252fb729242cf1322e16a
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2021-10-17 03:32:43 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2021-10-17 03:35:35 +0000
graphics/radiance: Update 0.6.1 -> 0.6.1.20200216; Unbreak; Add the PORTSCOUT tag
mpv removed the header qthelper.hpp and they now recommend to copy it
into project's source. This is done by this unbreak.
mpv-based code fails to initialize OpenGL, at least on my computer,
so mpv throws an exception.
Testcase: https://github.com/mpv-player/mpv/issues/9319
---
graphics/radiance/Makefile | 18 ++++++++++++------
graphics/radiance/distinfo | 12 +++++++-----
graphics/radiance/files/patch-src_MovieNode.h | 11 +++++++++++
3 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/graphics/radiance/Makefile b/graphics/radiance/Makefile
index 47e954061615..4767e744ac97 100644
--- a/graphics/radiance/Makefile
+++ b/graphics/radiance/Makefile
@@ -1,8 +1,11 @@
PORTNAME= radiance
-DISTVERSION= 0.6.1
-PORTREVISION= 2
+DISTVERSION= 0.6.1.20200216
CATEGORIES= graphics
+MASTER_SITES= https://raw.githubusercontent.com/mpv-player/mpv/v0.32.0/libmpv/:qthelper
PKGNAMESUFFIX= -video
+DISTFILES= qthelper.hpp:qthelper
+DIST_SUBDIR= ${PORTNAME}-${DISTVERSION}
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} zbanks-BTrack-1c5b72e_GH0${EXTRACT_SUFX}
MAINTAINER= yuri@FreeBSD.org
COMMENT= Video art software for VJs
@@ -10,8 +13,6 @@ COMMENT= Video art software for VJs
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BROKEN= Fails to build with the latest mpv: https://github.com/zbanks/radiance/issues/114
-
LIB_DEPENDS= libfftw3.so:math/fftw3 \
libfftw3f.so:math/fftw3-float \
libmpv.so:multimedia/mpv \
@@ -21,15 +22,20 @@ LIB_DEPENDS= libfftw3.so:math/fftw3 \
USES= cmake compiler:c++14-lang cpe gl localbase:ldflags qt:5
USE_GITHUB= yes
-GH_ACCOUNT= zbanks
-GH_TUPLE= zbanks:BTrack:1c5b72e:bt/BTrack
USE_QT= core declarative graphicaleffects gui network quickcontrols widgets \
buildtools_build qmake_build
USE_GL= gl glu
+GH_ACCOUNT= zbanks
+GH_TAGNAME= baf2c40
+GH_TUPLE= zbanks:BTrack:1c5b72e:bt/BTrack
+
CMAKE_ARGS= -DRADIANCE_SYSTEM_RESOURCES:STRING=${DATADIR}/
+PORTSCOUT= limit:^[0-9\.]*$$ # prevent tags like release-YYYYMMDD
+
post-patch:
@${REINPLACE_CMD} '/-march=native/d' ${WRKSRC}/CMakeLists.txt
+ @${MKDIR} ${WRKSRC}/mpv && ${CP} ${DISTDIR}/${DIST_SUBDIR}/qthelper.hpp ${WRKSRC}/mpv
.include <bsd.port.mk>
diff --git a/graphics/radiance/distinfo b/graphics/radiance/distinfo
index 24a57ce854cc..495793304f14 100644
--- a/graphics/radiance/distinfo
+++ b/graphics/radiance/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1564379184
-SHA256 (zbanks-radiance-0.6.1_GH0.tar.gz) = cfc3281abe61ee9a5efba67d682b212bb75cb7197ff65ee0eff0d30577011163
-SIZE (zbanks-radiance-0.6.1_GH0.tar.gz) = 308059
-SHA256 (zbanks-BTrack-1c5b72e_GH0.tar.gz) = af567e80f6edf031af17bf4e7ed7eb89349be059046a4877defd14bb6cc70899
-SIZE (zbanks-BTrack-1c5b72e_GH0.tar.gz) = 21590
+TIMESTAMP = 1634434473
+SHA256 (radiance-0.6.1.20200216/qthelper.hpp) = 86e1fcba6001829b7e23a856db84d01ebc76e63528f74064d7bc5705015a2684
+SIZE (radiance-0.6.1.20200216/qthelper.hpp) = 12024
+SHA256 (radiance-0.6.1.20200216/zbanks-radiance-0.6.1.20200216-baf2c40_GH0.tar.gz) = efbdcaa88c092690d253da1bc3d330d704c5d950bff779277bc7e6d54a5d38b2
+SIZE (radiance-0.6.1.20200216/zbanks-radiance-0.6.1.20200216-baf2c40_GH0.tar.gz) = 312159
+SHA256 (radiance-0.6.1.20200216/zbanks-BTrack-1c5b72e_GH0.tar.gz) = af567e80f6edf031af17bf4e7ed7eb89349be059046a4877defd14bb6cc70899
+SIZE (radiance-0.6.1.20200216/zbanks-BTrack-1c5b72e_GH0.tar.gz) = 21590
diff --git a/graphics/radiance/files/patch-src_MovieNode.h b/graphics/radiance/files/patch-src_MovieNode.h
new file mode 100644
index 000000000000..cfdd880f45ae
--- /dev/null
+++ b/graphics/radiance/files/patch-src_MovieNode.h
@@ -0,0 +1,11 @@
+--- src/MovieNode.h.orig 2021-10-17 01:26:30 UTC
++++ src/MovieNode.h
+@@ -9,7 +9,7 @@
+ #include <QOpenGLShaderProgram>
+ #include <mpv/client.h>
+ #include <mpv/opengl_cb.h>
+-#include <mpv/qthelper.hpp>
++#include "mpv/qthelper.hpp" // removed file manually copied in, see https://github.com/mpv-player/mpv/blob/575197ff8b0a0d8cd14f7ee78461c1d61d045d72/DOCS/client-api-changes.rst#api-changes
+ #include <vector>
+ #include <array>
+