[arch-commits] Commit in ffmpegthumbnailer/repos (6 files)

Ronald van Haren ronald at archlinux.org
Thu Aug 6 08:44:02 UTC 2015


    Date: Thursday, August 6, 2015 @ 10:44:02
  Author: ronald
Revision: 243070

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  ffmpegthumbnailer/repos/extra-i686/PKGBUILD
    (from rev 243069, ffmpegthumbnailer/trunk/PKGBUILD)
  ffmpegthumbnailer/repos/extra-i686/locale.patch
    (from rev 243069, ffmpegthumbnailer/trunk/locale.patch)
  ffmpegthumbnailer/repos/extra-x86_64/PKGBUILD
    (from rev 243069, ffmpegthumbnailer/trunk/PKGBUILD)
  ffmpegthumbnailer/repos/extra-x86_64/locale.patch
    (from rev 243069, ffmpegthumbnailer/trunk/locale.patch)
Deleted:
  ffmpegthumbnailer/repos/extra-i686/PKGBUILD
  ffmpegthumbnailer/repos/extra-x86_64/PKGBUILD

---------------------------+
 /PKGBUILD                 |   68 ++++++++++++++++++++++++++++++++++++++++++++
 extra-i686/PKGBUILD       |   27 -----------------
 extra-i686/locale.patch   |   46 +++++++++++++++++++++++++++++
 extra-x86_64/PKGBUILD     |   27 -----------------
 extra-x86_64/locale.patch |   46 +++++++++++++++++++++++++++++
 5 files changed, 160 insertions(+), 54 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2015-08-06 08:43:37 UTC (rev 243069)
+++ extra-i686/PKGBUILD	2015-08-06 08:44:02 UTC (rev 243070)
@@ -1,27 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: boromil at gmail.com
-
-pkgname=ffmpegthumbnailer
-pkgver=2.0.10
-pkgrel=1
-pkgdesc="Lightweight video thumbnailer that can be used by file managers."
-url="https://github.com/dirkvdb/ffmpegthumbnailer"
-license=('GPL2')
-arch=('i686' 'x86_64')
-depends=('ffmpeg' 'libjpeg' 'libpng')
-optdepends=('gvfs: support for gio uris')
-source=("https://github.com/dirkvdb/$pkgname/archive/$pkgver.tar.gz")
-sha1sums=('c947cb175dfc6b414046b2ffc7008246fa101f4f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./autogen.sh
-  ./configure --prefix=/usr --enable-gio --enable-thumbnailer
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}

Copied: ffmpegthumbnailer/repos/extra-i686/PKGBUILD (from rev 243069, ffmpegthumbnailer/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2015-08-06 08:44:02 UTC (rev 243070)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: boromil at gmail.com
+
+pkgname=ffmpegthumbnailer
+pkgver=2.0.10
+pkgrel=2
+pkgdesc="Lightweight video thumbnailer that can be used by file managers."
+url="https://github.com/dirkvdb/ffmpegthumbnailer"
+license=('GPL2')
+arch=('i686' 'x86_64')
+depends=('ffmpeg' 'libjpeg' 'libpng')
+optdepends=('gvfs: support for gio uris')
+source=("https://github.com/dirkvdb/$pkgname/archive/$pkgver.tar.gz"
+        "locale.patch")
+sha1sums=('c947cb175dfc6b414046b2ffc7008246fa101f4f'
+          '569d262435cd5ebc4515e2389df048e3630af034')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/locale.patch"
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./autogen.sh
+  ./configure --prefix=/usr --enable-gio --enable-thumbnailer
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}

Copied: ffmpegthumbnailer/repos/extra-i686/locale.patch (from rev 243069, ffmpegthumbnailer/trunk/locale.patch)
===================================================================
--- extra-i686/locale.patch	                        (rev 0)
+++ extra-i686/locale.patch	2015-08-06 08:44:02 UTC (rev 243070)
@@ -0,0 +1,46 @@
+From 718f1b1147fe7e9138e2d503ed151e589d643772 Mon Sep 17 00:00:00 2001
+From: Dirk Vanden Boer <dirk.vdb at 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/unittest/testrunner.cpp b/unittest/testrunner.cpp
+index 7023d25..20a4903 100644
+--- a/unittest/testrunner.cpp
++++ b/unittest/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);

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2015-08-06 08:43:37 UTC (rev 243069)
+++ extra-x86_64/PKGBUILD	2015-08-06 08:44:02 UTC (rev 243070)
@@ -1,27 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: boromil at gmail.com
-
-pkgname=ffmpegthumbnailer
-pkgver=2.0.10
-pkgrel=1
-pkgdesc="Lightweight video thumbnailer that can be used by file managers."
-url="https://github.com/dirkvdb/ffmpegthumbnailer"
-license=('GPL2')
-arch=('i686' 'x86_64')
-depends=('ffmpeg' 'libjpeg' 'libpng')
-optdepends=('gvfs: support for gio uris')
-source=("https://github.com/dirkvdb/$pkgname/archive/$pkgver.tar.gz")
-sha1sums=('c947cb175dfc6b414046b2ffc7008246fa101f4f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./autogen.sh
-  ./configure --prefix=/usr --enable-gio --enable-thumbnailer
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}

Copied: ffmpegthumbnailer/repos/extra-x86_64/PKGBUILD (from rev 243069, ffmpegthumbnailer/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2015-08-06 08:44:02 UTC (rev 243070)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: boromil at gmail.com
+
+pkgname=ffmpegthumbnailer
+pkgver=2.0.10
+pkgrel=2
+pkgdesc="Lightweight video thumbnailer that can be used by file managers."
+url="https://github.com/dirkvdb/ffmpegthumbnailer"
+license=('GPL2')
+arch=('i686' 'x86_64')
+depends=('ffmpeg' 'libjpeg' 'libpng')
+optdepends=('gvfs: support for gio uris')
+source=("https://github.com/dirkvdb/$pkgname/archive/$pkgver.tar.gz"
+        "locale.patch")
+sha1sums=('c947cb175dfc6b414046b2ffc7008246fa101f4f'
+          '569d262435cd5ebc4515e2389df048e3630af034')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/locale.patch"
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./autogen.sh
+  ./configure --prefix=/usr --enable-gio --enable-thumbnailer
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}

Copied: ffmpegthumbnailer/repos/extra-x86_64/locale.patch (from rev 243069, ffmpegthumbnailer/trunk/locale.patch)
===================================================================
--- extra-x86_64/locale.patch	                        (rev 0)
+++ extra-x86_64/locale.patch	2015-08-06 08:44:02 UTC (rev 243070)
@@ -0,0 +1,46 @@
+From 718f1b1147fe7e9138e2d503ed151e589d643772 Mon Sep 17 00:00:00 2001
+From: Dirk Vanden Boer <dirk.vdb at 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/unittest/testrunner.cpp b/unittest/testrunner.cpp
+index 7023d25..20a4903 100644
+--- a/unittest/testrunner.cpp
++++ b/unittest/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);



More information about the arch-commits mailing list