From 0073ad2989d30ac5c02205602b7aabafc3adc2ed Mon Sep 17 00:00:00 2001 From: jbeich Date: Thu, 3 May 2018 09:26:57 +0000 Subject: math/octave-forge-video: unbreak patch after r468833 ===> Patching for octave-forge-video-1.2.4_5 ===> Applying FreeBSD patches for octave-forge-video-1.2.4_5 No file to patch. Skipping... 1 out of 1 hunks ignored--saving rejects to src/AVHandler.cc.rej Can't create src/AVHandler.cc.rej, output is in /tmp/patchrvg0LqpIBg4: No such file or directory => FreeBSD patch patch-src_AVHandler.cc failed to apply cleanly. *** Error code 1 Pointy hat to: jbeich --- math/octave-forge-video/files/patch-AVHandler.cc | 20 ++++++++++++++++++++ math/octave-forge-video/files/patch-src_AVHandler.cc | 20 -------------------- 2 files changed, 20 insertions(+), 20 deletions(-) create mode 100644 math/octave-forge-video/files/patch-AVHandler.cc delete mode 100644 math/octave-forge-video/files/patch-src_AVHandler.cc (limited to 'math') diff --git a/math/octave-forge-video/files/patch-AVHandler.cc b/math/octave-forge-video/files/patch-AVHandler.cc new file mode 100644 index 000000000000..b114750200b1 --- /dev/null +++ b/math/octave-forge-video/files/patch-AVHandler.cc @@ -0,0 +1,20 @@ +AVHandler.cc:246:29: error: use of undeclared identifier 'CODEC_CAP_TRUNCATED' + if (codec->capabilities & CODEC_CAP_TRUNCATED) + ^ +AVHandler.cc:247:30: error: use of undeclared identifier 'CODEC_FLAG_TRUNCATED' + vstream->codec->flags |= CODEC_FLAG_TRUNCATED; + ^ + +--- AVHandler.cc.orig 2017-05-28 14:27:02 UTC ++++ AVHandler.cc +@@ -243,8 +243,8 @@ AVHandler::setup_read() + codec_name = codec->name; + + // We can handle truncated bitstreams +- if (codec->capabilities & CODEC_CAP_TRUNCATED) +- vstream->codec->flags |= CODEC_FLAG_TRUNCATED; ++ if (codec->capabilities & AV_CODEC_CAP_TRUNCATED) ++ vstream->codec->flags |= AV_CODEC_FLAG_TRUNCATED; + + if (avcodec_open2(vstream->codec, codec, NULL) < 0) + { diff --git a/math/octave-forge-video/files/patch-src_AVHandler.cc b/math/octave-forge-video/files/patch-src_AVHandler.cc deleted file mode 100644 index 111f05983381..000000000000 --- a/math/octave-forge-video/files/patch-src_AVHandler.cc +++ /dev/null @@ -1,20 +0,0 @@ -AVHandler.cc:246:29: error: use of undeclared identifier 'CODEC_CAP_TRUNCATED' - if (codec->capabilities & CODEC_CAP_TRUNCATED) - ^ -AVHandler.cc:247:30: error: use of undeclared identifier 'CODEC_FLAG_TRUNCATED' - vstream->codec->flags |= CODEC_FLAG_TRUNCATED; - ^ - ---- src/AVHandler.cc.orig 2017-05-28 14:27:02 UTC -+++ src/AVHandler.cc -@@ -243,8 +243,8 @@ AVHandler::setup_read() - codec_name = codec->name; - - // We can handle truncated bitstreams -- if (codec->capabilities & CODEC_CAP_TRUNCATED) -- vstream->codec->flags |= CODEC_FLAG_TRUNCATED; -+ if (codec->capabilities & AV_CODEC_CAP_TRUNCATED) -+ vstream->codec->flags |= AV_CODEC_FLAG_TRUNCATED; - - if (avcodec_open2(vstream->codec, codec, NULL) < 0) - { -- cgit