Fix build on 9 and fix dependency list.

PR:		209046
Submitted by:	tkato432 yahoo com
Sponsored by:	Absolight
This commit is contained in:
Mathieu Arnold 2016-05-09 13:42:54 +00:00
parent f22b34a823
commit b1331178b4
4 changed files with 207 additions and 98 deletions

View file

@ -2,40 +2,45 @@
PORTNAME= obs-studio
PORTVERSION= 0.14.1
PORTREVISION= 1
CATEGORIES= multimedia
MAINTAINER= ports@FreeBSD.org
COMMENT= Open Broadcaster Software Multiplatform
COMMENT= Open source streaming/recording software
LICENSE= GPLv2
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libsysinfo.so:devel/libsysinfo \
libx264.so:multimedia/libx264 \
libv4l2.so:multimedia/libv4l \
libpulse.so:audio/pulseaudio \
libjack.so:audio/jack \
libjansson.so:devel/jansson \
libcurl.so:ftp/curl \
libavcodec.so:multimedia/ffmpeg \
libfdk-aac.so:audio/fdk-aac
BUILD_DEPENDS= v4l_compat>=0:multimedia/v4l_compat
BROKEN_FreeBSD_9= does not build
USE_XORG= x11 xcomposite xdamage xrender
USE_XCB= x11extras wm
USE_XORG= xcb xcomposite xfixes xinerama xrandr
USE_LDCONFIG= yes
USE_GL+= gl
USE_QT5= core dbus gui opengl network svg multimedia \
imageformats buildtools qmake x11extras
CFLAGS+= -fPIC
LDFLAGS+= ${LOCALBASE}/lib/libsysinfo.so
USES= cmake compiler:c11
CMAKE_ARGS+= -DUNIX_STRUCTURE=1 \
-DOBS_VERSION_OVERRIDE=${PORTVERSION}
INSTALLS_ICONS= yes
USE_GL= gl
USE_QT5= widgets x11extras buildtools_build qmake_build imageformats_run
USES= cmake:outsource compiler:c++11-lib pkgconfig
CMAKE_ARGS= -DUNIX_STRUCTURE:BOOL=ON \
-DOBS_VERSION_OVERRIDE:STRING="${PORTVERSION}" \
USE_GITHUB= yes
GH_ACCOUNT= jp9000
.include <bsd.port.pre.mk>
.if ${CHOSEN_COMPILER_TYPE} == gcc
CXXFLAGS+= -D_GLIBCXX_USE_C99
.endif
post-patch:
@${REINPLACE_CMD} -e 's|-ldl||' \
${CONFIGURE_WRKSRC}/deps/glad/CMakeLists.txt
${WRKSRC}/deps/glad/CMakeLists.txt
.include <bsd.port.mk>
.include <bsd.port.post.mk>

View file

@ -1,6 +1,6 @@
--- obs/window-basic-main.cpp.orig 2015-03-27 21:29:37 UTC
--- obs/window-basic-main.cpp.orig 2016-04-24 23:05:32 UTC
+++ obs/window-basic-main.cpp
@@ -1056,6 +1056,10 @@ void OBSBasic::TimedCheckForUpdates()
@@ -1824,6 +1824,10 @@ void OBSBasic::TimedCheckForUpdates()
void OBSBasic::CheckForUpdates()
{

View file

@ -0,0 +1,69 @@
--- obs/window-basic-preview.cpp.orig 2016-04-24 23:05:32 UTC
+++ obs/window-basic-preview.cpp
@@ -402,8 +402,8 @@ void OBSBasicPreview::mousePressEvent(QM
GetStretchHandleData(startPos);
vec2_divf(&startPos, &startPos, main->previewScale / pixelRatio);
- startPos.x = std::round(startPos.x);
- startPos.y = std::round(startPos.y);
+ startPos.x = ::round(startPos.x);
+ startPos.y = ::round(startPos.y);
mouseOverItems = SelectedAtPos(startPos);
vec2_zero(&lastMoveOffset);
@@ -692,8 +692,8 @@ void OBSBasicPreview::ClampAspect(vec3 &
size.y = size.x / baseAspect;
}
- size.x = std::round(size.x);
- size.y = std::round(size.y);
+ size.x = ::round(size.x);
+ size.y = ::round(size.y);
if (stretchFlags & ITEM_LEFT)
tl.x = br.x - size.x;
@@ -826,18 +826,18 @@ void OBSBasicPreview::CropItem(const vec
crop = startCrop;
if (stretchFlags & ITEM_LEFT)
- crop.left += int(std::round(tl.x / scale.x));
+ crop.left += int(::round(tl.x / scale.x));
else if (stretchFlags & ITEM_RIGHT)
- crop.right += int(std::round((stretchItemSize.x - br.x) / scale.x));
+ crop.right += int(::round((stretchItemSize.x - br.x) / scale.x));
if (stretchFlags & ITEM_TOP)
- crop.top += int(std::round(tl.y / scale.y));
+ crop.top += int(::round(tl.y / scale.y));
else if (stretchFlags & ITEM_BOTTOM)
- crop.bottom += int(std::round((stretchItemSize.y - br.y) / scale.y));
+ crop.bottom += int(::round((stretchItemSize.y - br.y) / scale.y));
vec3_transform(&newPos, &newPos, &itemToScreen);
- newPos.x = std::round(newPos.x);
- newPos.y = std::round(newPos.y);
+ newPos.x = ::round(newPos.x);
+ newPos.y = ::round(newPos.y);
#if 0
vec3 curPos;
@@ -922,7 +922,7 @@ void OBSBasicPreview::StretchItem(const
vec3_transform(&pos3, &pos3, &itemToScreen);
vec2 newPos;
- vec2_set(&newPos, std::round(pos3.x), std::round(pos3.y));
+ vec2_set(&newPos, ::round(pos3.x), ::round(pos3.y));
obs_sceneitem_set_pos(stretchItem, &newPos);
}
@@ -937,8 +937,8 @@ void OBSBasicPreview::mouseMoveEvent(QMo
mouseOverItems = SelectedAtPos(startPos);
}
- pos.x = std::round(pos.x);
- pos.y = std::round(pos.y);
+ pos.x = ::round(pos.x);
+ pos.y = ::round(pos.y);
if (stretchHandle != ItemHandle::None) {
if (cropping)

View file

@ -11,8 +11,8 @@ include/obs/graphics/effect.h
include/obs/graphics/graphics-internal.h
include/obs/graphics/graphics.h
include/obs/graphics/image-file.h
include/obs/graphics/%%QT_LIBDIR%%nsgif/%%QT_LIBDIR%%nsgif.h
include/obs/graphics/input.h
include/obs/graphics/libnsgif/libnsgif.h
include/obs/graphics/math-defs.h
include/obs/graphics/math-extra.h
include/obs/graphics/matrix3.h
@ -26,8 +26,8 @@ include/obs/graphics/vec4.h
include/obs/media-io/audio-io.h
include/obs/media-io/audio-math.h
include/obs/media-io/audio-resampler.h
include/obs/media-io/frame-rate.h
include/obs/media-io/format-conversion.h
include/obs/media-io/frame-rate.h
include/obs/media-io/media-io-defs.h
include/obs/media-io/media-remux.h
include/obs/media-io/video-frame.h
@ -73,56 +73,57 @@ include/obs/util/profiler.h
include/obs/util/profiler.hpp
include/obs/util/serializer.h
include/obs/util/text-lookup.h
include/obs/util/threading.h
include/obs/util/threading-posix.h
include/obs/util/threading.h
include/obs/util/utf8.h
include/obs/util/util_uint128.h
include/obs/util/vc/vc_inttypes.h
include/obs/util/vc/vc_stdbool.h
include/obs/util/vc/vc_stdint.h
%%QT_LIBDIR%%/cmake/LibObs/LibObsConfig.cmake
%%QT_LIBDIR%%/cmake/LibObs/LibObsConfigVersion.cmake
%%QT_LIBDIR%%/cmake/LibObs/LibObsTarget-%%CMAKE_BUILD_TYPE%%.cmake
%%QT_LIBDIR%%/cmake/LibObs/LibObsTarget.cmake
%%QT_LIBDIR%%/%%QT_LIBDIR%%obs-opengl.so
%%QT_LIBDIR%%/%%QT_LIBDIR%%obs-opengl.so.0
%%QT_LIBDIR%%/%%QT_LIBDIR%%obs-opengl.so.0.0
%%QT_LIBDIR%%/%%QT_LIBDIR%%obs.so
%%QT_LIBDIR%%/%%QT_LIBDIR%%obs.so.0
%%QT_LIBDIR%%/%%QT_LIBDIR%%obsglad.so
%%QT_LIBDIR%%/%%QT_LIBDIR%%obsglad.so.0
%%QT_LIBDIR%%/obs-plugins/image-source.so
%%QT_LIBDIR%%/obs-plugins/linux-capture.so
%%QT_LIBDIR%%/obs-plugins/linux-pulseaudio.so
%%QT_LIBDIR%%/obs-plugins/linux-v4l2.so
%%QT_LIBDIR%%/obs-plugins/obs-ffmpeg.so
%%QT_LIBDIR%%/obs-plugins/obs-filters.so
%%QT_LIBDIR%%/obs-plugins/obs-%%QT_LIBDIR%%fdk.so
%%QT_LIBDIR%%/obs-plugins/obs-outputs.so
%%QT_LIBDIR%%/obs-plugins/obs-transitions.so
%%QT_LIBDIR%%/obs-plugins/obs-x264.so
%%QT_LIBDIR%%/obs-plugins/rtmp-services.so
%%QT_LIBDIR%%/obs-plugins/text-freetype2.so
lib/cmake/LibObs/LibObsConfig.cmake
lib/cmake/LibObs/LibObsConfigVersion.cmake
lib/cmake/LibObs/LibObsTarget-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/LibObs/LibObsTarget.cmake
lib/libobs-opengl.so
lib/libobs-opengl.so.0
lib/libobs-opengl.so.0.0
lib/libobs.so
lib/libobs.so.0
lib/libobsglad.so
lib/libobsglad.so.0
lib/obs-plugins/image-source.so
lib/obs-plugins/linux-capture.so
lib/obs-plugins/linux-jack.so
lib/obs-plugins/linux-pulseaudio.so
lib/obs-plugins/linux-v4l2.so
lib/obs-plugins/obs-ffmpeg.so
lib/obs-plugins/obs-filters.so
lib/obs-plugins/obs-libfdk.so
lib/obs-plugins/obs-outputs.so
lib/obs-plugins/obs-transitions.so
lib/obs-plugins/obs-x264.so
lib/obs-plugins/rtmp-services.so
lib/obs-plugins/text-freetype2.so
share/applications/obs.desktop
share/icons/hicolor/256x256/apps/obs.png
share/obs/%%QT_LIBDIR%%obs/bicubic_scale.effect
share/obs/%%QT_LIBDIR%%obs/bilinear_lowres_scale.effect
share/obs/%%QT_LIBDIR%%obs/default.effect
share/obs/%%QT_LIBDIR%%obs/default_rect.effect
share/obs/%%QT_LIBDIR%%obs/deinterlace_base.effect
share/obs/%%QT_LIBDIR%%obs/deinterlace_blend.effect
share/obs/%%QT_LIBDIR%%obs/deinterlace_blend_2x.effect
share/obs/%%QT_LIBDIR%%obs/deinterlace_discard.effect
share/obs/%%QT_LIBDIR%%obs/deinterlace_discard_2x.effect
share/obs/%%QT_LIBDIR%%obs/deinterlace_linear.effect
share/obs/%%QT_LIBDIR%%obs/deinterlace_linear_2x.effect
share/obs/%%QT_LIBDIR%%obs/deinterlace_yadif.effect
share/obs/%%QT_LIBDIR%%obs/deinterlace_yadif_2x.effect
share/obs/%%QT_LIBDIR%%obs/format_conversion.effect
share/obs/%%QT_LIBDIR%%obs/lanczos_scale.effect
share/obs/%%QT_LIBDIR%%obs/opaque.effect
share/obs/%%QT_LIBDIR%%obs/premultiplied_alpha.effect
share/obs/%%QT_LIBDIR%%obs/solid.effect
share/obs/libobs/bicubic_scale.effect
share/obs/libobs/bilinear_lowres_scale.effect
share/obs/libobs/default.effect
share/obs/libobs/default_rect.effect
share/obs/libobs/deinterlace_base.effect
share/obs/libobs/deinterlace_blend.effect
share/obs/libobs/deinterlace_blend_2x.effect
share/obs/libobs/deinterlace_discard.effect
share/obs/libobs/deinterlace_discard_2x.effect
share/obs/libobs/deinterlace_linear.effect
share/obs/libobs/deinterlace_linear_2x.effect
share/obs/libobs/deinterlace_yadif.effect
share/obs/libobs/deinterlace_yadif_2x.effect
share/obs/libobs/format_conversion.effect
share/obs/libobs/lanczos_scale.effect
share/obs/libobs/opaque.effect
share/obs/libobs/premultiplied_alpha.effect
share/obs/libobs/solid.effect
share/obs/obs-plugins/image-source/locale/ar-SA.ini
share/obs/obs-plugins/image-source/locale/bg-BG.ini
share/obs/obs-plugins/image-source/locale/ca-ES.ini
@ -192,6 +193,40 @@ share/obs/obs-plugins/linux-capture/locale/sv-SE.ini
share/obs/obs-plugins/linux-capture/locale/tr-TR.ini
share/obs/obs-plugins/linux-capture/locale/zh-CN.ini
share/obs/obs-plugins/linux-capture/locale/zh-TW.ini
share/obs/obs-plugins/linux-jack/locale/ar-SA.ini
share/obs/obs-plugins/linux-jack/locale/bg-BG.ini
share/obs/obs-plugins/linux-jack/locale/ca-ES.ini
share/obs/obs-plugins/linux-jack/locale/cs-CZ.ini
share/obs/obs-plugins/linux-jack/locale/da-DK.ini
share/obs/obs-plugins/linux-jack/locale/de-DE.ini
share/obs/obs-plugins/linux-jack/locale/el-GR.ini
share/obs/obs-plugins/linux-jack/locale/en-US.ini
share/obs/obs-plugins/linux-jack/locale/es-ES.ini
share/obs/obs-plugins/linux-jack/locale/eu-ES.ini
share/obs/obs-plugins/linux-jack/locale/fi-FI.ini
share/obs/obs-plugins/linux-jack/locale/fr-FR.ini
share/obs/obs-plugins/linux-jack/locale/gl-ES.ini
share/obs/obs-plugins/linux-jack/locale/he-IL.ini
share/obs/obs-plugins/linux-jack/locale/hr-HR.ini
share/obs/obs-plugins/linux-jack/locale/hu-HU.ini
share/obs/obs-plugins/linux-jack/locale/it-IT.ini
share/obs/obs-plugins/linux-jack/locale/ja-JP.ini
share/obs/obs-plugins/linux-jack/locale/ko-KR.ini
share/obs/obs-plugins/linux-jack/locale/nb-NO.ini
share/obs/obs-plugins/linux-jack/locale/nl-NL.ini
share/obs/obs-plugins/linux-jack/locale/pl-PL.ini
share/obs/obs-plugins/linux-jack/locale/pt-BR.ini
share/obs/obs-plugins/linux-jack/locale/pt-PT.ini
share/obs/obs-plugins/linux-jack/locale/ro-RO.ini
share/obs/obs-plugins/linux-jack/locale/ru-RU.ini
share/obs/obs-plugins/linux-jack/locale/sk-SK.ini
share/obs/obs-plugins/linux-jack/locale/sl-SI.ini
share/obs/obs-plugins/linux-jack/locale/sr-CS.ini
share/obs/obs-plugins/linux-jack/locale/sr-SP.ini
share/obs/obs-plugins/linux-jack/locale/sv-SE.ini
share/obs/obs-plugins/linux-jack/locale/tr-TR.ini
share/obs/obs-plugins/linux-jack/locale/zh-CN.ini
share/obs/obs-plugins/linux-jack/locale/zh-TW.ini
share/obs/obs-plugins/linux-pulseaudio/locale/ar-SA.ini
share/obs/obs-plugins/linux-pulseaudio/locale/bg-BG.ini
share/obs/obs-plugins/linux-pulseaudio/locale/ca-ES.ini
@ -317,8 +352,8 @@ share/obs/obs-plugins/obs-filters/locale/es-ES.ini
share/obs/obs-plugins/obs-filters/locale/eu-ES.ini
share/obs/obs-plugins/obs-filters/locale/fi-FI.ini
share/obs/obs-plugins/obs-filters/locale/fr-FR.ini
share/obs/obs-plugins/obs-filters/locale/he-IL.ini
share/obs/obs-plugins/obs-filters/locale/gl-ES.ini
share/obs/obs-plugins/obs-filters/locale/he-IL.ini
share/obs/obs-plugins/obs-filters/locale/hr-HR.ini
share/obs/obs-plugins/obs-filters/locale/hu-HU.ini
share/obs/obs-plugins/obs-filters/locale/it-IT.ini
@ -341,40 +376,40 @@ share/obs/obs-plugins/obs-filters/locale/zh-CN.ini
share/obs/obs-plugins/obs-filters/mask_alpha_filter.effect
share/obs/obs-plugins/obs-filters/mask_color_filter.effect
share/obs/obs-plugins/obs-filters/sharpness.effect
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/ar-SA.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/ca-ES.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/cs-CZ.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/da-DK.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/de-DE.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/el-GR.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/en-US.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/es-ES.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/eu-ES.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/fi-FI.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/fr-FR.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/gl-ES.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/he-IL.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/hr-HR.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/hu-HU.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/it-IT.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/ja-JP.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/ko-KR.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/nb-NO.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/nl-NL.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/pl-PL.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/pt-BR.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/pt-PT.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/ro-RO.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/ru-RU.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/sk-SK.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/sl-SI.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/sr-CS.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/sr-SP.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/sv-SE.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/th-TH.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/tr-TR.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/zh-CN.ini
share/obs/obs-plugins/obs-%%QT_LIBDIR%%fdk/locale/zh-TW.ini
share/obs/obs-plugins/obs-libfdk/locale/ar-SA.ini
share/obs/obs-plugins/obs-libfdk/locale/ca-ES.ini
share/obs/obs-plugins/obs-libfdk/locale/cs-CZ.ini
share/obs/obs-plugins/obs-libfdk/locale/da-DK.ini
share/obs/obs-plugins/obs-libfdk/locale/de-DE.ini
share/obs/obs-plugins/obs-libfdk/locale/el-GR.ini
share/obs/obs-plugins/obs-libfdk/locale/en-US.ini
share/obs/obs-plugins/obs-libfdk/locale/es-ES.ini
share/obs/obs-plugins/obs-libfdk/locale/eu-ES.ini
share/obs/obs-plugins/obs-libfdk/locale/fi-FI.ini
share/obs/obs-plugins/obs-libfdk/locale/fr-FR.ini
share/obs/obs-plugins/obs-libfdk/locale/gl-ES.ini
share/obs/obs-plugins/obs-libfdk/locale/he-IL.ini
share/obs/obs-plugins/obs-libfdk/locale/hr-HR.ini
share/obs/obs-plugins/obs-libfdk/locale/hu-HU.ini
share/obs/obs-plugins/obs-libfdk/locale/it-IT.ini
share/obs/obs-plugins/obs-libfdk/locale/ja-JP.ini
share/obs/obs-plugins/obs-libfdk/locale/ko-KR.ini
share/obs/obs-plugins/obs-libfdk/locale/nb-NO.ini
share/obs/obs-plugins/obs-libfdk/locale/nl-NL.ini
share/obs/obs-plugins/obs-libfdk/locale/pl-PL.ini
share/obs/obs-plugins/obs-libfdk/locale/pt-BR.ini
share/obs/obs-plugins/obs-libfdk/locale/pt-PT.ini
share/obs/obs-plugins/obs-libfdk/locale/ro-RO.ini
share/obs/obs-plugins/obs-libfdk/locale/ru-RU.ini
share/obs/obs-plugins/obs-libfdk/locale/sk-SK.ini
share/obs/obs-plugins/obs-libfdk/locale/sl-SI.ini
share/obs/obs-plugins/obs-libfdk/locale/sr-CS.ini
share/obs/obs-plugins/obs-libfdk/locale/sr-SP.ini
share/obs/obs-plugins/obs-libfdk/locale/sv-SE.ini
share/obs/obs-plugins/obs-libfdk/locale/th-TH.ini
share/obs/obs-plugins/obs-libfdk/locale/tr-TR.ini
share/obs/obs-plugins/obs-libfdk/locale/zh-CN.ini
share/obs/obs-plugins/obs-libfdk/locale/zh-TW.ini
share/obs/obs-plugins/obs-outputs/locale/ar-SA.ini
share/obs/obs-plugins/obs-outputs/locale/ca-ES.ini
share/obs/obs-plugins/obs-outputs/locale/cs-CZ.ini