Date: Tue, 6 Apr 2021 12:03:09 GMT From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 451d0c283a0f - main - devel/juce: use system png Message-ID: <202104061203.136C39aG006828@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=451d0c283a0f9d6e633cc665f5fec8d21c4162b8 commit 451d0c283a0f9d6e633cc665f5fec8d21c4162b8 Author: Piotr Kubaj <pkubaj@FreeBSD.org> AuthorDate: 2021-04-06 12:03:34 +0000 Commit: Piotr Kubaj <pkubaj@FreeBSD.org> CommitDate: 2021-04-06 12:03:34 +0000 devel/juce: use system png This fixes build on powerpc64le since the builtin png does not detect VSX availaibility. PR: 254726 Approved by: yuri (maintainer) --- devel/juce/Makefile | 5 +++-- devel/juce/files/patch-modules_juce__core_juce__core.h | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/devel/juce/Makefile b/devel/juce/Makefile index f0f5a506e1b1..797a975998a9 100644 --- a/devel/juce/Makefile +++ b/devel/juce/Makefile @@ -18,7 +18,8 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib \ libfreetype.so:print/freetype2 \ libsysinfo.so:devel/libsysinfo -USES= cmake compiler:c++11-lang gl localbase:ldflags pkgconfig xorg +USES= cmake compiler:c++11-lang dos2unix gl localbase:ldflags pkgconfig xorg +DOS2UNIX_FILES= modules/juce_core/juce_core.h USE_GL= gl USE_XORG= x11 xcomposite xcursor xext xinerama xorgproto xrandr @@ -30,7 +31,7 @@ GH_TAGNAME= f37e9a1 CMAKE_ON= JUCE_BUILD_EXTRAS CXXFLAGS+= -I${LOCALBASE}/include/freetype2 -LDFLAGS+= -pthread -lfreetype +LDFLAGS+= -pthread -lfreetype -lpng16 LDFLAGS+= -lGL # while building NetworkGraphicsDemo ld: error: undefined symbol: glXGetCurrentContext referenced by ld-temp.o LDFLAGS+= -lasound # while building AudioPerformanceTest ld: error: undefined symbol: snd_seq_system_info_sizeof LDFLAGS+= -lsysinfo # while building Projucer ld: error: undefined symbol: sysinfo diff --git a/devel/juce/files/patch-modules_juce__core_juce__core.h b/devel/juce/files/patch-modules_juce__core_juce__core.h new file mode 100644 index 000000000000..878aeafb49f9 --- /dev/null +++ b/devel/juce/files/patch-modules_juce__core_juce__core.h @@ -0,0 +1,14 @@ +--- modules/juce_core/juce_core.h.orig 2021-04-02 18:08:09 UTC ++++ modules/juce_core/juce_core.h +@@ -64,6 +64,11 @@ + + #include "system/juce_TargetPlatform.h" + ++#ifdef JUCE_INCLUDE_PNGLIB_CODE ++# undef JUCE_INCLUDE_PNGLIB_CODE ++#endif ++#define JUCE_INCLUDE_PNGLIB_CODE 0 ++ + //============================================================================== + /** Config: JUCE_FORCE_DEBUG +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104061203.136C39aG006828>