summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Bornkessel <hd_brummy@gentoo.org>2008-03-29 16:35:58 +0000
committerJörg Bornkessel <hd_brummy@gentoo.org>2008-03-29 16:35:58 +0000
commit445a7a6f96dc21c5a99cb039a954f695b8b455b4 (patch)
tree997694caed622a8bd92511041db71cb4a1a2b03d /media-video/vdr2jpeg/files
parentmedia-video/vdr2jpeg-0.1.0 masked depend on bug #214740, wait for unmask depe... (diff)
downloadgentoo-2-445a7a6f96dc21c5a99cb039a954f695b8b455b4.tar.gz
gentoo-2-445a7a6f96dc21c5a99cb039a954f695b8b455b4.tar.bz2
gentoo-2-445a7a6f96dc21c5a99cb039a954f695b8b455b4.zip
cleanup, 0.0.12 stable on x86; version bump, masked by package.mask bug #214740
(Portage version: 2.1.4.4)
Diffstat (limited to 'media-video/vdr2jpeg/files')
-rw-r--r--media-video/vdr2jpeg/files/ffmpeg-0.4.9_p20080326-new_header.diff18
-rw-r--r--media-video/vdr2jpeg/files/vdr2jpeg-ffmpeg.diff10
2 files changed, 18 insertions, 10 deletions
diff --git a/media-video/vdr2jpeg/files/ffmpeg-0.4.9_p20080326-new_header.diff b/media-video/vdr2jpeg/files/ffmpeg-0.4.9_p20080326-new_header.diff
new file mode 100644
index 000000000000..2608a0a6912a
--- /dev/null
+++ b/media-video/vdr2jpeg/files/ffmpeg-0.4.9_p20080326-new_header.diff
@@ -0,0 +1,18 @@
+diff -Naur vdr2jpeg-0.1.0.orig/ffm.cpp vdr2jpeg-0.1.0/ffm.cpp
+--- vdr2jpeg-0.1.0.orig/ffm.cpp 2008-03-29 17:06:41.000000000 +0100
++++ vdr2jpeg-0.1.0/ffm.cpp 2008-03-29 17:07:42.000000000 +0100
+@@ -38,10 +38,10 @@
+ #include <avformat.h>
+ #include <swscale.h>
+ #else
+-#include <ffmpeg/avutil.h>
+-#include <ffmpeg/avcodec.h>
+-#include <ffmpeg/avformat.h>
+-#include <ffmpeg/swscale.h>
++#include <libavutil/avutil.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
++#include <libswscale/swscale.h>
+ #endif
+ }
+
diff --git a/media-video/vdr2jpeg/files/vdr2jpeg-ffmpeg.diff b/media-video/vdr2jpeg/files/vdr2jpeg-ffmpeg.diff
deleted file mode 100644
index b5ca2433cbc9..000000000000
--- a/media-video/vdr2jpeg/files/vdr2jpeg-ffmpeg.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- ffm.cpp.org 2007-05-28 09:58:00.555083916 +0200
-+++ ffm.cpp 2007-05-28 09:55:55.074227146 +0200
-@@ -22,6 +22,7 @@
- */
-
-
-+#define __STDC_CONSTANT_MACROS
- #include <stdio.h>
- #include <unistd.h>
- #include <errno.h>