c6ce65d3d0
```sh git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" | while read template; do for p in ${template%/template}/patches/*; do sed -i ' \,^[+-][+-][+-] /dev/null,b /^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b s,^[*][*][*] ,&a/, /^--- /{ s,\(^--- \)\(./\)*,\1a/, s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1, s/[.-][Oo][Rr][Ii][Gg]$// s/[.]patched[.]\([^.]\)/.\1/ h } /^+++ -/{ g s/^--- a/+++ b/ b } s,\(^+++ \)\(./\)*,\1b/, ' "$p" done sed -i '/^patch_args=/d' $template done ```
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
libavutil/audioconvert.h is gone in ffmpeg3.x
|
|
|
|
--- a/src/mpv/audio/filter/af_lavcac3enc.c 2015-05-20 11:31:58.000000000 +0200
|
|
+++ b/src/mpv/audio/filter/af_lavcac3enc.c 2016-09-22 19:52:47.730132367 +0200
|
|
@@ -26,7 +26,6 @@
|
|
#include <assert.h>
|
|
|
|
#include <libavcodec/avcodec.h>
|
|
-#include <libavutil/audioconvert.h>
|
|
#include <libavutil/intreadwrite.h>
|
|
#include <libavutil/common.h>
|
|
#include <libavutil/bswap.h>
|
|
--- a/src/mpv/audio/out/ao_lavc.c 2015-05-20 11:31:58.000000000 +0200
|
|
+++ b/src/mpv/audio/out/ao_lavc.c 2016-09-22 19:54:50.291163189 +0200
|
|
@@ -25,7 +25,6 @@
|
|
#include <limits.h>
|
|
|
|
#include <libavutil/common.h>
|
|
-#include <libavutil/audioconvert.h>
|
|
|
|
#include "config.h"
|
|
#include "options/options.h"
|
|
--- a/src/mpv/audio/filter/af_lavrresample.c 2015-05-20 11:31:58.000000000 +0200
|
|
+++ b/src/mpv/audio/filter/af_lavrresample.c 2016-09-22 19:57:13.539200765 +0200
|
|
@@ -28,7 +28,6 @@
|
|
#include <assert.h>
|
|
|
|
#include <libavutil/opt.h>
|
|
-#include <libavutil/audioconvert.h>
|
|
#include <libavutil/common.h>
|
|
#include <libavutil/samplefmt.h>
|
|
#include <libavutil/mathematics.h>
|