From 8be70107efbb417f839292165ee39d07a062046f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Jan 2018 06:19:51 +0000 Subject: gentoo resync : 13.01.2018 --- media-video/Manifest.gz | Bin 30085 -> 30237 bytes media-video/blind/Manifest | 4 + media-video/blind/blind-1.1.ebuild | 42 ++++++++ media-video/blind/files/blind-1.1-ldflags.patch | 11 +++ media-video/blind/metadata.xml | 7 ++ media-video/simplescreenrecorder/Manifest | 3 +- .../files/simplescreenrecorder-0.3.9-cmake.patch | 106 +++++++++++++++++++++ .../simplescreenrecorder-0.3.9-r1.ebuild | 1 + 8 files changed, 173 insertions(+), 1 deletion(-) create mode 100644 media-video/blind/Manifest create mode 100644 media-video/blind/blind-1.1.ebuild create mode 100644 media-video/blind/files/blind-1.1-ldflags.patch create mode 100644 media-video/blind/metadata.xml create mode 100644 media-video/simplescreenrecorder/files/simplescreenrecorder-0.3.9-cmake.patch (limited to 'media-video') diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz index 71ecc8b859dc..abc8f48dccec 100644 Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ diff --git a/media-video/blind/Manifest b/media-video/blind/Manifest new file mode 100644 index 000000000000..bc069c47d636 --- /dev/null +++ b/media-video/blind/Manifest @@ -0,0 +1,4 @@ +AUX blind-1.1-ldflags.patch 219 BLAKE2B eb0eb29d385d441253663315848810932ecb8b6f44dcd91193d93f23f8340574224f87f8d08b1769b7b49b92eebd787164a5eba19dde9022e1816c761d035a3e SHA512 cf66425a23cd2202fda9cc825a30b78281501972307ca8c1db942cadf40f58e1aa460fc1e649bc0d279e0d90615acd5b30ac9418cf12db57c499c046a76ca69d +DIST blind-1.1.tar.gz 47568 BLAKE2B b284e614efafb70ea41c274ddeedce66a0123c1ba6dfbba6522e0a11d6b2aa39b1059a0c9cc1c45a37f951b75c0b23580f714858bf2257a15e4f7d03ffb0b258 SHA512 620a5edc69bf736f642948e4f6ac6dda8cdbea4bdad143b09f931e62aaa57983e23ff60961d1485dcbce1ac461be12b393fe03f056ef46ca5ad2012cb03cf637 +EBUILD blind-1.1.ebuild 809 BLAKE2B a86ab8543ffee8edae09a497f1e241158bdb98bade70d05737e306c9169e52cf86deb7f8b4790d3ef7abff4e1e7b38e1ade4fc05bab3d0225c268f8d71832318 SHA512 8b0130007a0451a646bf0cb316893959001cad23de451ff975213b567e914e3f45aa29f96bfb436d7a02106298d48c0e065b019b6bd46423b938b54f1b68d5a4 +MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54 diff --git a/media-video/blind/blind-1.1.ebuild b/media-video/blind/blind-1.1.ebuild new file mode 100644 index 000000000000..43fc42d195d8 --- /dev/null +++ b/media-video/blind/blind-1.1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit toolchain-funcs + +DESCRIPTION="a collection of command line video editing utilities" +HOMEPAGE="https://tools.suckless.org/blind/" +SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" +" +DEPEND=" + ${RDEPEND} +" +PATCHES=( + "${FILESDIR}"/${PN}-1.1-ldflags.patch +) + +src_prepare() { + default + + sed -i \ + -e '/^CC/d' \ + -e 's|/usr/local|/usr|g' \ + -e 's|^CFLAGS.*|CFLAGS += -std=c99 -pedantic -Wall -Wextra $(INCS) $(CPPFLAGS)|g' \ + -e '/^LDFLAGS.*/ { s:-s::g; s:=:+=:g; }' \ + -e 's|{|(|g;s|}|)|g' \ + config.mk || die +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + emake DESTDIR="${D}" install MANPREFIX=/usr/share/man +} diff --git a/media-video/blind/files/blind-1.1-ldflags.patch b/media-video/blind/files/blind-1.1-ldflags.patch new file mode 100644 index 000000000000..6e247b10f13f --- /dev/null +++ b/media-video/blind/files/blind-1.1-ldflags.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -80,7 +80,7 @@ + all: $(BIN) + + %: %.o util.o stream.o +- $(CC) $(LDFLAGS) -o $@ $^ ++ $(CC) -o $@ $^ $(LDFLAGS) + + %.o: src/%.c src/*.h src/*/*.h + $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< diff --git a/media-video/blind/metadata.xml b/media-video/blind/metadata.xml new file mode 100644 index 000000000000..5ba62861f1c4 --- /dev/null +++ b/media-video/blind/metadata.xml @@ -0,0 +1,7 @@ + + + + +jer@gentoo.org + + diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest index f3fc3aa2bb73..bc938cd7eb23 100644 --- a/media-video/simplescreenrecorder/Manifest +++ b/media-video/simplescreenrecorder/Manifest @@ -1,8 +1,9 @@ AUX simplescreenrecorder-0.3.8-qtbindir.patch 659 BLAKE2B c5de5c06d2dae1e3e0133b77a7d02fade47de65c9a90e9e3a8c5e69dfb8bc6dd3f17e09b974f6021b2ed23b2cc2a5934b84b553cf22e3d4b37e6527416982109 SHA512 5321b44e6cdfbe9081d716008c1da4b5f828a298a2e73e313b7bd960274f1d5151f8c653f2fc165ab7fe27d20ef76fc6a77f4e87de2cf91a91e6f84f8b66bf4f +AUX simplescreenrecorder-0.3.9-cmake.patch 3098 BLAKE2B 5f744c8b56e04022a1048f9fb37924ec4443b12da7bd8c6d8569bab302f39cbe7d697948e578e4b2f19050ff78d7a3d278d0c9481aadafc5b9883e7b84923bc4 SHA512 ffcbc6822d1d0fe833018206fc23bf3c880d5a39bb607346b78dcb6d37e320b357f73b4216d8724c30052cebe70cc0167889fbd4c1ddd2a3713cbaf8ad4ae338 AUX simplescreenrecorder-0.3.9-pulseaudio_dep.patch 427 BLAKE2B 9ce385a87222d4684f6626db9f6be5d7efc04e84e5175a804e415f053c4c3e4684b0b7338615e74801485f1962d1f8ccc114ec357d6c1446ab56816d0880ede6 SHA512 d9616bf99d784c5ab0a1446b965ebec4e089a3ecafc2ed128dbc04747ad2511a84d679e309530369241816b662f527d7109dfb26df13888d8c4f917a99ea2c72 DIST simplescreenrecorder-0.3.8.tar.gz 2037017 BLAKE2B 891d4ab5e02a0a47452dfdd0c936819a46ea558221edb5699dd95682561153f7db9f4a301414145e8582f944490ce6d4f722b71e197fc5fa54008c3dbbc25f4c SHA512 f94c7ac7d5f6fdebd1c68da7469b6c46a21b399e2ad8744c52d3e9959d2ec74d15e6ac061d7fe41f02ebb9ee9a89fbd8feecf4e0a10110975f3857a7fbb66365 DIST simplescreenrecorder-0.3.9.tar.gz 1816221 BLAKE2B 995ac44da0a5e65dcb33a10b353085f6907531b2af84a0b4c5898f1a44d45676a759b94facdf7f6f311444bcb1ea2cbd8dcf143b8c6e0efac4a7eb06484d1096 SHA512 36dc30597d1cb07f060dcb667d79074851fec75f369efe349d1a1852110e663f0704fd0ec7d85fd0fc0dac27e478b7422f6e273dfecbb27ddeb6d2228217a3b2 EBUILD simplescreenrecorder-0.3.8.ebuild 2734 BLAKE2B d59ba3285fab99bf61f5ab9eeeb03dbce471c529d5b3ada2494e95318403b936db3ac0d92b2100dc12b6351bf0a9a24136856924012fa8ef996ce1bb876296d6 SHA512 99bc9d5244b5ad58c88db47f0d4bc0d8f5468e3174a652446eba8a11e455b66137beefd18982c23b8180ba95b486b527f147c44d760e7b6e344ec63fbc8131b7 -EBUILD simplescreenrecorder-0.3.9-r1.ebuild 2881 BLAKE2B aa618128f99fffb83194344140598fe2b1ac4bc3897e294bb0604f9a37e2c6dda1f2c80b3b9bc788bffb0986902f1379c578e22eb2b3c35f380218a30f382f16 SHA512 28e26f8ef4b93bb751480b0325665353afc78700f1c3c29802c026d4902cdf06680a514c67983e8d71deead38e9e61a61ac51ec092c4ba13366a24b75091b144 +EBUILD simplescreenrecorder-0.3.9-r1.ebuild 2913 BLAKE2B da8680a70094428174dd39a169b38cedaec5a4304c031d1024fe5616832252fee8b391889e0de413d291397f3edf39eefc8027136221202f5341b51e542fc5db SHA512 33b9d71372a3fa47492e8afc0d5341b99a2ab33544ca53badabc8678e4f1b2c71a0f6592f7b7c13f6dc6120ca7390b5863ec34a6193402e9ff98245c4bb1f88f EBUILD simplescreenrecorder-9999.ebuild 2827 BLAKE2B 97ee9516f58c00e93ffafb47e416c5d7d6b686deec24271a7c59f8f713a327b8179733d3e1f4f2a9799cbaf32206b24e6fcd9ead61bf442092b5d641d7bffc98 SHA512 42d178d475278d1d7c888215b3d11182786575eb3d7447628ee4eeda73799da27c0c291b9ca40fddb4db66a00ebdd969a8dc82b68ab9e8f67d4685eaf236d3d4 MISC metadata.xml 508 BLAKE2B c43c69903c35e9e1f87c94cb26b06a8d6c4dd1a51c8a3409027ab8c867e54851aa8e4bfcaf4a0a37298795ded69743e82d2b0a4e0bb84cb3d88d6a6c5c4a1c0f SHA512 d4879cb7f57f23d273e45b429ab5548d30a0a6eefe63e28c2c60e7cef9a44b295d8455bfedaf9d9294ff4cf16b4f841f0ddb34541c62c25cbf190f7b6c7538ce diff --git a/media-video/simplescreenrecorder/files/simplescreenrecorder-0.3.9-cmake.patch b/media-video/simplescreenrecorder/files/simplescreenrecorder-0.3.9-cmake.patch new file mode 100644 index 000000000000..6d9fc1fa607b --- /dev/null +++ b/media-video/simplescreenrecorder/files/simplescreenrecorder-0.3.9-cmake.patch @@ -0,0 +1,106 @@ +From 7f8f72ac5f7ba7b060b4366828200050b96a9df0 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Thu, 11 Jan 2018 21:28:15 +0100 +Subject: [PATCH 1/3] Fix Qt5LinguistTools detection/lrelease binary location + +Correctly find the Qt5 module that provides the path to Qt5-based lrelease. +Only available since >= Qt-5.3.1 which is a low enough minimum dependency. +--- + src/CMakeLists.txt | 10 ++++++---- + src/translations/CMakeLists.txt | 7 ++++++- + 2 files changed, 12 insertions(+), 5 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 64652c5..5779a49 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -17,10 +17,12 @@ if(WITH_JACK) + endif() + + if(WITH_QT5) +- find_package(Qt5Core REQUIRED) +- find_package(Qt5Gui REQUIRED) +- find_package(Qt5Widgets REQUIRED) +- find_package(Qt5X11Extras REQUIRED) ++ set(QT_MIN_VERSION "5.3.1") ++ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED ++ Gui ++ Widgets ++ X11Extras ++ ) + else() + find_package(Qt4 REQUIRED QtGui) + endif() +diff --git a/src/translations/CMakeLists.txt b/src/translations/CMakeLists.txt +index 455fdb2..0902cfd 100644 +--- a/src/translations/CMakeLists.txt ++++ b/src/translations/CMakeLists.txt +@@ -1,6 +1,11 @@ + # translations for 'simplescreenrecorder' executable + +-find_program(LRELEASE lrelease) ++if(WITH_QT5) ++ find_package(Qt5LinguistTools REQUIRED) ++ set(LRELEASE Qt5::lrelease) ++else() ++ find_program(LRELEASE lrelease) ++endif() + + if(LRELEASE) + +-- +2.15.1 + + +From 24db02e2a689e08f737c4d720e195a3758cba2eb Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Thu, 11 Jan 2018 21:43:08 +0100 +Subject: [PATCH 2/3] Use FeatureSummary + +--- + CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e770251..cb36d7d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,6 +25,7 @@ option(WITH_GLINJECT "Build the 'libssr-glinject' library. Required for OpenGL r + + set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) + ++include(FeatureSummary) + include(GNUInstallDirs) + + # try to guess the correct 32-bit library path on 64-bit systems +@@ -106,3 +107,5 @@ if(WITH_SIMPLESCREENRECORDER) + ) + + endif() ++ ++feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) +-- +2.15.1 + + +From 329ec866097de4f011cd1bbde9dad784acbb487f Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Thu, 11 Jan 2018 22:07:39 +0100 +Subject: [PATCH 3/3] FindFFmpeg.cmake: Provide FFMPEG_FOUND + +--- + cmake/FindFFmpeg.cmake | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake +index 117e654..993219b 100644 +--- a/cmake/FindFFmpeg.cmake ++++ b/cmake/FindFFmpeg.cmake +@@ -28,3 +28,4 @@ mark_as_advanced(SWSCALE_INCLUDE_DIR SWSCALE_LIBRARY) + + set(FFMPEG_INCLUDE_DIRS ${AVFORMAT_INCLUDE_DIR} ${AVCODEC_INCLUDE_DIR} ${AVUTIL_INCLUDE_DIR} ${SWSCALE_INCLUDE_DIR}) + set(FFMPEG_LIBRARIES ${AVFORMAT_LIBRARY} ${AVCODEC_LIBRARY} ${AVUTIL_LIBRARY} ${SWSCALE_LIBRARY}) ++set(FFMPEG_FOUND ${PC_FFMPEG_FOUND}) +-- +2.15.1 + diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.9-r1.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.9-r1.ebuild index 273c02c9d239..2f317e44e5d3 100644 --- a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.9-r1.ebuild +++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.9-r1.ebuild @@ -49,6 +49,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${P}-pulseaudio_dep.patch" + "${FILESDIR}/${P}-cmake.patch" ) pkg_setup() { -- cgit v1.2.3