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 | |
| 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')
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 3db3df34b2..0000000000 --- a/meta-multimedia/recipes-multimedia/vlc/vlc/0002-glibc-does-not-provide-strlcpy.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/src/input/subtitles.c -+++ b/src/input/subtitles.c -@@ -42,6 +42,12 @@ - #include "input_internal.h" - - /** -+ * Drepper's alternative -+ * http://en.wikibooks.org/wiki/C_Programming/C_Reference/nonstandard/strlcpy -+ */ -+#define strlcpy(dst, src, n) *((char* ) mempcpy(dst, src, n)) = '\0' -+ -+/** - * The possible extensions for subtitle files we support - */ - 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 77a7d61730..0000000000 --- a/meta-multimedia/recipes-multimedia/vlc/vlc/0005-libpostproc-header-check.patch +++ /dev/null @@ -1,15 +0,0 @@ -* Also look for postprocess.h under libpostproc/ - -Upstream-status: Pending - ---- a/configure.ac -+++ b/configure.ac -@@ -2589,7 +2589,7 @@ then - VLC_SAVE_FLAGS - CPPFLAGS="${CPPFLAGS} ${POSTPROC_CFLAGS}" - CFLAGS="${CFLAGS} ${POSTPROC_CFLAGS}" -- AC_CHECK_HEADERS(postproc/postprocess.h) -+ AC_CHECK_HEADERS(postproc/postprocess.h,[],[AC_CHECK_HEADERS(libpostproc/postprocess.h)]) - VLC_ADD_PLUGIN([postproc]) - VLC_RESTORE_FLAGS - ],[ 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 1ae213ff32..fcd321cb0e 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 @@ require ${BPN}.inc -# work around build failure -EXTRA_OECONF += " --enable-libxml2=no" - LDFLAGS_append_riscv64 = " -pthread" SRC_URI += " \ - file://0002-glibc-does-not-provide-strlcpy.patch \ - file://0005-libpostproc-header-check.patch \ file://0006-make-opencv-configurable.patch \ file://0007-use-vorbisidec.patch \ file://0008-fix-luaL-checkint.patch \ |