[gentoo-commits] gentoo-x86 commit in media-video/ffmpegthumbnailer/files: ffmpegthumbnailer-2.0.10-set-locale.patch ffmpegthumbnailer-2.0.10-config-summary.patch ffmpegthumbnailer-2.0.10-installdirs.patch

[Michal Gorny (mgorny)]

mgorny      15/07/26 21:30:52

  Added:                ffmpegthumbnailer-2.0.10-set-locale.patch
                        ffmpegthumbnailer-2.0.10-config-summary.patch
                        ffmpegthumbnailer-2.0.10-installdirs.patch
  Log:
  Version bump. Update homepage and switch to cmake. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/175 by a17r.
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

Revision  Changes    Path
1.1                  media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-set-locale.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-set-locale.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-set-locale.patch?rev=1.1&content-type=text/plain

Index: ffmpegthumbnailer-2.0.10-set-locale.patch
===================================================================
From 718f1b1147fe7e9138e2d503ed151e589d643772 Mon Sep 17 00:00:00 2001
From: Dirk Vanden Boer <dirk.vdb@×××××.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);



1.1                  media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-config-summary.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-config-summary.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-config-summary.patch?rev=1.1&content-type=text/plain

Index: ffmpegthumbnailer-2.0.10-config-summary.patch
===================================================================
From 9c2a5fe997a6d8b00bef49eabb7bc49840882ec6 Mon Sep 17 00:00:00 2001
From: Dirk Vanden Boer <dirk.vdb@×××××.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")



1.1                  media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-installdirs.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-installdirs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-installdirs.patch?rev=1.1&content-type=text/plain

Index: ffmpegthumbnailer-2.0.10-installdirs.patch
===================================================================
From 621274d694dee1f8c92f5db99a5cff98e82c6bd4 Mon Sep 17 00:00:00 2001
From: Dirk Vanden Boer <dirk.vdb@×××××.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)