From 849e8e712b53642a86bcc9782e68c772b052420d Mon Sep 17 00:00:00 2001 From: yuri Date: Sun, 7 Jan 2018 20:42:56 +0000 Subject: multimedia/simplescreenrecorder: Update to 0.3.9 The update also includes: * Change to Qt5 * Disabling of GLinject feature that doesn't work on FreeBSD * Switching build to cmake Tests showed that it works as expected. Submitted by: myself Reported by: portscout Approved by: adamw (mentor) Differential Revision: https://reviews.freebsd.org/D13787 --- multimedia/simplescreenrecorder/Makefile | 38 +++++++++------------- multimedia/simplescreenrecorder/distinfo | 6 ++-- .../files/patch-CMakeLists.txt | 31 ++++++++++++++++++ .../files/patch-glinject_CMakeLists.txt | 11 +++++++ .../files/patch-glinject_Hook.cpp | 2 +- .../files/patch-glinject_Makefile.in | 11 ------- .../files/patch-scripts_ssr-glinject | 2 +- multimedia/simplescreenrecorder/pkg-plist | 4 +-- 8 files changed, 64 insertions(+), 41 deletions(-) create mode 100644 multimedia/simplescreenrecorder/files/patch-CMakeLists.txt create mode 100644 multimedia/simplescreenrecorder/files/patch-glinject_CMakeLists.txt delete mode 100644 multimedia/simplescreenrecorder/files/patch-glinject_Makefile.in (limited to 'multimedia') diff --git a/multimedia/simplescreenrecorder/Makefile b/multimedia/simplescreenrecorder/Makefile index 092cfc14f707..1135d6bcd18e 100644 --- a/multimedia/simplescreenrecorder/Makefile +++ b/multimedia/simplescreenrecorder/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= simplescreenrecorder -DISTVERSION= 0.3.8-26 -DISTVERSIONSUFFIX= -g0f6eebf +DISTVERSION= 0.3.9 CATEGORIES= multimedia MAINTAINER= yuri@FreeBSD.org @@ -14,29 +13,24 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libasound.so:audio/alsa-lib \ libavformat.so:multimedia/ffmpeg -USES= gmake localbase libtool pkgconfig +USES= cmake:outsource pkgconfig USE_GITHUB= yes GH_ACCOUNT= MaartenBaert GH_PROJECT= ssr -USE_GL= gl glu -USE_QT4= corelib gui moc_build rcc_build uic_build linguisttools_build +USE_QT5= core gui widgets x11extras buildtools_build linguisttools_build qmake_build USE_XORG= x11 xext xfixes xi -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-assert -USE_LDCONFIG= yes -INSTALL_TARGET= install-strip - -OPTIONS_DEFINE= PULSEAUDIO JACK -OPTIONS_DEFAULT= PULSEAUDIO -PULSEAUDIO_CONFIGURE_WITH= pulseaudio -PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio -JACK_CONFIGURE_WITH= jack -JACK_LIB_DEPENDS= libjack.so:audio/jack - -post-patch: - @${REINPLACE_CMD} -E \ - -e 's|-ldl([". ])|-lc\1|g' \ - -e 's|-ldl$$|-lc|g' \ - ${WRKSRC}/configure + +CMAKE_ON= WITH_QT5 +CMAKE_OFF= WITH_GLINJECT # doesn't yet work on FreeBSD: https://github.com/MaartenBaert/ssr/issues/586#issuecomment-343780107 + +OPTIONS_DEFINE= PULSEAUDIO JACK +OPTIONS_DEFAULT= PULSEAUDIO +PULSEAUDIO_CMAKE_BOOL= WITH_PULSEAUDIO +PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio +JACK_CMAKE_BOOL= WITH_JACK +JACK_LIB_DEPENDS= libjack.so:audio/jack + +post-install: # https://github.com/MaartenBaert/ssr/issues/609 + @${RM} ${STAGEDIR}${PREFIX}/man/man1/ssr-glinject.* .include diff --git a/multimedia/simplescreenrecorder/distinfo b/multimedia/simplescreenrecorder/distinfo index 0286bcd7459c..69a8d7315384 100644 --- a/multimedia/simplescreenrecorder/distinfo +++ b/multimedia/simplescreenrecorder/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1509824652 -SHA256 (MaartenBaert-ssr-0.3.8-26-g0f6eebf_GH0.tar.gz) = 168782672ce04bd68cb65254c7a6bb22337559149e3dfad4b5dbc6158e70c53e -SIZE (MaartenBaert-ssr-0.3.8-26-g0f6eebf_GH0.tar.gz) = 2188599 +TIMESTAMP = 1515280704 +SHA256 (MaartenBaert-ssr-0.3.9_GH0.tar.gz) = f3820eadaf9ecfe9aaf0940bf868cedd828c6e75b6a860195ecc091c174fcebe +SIZE (MaartenBaert-ssr-0.3.9_GH0.tar.gz) = 1816221 diff --git a/multimedia/simplescreenrecorder/files/patch-CMakeLists.txt b/multimedia/simplescreenrecorder/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..b9e16b20e6aa --- /dev/null +++ b/multimedia/simplescreenrecorder/files/patch-CMakeLists.txt @@ -0,0 +1,31 @@ +--- CMakeLists.txt.orig 2017-12-11 00:15:36 UTC ++++ CMakeLists.txt +@@ -6,7 +6,11 @@ set(CMAKE_CXX_STANDARD 11) + project(simplescreenrecorder VERSION 0.3.9) + + option(ENABLE_32BIT_GLINJECT "Build the 32-bit version of 'libssr-glinject' on 64-bit systems (in addition to the 64-bit version). Required for OpenGL recording of 32-bit applications on 64-bit systems." FALSE) +-option(ENABLE_X86_ASM "Allow x86/x64 assembly or intrinsics." TRUE) ++if (CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|i386|i686") ++ option(ENABLE_X86_ASM "Allow x86/x64 assembly or intrinsics." TRUE) ++else (CMAKE_SYSTEM_PROCESSOR) ++ option(ENABLE_X86_ASM "Allow x86/x64 assembly or intrinsics." FALSE) ++endif (CMAKE_SYSTEM_PROCESSOR MATCHES) + option(ENABLE_FFMPEG_VERSIONS "Use FFmpeg version numbers for feature support tests. Enable when using FFmpeg, disable when using Libav." TRUE) + option(WITH_PULSEAUDIO "Build with PulseAudio support." TRUE) + option(WITH_JACK "Build with JACK support." TRUE) +@@ -57,11 +61,13 @@ if(WITH_SIMPLESCREENRECORDER) + add_subdirectory(src/translations) + + # the 'ssr-glinject' script is installed together with the main SSR executable to avoid problems with multiarch packages +- install( ++ if (WITH_GLINJECT) ++ install( + FILES scripts/ssr-glinject + DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE +- ) ++ ) ++ endif (WITH_GLINJECT) + install( + DIRECTORY data/output-profiles + DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/simplescreenrecorder diff --git a/multimedia/simplescreenrecorder/files/patch-glinject_CMakeLists.txt b/multimedia/simplescreenrecorder/files/patch-glinject_CMakeLists.txt new file mode 100644 index 000000000000..762d0e42247f --- /dev/null +++ b/multimedia/simplescreenrecorder/files/patch-glinject_CMakeLists.txt @@ -0,0 +1,11 @@ +--- glinject/CMakeLists.txt.orig 2017-12-11 00:15:36 UTC ++++ glinject/CMakeLists.txt +@@ -30,7 +30,7 @@ set(link_libraries + ${X11_Xfixes_LIB} + ${OPENGL_LIBRARIES} + -lrt +- -ldl ++ ${CMAKE_DL_LIBS} + ) + + add_library(ssr-glinject SHARED ${sources}) diff --git a/multimedia/simplescreenrecorder/files/patch-glinject_Hook.cpp b/multimedia/simplescreenrecorder/files/patch-glinject_Hook.cpp index 66db6151a5f9..977f71027385 100644 --- a/multimedia/simplescreenrecorder/files/patch-glinject_Hook.cpp +++ b/multimedia/simplescreenrecorder/files/patch-glinject_Hook.cpp @@ -1,4 +1,4 @@ ---- glinject/Hook.cpp.orig 2017-07-25 22:43:33 UTC +--- glinject/Hook.cpp.orig 2017-12-11 00:15:36 UTC +++ glinject/Hook.cpp @@ -15,6 +15,8 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE #include diff --git a/multimedia/simplescreenrecorder/files/patch-glinject_Makefile.in b/multimedia/simplescreenrecorder/files/patch-glinject_Makefile.in deleted file mode 100644 index 170561f1ccb0..000000000000 --- a/multimedia/simplescreenrecorder/files/patch-glinject_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- glinject/Makefile.in.orig 2017-08-02 06:41:19 UTC -+++ glinject/Makefile.in -@@ -375,7 +375,7 @@ top_srcdir = @top_srcdir@ - @ENABLE_GLINJECTLIB_TRUE@ $(am__append_1) - @ENABLE_GLINJECTLIB_TRUE@libssr_glinject_la_CFLAGS = -pthread -fPIC - @ENABLE_GLINJECTLIB_TRUE@libssr_glinject_la_CXXFLAGS = -pthread -fPIC -std=c++0x --@ENABLE_GLINJECTLIB_TRUE@libssr_glinject_la_LDFLAGS = -pthread -fPIC -avoid-version -shared -lrt -ldl -lGL -lGLU -lX11 -lXfixes -+@ENABLE_GLINJECTLIB_TRUE@libssr_glinject_la_LDFLAGS = -pthread -fPIC -avoid-version -shared -lrt -lGL -lGLU -lX11 -lXfixes - @ENABLE_GLINJECTLIB_TRUE@libssr_glinject_la_SOURCES = \ - @ENABLE_GLINJECTLIB_TRUE@ elfhacks.c \ - @ENABLE_GLINJECTLIB_TRUE@ elfhacks.h \ diff --git a/multimedia/simplescreenrecorder/files/patch-scripts_ssr-glinject b/multimedia/simplescreenrecorder/files/patch-scripts_ssr-glinject index cdfa6682d5ff..bda3ac5226d7 100644 --- a/multimedia/simplescreenrecorder/files/patch-scripts_ssr-glinject +++ b/multimedia/simplescreenrecorder/files/patch-scripts_ssr-glinject @@ -1,4 +1,4 @@ ---- scripts/ssr-glinject.orig 2017-07-25 22:43:33 UTC +--- scripts/ssr-glinject.orig 2017-12-11 00:15:36 UTC +++ scripts/ssr-glinject @@ -1,4 +1,4 @@ -#!/bin/bash diff --git a/multimedia/simplescreenrecorder/pkg-plist b/multimedia/simplescreenrecorder/pkg-plist index d7b398baf371..a703bd6e1dfc 100644 --- a/multimedia/simplescreenrecorder/pkg-plist +++ b/multimedia/simplescreenrecorder/pkg-plist @@ -1,8 +1,5 @@ bin/simplescreenrecorder -bin/ssr-glinject -lib/libssr-glinject.so man/man1/simplescreenrecorder.1.gz -man/man1/ssr-glinject.1.gz share/appdata/simplescreenrecorder.appdata.xml share/applications/simplescreenrecorder.desktop share/icons/hicolor/128x128/apps/simplescreenrecorder-error.png @@ -74,6 +71,7 @@ share/icons/hicolor/scalable/apps/simplescreenrecorder.svg %%DATADIR%%/translations/simplescreenrecorder_fr.qm %%DATADIR%%/translations/simplescreenrecorder_he.qm %%DATADIR%%/translations/simplescreenrecorder_hu.qm +%%DATADIR%%/translations/simplescreenrecorder_id.qm %%DATADIR%%/translations/simplescreenrecorder_it.qm %%DATADIR%%/translations/simplescreenrecorder_ja.qm %%DATADIR%%/translations/simplescreenrecorder_lt.qm -- cgit