diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
| commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
| tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-plugins/vdr-markad/files | |
| download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip | |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-plugins/vdr-markad/files')
| -rw-r--r-- | media-plugins/vdr-markad/files/vdr-markad-0.1.4-libav9.patch | 40 | ||||
| -rw-r--r-- | media-plugins/vdr-markad/files/vdr-markad-0.1.4_ffmpeg-2.patch | 13 |
2 files changed, 53 insertions, 0 deletions
diff --git a/media-plugins/vdr-markad/files/vdr-markad-0.1.4-libav9.patch b/media-plugins/vdr-markad/files/vdr-markad-0.1.4-libav9.patch new file mode 100644 index 000000000000..f11fc6137000 --- /dev/null +++ b/media-plugins/vdr-markad/files/vdr-markad-0.1.4-libav9.patch @@ -0,0 +1,40 @@ +diff -urN markad-0.1.4.old/command/decoder.cpp markad-0.1.4/command/decoder.cpp +--- markad-0.1.4.old/command/decoder.cpp 2013-06-17 21:52:44.333367552 +0200 ++++ markad-0.1.4/command/decoder.cpp 2013-06-17 21:53:03.708366863 +0200 +@@ -11,6 +11,7 @@ + #include <sys/types.h> + #include <string.h> + #include <cstdlib> ++#include <cstdio> + + #include "decoder.h" + +@@ -172,7 +173,7 @@ + + if (video_codec) + { +- video_context = avcodec_alloc_context(); ++ video_context = avcodec_alloc_context3(NULL); + if (video_context) + { + if (video_codec->capabilities & CODEC_CAP_TRUNCATED) +@@ -321,7 +322,7 @@ + { + avcodec_flush_buffers(video_context); + AVCodecContext *dest; +- dest=avcodec_alloc_context(); ++ dest=avcodec_alloc_context3(NULL); + if (dest) + { + if (avcodec_copy_context(dest,video_context)!=0) ret=false; +diff -urN markad-0.1.4.old/command/decoder.h markad-0.1.4/command/decoder.h +--- markad-0.1.4.old/command/decoder.h 2013-06-17 21:52:44.333367552 +0200 ++++ markad-0.1.4/command/decoder.h 2013-06-17 21:53:03.708366863 +0200 +@@ -18,6 +18,7 @@ + #include <avcodec.h> + #else + #include <libavcodec/avcodec.h> ++#include <libavutil/mem.h> + #endif + + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) diff --git a/media-plugins/vdr-markad/files/vdr-markad-0.1.4_ffmpeg-2.patch b/media-plugins/vdr-markad/files/vdr-markad-0.1.4_ffmpeg-2.patch new file mode 100644 index 000000000000..c94d54ea7aef --- /dev/null +++ b/media-plugins/vdr-markad/files/vdr-markad-0.1.4_ffmpeg-2.patch @@ -0,0 +1,13 @@ +diff -Naur markad-0.1.4.orig/command/decoder.cpp markad-0.1.4/command/decoder.cpp +--- markad-0.1.4.orig/command/decoder.cpp 2014-01-29 20:16:23.000000000 +0100 ++++ markad-0.1.4/command/decoder.cpp 2014-01-29 20:17:49.000000000 +0100 +@@ -152,7 +152,8 @@ + } + + video_codec=NULL; +- CodecID video_codecid; ++// CodecID video_codecid; ++ AVCodecID video_codecid; + + if (useH264) + { |