diff options
author | Ben Woods <woodsb02@FreeBSD.org> | 2016-05-10 15:35:19 +0000 |
---|---|---|
committer | Ben Woods <woodsb02@FreeBSD.org> | 2016-05-10 15:35:19 +0000 |
commit | f44f67e9b8093b1620f3abcf1a0cf62844232930 (patch) | |
tree | 01273598056c1692ec32443b05a21fc2388f4b57 /multimedia/vdr-plugin-markad/files/patch-command-decoder.cpp | |
parent | 5fb19cc017161787e7dd5ca5f9c30910f6e9ea03 (diff) | |
download | ports-f44f67e9b8093b1620f3abcf1a0cf62844232930.tar.gz ports-f44f67e9b8093b1620f3abcf1a0cf62844232930.zip |
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
Notes
Notes:
svn path=/head/; revision=414944
Diffstat (limited to 'multimedia/vdr-plugin-markad/files/patch-command-decoder.cpp')
-rw-r--r-- | multimedia/vdr-plugin-markad/files/patch-command-decoder.cpp | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/multimedia/vdr-plugin-markad/files/patch-command-decoder.cpp b/multimedia/vdr-plugin-markad/files/patch-command-decoder.cpp deleted file mode 100644 index d66a0b13e4f7..000000000000 --- a/multimedia/vdr-plugin-markad/files/patch-command-decoder.cpp +++ /dev/null @@ -1,36 +0,0 @@ ---- a/command/decoder.cpp -+++ b/command/decoder.cpp -@@ -6,7 +6,12 @@ - */ - - #include <stdint.h> -+#ifndef __FreeBSD__ - #include <sched.h> -+#else -+#include <sys/types.h> -+#include <sys/sysctl.h> -+#endif - #include <errno.h> - #include <sys/types.h> - #include <string.h> -@@ -107,6 +112,7 @@ cMarkAdDecoder::cMarkAdDecoder(bool useH - noticeERRMP2=false; - noticeERRAC3=false; - -+#ifndef __FreeBSD__ - cpu_set_t cpumask; - uint len = sizeof(cpumask); - int cpucount; -@@ -118,6 +124,12 @@ cMarkAdDecoder::cMarkAdDecoder(bool useH - { - cpucount=CPU_COUNT(&cpumask); - } -+#else -+ int cpucount; -+ size_t cpus_size = sizeof(cpucount); -+ if (sysctlbyname("hw.ncpu", &cpucount, &cpus_size, NULL, 0) == -1) -+ cpucount = 1; -+#endif - - if (Threads==-1) - { |