diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2013-01-26 18:32:54 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2013-01-26 18:32:54 +0000 |
| commit | 56d66cfc861ce73fab010ebbace856c2f96130eb (patch) | |
| tree | b70d299a660facac34c82a825c97a7b308580c5b /net-misc/mediatomb/files | |
| parent | Pushing out rev 11 (diff) | |
| download | historical-56d66cfc861ce73fab010ebbace856c2f96130eb.tar.gz historical-56d66cfc861ce73fab010ebbace856c2f96130eb.tar.bz2 historical-56d66cfc861ce73fab010ebbace856c2f96130eb.zip | |
Merge the thumbnail patches as you don't patch a patch.
Package-Manager: portage-2.2.0_alpha159/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156
Diffstat (limited to 'net-misc/mediatomb/files')
| -rw-r--r-- | net-misc/mediatomb/files/mediatomb-0.12.1-no-thumbnail.patch | 22 | ||||
| -rw-r--r-- | net-misc/mediatomb/files/mediatomb-0.12.1-thumb-cache.patch | 10 |
2 files changed, 7 insertions, 25 deletions
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()); |