cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add hidden build dependency on vulkan

Browse Source 
- Hidden dependency spotted by tb@. Upstram patch to unbreak the build when
  vulkan is present by me.
- Remove COMPILER because it is inherited by x11/qt5
- Regen WANTLIB

Maintainer timeout
This commit is contained in:
rsadowski 2021-05-13 06:40:58 +00:00
parent abf03e5732
commit aece573567
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
emulators/retroarch/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.19 2020/04/29 14:12:08 cwen Exp $
# $OpenBSD: Makefile,v 1.20 2021/05/13 06:40:58 rsadowski Exp $
COMMENT = generic multi-emulator frontend
V = 1.7.6
DISTNAME = RetroArch-$V
PKGNAME = retroarch-$V
REVISION = 2
REVISION = 3
CATEGORIES = emulators
@ -14,22 +14,20 @@ HOMEPAGE = https://www.libretro.com/
# code GPLv3+, assets CC-BY-4.0
PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX}
WANTLIB += EGL GL Qt5Concurrent Qt5Core Qt5Gui Qt5Network Qt5Widgets
WANTLIB += SDL2 X11 X11-xcb Xext Xinerama Xv Xxf86vm ass avcodec
WANTLIB += avformat avutil c crypto drm freetype gbm m openal
WANTLIB += ssl swresample swscale usb-1.0 xcb xkbcommon z
COMPILER = base-clang ports-gcc base-gcc
WANTLIB += ${COMPILER_LIBCXX} EGL GL Qt5Concurrent Qt5Core Qt5Gui
WANTLIB += Qt5Network Qt5Widgets SDL2 X11 X11-xcb Xext Xinerama
WANTLIB += Xrandr Xv Xxf86vm ass avcodec avformat avutil c crypto
WANTLIB += drm freetype gbm m openal ssl swresample swscale usb-1.0
WANTLIB += xcb xkbcommon z
MASTER_SITES = https://github.com/libretro/RetroArch/releases/download/v$V/
EXTRACT_SUFX = .tar.xz
MAINTAINER = Anthony J. Bentley <anthony@anjbe.name>
MODULES = x11/qt5
RUN_DEPENDS = devel/desktop-file-utils
BUILD_DEPENDS = graphics/vulkan-tools
LIB_DEPENDS = audio/openal \
devel/libusb1 \
devel/sdl2 \

18
emulators/retroarch/patches/patch-deps_glslang_glslang_glslang_Include_PoolAlloc_h Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-deps_glslang_glslang_glslang_Include_PoolAlloc_h,v 1.1 2021/05/13 06:40:58 rsadowski Exp $
TPoolAllocator is not copy assignable, so this setter could never have
been used. After a recent change (878a24ee2), new versions of Clang
reject this code outright.
https://github.com/libretro/RetroArch/commit/e4b9311ac15570bfe757d77de1c66584f95e1df9
Index: deps/glslang/glslang/glslang/Include/PoolAlloc.h
--- deps/glslang/glslang/glslang/Include/PoolAlloc.h.orig
+++ deps/glslang/glslang/glslang/Include/PoolAlloc.h
@@ -304,7 +304,6 @@ class pool_allocator { (public)
size_type max_size() const { return static_cast<size_type>(-1) / sizeof(T); }
size_type max_size(int size) const { return static_cast<size_type>(-1) / size; }
- void setAllocator(TPoolAllocator* a) { allocator = *a; }
TPoolAllocator& getAllocator() const { return allocator; }
protected: