commit: da6eb748fae73ffc816fd2beaf51be9d1ee24426 Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Thu Mar 23 19:44:15 2017 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Thu Mar 23 19:44:15 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da6eb748
media-video/ffmpegthumbnailer: Remove 2.0.10 Package-Manager: Portage-2.3.5, Repoman-2.3.2 media-video/ffmpegthumbnailer/Manifest | 1 - .../ffmpegthumbnailer-2.0.10.ebuild | 53 ------------------ .../ffmpegthumbnailer-2.0.10-config-summary.patch | 23 -------- .../files/ffmpegthumbnailer-2.0.10-ffmpeg29.patch | 62 ---------------------- .../ffmpegthumbnailer-2.0.10-installdirs.patch | 47 ---------------- .../ffmpegthumbnailer-2.0.10-set-locale.patch | 46 ---------------- 6 files changed, 232 deletions(-) diff --git a/media-video/ffmpegthumbnailer/Manifest b/media-video/ffmpegthumbnailer/Manifest index e9b1d3cd53f..2a0013aec2d 100644 --- a/media-video/ffmpegthumbnailer/Manifest +++ b/media-video/ffmpegthumbnailer/Manifest @@ -1,3 +1,2 @@ -DIST ffmpegthumbnailer-2.0.10.tar.bz2 2154028 SHA256 a3022c86aa3e704849e424147bd4a319867e18930d66a4a4c93c0baefdd1fc60 SHA512 1fcfcfe9457a3e3e70a749f3234f79d080fbbb40d4d1f65b84e1c46a7051c75368afaffb25a39b43f8e205ffdbc2e156e6fb5848514fce4a1a3f5222458c1b9d WHIRLPOOL fe60513d2a26db622d02f6f38f04009590337415aeb02b441757949e4402cdfeb33d37cb295720f8dd66ebae9dcfdba9304c88256ccda4800e015fa40650151b DIST ffmpegthumbnailer-2.1.2.tar.bz2 1221508 SHA256 f536035c3f2c2455b3180559e3fb3082db275d9264565271053028221dc6d2cd SHA512 e297708df4cbefdbead89af0499881b17128dc47c8403f84862343822113354de61450f63e932ab4b5b2414826a3fe5ff72ac2bec22ee3bb507801ee0d065d7b WHIRLPOOL 3775e071380936f447b880ee051e8c9fe6ec50735b46cd352600ee7125b0744847a5547378bba25a65d3829f25ccee6843c1559a917e50aa6e02c1a6727c6b8a DIST ffmpegthumbnailer-2.2.0.tar.bz2 1223895 SHA256 e5c31299d064968198cd378f7488e52cd5e738fac998eea780bc77d7f32238c2 SHA512 526d15b2c754fcb1415e69fb54cb6e7d0102b6d73a32a7e8528df81e32633dfe3786898984fdb988c93daee7218956c75c096ef657c9b3a42399d2d1d27c7bbf WHIRLPOOL 8634c8c33ae61a2b50cc8bc30e666b2c814a589758d83805f11710651a834439564c4702778e385eca3c63a76f1cf1a066d3ba2b6685df51f21acfe3bd5b4c4c diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.10.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.10.ebuild deleted file mode 100644 index 912b0d91c9f..00000000000 --- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.10.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils eutils - -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 - has_version '>=media-video/ffmpeg-2.9' && epatch "${FILESDIR}/${P}-ffmpeg29.patch" -} - -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 deleted file mode 100644 index 60849455921..00000000000 --- a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-config-summary.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 9c2a5fe997a6d8b00bef49eabb7bc49840882ec6 Mon Sep 17 00:00:00 2001 -From: Dirk Vanden Boer <[email protected]> -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-ffmpeg29.patch b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-ffmpeg29.patch deleted file mode 100644 index fb50ae85eb8..00000000000 --- a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-ffmpeg29.patch +++ /dev/null @@ -1,62 +0,0 @@ -Index: ffmpegthumbnailer-2.0.10/libffmpegthumbnailer/moviedecoder.cpp -=================================================================== ---- ffmpegthumbnailer-2.0.10.orig/libffmpegthumbnailer/moviedecoder.cpp -+++ ffmpegthumbnailer-2.0.10/libffmpegthumbnailer/moviedecoder.cpp -@@ -266,7 +266,7 @@ bool MovieDecoder::decodeVideoPacket() - return false; - } - -- avcodec_get_frame_defaults(m_pFrame); -+ av_frame_unref(m_pFrame); - - int frameFinished; - -@@ -312,14 +312,8 @@ bool MovieDecoder::getVideoPacket() - - void MovieDecoder::getScaledVideoFrame(int scaledSize, bool maintainAspectRatio, VideoFrame& videoFrame) - { -- if (m_pFrame->interlaced_frame) -- { -- avpicture_deinterlace((AVPicture*) m_pFrame, (AVPicture*) m_pFrame, m_pVideoCodecContext->pix_fmt, -- m_pVideoCodecContext->width, m_pVideoCodecContext->height); -- } -- - int scaledWidth, scaledHeight; -- convertAndScaleFrame(PIX_FMT_RGB24, scaledSize, maintainAspectRatio, scaledWidth, scaledHeight); -+ convertAndScaleFrame(AV_PIX_FMT_RGB24, scaledSize, maintainAspectRatio, scaledWidth, scaledHeight); - - videoFrame.width = scaledWidth; - videoFrame.height = scaledHeight; -@@ -330,7 +324,7 @@ void MovieDecoder::getScaledVideoFrame(i - memcpy((&(videoFrame.frameData.front())), m_pFrame->data[0], videoFrame.lineSize * videoFrame.height); - } - --void MovieDecoder::convertAndScaleFrame(PixelFormat format, int scaledSize, bool maintainAspectRatio, int& scaledWidth, int& scaledHeight) -+void MovieDecoder::convertAndScaleFrame(AVPixelFormat format, int scaledSize, bool maintainAspectRatio, int& scaledWidth, int& scaledHeight) - { - calculateDimensions(scaledSize, maintainAspectRatio, scaledWidth, scaledHeight); - -@@ -427,7 +421,7 @@ void MovieDecoder::calculateDimensions(i - } - } - --void MovieDecoder::createAVFrame(AVFrame** pAvFrame, uint8_t** pFrameBuffer, int width, int height, PixelFormat format) -+void MovieDecoder::createAVFrame(AVFrame** pAvFrame, uint8_t** pFrameBuffer, int width, int height, AVPixelFormat format) - { - *pAvFrame = av_frame_alloc(); - -Index: ffmpegthumbnailer-2.0.10/libffmpegthumbnailer/moviedecoder.h -=================================================================== ---- ffmpegthumbnailer-2.0.10.orig/libffmpegthumbnailer/moviedecoder.h -+++ ffmpegthumbnailer-2.0.10/libffmpegthumbnailer/moviedecoder.h -@@ -54,8 +54,8 @@ private: - - bool decodeVideoPacket(); - bool getVideoPacket(); -- void convertAndScaleFrame(PixelFormat format, int scaledSize, bool maintainAspectRatio, int& scaledWidth, int& scaledHeight); -- void createAVFrame(AVFrame** pAvFrame, uint8_t** pFrameBuffer, int width, int height, PixelFormat format); -+ void convertAndScaleFrame(AVPixelFormat format, int scaledSize, bool maintainAspectRatio, int& scaledWidth, int& scaledHeight); -+ void createAVFrame(AVFrame** pAvFrame, uint8_t** pFrameBuffer, int width, int height, AVPixelFormat format); - void calculateDimensions(int squareSize, bool maintainAspectRatio, int& destWidth, int& destHeight); - - private: diff --git a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-installdirs.patch b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-installdirs.patch deleted file mode 100644 index 33a96b85735..00000000000 --- a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-installdirs.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 621274d694dee1f8c92f5db99a5cff98e82c6bd4 Mon Sep 17 00:00:00 2001 -From: Dirk Vanden Boer <[email protected]> -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 deleted file mode 100644 index b1a198a93a1..00000000000 --- a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-set-locale.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 718f1b1147fe7e9138e2d503ed151e589d643772 Mon Sep 17 00:00:00 2001 -From: Dirk Vanden Boer <[email protected]> -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);
