diff options
author | Adrian Bunk <bunk@stusta.de> | 2019-05-08 22:58:52 +0300 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-05-09 20:34:33 -0700 |
commit | d9b5e720a149f846fc251a4fbf4018a857559f2e (patch) | |
tree | 8a6b30f33d90a33dd2f2f42e43d682fd276434ec /meta-multimedia/recipes-multimedia | |
parent | 82b4ce8e9eaf3ef8240b24ffd42b54f6a0d05bfc (diff) | |
download | meta-openembedded-d9b5e720a149f846fc251a4fbf4018a857559f2e.tar.gz |
vlc: Remove workaround and patches for problems fixed upstream
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-multimedia/recipes-multimedia')
3 files changed, 0 insertions, 35 deletions
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0002-glibc-does-not-provide-strlcpy.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0002-glibc-does-not-provide-strlcpy.patch deleted file mode 100644 index 3db3df34b..000000000 --- a/meta-multimedia/recipes-multimedia/vlc/vlc/0002-glibc-does-not-provide-strlcpy.patch +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | --- a/src/input/subtitles.c | ||
2 | +++ b/src/input/subtitles.c | ||
3 | @@ -42,6 +42,12 @@ | ||
4 | #include "input_internal.h" | ||
5 | |||
6 | /** | ||
7 | + * Drepper's alternative | ||
8 | + * http://en.wikibooks.org/wiki/C_Programming/C_Reference/nonstandard/strlcpy | ||
9 | + */ | ||
10 | +#define strlcpy(dst, src, n) *((char* ) mempcpy(dst, src, n)) = '\0' | ||
11 | + | ||
12 | +/** | ||
13 | * The possible extensions for subtitle files we support | ||
14 | */ | ||
15 | static const char *const sub_exts[] = { SLAVE_SPU_EXTENSIONS, "" }; | ||
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0005-libpostproc-header-check.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0005-libpostproc-header-check.patch deleted file mode 100644 index 77a7d6173..000000000 --- a/meta-multimedia/recipes-multimedia/vlc/vlc/0005-libpostproc-header-check.patch +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | * Also look for postprocess.h under libpostproc/ | ||
2 | |||
3 | Upstream-status: Pending | ||
4 | |||
5 | --- a/configure.ac | ||
6 | +++ b/configure.ac | ||
7 | @@ -2589,7 +2589,7 @@ then | ||
8 | VLC_SAVE_FLAGS | ||
9 | CPPFLAGS="${CPPFLAGS} ${POSTPROC_CFLAGS}" | ||
10 | CFLAGS="${CFLAGS} ${POSTPROC_CFLAGS}" | ||
11 | - AC_CHECK_HEADERS(postproc/postprocess.h) | ||
12 | + AC_CHECK_HEADERS(postproc/postprocess.h,[],[AC_CHECK_HEADERS(libpostproc/postprocess.h)]) | ||
13 | VLC_ADD_PLUGIN([postproc]) | ||
14 | VLC_RESTORE_FLAGS | ||
15 | ],[ | ||
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.6.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.6.bb index 1ae213ff3..fcd321cb0 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.6.bb +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.6.bb | |||
@@ -1,13 +1,8 @@ | |||
1 | require ${BPN}.inc | 1 | require ${BPN}.inc |
2 | 2 | ||
3 | # work around build failure | ||
4 | EXTRA_OECONF += " --enable-libxml2=no" | ||
5 | |||
6 | LDFLAGS_append_riscv64 = " -pthread" | 3 | LDFLAGS_append_riscv64 = " -pthread" |
7 | 4 | ||
8 | SRC_URI += " \ | 5 | SRC_URI += " \ |
9 | file://0002-glibc-does-not-provide-strlcpy.patch \ | ||
10 | file://0005-libpostproc-header-check.patch \ | ||
11 | file://0006-make-opencv-configurable.patch \ | 6 | file://0006-make-opencv-configurable.patch \ |
12 | file://0007-use-vorbisidec.patch \ | 7 | file://0007-use-vorbisidec.patch \ |
13 | file://0008-fix-luaL-checkint.patch \ | 8 | file://0008-fix-luaL-checkint.patch \ |