Index: head/multimedia/obs-studio/Makefile =================================================================== --- head/multimedia/obs-studio/Makefile (revision 530916) +++ head/multimedia/obs-studio/Makefile (revision 530917) @@ -1,73 +1,75 @@ # $FreeBSD$ PORTNAME= obs-studio DISTVERSION= 25.0.4 +PORTREVISION= 1 CATEGORIES= multimedia PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES= e1de4e8a50b5e50f69214d3a4fd39b4b9b03e050.patch:-p1 # obs-studio-25.0.3-fix-compiler-warnings.patch +PATCHFILES+= 9bd33f6fdebc47d17e3cc1f0122a1f784eebc507.patch:-p1 # https://github.com/obsproject/obs-studio/pull/2663 (Add FreeBSD and Dragonfly support in os_get_executable_path_ptr()) MAINTAINER= yuri@FreeBSD.org COMMENT= Open source streaming/recording software LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_aarch64= Fails to compile: invalid conversion between vector type and integer type BUILD_DEPENDS= v4l_compat>=0:multimedia/v4l_compat \ swig3.0:devel/swig30 LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libcurl.so:ftp/curl \ libdbus-1.so:devel/dbus \ libfdk-aac.so:audio/fdk-aac \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libjack.so:audio/jack \ libjansson.so:devel/jansson \ libmbedtls.so:security/mbedtls \ libpulse.so:audio/pulseaudio \ libspeexdsp.so:audio/speexdsp \ libsysinfo.so:devel/libsysinfo \ libudev.so:devel/libudev-devd \ libv4l2.so:multimedia/libv4l \ libvlc.so:multimedia/vlc \ libx264.so:multimedia/libx264 \ ${LIB_DEPENDS_${ARCH}} LIB_DEPENDS_amd64= libluajit-5.1.so:lang/luajit LIB_DEPENDS_armv7= libluajit-5.1.so:lang/luajit LIB_DEPENDS_i386= libluajit-5.1.so:lang/luajit LIB_DEPENDS_powerpc= libluajit-5.1.so:lang/luajit USES= cmake compiler:c++11-lib gl lua pkgconfig python:3.4+ qt:5 xorg USE_GITHUB= yes GH_ACCOUNT= obsproject USE_QT= core gui svg widgets x11extras xml buildtools_build imageformats_run qmake_build USE_GL= gl USE_XORG= ice sm x11 xcb xcomposite xext xfixes xinerama xrandr USE_LDCONFIG= yes CMAKE_ON= UNIX_STRUCTURE CMAKE_ARGS= -DOBS_VERSION_OVERRIDE:STRING="${PORTVERSION}" CFLAGS+= -D_WITH_GETLINE .include .if ${ARCH} != amd64 && ${ARCH} != armv7 && ${ARCH} != i386 && ${ARCH} != powerpc PLIST_SUB+= LUAJIT="@comment " .else PLIST_SUB+= LUAJIT="" .endif post-patch: @${REINPLACE_CMD} -e 's| 3.4)| ${PYTHON_VER})|' \ ${WRKSRC}/cmake/Modules/FindPythonDeps.cmake post-install: # https://github.com/obsproject/obs-studio/issues/2625 ${INSTALL_DATA} ${WRKSRC}/UI/obs-frontend-api/obs-frontend-api.h ${STAGEDIR}${PREFIX}/include/obs # https://github.com/obsproject/obs-studio/issues/2647 (only for multimedia/obs-audio-spectralizer, should be removed later) ${INSTALL_DATA} ${WRKSRC}/cmake/Modules/ObsHelpers.cmake ${STAGEDIR}${PREFIX}/lib/cmake ${INSTALL_DATA} ${WRKSRC}/cmake/external/ObsPluginHelpers.cmake ${STAGEDIR}${PREFIX}/lib/cmake .include Index: head/multimedia/obs-studio/distinfo =================================================================== --- head/multimedia/obs-studio/distinfo (revision 530916) +++ head/multimedia/obs-studio/distinfo (revision 530917) @@ -1,5 +1,7 @@ -TIMESTAMP = 1586152652 +TIMESTAMP = 1586197157 SHA256 (obsproject-obs-studio-25.0.4_GH0.tar.gz) = c8db224d2ee4d9b91448be9e47414398e570eebe4a59ff9fd19b066789d1ccdb SIZE (obsproject-obs-studio-25.0.4_GH0.tar.gz) = 8367681 SHA256 (e1de4e8a50b5e50f69214d3a4fd39b4b9b03e050.patch) = 3efc78daa680c40130a0dfccac0d3ef522619afb46558cd52db9e67ec41e696b SIZE (e1de4e8a50b5e50f69214d3a4fd39b4b9b03e050.patch) = 1239 +SHA256 (9bd33f6fdebc47d17e3cc1f0122a1f784eebc507.patch) = 994ce2a44a141c61bad29e7ddfb2c9c9ef82bc86a3df51bd186cc53ac6cc24d2 +SIZE (9bd33f6fdebc47d17e3cc1f0122a1f784eebc507.patch) = 1423 Index: head/multimedia/obs-studio/files/patch-libobs_util_platform-nix.c =================================================================== --- head/multimedia/obs-studio/files/patch-libobs_util_platform-nix.c (revision 530916) +++ head/multimedia/obs-studio/files/patch-libobs_util_platform-nix.c (nonexistent) @@ -1,22 +0,0 @@ ---- libobs/util/platform-nix.c.orig 2020-03-19 16:51:06 UTC -+++ libobs/util/platform-nix.c -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - #include - #include - #else -@@ -275,7 +276,11 @@ char *os_get_program_data_path_ptr(const char *name) - char *os_get_executable_path_ptr(const char *name) - { - char exe[PATH_MAX]; -+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) -+ ssize_t count = readlink("/proc/curproc/file", exe, PATH_MAX); -+#else - ssize_t count = readlink("/proc/self/exe", exe, PATH_MAX); -+#endif - const char *path_out = NULL; - struct dstr path; - Property changes on: head/multimedia/obs-studio/files/patch-libobs_util_platform-nix.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property