From f44f67e9b8093b1620f3abcf1a0cf62844232930 Mon Sep 17 00:00:00 2001 From: Ben Woods Date: Tue, 10 May 2016 15:35:19 +0000 Subject: multimedia/vdr-plugin-markad: Fix build with ffmpeg 3.0.x - Update patch of command/decoder.cpp to allow vdr-plugin-markad to build successfully once multimedia/ffmpeg is updated to 3.0.x. Note that multimedia/ffmpeg is currently still on the 2.8.x branch, however this patch is backwards compatible with ffmpeg 2.8.x. The additional changes to this file were based on upstream bug report #1898 [1], and also the requirement to replace s/avcodec_alloc_frame/av_frame_alloc/g. - Regenerate patches with makepatch (pet portlint), and remove PATCH_STRIP=-p1 from Makefile. [1] https://projects.vdr-developer.org/issues/1898 PR: 209386 Reported by: antoine (PR207547) Reviewed by: mat (mentor) Approved by: adamw (mentor) Differential Revision: https://reviews.freebsd.org/D6283 --- .../vdr-plugin-markad/files/patch-plugin_markad.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 multimedia/vdr-plugin-markad/files/patch-plugin_markad.cpp (limited to 'multimedia/vdr-plugin-markad/files/patch-plugin_markad.cpp') diff --git a/multimedia/vdr-plugin-markad/files/patch-plugin_markad.cpp b/multimedia/vdr-plugin-markad/files/patch-plugin_markad.cpp new file mode 100644 index 000000000000..86a4a947806e --- /dev/null +++ b/multimedia/vdr-plugin-markad/files/patch-plugin_markad.cpp @@ -0,0 +1,19 @@ +--- plugin/markad.cpp.orig 2012-09-10 12:45:12 UTC ++++ plugin/markad.cpp +@@ -15,8 +15,16 @@ + + #include "markad.h" + ++#ifdef PREFIX ++#define DEF_BINDIR PREFIX "/bin" ++#else + #define DEF_BINDIR "/usr/bin" ++#endif ++#ifdef DATADIR ++#define DEF_LOGODIR DATADIR "/logos" ++#else + #define DEF_LOGODIR "/var/lib/markad" ++#endif + + cPluginMarkAd::cPluginMarkAd(void) + { -- cgit v1.2.3