Merge the thumbnail patches as you don't patch a patch.

(Portage version: 2.2.0_alpha159/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

4 files changed, 14 insertions, 28 deletions

diff --git a/net-misc/mediatomb/ChangeLog b/net-misc/mediatomb/ChangeLog
index 63e904539237..c4d6dad7034d 100644
--- a/net-misc/mediatomb/ChangeLog
+++ b/net-misc/mediatomb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/mediatomb
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.42 2013/01/20 20:35:16 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.43 2013/01/26 18:32:49 vapier Exp $
+
+  26 Jan 2013; Mike Frysinger <vapier@gentoo.org>
+  -files/mediatomb-0.12.1-no-thumbnail.patch,
+  files/mediatomb-0.12.1-thumb-cache.patch, mediatomb-0.12.1-r5.ebuild:
+  Merge the thumbnail patches as you don't patch a patch.
 
   20 Jan 2013; Ian Whyman <thev00d00@gentoo.org> -mediatomb-0.12.1-r1.ebuild,
   -mediatomb-0.12.1-r3.ebuild, mediatomb-0.12.1-r5.ebuild:
diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-no-thumbnail.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-no-thumbnail.patch
deleted file mode 100644
index a16731ee29e4..000000000000
--- a/net-misc/mediatomb/files/mediatomb-0.12.1-no-thumbnail.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -burN mediatomb-0.12.1.old//src/metadata/ffmpeg_handler.cc mediatomb-0.12.1/src/metadata/ffmpeg_handler.cc
---- mediatomb-0.12.1.old//src/metadata/ffmpeg_handler.cc	2012-11-25 15:47:25.001638849 +0100
-+++ mediatomb-0.12.1/src/metadata/ffmpeg_handler.cc	2012-11-25 15:52:15.926628259 +0100
-@@ -374,7 +374,7 @@
-     free(path_temp);
-     return ret;
- }
--
-+#ifdef HAVE_FFMPEGTHUMBNAILER
- static String getThumbnailCacheFilePath(String& movie_filename, bool create)
- {
-     Ref<ConfigManager> cfg = ConfigManager::getInstance();
-@@ -421,6 +421,8 @@
-     fclose(fp);
- }
- 
-+#endif
-+
- Ref<IOHandler> FfmpegHandler::serveContent(Ref<CdsItem> item, int resNum, off_t *data_size)
- {
-     *data_size = -1;
-Binary files mediatomb-0.12.1.old//src/metadata/.ffmpeg_handler.cc.swp and mediatomb-0.12.1/src/metadata/.ffmpeg_handler.cc.swp differ
diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-thumb-cache.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-thumb-cache.patch
index 5b26de0f271a..6bcdedb0c74f 100644
--- a/net-misc/mediatomb/files/mediatomb-0.12.1-thumb-cache.patch
+++ b/net-misc/mediatomb/files/mediatomb-0.12.1-thumb-cache.patch
@@ -82,10 +82,12 @@ index a637d9c..8e7ef23 100644
  
  //#ifdef FFMPEG_NEEDS_EXTERN_C
  extern "C" 
-@@ -279,6 +282,118 @@ void FfmpegHandler::fillMetadata(Ref<CdsItem> item)
+@@ -279,6 +282,122 @@ void FfmpegHandler::fillMetadata(Ref<CdsItem> item)
      av_close_input_file(pFormatCtx);
  }
  
++#ifdef HAVE_FFMPEGTHUMBNAILER
++
 +static bool _mkdir(const char *path)
 +{
 +    int ret = mkdir(path, 0777);
@@ -198,10 +200,12 @@ index a637d9c..8e7ef23 100644
 +    fclose(fp);
 +}
 +
++#endif
++
  Ref<IOHandler> FfmpegHandler::serveContent(Ref<CdsItem> item, int resNum, off_t *data_size)
  {
      *data_size = -1;
-@@ -288,6 +403,18 @@ Ref<IOHandler> FfmpegHandler::serveContent(Ref<CdsItem> item, int resNum, off_t
+@@ -288,6 +407,18 @@ Ref<IOHandler> FfmpegHandler::serveContent(Ref<CdsItem> item, int resNum, off_t
      if (!cfg->getBoolOption(CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_ENABLED))
          return nil;
  
@@ -220,7 +224,7 @@ index a637d9c..8e7ef23 100644
  #ifdef FFMPEGTHUMBNAILER_OLD_API
      video_thumbnailer *th = create_thumbnailer();
      image_data *img = create_image_data();
-@@ -318,6 +445,10 @@ Ref<IOHandler> FfmpegHandler::serveContent(Ref<CdsItem> item, int resNum, off_t
+@@ -318,6 +449,10 @@ Ref<IOHandler> FfmpegHandler::serveContent(Ref<CdsItem> item, int resNum, off_t
  #endif // old api
          throw _Exception(_("Could not generate thumbnail for ") + 
                  item->getLocation());
diff --git a/net-misc/mediatomb/mediatomb-0.12.1-r5.ebuild b/net-misc/mediatomb/mediatomb-0.12.1-r5.ebuild
index 1aebdb9520e0..ba4314ce9d08 100644
--- a/net-misc/mediatomb/mediatomb-0.12.1-r5.ebuild
+++ b/net-misc/mediatomb/mediatomb-0.12.1-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/mediatomb-0.12.1-r5.ebuild,v 1.2 2013/01/20 20:35:16 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/mediatomb-0.12.1-r5.ebuild,v 1.3 2013/01/26 18:32:49 vapier Exp $
 
 EAPI="4"
 inherit autotools eutils linux-info user
@@ -69,7 +69,6 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-inotify-hard-links.patch
 	epatch "${FILESDIR}"/${P}-thumb-cache.patch
 	epatch "${FILESDIR}"/${P}-libav9.patch
-	epatch "${FILESDIR}"/${P}-no-thumbnail.patch
 	epatch "${FILESDIR}"/${P}-avformatcontext-pointer.patch #446922
 	eautoreconf
 }