Attachment 169687 Details for Bug 209046 – multimedia_obs-studio.diff

[patch] multimedia_obs-studio.diff

multimedia_obs-studio.diff (text/plain), 14.19 KB, created by tkato432 on 2016-04-25 18:32:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2016-04-25 18:32:39 UTC

Size: 14.19 KB

patch

obsolete

>diff -urN /usr/ports/multimedia/obs-studio/Makefile multimedia/obs-studio/Makefile
>--- /usr/ports/multimedia/obs-studio/Makefile	2016-04-26 02:54:45.727766000 +0900
>+++ multimedia/obs-studio/Makefile	2016-04-26 00:00:00.000000000 +0900
>@@ -2,40 +2,48 @@
> 
> 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 \
>+BUILD_DEPENDS=	v4l_compat>0:multimedia/v4l_compat
>+LIB_DEPENDS=	libfdk-aac.so:audio/fdk-aac \
>+		libjack.so:audio/jack \
> 		libpulse.so:audio/pulseaudio \
>+		libjansson.so:devel/jansson \
>+		libsysinfo.so:devel/libsysinfo \
>+		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
>+		libv4l2.so:multimedia/libv4l \
>+		libx264.so:multimedia/libx264
> 
>-USE_XORG=	x11 xcomposite xdamage xrender
>-USE_XCB=	x11extras wm
>-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_GITHUB=	yes
> GH_ACCOUNT=	jp9000
> 
>+USES=		cmake:outsource compiler:c++11-lib pkgconfig
>+USE_GL=		gl
>+USE_QT5=	widgets x11extras buildtools_build qmake_build imageformats_run
>+USE_XORG=	xcb xcomposite xfixes xinerama xrandr
>+CMAKE_ARGS=	-DOBS_VERSION_OVERRIDE:STRING="${PORTVERSION}" \
>+		-DUNIX_STRUCTURE:BOOL=ON
>+USE_LDCONFIG=	yes
>+
>+.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
>+	@${GREP} -R -l --null "std::round" ${WRKSRC} | ${XARGS} -0 \
>+		${REINPLACE_CMD} -e \
>+		's|std::round|::round|g'
>+	@${REINPLACE_CMD} -e \
>+		's|-ldl||' ${WRKSRC}/deps/glad/CMakeLists.txt
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -urN /usr/ports/multimedia/obs-studio/pkg-descr multimedia/obs-studio/pkg-descr
>--- /usr/ports/multimedia/obs-studio/pkg-descr	2015-08-24 03:50:59.468131000 +0900
>+++ multimedia/obs-studio/pkg-descr	2016-04-26 00:00:00.000000000 +0900
>@@ -1,4 +1,4 @@
>-Open Broadcaster Software is free and open source software
>-for video recording and live streaming.
>+Open Broadcaster Software is free and open source software for video
>+recording and live streaming.
> 
> WWW: https://obsproject.com/
>diff -urN /usr/ports/multimedia/obs-studio/pkg-plist multimedia/obs-studio/pkg-plist
>--- /usr/ports/multimedia/obs-studio/pkg-plist	2016-04-26 02:54:45.747263000 +0900
>+++ multimedia/obs-studio/pkg-plist	2016-04-26 00:00:00.000000000 +0900
>@@ -11,8 +11,8 @@
> 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/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.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/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/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/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

Actions: View | Diff

Attachments on bug 209046: 169687