From owner-svn-ports-head@freebsd.org Sun Jan 7 20:42:58 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DFBA4E5BF93; Sun, 7 Jan 2018 20:42:58 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B6AF677FE7; Sun, 7 Jan 2018 20:42:58 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E89F5262B2; Sun, 7 Jan 2018 20:42:57 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w07Kgvgk052735; Sun, 7 Jan 2018 20:42:57 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w07KgviL052728; Sun, 7 Jan 2018 20:42:57 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201801072042.w07KgviL052728@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sun, 7 Jan 2018 20:42:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458383 - in head/multimedia/simplescreenrecorder: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/multimedia/simplescreenrecorder: . files X-SVN-Commit-Revision: 458383 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Jan 2018 20:42:59 -0000 Author: yuri Date: Sun Jan 7 20:42:56 2018 New Revision: 458383 URL: https://svnweb.freebsd.org/changeset/ports/458383 Log: 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 Added: head/multimedia/simplescreenrecorder/files/patch-CMakeLists.txt (contents, props changed) head/multimedia/simplescreenrecorder/files/patch-glinject_CMakeLists.txt (contents, props changed) Deleted: head/multimedia/simplescreenrecorder/files/patch-glinject_Makefile.in Modified: head/multimedia/simplescreenrecorder/Makefile head/multimedia/simplescreenrecorder/distinfo head/multimedia/simplescreenrecorder/files/patch-glinject_Hook.cpp head/multimedia/simplescreenrecorder/files/patch-scripts_ssr-glinject head/multimedia/simplescreenrecorder/pkg-plist Modified: head/multimedia/simplescreenrecorder/Makefile ============================================================================== --- head/multimedia/simplescreenrecorder/Makefile Sun Jan 7 20:22:22 2018 (r458382) +++ head/multimedia/simplescreenrecorder/Makefile Sun Jan 7 20:42:56 2018 (r458383) @@ -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 +CMAKE_ON= WITH_QT5 +CMAKE_OFF= WITH_GLINJECT # doesn't yet work on FreeBSD: https://github.com/MaartenBaert/ssr/issues/586#issuecomment-343780107 -post-patch: - @${REINPLACE_CMD} -E \ - -e 's|-ldl([". ])|-lc\1|g' \ - -e 's|-ldl$$|-lc|g' \ - ${WRKSRC}/configure +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 Modified: head/multimedia/simplescreenrecorder/distinfo ============================================================================== --- head/multimedia/simplescreenrecorder/distinfo Sun Jan 7 20:22:22 2018 (r458382) +++ head/multimedia/simplescreenrecorder/distinfo Sun Jan 7 20:42:56 2018 (r458383) @@ -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 Added: head/multimedia/simplescreenrecorder/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/simplescreenrecorder/files/patch-CMakeLists.txt Sun Jan 7 20:42:56 2018 (r458383) @@ -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 Added: head/multimedia/simplescreenrecorder/files/patch-glinject_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/simplescreenrecorder/files/patch-glinject_CMakeLists.txt Sun Jan 7 20:42:56 2018 (r458383) @@ -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}) Modified: head/multimedia/simplescreenrecorder/files/patch-glinject_Hook.cpp ============================================================================== --- head/multimedia/simplescreenrecorder/files/patch-glinject_Hook.cpp Sun Jan 7 20:22:22 2018 (r458382) +++ head/multimedia/simplescreenrecorder/files/patch-glinject_Hook.cpp Sun Jan 7 20:42:56 2018 (r458383) @@ -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 Modified: head/multimedia/simplescreenrecorder/files/patch-scripts_ssr-glinject ============================================================================== --- head/multimedia/simplescreenrecorder/files/patch-scripts_ssr-glinject Sun Jan 7 20:22:22 2018 (r458382) +++ head/multimedia/simplescreenrecorder/files/patch-scripts_ssr-glinject Sun Jan 7 20:42:56 2018 (r458383) @@ -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 Modified: head/multimedia/simplescreenrecorder/pkg-plist ============================================================================== --- head/multimedia/simplescreenrecorder/pkg-plist Sun Jan 7 20:22:22 2018 (r458382) +++ head/multimedia/simplescreenrecorder/pkg-plist Sun Jan 7 20:42:56 2018 (r458383) @@ -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 %%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