[arch-commits] Commit in ffmpegthumbnailer/repos (8 files)
Ronald van Haren
ronald at archlinux.org
Sat Nov 17 14:57:46 UTC 2012
Date: Saturday, November 17, 2012 @ 09:57:45
Author: ronald
Revision: 171435
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
ffmpegthumbnailer/repos/extra-i686/PKGBUILD
(from rev 171434, ffmpegthumbnailer/trunk/PKGBUILD)
ffmpegthumbnailer/repos/extra-x86_64/PKGBUILD
(from rev 171434, ffmpegthumbnailer/trunk/PKGBUILD)
Deleted:
ffmpegthumbnailer/repos/extra-i686/PKGBUILD
ffmpegthumbnailer/repos/extra-i686/ffmpegapi_fix_r241.patch
ffmpegthumbnailer/repos/extra-i686/ffmpegthumbnailer.desktop
ffmpegthumbnailer/repos/extra-x86_64/PKGBUILD
ffmpegthumbnailer/repos/extra-x86_64/ffmpegapi_fix_r241.patch
ffmpegthumbnailer/repos/extra-x86_64/ffmpegthumbnailer.desktop
----------------------------------------+
extra-i686/PKGBUILD | 68 +++++++++++++------------------
extra-i686/ffmpegapi_fix_r241.patch | 56 -------------------------
extra-i686/ffmpegthumbnailer.desktop | 4 -
extra-x86_64/PKGBUILD | 68 +++++++++++++------------------
extra-x86_64/ffmpegapi_fix_r241.patch | 56 -------------------------
extra-x86_64/ffmpegthumbnailer.desktop | 4 -
6 files changed, 58 insertions(+), 198 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-11-17 14:56:23 UTC (rev 171434)
+++ extra-i686/PKGBUILD 2012-11-17 14:57:45 UTC (rev 171435)
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 23110 2010-08-06 11:01:51Z rvanharen $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: boromil at gmail.com
-
-pkgname=ffmpegthumbnailer
-pkgver=2.0.7
-pkgrel=5
-pkgdesc="Lightweight video thumbnailer that can be used by file managers."
-url="http://code.google.com/p/ffmpegthumbnailer/"
-license=('GPL2')
-arch=('i686' 'x86_64')
-depends=('ffmpeg' 'libjpeg' 'libpng')
-optdepends=('gvfs: support for gio uris')
-source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz"
- 'ffmpegthumbnailer.desktop' 'ffmpegapi_fix_r241.patch')
-options=('!libtool')
-sha1sums=('b8f5371aa995fefd1fb75e306e8cd76e8c9f3a73'
- 'bdd3ae35a5c6f0e1f4b0c7926f72b3429b2eaa53'
- '4e1a6a0f06ae3ae322ea44046599ebf3ab693cb6')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- # Don't use deprecated (removed?) ffmpeg api
- patch -Np0 -i "${srcdir}/ffmpegapi_fix_r241.patch"
-
- ./configure --prefix=/usr --enable-gio
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- # FS#24105: Generate thumbnails in nautilus
- # FS#26540: Rename to .thumbnailer for nautilus
- install -Dm644 "${srcdir}/ffmpegthumbnailer.desktop" \
- "${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.thumbnailer"
-}
Copied: ffmpegthumbnailer/repos/extra-i686/PKGBUILD (from rev 171434, ffmpegthumbnailer/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-11-17 14:57:45 UTC (rev 171435)
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 23110 2010-08-06 11:01:51Z rvanharen $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: boromil at gmail.com
+
+pkgname=ffmpegthumbnailer
+pkgver=2.0.8
+pkgrel=1
+pkgdesc="Lightweight video thumbnailer that can be used by file managers."
+url="http://code.google.com/p/ffmpegthumbnailer/"
+license=('GPL2')
+arch=('i686' 'x86_64')
+depends=('ffmpeg' 'libjpeg' 'libpng')
+optdepends=('gvfs: support for gio uris')
+source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz")
+options=('!libtool')
+sha1sums=('2c54ca16efd953f46547e22799cfc40bd9c24533')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./configure --prefix=/usr --enable-gio --enable-thumbnailer
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-i686/ffmpegapi_fix_r241.patch
===================================================================
--- extra-i686/ffmpegapi_fix_r241.patch 2012-11-17 14:56:23 UTC (rev 171434)
+++ extra-i686/ffmpegapi_fix_r241.patch 2012-11-17 14:57:45 UTC (rev 171435)
@@ -1,56 +0,0 @@
---- libffmpegthumbnailer/moviedecoder.cpp.old 2012-05-20 11:57:04.503450287 +0200
-+++ libffmpegthumbnailer/moviedecoder.cpp 2012-05-20 11:57:14.633450566 +0200
-@@ -58,19 +58,26 @@
- void MovieDecoder::initialize(const string& filename)
- {
- av_register_all();
-- avcodec_init();
- avcodec_register_all();
-
- string inputFile = filename == "-" ? "pipe:" : filename;
- m_AllowSeek = (filename != "-") && (filename.find("rtsp://") != 0);
--
-+
-+#if LIBAVCODEC_VERSION_MAJOR < 53
- if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext, inputFile.c_str(), NULL, 0, NULL) != 0)
-+#else
-+ if ((!m_FormatContextWasGiven) && avformat_open_input(&m_pFormatContext, inputFile.c_str(), NULL, NULL) != 0)
-+#endif
- {
- destroy();
- throw logic_error(string("Could not open input file: ") + filename);
- }
-
-+#if LIBAVCODEC_VERSION_MAJOR < 53
- if (av_find_stream_info(m_pFormatContext) < 0)
-+#else
-+ if (avformat_find_stream_info(m_pFormatContext, NULL) < 0)
-+#endif
- {
- destroy();
- throw logic_error(string("Could not find stream information"));
-@@ -90,8 +97,12 @@
-
- if ((!m_FormatContextWasGiven) && m_pFormatContext)
- {
-+#if LIBAVCODEC_VERSION_MAJOR < 53
- av_close_input_file(m_pFormatContext);
- m_pFormatContext = NULL;
-+#else
-+ avformat_close_input(&m_pFormatContext);
-+#endif
- }
-
- if (m_pPacket)
-@@ -159,7 +170,11 @@
-
- m_pVideoCodecContext->workaround_bugs = 1;
-
-+#if LIBAVCODEC_VERSION_MAJOR < 53
- if (avcodec_open(m_pVideoCodecContext, m_pVideoCodec) < 0)
-+#else
-+ if (avcodec_open2(m_pVideoCodecContext, m_pVideoCodec, NULL) < 0)
-+#endif
- {
- throw logic_error("Could not open video codec");
- }
Deleted: extra-i686/ffmpegthumbnailer.desktop
===================================================================
--- extra-i686/ffmpegthumbnailer.desktop 2012-11-17 14:56:23 UTC (rev 171434)
+++ extra-i686/ffmpegthumbnailer.desktop 2012-11-17 14:57:45 UTC (rev 171435)
@@ -1,4 +0,0 @@
-[Thumbnailer Entry]
-TryExec=ffmpegthumbnailer
-Exec=ffmpegthumbnailer -s %s -i %u -o %o -c png -f -t 10
-MimeType=video/flv;video/webm;video/mkv;video/mp4;video/mpeg;video/avi;video/ogg;video/quicktime;video/x-avi;video/x-flv;video/x-mp4;video/x-mpeg;video/x-webm;video/x-mkv;application/x-extension-webm;video/x-matroska;video/x-ms-wmv;video/x-msvideo;video/x-msvideo/avi;video/x-theora/ogg;video/x-theora/ogv;video/x-ms-asf;video/x-m4v;
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-11-17 14:56:23 UTC (rev 171434)
+++ extra-x86_64/PKGBUILD 2012-11-17 14:57:45 UTC (rev 171435)
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 23110 2010-08-06 11:01:51Z rvanharen $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: boromil at gmail.com
-
-pkgname=ffmpegthumbnailer
-pkgver=2.0.7
-pkgrel=5
-pkgdesc="Lightweight video thumbnailer that can be used by file managers."
-url="http://code.google.com/p/ffmpegthumbnailer/"
-license=('GPL2')
-arch=('i686' 'x86_64')
-depends=('ffmpeg' 'libjpeg' 'libpng')
-optdepends=('gvfs: support for gio uris')
-source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz"
- 'ffmpegthumbnailer.desktop' 'ffmpegapi_fix_r241.patch')
-options=('!libtool')
-sha1sums=('b8f5371aa995fefd1fb75e306e8cd76e8c9f3a73'
- 'bdd3ae35a5c6f0e1f4b0c7926f72b3429b2eaa53'
- '4e1a6a0f06ae3ae322ea44046599ebf3ab693cb6')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- # Don't use deprecated (removed?) ffmpeg api
- patch -Np0 -i "${srcdir}/ffmpegapi_fix_r241.patch"
-
- ./configure --prefix=/usr --enable-gio
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- # FS#24105: Generate thumbnails in nautilus
- # FS#26540: Rename to .thumbnailer for nautilus
- install -Dm644 "${srcdir}/ffmpegthumbnailer.desktop" \
- "${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.thumbnailer"
-}
Copied: ffmpegthumbnailer/repos/extra-x86_64/PKGBUILD (from rev 171434, ffmpegthumbnailer/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-11-17 14:57:45 UTC (rev 171435)
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 23110 2010-08-06 11:01:51Z rvanharen $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: boromil at gmail.com
+
+pkgname=ffmpegthumbnailer
+pkgver=2.0.8
+pkgrel=1
+pkgdesc="Lightweight video thumbnailer that can be used by file managers."
+url="http://code.google.com/p/ffmpegthumbnailer/"
+license=('GPL2')
+arch=('i686' 'x86_64')
+depends=('ffmpeg' 'libjpeg' 'libpng')
+optdepends=('gvfs: support for gio uris')
+source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz")
+options=('!libtool')
+sha1sums=('2c54ca16efd953f46547e22799cfc40bd9c24533')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./configure --prefix=/usr --enable-gio --enable-thumbnailer
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-x86_64/ffmpegapi_fix_r241.patch
===================================================================
--- extra-x86_64/ffmpegapi_fix_r241.patch 2012-11-17 14:56:23 UTC (rev 171434)
+++ extra-x86_64/ffmpegapi_fix_r241.patch 2012-11-17 14:57:45 UTC (rev 171435)
@@ -1,56 +0,0 @@
---- libffmpegthumbnailer/moviedecoder.cpp.old 2012-05-20 11:57:04.503450287 +0200
-+++ libffmpegthumbnailer/moviedecoder.cpp 2012-05-20 11:57:14.633450566 +0200
-@@ -58,19 +58,26 @@
- void MovieDecoder::initialize(const string& filename)
- {
- av_register_all();
-- avcodec_init();
- avcodec_register_all();
-
- string inputFile = filename == "-" ? "pipe:" : filename;
- m_AllowSeek = (filename != "-") && (filename.find("rtsp://") != 0);
--
-+
-+#if LIBAVCODEC_VERSION_MAJOR < 53
- if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext, inputFile.c_str(), NULL, 0, NULL) != 0)
-+#else
-+ if ((!m_FormatContextWasGiven) && avformat_open_input(&m_pFormatContext, inputFile.c_str(), NULL, NULL) != 0)
-+#endif
- {
- destroy();
- throw logic_error(string("Could not open input file: ") + filename);
- }
-
-+#if LIBAVCODEC_VERSION_MAJOR < 53
- if (av_find_stream_info(m_pFormatContext) < 0)
-+#else
-+ if (avformat_find_stream_info(m_pFormatContext, NULL) < 0)
-+#endif
- {
- destroy();
- throw logic_error(string("Could not find stream information"));
-@@ -90,8 +97,12 @@
-
- if ((!m_FormatContextWasGiven) && m_pFormatContext)
- {
-+#if LIBAVCODEC_VERSION_MAJOR < 53
- av_close_input_file(m_pFormatContext);
- m_pFormatContext = NULL;
-+#else
-+ avformat_close_input(&m_pFormatContext);
-+#endif
- }
-
- if (m_pPacket)
-@@ -159,7 +170,11 @@
-
- m_pVideoCodecContext->workaround_bugs = 1;
-
-+#if LIBAVCODEC_VERSION_MAJOR < 53
- if (avcodec_open(m_pVideoCodecContext, m_pVideoCodec) < 0)
-+#else
-+ if (avcodec_open2(m_pVideoCodecContext, m_pVideoCodec, NULL) < 0)
-+#endif
- {
- throw logic_error("Could not open video codec");
- }
Deleted: extra-x86_64/ffmpegthumbnailer.desktop
===================================================================
--- extra-x86_64/ffmpegthumbnailer.desktop 2012-11-17 14:56:23 UTC (rev 171434)
+++ extra-x86_64/ffmpegthumbnailer.desktop 2012-11-17 14:57:45 UTC (rev 171435)
@@ -1,4 +0,0 @@
-[Thumbnailer Entry]
-TryExec=ffmpegthumbnailer
-Exec=ffmpegthumbnailer -s %s -i %u -o %o -c png -f -t 10
-MimeType=video/flv;video/webm;video/mkv;video/mp4;video/mpeg;video/avi;video/ogg;video/quicktime;video/x-avi;video/x-flv;video/x-mp4;video/x-mpeg;video/x-webm;video/x-mkv;application/x-extension-webm;video/x-matroska;video/x-ms-wmv;video/x-msvideo;video/x-msvideo/avi;video/x-theora/ogg;video/x-theora/ogv;video/x-ms-asf;video/x-m4v;
More information about the arch-commits
mailing list