diff options
author | 2015-07-26 21:30:57 +0000 | |
---|---|---|
committer | 2015-07-26 21:30:57 +0000 | |
commit | 40563581a2fef2e19d251cc936244c38207d1179 (patch) | |
tree | eec53713ea21970616252e3370d9c33eb43af4c8 /media-video | |
parent | Revert pypy support because of broken deps (diff) | |
download | historical-40563581a2fef2e19d251cc936244c38207d1179.tar.gz historical-40563581a2fef2e19d251cc936244c38207d1179.tar.bz2 historical-40563581a2fef2e19d251cc936244c38207d1179.zip |
Version bump. Update homepage and switch to cmake. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/175 by a17r.
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!
Diffstat (limited to 'media-video')
6 files changed, 203 insertions, 11 deletions
diff --git a/media-video/ffmpegthumbnailer/ChangeLog b/media-video/ffmpegthumbnailer/ChangeLog index 18620d132139..d514bbaed022 100644 --- a/media-video/ffmpegthumbnailer/ChangeLog +++ b/media-video/ffmpegthumbnailer/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for media-video/ffmpegthumbnailer -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ChangeLog,v 1.151 2013/04/05 20:39:09 ssuominen Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ChangeLog,v 1.152 2015/07/26 21:30:52 mgorny Exp $ + +*ffmpegthumbnailer-2.0.10 (26 Jul 2015) + + 26 Jul 2015; Michał Górny <mgorny@gentoo.org> + +ffmpegthumbnailer-2.0.10.ebuild, + +files/ffmpegthumbnailer-2.0.10-config-summary.patch, + +files/ffmpegthumbnailer-2.0.10-installdirs.patch, + +files/ffmpegthumbnailer-2.0.10-set-locale.patch: + Version bump. Update homepage and switch to cmake. https://github.com/gentoo + /gentoo-portage-rsync-mirror/pull/175 by a17r. 05 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> ffmpegthumbnailer-2.0.8.ebuild: diff --git a/media-video/ffmpegthumbnailer/Manifest b/media-video/ffmpegthumbnailer/Manifest index 014790fdf198..83f5baea9e29 100644 --- a/media-video/ffmpegthumbnailer/Manifest +++ b/media-video/ffmpegthumbnailer/Manifest @@ -1,19 +1,32 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX ffmpegthumbnailer-2.0.10-config-summary.patch 669 SHA256 ce9ad1604deb6e1d7b9470990f4b827702d0dcf840cdced6db6ff33703cb1064 SHA512 977da2213c2b9048594b65d0e57f9382120264a75d80c89d38d9df94ba02a0f45e76a350c8a3d6f9c3a674f7834c772d7349654a8c5b59eaa34f105cae8618cd WHIRLPOOL 4b055e42fed99b1c1daaf5437e9cbf710a23d88b6f8908b07f19d9fe47a42b3901102a242720e74dfb7c1e2461450bbe706268ad81c3904974eee745899b731d +AUX ffmpegthumbnailer-2.0.10-installdirs.patch 2019 SHA256 2c189fb984a165af652607b7705286124f369bf62f87d6f67cb42de6bea06414 SHA512 6706aa316ed42cb43f9e80997e543a27da32ab09c6b75baa1dec7b2edc57d17258d84bfc9886a0ba1a9a19014a207b30ed949a1ea4029518104121cad820ae56 WHIRLPOOL dc55aa258c0671d0a22af6d08cabd351bbc70833029864cb47d237440d153efc3204fad18d1c85281605ef146a579f813861e8d25d79d1a5e546a128f4df0a63 +AUX ffmpegthumbnailer-2.0.10-set-locale.patch 1465 SHA256 798e76b494ac83914d287bee306c0e1feae6021db93654cc81a303977bb8a8b1 SHA512 58e28602a98cdd88447d81897736d51417713c564abf59538bdd910a5352211466a3765166406f6d4d4ce66f979e4c735388eae0cc98da6b3e51028365962d6b WHIRLPOOL 1fd89f7e1b9588987b2cac5459ed05211b8f089980fc94ca45f844f5d707d5c3d9939c10e87d84d5c0beed5b7f5603031271a1fde7329b255712eb2b9198c7cf AUX ffmpegthumbnailer-2.0.8-memcpy.patch 428 SHA256 6fb975f6f927930a896a2adadbb0051b556cc6c3b8cdeac030a29d374311ac13 SHA512 61625691d1a1595b25a7962b734387c234c78ab4910c94dbf2527d5b74763529cb04e1e0bc2fbcdae2ac56327e5548a9758b7ae1e95a1aa16eb8cf436eefa188 WHIRLPOOL 85a3cd61a1eff1c6d2469b79aeddf661a8677c8a3f2ab906e50120e6e94af0b79f6abc36886b955b33987baaaf7ba5e000482429362fab8b559d2cb5f6b12ba7 +DIST ffmpegthumbnailer-2.0.10.tar.bz2 2154028 SHA256 a3022c86aa3e704849e424147bd4a319867e18930d66a4a4c93c0baefdd1fc60 SHA512 1fcfcfe9457a3e3e70a749f3234f79d080fbbb40d4d1f65b84e1c46a7051c75368afaffb25a39b43f8e205ffdbc2e156e6fb5848514fce4a1a3f5222458c1b9d WHIRLPOOL fe60513d2a26db622d02f6f38f04009590337415aeb02b441757949e4402cdfeb33d37cb295720f8dd66ebae9dcfdba9304c88256ccda4800e015fa40650151b DIST ffmpegthumbnailer-2.0.8.tar.gz 367186 SHA256 2c8bbefa838d38ea42fc8ac78258cda36865d974c991624b14cffdb92a3bc68b SHA512 6062d4b8f5326bde96c8c6dceaac52e1fabcec93f0a0ee4be19e203050e6c80426a006076a27e4a12582e05daceebd37beef008154fdd92a87f365fdff68ca83 WHIRLPOOL 6b0bd942777515f690f212df5616dffc4fc1c6e0e0e5be67128b376347b18d75eb144d25e9f8ac841b41099703092af5784edc31f34d7dbf81b742d678233e79 +EBUILD ffmpegthumbnailer-2.0.10.ebuild 1323 SHA256 56298cb4d42cd1aeeda1ab9d0fb39dfe22f52e8ff44e3f6537497a5c1ef96c59 SHA512 3968e43ba3fe82169d0aae1f269c68f546b9b45c9cac19690c61f2ef0176d3a8aebc1f9bfadc7d687a78605d01878efe243eb73008160d3b4f614c87543e3432 WHIRLPOOL 69c00eec3fe36c355fedebde90e293d95e339efe34a70419fdb436bb331e744ea8201e950f1e53b34310da614c40e369612b537c4d6a85bec8b054f9a8d5f6d3 EBUILD ffmpegthumbnailer-2.0.8.ebuild 1130 SHA256 40c5ee9e6ff42c5aaf462bad2cbfad68e6742688bf5e38c4468b8bd128f30f68 SHA512 5a3b28d82c802adfa78ad2bfed08640ae510ab4300dc8d04e7dffaeff90e593a426f31cafa868543e7d2fb69d57ad1583de39da7293254975b9afb6be47bc606 WHIRLPOOL 63a0b388ba1a3769407a9fe74c1b2420e199fcec7a3784dbee02bf245a7610b039b89b7ed46b5b1701584a1df47f21e22e9349ff69ffc0d0e89d322c0e6d4169 -MISC ChangeLog 21610 SHA256 97cfe831c02c650fcdfe7dbce98eef79de54bbbf55dbc13bf7b7c6cdcbe1170b SHA512 86a18fd75e8998e1272bf4a4de0a65aa33c5a40a975b5251a8506c33d853b38bf2d63dd59a98a4255bd1dc2fdd7bf7c001f3018dfe421f810653a80fcb079d5a WHIRLPOOL 0acfda56a6d6cb10f687f39b814a126a58f03c45515de2d56ca91320e7cc19a7fa5e53c25fee8e02a7012f06f9f8506d00e81a454e3faee16a90ff8d110017c3 +MISC ChangeLog 22024 SHA256 1ddb2da9d8638b6232f704e5cdbdc62296dd441aa09e050006549cd74f6072fb SHA512 30be47d53f864f6ca882ccb60121ebd6e6dc118dc3e1df976a54a21db950c389b19e7b112e003dffdc86583c449bb5a0058932ad03660f749396e7f303222000 WHIRLPOOL ba4fa1dd3a9747aaa111d254a7f9d8354d12d4fdbcabf1cdc142831bb6fa6a0994cba1ca0fbb412fa0a814b0b434ca22674c8e2c1bddc09d06053aeb3ff83b77 MISC metadata.xml 315 SHA256 8beca342a8dc4c2bcc2123a77446bafed1a5eb8e767cd241b405bcf0990c7584 SHA512 a8b2f932d8110c25f87fc5dc1123ce9ad7e78404b1877665ad9326afa64c2e7c7ba0c00bc42a0588c9f0e7db1fa533b7d7e1db4f2531229b2000bd8a3ae0ee1c WHIRLPOOL 950e37d30be147eb82bfe9f072e8363a17b506cacbbb7208d2a956088b0e7120311e378010d586e641b9820e7cc737d999c85840c7179eb18b70c60017f86891 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2 -iQEcBAEBCAAGBQJRXzZSAAoJEEdUh39IaPFNevUIAKTDRqxOYPSa2H+Vf+VnALRi -BIMjye+vHu4tFE3Ad86pTIb6eMDMRIDwJRUAJwK4xvXv5JXbOX3upD4wrExtDekj -eX1rNp7uGHNZKcgxS7pMvUFgxuReE6OKwoyXnP8JgRlUhcQvkSe7VEJvDNX4ocBY -FyvGdv6kgCNWm2KOG/f1xYip0XTL+9NeAmDENUEPcN+U/2xs2BlaU3a/rPHO8k7u -Ud0YdizzVBaxuo+5CD/iihw8ClhJGZdH0v1Lmww+0EB8OlL+DtFszkGN/0Jjmh+c -1JIRnH5VU5bepcLPqZRPJL2mbSYwh3D7xMOsAZk1aZ69j770lRwNzoWH8VQ+V/M= -=lTMU +iQJ8BAEBCABmBQJVtVGNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO3CQP/A+/UTbrUcIuZAnK5ZOWOB3h +fVvNBJiZczvVCCmKYpIUjdA0HzBFv5OdyaUH1ywRy1M7XG+nUh1FbkYzJ29nGBjF +8HsA58Db0f3Fcht4zgyqULPr3jyFGzgBbzskkxIMYLb8zy3iv6oGtctWMagLhBJE +5ltxvAfPCuVHQne4ghv4CkPgAse169KwueykBf0i1SJoHfZ5KsmzxAFcrCQzXJHk +mlDVj4TUqPlhMO99vgYuxrFoX7EHwaiTYRHacgZ0A1+Gyf9o/gxMznkdGnOHksgJ +08Lh4hPuAwPDcqLTiqVcVNEFbVYEcnPCklMTAJRBIhqqS7qPUeikVy2tPwF9hxxC +LZxUc3xdEhCcWfl8MmSrzsT0Ef9x/Pfia54E2XGimZ5bqiX/Iknip7eRo06XJ8Y5 +YVJ42y1rpB4G99NwCQ5IGT7OMZnvS/LmiDuqbvdZd0ECFAk5mKON3pzLDfhSWvtv +a6LQ+OV1BllpGMTMEry3XEv7CYJYVe1JoPBRJIRdyZzvMD/Zw7QKTF80hhzVZ9jw +HGuLkFzTVF6roNhp6rXjn/umJCdSgSuZ9QdZZQdf1r6aY+9cP37e9i2u18b34E5k +yXFk5ozwETjOXszInfI1ImMxzwYyBcvjR3E0OrARWfUoOvdGgmSHFRfGJosZfNHX +iVgWzEyebWEiI8Vf8qpl +=/ekc -----END PGP SIGNATURE----- diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.10.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.10.ebuild new file mode 100644 index 000000000000..cc1d00558cd9 --- /dev/null +++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.10.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.10.ebuild,v 1.1 2015/07/26 21:30:52 mgorny Exp $ + +EAPI=5 + +inherit cmake-utils + +DESCRIPTION="Lightweight video thumbnailer that can be used by file managers" +HOMEPAGE="https://github.com/dirkvdb/ffmpegthumbnailer" +SRC_URI="https://github.com/dirkvdb/${PN}/releases/download/${PV}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="gnome gtk jpeg libav png test" + +RDEPEND=" + gtk? ( dev-libs/glib:2= ) + jpeg? ( virtual/jpeg:0= ) + !libav? ( >=media-video/ffmpeg-2.7:0= ) + libav? ( >=media-video/libav-11:0= ) + png? ( media-libs/libpng:0= ) +" +DEPEND="${RDEPEND} + virtual/pkgconfig +" +REQUIRED_USE="gnome? ( gtk )" + +PATCHES=( + "${FILESDIR}/${P}-config-summary.patch" + "${FILESDIR}/${P}-installdirs.patch" + "${FILESDIR}/${P}-set-locale.patch" +) + +DOCS=( AUTHORS ChangeLog README.md ) + +src_prepare() { + rm -rf out* || die + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DENABLE_GIO=$(usex gtk) + -DENABLE_TESTS=$(usex test) + -DENABLE_THUMBNAILER=$(usex gnome) + -DHAVE_JPEG=$(usex jpeg) + -DHAVE_PNG=$(usex png) + ) + cmake-utils_src_configure +} diff --git a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-config-summary.patch b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-config-summary.patch new file mode 100644 index 000000000000..608494559217 --- /dev/null +++ b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-config-summary.patch @@ -0,0 +1,23 @@ +From 9c2a5fe997a6d8b00bef49eabb7bc49840882ec6 Mon Sep 17 00:00:00 2001 +From: Dirk Vanden Boer <dirk.vdb@gmail.com> +Date: Wed, 29 Apr 2015 20:19:58 +0200 +Subject: [PATCH] Fixed configuration summary + +--- + .travis.yml | 1 + + CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 22803d9..6b6e515 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -239,7 +239,7 @@ ELSE () + MESSAGE(STATUS "register thumbnailer : disabled") + ENDIF () + +-IF (ENABLE_UNITTEST) ++IF (ENABLE_TESTS) + MESSAGE(STATUS "unittests : enabled") + ELSE () + MESSAGE(STATUS "unittests : disabled") diff --git a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-installdirs.patch b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-installdirs.patch new file mode 100644 index 000000000000..33a96b85735d --- /dev/null +++ b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-installdirs.patch @@ -0,0 +1,47 @@ +From 621274d694dee1f8c92f5db99a5cff98e82c6bd4 Mon Sep 17 00:00:00 2001 +From: Dirk Vanden Boer <dirk.vdb@gmail.com> +Date: Sat, 2 May 2015 09:33:34 +0200 +Subject: [PATCH] Use proper gnu installation dirs (Thanks to Vallimar) + +--- + CMakeLists.txt | 15 ++++++++------- + ChangeLog | 1 + + 2 files changed, 9 insertions(+), 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6b6e515..badb7cf 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,6 +25,7 @@ ENDIF () + + PROJECT(${PACKAGE}) + INCLUDE(CPack) ++INCLUDE(GNUInstallDirs) + + SET(CMAKE_EXPORT_COMPILE_COMMANDS 1) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") +@@ -189,17 +190,17 @@ ELSE () + ENDIF () + + INSTALL(TARGETS ffmpegthumbnailer ${STATIC_LIB} ${SHARED_LIB} +- LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib +- RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin +- ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib +- PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_PREFIX}/include/libffmpegthumbnailer ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libffmpegthumbnailer + ) + +-INSTALL(FILES man/ffmpegthumbnailer.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1) +-INSTALL(FILES ${CMAKE_BINARY_DIR}/libffmpegthumbnailer.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) ++INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/man/ffmpegthumbnailer.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) ++INSTALL(FILES ${CMAKE_BINARY_DIR}/libffmpegthumbnailer.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + + IF (ENABLE_THUMBNAILER) +- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dist/ffmpegthumbnailer.thumbnailer DESTINATION ${CMAKE_INSTALL_PREFIX}/share/thumbnailers) ++ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dist/ffmpegthumbnailer.thumbnailer DESTINATION ${CMAKE_INSTALL_DATADIR}/thumbnailers) + ENDIF () + + CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.in ${CMAKE_BINARY_DIR}/config.h) diff --git a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-set-locale.patch b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-set-locale.patch new file mode 100644 index 000000000000..b1a198a93a1e --- /dev/null +++ b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-set-locale.patch @@ -0,0 +1,46 @@ +From 718f1b1147fe7e9138e2d503ed151e589d643772 Mon Sep 17 00:00:00 2001 +From: Dirk Vanden Boer <dirk.vdb@gmail.com> +Date: Sat, 18 Jul 2015 10:24:28 +0200 +Subject: [PATCH] Set locale to the user specified locale + +--- + main.cpp | 5 ++--- + test/testrunner.cpp | 7 ++----- + 2 files changed, 4 insertions(+), 8 deletions(-) + +diff --git a/main.cpp b/main.cpp +index 6cb6c55..7cb7089 100644 +--- a/main.cpp ++++ b/main.cpp +@@ -54,10 +54,9 @@ int main(int argc, char** argv) + string outputFile; + string imageFormat; + +- if (!setlocale(LC_CTYPE, "en_US.UTF-8")) ++ if (!std::setlocale(LC_CTYPE, "")) + { +- std::cerr << "Locale not specified. Check LANG, LC_CTYPE, LC_ALL" << std::endl; +- return 1; ++ std::cerr << "Failed to set locale" << std::endl; + } + + while ((option = getopt (argc, argv, "i:o:s:t:q:c:afwhvp")) != -1) +diff --git a/test/testrunner.cpp b/test/testrunner.cpp +index 7023d25..20a4903 100644 +--- a/test/testrunner.cpp ++++ b/test/testrunner.cpp +@@ -4,12 +4,9 @@ + #include <gtest/gtest.h> + + int main(int argc, char **argv) { +- std::cout << "Running ffmpegthumbnailer tests" << std::endl; +- +- if (!setlocale(LC_CTYPE, "en_US.UTF-8")) ++ if (!std::setlocale(LC_CTYPE, "")) + { +- std::cerr << "Locale not specified. Check LANG, LC_CTYPE, LC_ALL" << std::endl; +- return 1; ++ std::cerr << "Failed to set locale" << std::endl; + } + + testing::InitGoogleTest(&argc, argv); |