package/vlc: bump version to 3.0.3
v2 cover package/vlc: bump version to 3.0.3
Hi,
the upcoming version bump to ffmpeg 4.0.2 also affects vlc which needs to be bumped to version 3.0.3.
Patches 1-12 add some optional dependencies of vlc which are used both in vlc 2.2.8 and 3.0.3.
Patch 13 bumps vlc to version 3.0.3.
Patches 14-23 add another round of new optional dependencies.
Regards, Bernd
v2: added patches 13-23
Bernd Kuhls (23):
package/vlc: needs speexdsp for optional speex support package/vlc: sort VLC_CONF_OPTS
package/vlc: add optional dependency to x264 package/vlc: add optional dependency to x265 package/vlc: add optional dependency to ncurses package/vlc: add optional dependency to samba4 package/vlc: add optional dependency to pulseaudio package/vlc: add optional dependency to libvpx package/vlc: add optional dependency to libidn package/vlc: add optional dependency to libsamplerate package/vlc: add optional dependency to libdvdread package/vlc: add optional dependency to libdvdnav package/vlc: bump version to 3.0.3
package/vlc: add optional dependency to gst1-plugins-base package/vlc: add optional dependency to harfbuzz package/vlc: add optional dependency to libarchive package/vlc: add optional dependency to libnfs package/vlc: add optional dependency to libsecret package/vlc: add optional dependency to libsoxr package/vlc: add optional dependency to libva package/vlc: add optional dependency to mpg123 package/vlc: add optional dependency to wayland package/vlc: add optional support for skins2
...ding-of-statically-linked-vlc-binary.patch | 15 +-
...d-check-for-libgcrypt-config-program.patch | 46 ---
package/vlc/0002-lua53_compat.patch | 35 ++
...cit-function-declaration-compile-fla.patch | 32 --
.../0004-qt-fix-build-against-Qt-5.11.patch | 29 ++
...me-X11-is-available-when-Qt5-is-used.patch | 28 --
...r-using-uClibc-by-adding-sys-types.h.patch | 44 +++
...Don-t-assume-strerror_l-is-available.patch | 15 +-
...e-and-add-required-realtime-library-.patch | 40 ---
package/vlc/0008-posix-clock.patch | 179 ++++++++++
package/vlc/0009-Changes-for-ffmpeg-3.0.patch | 309 ------------------
...build-support-and-fix-10bit-support.patch} | 45 ++-
...10-Fix-build-when-using-C99-and-C-11.patch | 30 --
package/vlc/0010-freerdp-2.patch | 138 ++++++++
.../vlc/0011-compat-fix-static_assert.patch | 36 --
...-Fix-build-with-libupnp-above-1.6.23.patch | 64 ----
package/vlc/Config.in | 9 +-
package/vlc/vlc.hash | 13 +-
package/vlc/vlc.mk | 247 +++++++++++---
19 files changed, 667 insertions(+), 687 deletions(-)
delete mode 100644 package/vlc/0002-configure.ac-add-check-for-libgcrypt-config-program.patch
create mode 100644 package/vlc/0002-lua53_compat.patch
delete mode 100644 package/vlc/0004-Drop-error-implicit-function-declaration-compile-fla.patch
create mode 100644 package/vlc/0004-qt-fix-build-against-Qt-5.11.patch
delete mode 100644 package/vlc/0006-Don-t-assume-X11-is-available-when-Qt5-is-used.patch
create mode 100644 package/vlc/0006-Fix-build-error-using-uClibc-by-adding-sys-types.h.patch
delete mode 100644 package/vlc/0008-fix-fallback-code-and-add-required-realtime-library-.patch
create mode 100644 package/vlc/0008-posix-clock.patch
delete mode 100644 package/vlc/0009-Changes-for-ffmpeg-3.0.patch
rename package/vlc/{0013-x264-drop-148-build-support-and-fix-10bit-support.patch => 0009-x264-drop-148-build-support-and-fix-10bit-support.patch} (84%)
delete mode 100644 package/vlc/0010-Fix-build-when-using-C99-and-C-11.patch
create mode 100644 package/vlc/0010-freerdp-2.patch
delete mode 100644 package/vlc/0011-compat-fix-static_assert.patch
delete mode 100644 package/vlc/0012-Fix-build-with-libupnp-above-1.6.23.patchSignature · 1 line
2.18.0
PATCH v2 1/23 package/vlc: needs speexdsp for optional speex support
Fixes configure warning:
checking for SPEEX... yes
checking for SPEEXDSP... no
configure: WARNING: Package speexdsp was not found in the pkg-config search path. Perhaps you should add the directory containing `speexdsp.pc'
to the PKG_CONFIG_PATH environment variable
Package 'speexdsp', required by 'world', not found.
Backported from master branch
https://git.buildroot.net/buildroot/commit/?id=c4f18dd3c8664bb6715122c62a32e3b4388fa34e
to avoid merge conflict with upcoming samba4 dependency patch.
--- package/vlc/vlc.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/vlc/vlc.mk +2 -2
@@ -381,9 +381,9 @@ else VLC_CONF_OPTS += --disable-sdl-image endif -ifeq ($(BR2_PACKAGE_SPEEX),y) +ifeq ($(BR2_PACKAGE_SPEEX)$(BR2_PACKAGE_SPEEXDSP),yy) VLC_CONF_OPTS += --enable-speex -VLC_DEPENDENCIES += speex +VLC_DEPENDENCIES += speex speexdsp else VLC_CONF_OPTS += --disable-speex endif
Signature · 1 line
2.18.0
PATCH v2 2/23 package/vlc: sort VLC_CONF_OPTS
In reply to Bernd KuhlsNo code changes. The upcoming bump to vlc 3.0.3 will add another eleven --disable-* options to CONF_OPTS. To stay on top of things we sort the current entries before we begin the version bump.
--- package/vlc/vlc.mk | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-)
package/vlc/vlc.mk +18 -18
@@ -34,33 +34,33 @@ endef VLC_POST_PATCH_HOOKS += VLC_OVERRIDE_PKG_M4 VLC_CONF_OPTS += \ - --disable-gles1 \ --disable-a52 \ - --disable-shout \ - --disable-twolame \ - --disable-dca \ - --disable-schroedinger \ - --disable-fluidsynth \ - --disable-zvbi \ - --disable-kate \ + --disable-addonmanagermodules \ --disable-caca \ - --disable-jack \ - --disable-samplerate \ --disable-chromaprint \ + --disable-dca \ + --disable-dvdnav \ + --disable-fluidsynth \ + --disable-gles1 \ --disable-goom \ - --disable-projectm \ - --disable-vsxu \ - --disable-mtp \ + --disable-jack \ + --disable-jpeg \ + --disable-kate \ + --disable-mfx \ --disable-mmal-codec \ --disable-mmal-vout \ - --disable-dvdnav \ + --disable-mtp \ + --disable-projectm \ + --disable-samplerate \ + --disable-schroedinger \ + --disable-shout \ + --disable-twolame \ + --disable-vdpau \ --disable-vpx \ - --disable-jpeg \ + --disable-vsxu \ --disable-x262 \ --disable-x265 \ - --disable-mfx \ - --disable-vdpau \ - --disable-addonmanagermodules \ + --disable-zvbi \ --enable-run-as-root # Uses __atomic_fetch_add_4
Signature · 1 line
2.18.0
PATCH v2 3/23 package/vlc: add optional dependency to x264
In reply to Bernd Kuhls--- package/vlc/vlc.mk | 7 +++++++ 1 file changed, 7 insertions(+)
package/vlc/vlc.mk +7 -0
@@ -409,6 +409,13 @@ else VLC_CONF_OPTS += --disable-udev endif +ifeq ($(BR2_PACKAGE_X264),y) +VLC_CONF_OPTS += --enable-x264 +VLC_DEPENDENCIES += x264 +else +VLC_CONF_OPTS += --disable-x264 +endif + ifeq ($(BR2_PACKAGE_XCB_UTIL_KEYSYMS),y) VLC_CONF_OPTS += --enable-xcb VLC_DEPENDENCIES += xcb-util-keysyms
Signature · 1 line
2.18.0
PATCH v2 4/23 package/vlc: add optional dependency to x265
In reply to Bernd Kuhls--- package/vlc/vlc.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
package/vlc/vlc.mk +7 -1
@@ -59,7 +59,6 @@ VLC_CONF_OPTS += \ --disable-vpx \ --disable-vsxu \ --disable-x262 \ - --disable-x265 \ --disable-zvbi \ --enable-run-as-root
@@ -416,6 +415,13 @@ else VLC_CONF_OPTS += --disable-x264 endif +ifeq ($(BR2_PACKAGE_X265),y) +VLC_CONF_OPTS += --enable-x265 +VLC_DEPENDENCIES += x265 +else +VLC_CONF_OPTS += --disable-x265 +endif + ifeq ($(BR2_PACKAGE_XCB_UTIL_KEYSYMS),y) VLC_CONF_OPTS += --enable-xcb VLC_DEPENDENCIES += xcb-util-keysyms
Signature · 1 line
2.18.0
PATCH v2 5/23 package/vlc: add optional dependency to ncurses
In reply to Bernd Kuhls--- package/vlc/vlc.mk | 7 +++++++ 1 file changed, 7 insertions(+)
package/vlc/vlc.mk +7 -0
@@ -355,6 +355,13 @@ else VLC_CONF_OPTS += --disable-mpc endif +ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) +VLC_CONF_OPTS += --enable-ncurses +VLC_DEPENDENCIES += ncurses +else +VLC_CONF_OPTS += --disable-ncurses +endif + ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y) VLC_CONF_OPTS += --enable-qt VLC_CONF_ENV += \
Signature · 1 line
2.18.0
PATCH v2 6/23 package/vlc: add optional dependency to samba4
In reply to Bernd Kuhls--- package/vlc/vlc.mk | 7 +++++++ 1 file changed, 7 insertions(+)
package/vlc/vlc.mk +7 -0
@@ -387,6 +387,13 @@ else VLC_CONF_OPTS += --disable-sdl-image endif +ifeq ($(BR2_PACKAGE_SAMBA4),y) +VLC_CONF_OPTS += --enable-smbclient +VLC_DEPENDENCIES += samba4 +else +VLC_CONF_OPTS += --disable-smbclient +endif + ifeq ($(BR2_PACKAGE_SPEEX)$(BR2_PACKAGE_SPEEXDSP),yy) VLC_CONF_OPTS += --enable-speex VLC_DEPENDENCIES += speex speexdsp
Signature · 1 line
2.18.0
PATCH v2 7/23 package/vlc: add optional dependency to pulseaudio
In reply to Bernd Kuhls--- package/vlc/vlc.mk | 7 +++++++ 1 file changed, 7 insertions(+)
package/vlc/vlc.mk +7 -0
@@ -362,6 +362,13 @@ else VLC_CONF_OPTS += --disable-ncurses endif +ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) +VLC_CONF_OPTS += --enable-pulse +VLC_DEPENDENCIES += pulseaudio +else +VLC_CONF_OPTS += --disable-pulse +endif + ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y) VLC_CONF_OPTS += --enable-qt VLC_CONF_ENV += \
Signature · 1 line
2.18.0
PATCH v2 8/23 package/vlc: add optional dependency to libvpx
In reply to Bernd Kuhls--- package/vlc/vlc.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
package/vlc/vlc.mk +7 -1
@@ -56,7 +56,6 @@ VLC_CONF_OPTS += \ --disable-shout \ --disable-twolame \ --disable-vdpau \ - --disable-vpx \ --disable-vsxu \ --disable-x262 \ --disable-zvbi \
@@ -308,6 +307,13 @@ else VLC_CONF_OPTS += --disable-v4l2 endif +ifeq ($(BR2_PACKAGE_LIBVPX),y) +VLC_CONF_OPTS += --enable-vpx +VLC_DEPENDENCIES += libvpx +else +VLC_CONF_OPTS += --disable-vpx +endif + ifeq ($(BR2_PACKAGE_LIBXCB),y) VLC_CONF_OPTS += --enable-xcb VLC_DEPENDENCIES += libxcb
Signature · 1 line
2.18.0
PATCH v2 9/23 package/vlc: add optional dependency to libidn
In reply to Bernd Kuhls--- package/vlc/vlc.mk | 4 ++++ 1 file changed, 4 insertions(+)
package/vlc/vlc.mk +4 -0
@@ -216,6 +216,10 @@ else VLC_CONF_OPTS += --disable-libgcrypt endif +ifeq ($(BR2_PACKAGE_LIBIDN),y) +VLC_DEPENDENCIES += libidn +endif + ifeq ($(BR2_PACKAGE_LIBMAD),y) VLC_CONF_OPTS += --enable-mad VLC_DEPENDENCIES += libmad
Signature · 1 line
2.18.0
PATCH v2 10/23 package/vlc: add optional dependency to libsamplerate
In reply to Bernd Kuhls--- package/vlc/vlc.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
package/vlc/vlc.mk +7 -1
@@ -51,7 +51,6 @@ VLC_CONF_OPTS += \ --disable-mmal-vout \ --disable-mtp \ --disable-projectm \ - --disable-samplerate \ --disable-schroedinger \ --disable-shout \ --disable-twolame \
@@ -262,6 +261,13 @@ else VLC_CONF_OPTS += --disable-svg --disable-svgdec endif +ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) +VLC_CONF_OPTS += --enable-samplerate +VLC_DEPENDENCIES += libsamplerate +else +VLC_CONF_OPTS += --disable-samplerate +endif + ifeq ($(BR2_PACKAGE_LIBSSH2),y) VLC_CONF_OPTS += --enable-sftp VLC_DEPENDENCIES += libssh2
Signature · 1 line
2.18.0
PATCH v2 11/23 package/vlc: add optional dependency to libdvdread
In reply to Bernd Kuhls--- package/vlc/vlc.mk | 7 +++++++ 1 file changed, 7 insertions(+)
package/vlc/vlc.mk +7 -0
@@ -206,6 +206,13 @@ else VLC_CONF_OPTS += --disable-dvbpsi endif +ifeq ($(BR2_PACKAGE_LIBDVDREAD),y) +VLC_CONF_OPTS += --enable-dvdread +VLC_DEPENDENCIES += libdvdread +else +VLC_CONF_OPTS += --disable-dvdread +endif + ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) VLC_CONF_OPTS += --enable-libgcrypt VLC_DEPENDENCIES += libgcrypt
Signature · 1 line
2.18.0
PATCH v2 12/23 package/vlc: add optional dependency to libdvdnav
In reply to Bernd Kuhls--- package/vlc/vlc.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
package/vlc/vlc.mk +7 -1
@@ -39,7 +39,6 @@ VLC_CONF_OPTS += \ --disable-caca \ --disable-chromaprint \ --disable-dca \ - --disable-dvdnav \ --disable-fluidsynth \ --disable-gles1 \ --disable-goom \
@@ -206,6 +205,13 @@ else VLC_CONF_OPTS += --disable-dvbpsi endif +ifeq ($(BR2_PACKAGE_LIBDVDNAV),y) +VLC_CONF_OPTS += --enable-dvdnav +VLC_DEPENDENCIES += libdvdnav +else +VLC_CONF_OPTS += --disable-dvdnav +endif + ifeq ($(BR2_PACKAGE_LIBDVDREAD),y) VLC_CONF_OPTS += --enable-dvdread VLC_DEPENDENCIES += libdvdread
Signature · 1 line
2.18.0
PATCH v2 13/23 package/vlc: bump version to 3.0.3
In reply to Bernd Kuhlsvlc depends on gcc-4.9+:
https://mailman.videolan.org/pipermail/vlc-devel/2016-September/109452.html
Added fix for stack-protector detection.
Disabled all new optional dependencies for now, subsequent patches will enable dependencies with buildroot packages present.
Removed gles1 configure option after
http://git.videolan.org/?p=vlc.git;a=commitdiff;h=6c4bb081844c51a9a1b1cdb44fc5f42e5a879327
Renamed mmal configure options after
http://git.videolan.org/?p=vlc.git;a=commitdiff;h=bdb1d86acfb0d0068e57281b6fbfc52345960d29
http://git.videolan.org/?p=vlc.git;a=commitdiff;h=1d2b56c68bbc3287e17f6140bdf8c8c3efe08fdc
Renamed avahi configure option after
http://git.videolan.org/?p=vlc.git;a=commitdiff;h=55280fa62cb68b71767778c56250352b4840b69a
Removed directfb support after being dropped upstream:
http://git.videolan.org/?p=vlc.git;a=commitdiff;h=8e1a0e876615da31321203090daa7c8699b6406d
Renamed matroska configure option after
http://git.videolan.org/?p=vlc.git;a=commitdiff;h=156ceb73e2f46618a6cffb081e71e368a315ec3e
Replaced qt4 support with qt5:
http://git.videolan.org/?p=vlc.git;a=commitdiff;h=1c221a77d92935866e897254c07e1d12a4b95ae0
Removed sdl support:
http://git.videolan.org/?p=vlc.git;a=commitdiff;h=4b8a2755fe8c0e3e1e9c52483b22c26e24fd5527
Removed --enable-xcb in BR2_PACKAGE_XCB_UTIL_KEYSYMS block, it is already present in the BR2_PACKAGE_LIBXCB block.
Rebased patches
- 0001-Disable-building-of-statically-linked-vlc-binary.patch
- 0007-Don-t-assume-strerror_l-is-available.patch
- 0009-x264-drop-148-build-support-and-fix-10bit-support.patch also renamed from 0013
Removed patches
- 0002-configure.ac-add-check-for-libgcrypt-config-program.patch not needed anymore after upstream commit
http://git.videolan.org/?p=vlc.git;a=commitdiff;h=f94ac7241f33b6896a8e12ae4e3e43d9fd7fb6cc
- 0004-Drop-error-implicit-function-declaration-compile-fla.patch
- 0006-Don-t-assume-X11-is-available-when-Qt5-is-used.patch removed, qt4 is not supported anymore
- 0008-fix-fallback-code-and-add-required-realtime-library-.patch
- 0009-Changes-for-ffmpeg-3.0.patch
- 0010-Fix-build-when-using-C99-and-C-11.patch
- 0011-compat-fix-static_assert.patch
- 0012-Fix-build-with-libupnp-above-1.6.23.patch
New patches
- 0002-lua53_compat.patch to fix lua-5.3 support
- 0004-qt-fix-build-against-Qt-5.11.patch
- 0006-Fix-build-error-using-uClibc-by-adding-sys-types.h.patch
- 0008-posix-clock.patch
- 0010-freerdp-2.patch
fixes support for freerdp >= 2.0
---
...ding-of-statically-linked-vlc-binary.patch | 15 +-
...d-check-for-libgcrypt-config-program.patch | 46 ---
package/vlc/0002-lua53_compat.patch | 35 ++
...cit-function-declaration-compile-fla.patch | 32 --
.../0004-qt-fix-build-against-Qt-5.11.patch | 29 ++
...me-X11-is-available-when-Qt5-is-used.patch | 28 --
...r-using-uClibc-by-adding-sys-types.h.patch | 44 +++
...Don-t-assume-strerror_l-is-available.patch | 15 +-
...e-and-add-required-realtime-library-.patch | 40 ---
package/vlc/0008-posix-clock.patch | 179 ++++++++++
package/vlc/0009-Changes-for-ffmpeg-3.0.patch | 309 ------------------
...build-support-and-fix-10bit-support.patch} | 45 ++-
...10-Fix-build-when-using-C99-and-C-11.patch | 30 --
package/vlc/0010-freerdp-2.patch | 138 ++++++++
.../vlc/0011-compat-fix-static_assert.patch | 36 --
...-Fix-build-with-libupnp-above-1.6.23.patch | 64 ----
package/vlc/Config.in | 9 +-
package/vlc/vlc.hash | 13 +-
package/vlc/vlc.mk | 87 +++--
19 files changed, 525 insertions(+), 669 deletions(-)
delete mode 100644 package/vlc/0002-configure.ac-add-check-for-libgcrypt-config-program.patch
create mode 100644 package/vlc/0002-lua53_compat.patch
delete mode 100644 package/vlc/0004-Drop-error-implicit-function-declaration-compile-fla.patch
create mode 100644 package/vlc/0004-qt-fix-build-against-Qt-5.11.patch
delete mode 100644 package/vlc/0006-Don-t-assume-X11-is-available-when-Qt5-is-used.patch
create mode 100644 package/vlc/0006-Fix-build-error-using-uClibc-by-adding-sys-types.h.patch
delete mode 100644 package/vlc/0008-fix-fallback-code-and-add-required-realtime-library-.patch
create mode 100644 package/vlc/0008-posix-clock.patch
delete mode 100644 package/vlc/0009-Changes-for-ffmpeg-3.0.patch
rename package/vlc/{0013-x264-drop-148-build-support-and-fix-10bit-support.patch => 0009-x264-drop-148-build-support-and-fix-10bit-support.patch} (84%)
delete mode 100644 package/vlc/0010-Fix-build-when-using-C99-and-C-11.patch
create mode 100644 package/vlc/0010-freerdp-2.patch
delete mode 100644 package/vlc/0011-compat-fix-static_assert.patch
delete mode 100644 package/vlc/0012-Fix-build-with-libupnp-above-1.6.23.patchpackage/vlc/0001-Disable-building-of-statically-linked-vlc-binary.patch +7 -8
@@ -13,7 +13,7 @@ diff --git a/Makefile.am b/Makefile.am index febdc63fe4..dca6354ec9 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -933,7 +933,7 @@ libvlc: libvlccore +@@ -108,7 +108,7 @@ libvlc: libvlccore cd lib && $(MAKE) $(AM_MAKEFLAGS) libvlc.la core: libvlc vlc$(EXEEXT)
@@ -26,15 +26,14 @@ diff --git a/bin/Makefile.am b/bin/Makefile.am index 869ac561dc..5e48b70d0a 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am -@@ -1,7 +1,7 @@ - # Building vlc - # +@@ -6,7 +6,7 @@ + noinst_PROGRAMS = vlc-osx-static + else bin_PROGRAMS = vlc -noinst_PROGRAMS = vlc-static +noinst_PROGRAMS = - noinst_DATA = - vlclib_PROGRAMS = vlc-cache-gen - EXTRA_PROGRAMS = vlc-wrapper + endif + endif + EXTRA_DIST = vlc_win32_rc.rc.in -- 2.14.3 -
package/vlc/0002-configure.ac-add-check-for-libgcrypt-config-program.patch deleted +0 -46
46 lines not on this page · raw message
package/vlc/0002-lua53_compat.patch new file +35 -0
@@ -0,0 +1,35 @@ +commit 41caaa08cde60c4fec4bf2e5f9610e2a1b9e6a23 +Author: Vinson Lee <[email protected]> +Date: Thu Feb 5 14:48:53 2015 -0800 + + lua: Define LUA_COMPAT_APIINTCASTS for Lua >= 5.3.0 compatibility. + + In Lua 5.3.0, luaL_checkint was deprecated. + + This patch fixes this build error with Lua 5.3.0. + + lua/demux.c: In function ?vlclua_demux_peek?: + lua/demux.c:55:5: error: implicit declaration of function ?luaL_checkint? [-Werror=implicit-function-declaration] + int n = luaL_checkint( L, 1 ); + ^ + +Signed-off-by: Vinson Lee <[email protected]> +Signed-off-by: Jean-Baptiste Kempf <[email protected]> + +Downloaded from +https://github.com/archlinuxarm/PKGBUILDs/blob/master/extra/vlc/lua53_compat.patch + +Signed-off-by: Bernd Kuhls <[email protected]> + +diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h +index efd94f1..85c7fc1 100644 +--- a/modules/lua/vlc.h ++++ b/modules/lua/vlc.h +@@ -38,6 +38,7 @@ + #include <vlc_stream.h> + #include <vlc_demux.h> + ++#define LUA_COMPAT_APIINTCASTS + #define LUA_COMPAT_MODULE + #include <lua.h> /* Low level lua C API */ + #include <lauxlib.h> /* Higher level C API */
package/vlc/0004-Drop-error-implicit-function-declaration-compile-fla.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From d4806743a059ec6720b5c29e7345390978614fc9 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls <[email protected]> -Date: Tue, 1 May 2018 22:29:29 +0200 -Subject: [PATCH] Drop error-implicit-function-declaration compile flag - -Fix compile warning being treated as error: - -codec/svg.c: In function 'DecodeBlock': -codec/svg.c:240:5: error: implicit declaration of function 'rsvg_handle_render_cairo' [-Werror=implicit-function-declaration] -cc1: some warnings being treated as errors - -Signed-off-by: Bernd Kuhls <[email protected]> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 9a37656ddd..b14ba46797 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -867,7 +867,7 @@ dnl - dnl Compiler warnings - dnl - --RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var error-implicit-function-declaration]) -+RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var]) - RDC_PROG_CC_FLAGS([-pipe]) - AC_LANG_PUSH([C++]) - RDC_PROG_CXX_WFLAGS([all extra sign-compare undef pointer-arith volatile-register-var]) --- -2.14.3 -
package/vlc/0004-qt-fix-build-against-Qt-5.11.patch new file +29 -0
@@ -0,0 +1,29 @@ +From: Dominique Leuenberger <[email protected]> +Date: Thu, 17 May 2018 17:40:37 +0200 +Subject: qt: fix build against Qt 5.11 + +Qt 5.11 is in RC phase now, and some headers need to be explicitly +included in order to build successfully. + +Signed-off-by: Jean-Baptiste Kempf <[email protected]> + +Downloaded from +https://sources.debian.org/src/vlc/3.0.3-1-3/debian/patches/0003-qt-fix-build-against-Qt-5.11.patch/ + +Signed-off-by: Bernd Kuhls <[email protected]> +--- + modules/gui/qt/components/simple_preferences.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/modules/gui/qt/components/simple_preferences.cpp b/modules/gui/qt/components/simple_preferences.cpp +index a89935d..43d9410 100644 +--- a/modules/gui/qt/components/simple_preferences.cpp ++++ b/modules/gui/qt/components/simple_preferences.cpp +@@ -36,6 +36,7 @@ + #include <QString> + #include <QFont> + #include <QToolButton> ++#include <QButtonGroup> + #include <QSignalMapper> + #include <QVBoxLayout> + #include <QScrollArea>
package/vlc/0006-Don-t-assume-X11-is-available-when-Qt5-is-used.patch deleted +0 -28
@@ -1,28 +0,0 @@ -From f87ef7f97e7e35cc1c922d5a3ff2a2275da7c22e Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls <[email protected]> -Date: Tue, 1 May 2018 22:30:39 +0200 -Subject: [PATCH] Don't assume X11 is available when Qt5 is used - -libX11 is an optional dependency for the qt4 module. - -Signed-off-by: Bernd Kuhls <[email protected]> ---- - modules/gui/qt4/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/gui/qt4/Makefile.am b/modules/gui/qt4/Makefile.am -index 1a564cf1ea..4d12501eb7 100644 ---- a/modules/gui/qt4/Makefile.am -+++ b/modules/gui/qt4/Makefile.am -@@ -22,7 +22,7 @@ else - if HAVE_WIN32 - libqt4_plugin_la_LIBADD += -lole32 -lcomctl32 -luuid - else --libqt4_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIB) -lX11 -+libqt4_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIB) - endif - endif - if HAVE_DARWIN --- -2.14.3 -
package/vlc/0006-Fix-build-error-using-uClibc-by-adding-sys-types.h.patch new file +44 -0
44 lines not on this page · raw message
package/vlc/0007-Don-t-assume-strerror_l-is-available.patch +7 -8
@@ -21,15 +21,15 @@ diff --git a/configure.ac b/configure.ac index b14ba46797..15cb4edcfd 100644 --- a/configure.ac +++ b/configure.ac -@@ -537,7 +537,7 @@ need_libc=false +@@ -590,7 +590,7 @@ + need_libc=false dnl Check for usual libc functions - AC_CHECK_DECLS([nanosleep],,,[#include <time.h>]) --AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r isatty lstat memalign mmap open_memstream openat pread posix_fadvise posix_madvise setlocale stricmp strnicmp strptime uselocale]) -+AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r isatty lstat memalign mmap open_memstream openat pread posix_fadvise posix_madvise setlocale strerror_l stricmp strnicmp strptime uselocale]) - AC_REPLACE_FUNCS([atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r lldiv localtime_r nrand48 poll posix_memalign rewind setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strsep strtof strtok_r strtoll swab tdestroy strverscmp]) - AC_CHECK_FUNCS(fdatasync,, - [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.]) +-AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatvfs fork getenv getpwuid_r isatty lstat memalign mkostemp mmap newlocale open_memstream openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp strptime uselocale]) ++AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatvfs fork getenv getpwuid_r isatty lstat memalign mkostemp mmap newlocale open_memstream openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale strerror_l stricmp strnicmp strptime uselocale]) + AC_REPLACE_FUNCS([aligned_alloc atof atoll dirfd fdopendir ffsll flockfile fsync getdelim getpid lldiv memrchr nrand48 poll recvmsg rewind sendmsg setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strnstr strsep strtof strtok_r strtoll swab tdestroy tfind timegm timespec_get strverscmp pathconf]) + AC_REPLACE_FUNCS([gettimeofday]) + AC_CHECK_FUNC(fdatasync,, diff --git a/src/posix/error.c b/src/posix/error.c index db51004601..b4aa6fb3ca 100644 --- a/src/posix/error.c
@@ -54,4 +54,3 @@ index db51004601..b4aa6fb3ca 100644 -- 2.14.3 -
package/vlc/0008-fix-fallback-code-and-add-required-realtime-library-.patch deleted +0 -40
@@ -1,40 +0,0 @@ -From b5d4edd81bcb685cbea61b01d54afa1fe200b7d2 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb <[email protected]> -Date: Fri, 26 Aug 2016 15:11:25 +0200 -Subject: [PATCH] fix fallback code and add required realtime library to link - command - -Signed-off-by: Waldemar Brodkorb <[email protected]> ---- - configure.ac | 1 + - src/posix/thread.c | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 15cb4edcfd..16e44a8c61 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -121,6 +121,7 @@ case "${host_os}" in - ;; - linux*) - SYS=linux -+ AC_CHECK_LIB([rt], [posix_spawnp], [VLC_ADD_LIBS([libvlccore],[-lrt])], [], []) - ;; - bsdi*) - SYS=bsdi -diff --git a/src/posix/thread.c b/src/posix/thread.c -index 07fa71eb3e..8b8595fcb8 100644 ---- a/src/posix/thread.c -+++ b/src/posix/thread.c -@@ -85,7 +85,7 @@ static clockid_t vlc_clock_id; - - static void vlc_clock_setup_once (void) - { --# if (_POSIX_MONOTONIC_CLOCK == 0) -+# if (_POSIX_MONOTONIC_CLOCK == 0) && (_POSIX_CLOCK_SELECTION > 0) - long val = sysconf (_SC_MONOTONIC_CLOCK); - assert (val != 0); - vlc_clock_id = (val < 0) ? CLOCK_REALTIME : CLOCK_MONOTONIC; --- -2.14.3 -
package/vlc/0008-posix-clock.patch new file +179 -0
179 lines not on this page · raw message
package/vlc/0009-Changes-for-ffmpeg-3.0.patch deleted +0 -309
309 lines not on this page · raw message
package/vlc/0009-x264-drop-148-build-support-and-fix-10bit-support.patch renamed from package/vlc/0013-x264-drop-148-build-support-and-fix-10bit-support.patch +20 -25
144 lines not on this page · raw message
package/vlc/0010-Fix-build-when-using-C99-and-C-11.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From 55e3ac26c1238df4c85877c32763a02c00da1345 Mon Sep 17 00:00:00 2001 -From: Thomas Guillem <[email protected]> -Date: Thu, 30 Apr 2015 13:29:50 +0200 -Subject: [PATCH] Fix build when using C99 and C++11 - -Fix build when using C99 and C++11 - -Indeed, C99 doesn't have static_assert and C++11 has it. - -Signed-off-by: Bernd Kuhls <[email protected]> ---- - include/vlc_fixups.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h -index 997f600d6a..0d4fcd0c8d 100644 ---- a/include/vlc_fixups.h -+++ b/include/vlc_fixups.h -@@ -239,7 +239,7 @@ static inline locale_t newlocale(int mask, const char * locale, locale_t base) - } - #endif - --#if !defined (HAVE_STATIC_ASSERT) -+#if !defined (HAVE_STATIC_ASSERT) && !defined(__cpp_static_assert) - # define _Static_assert(x, s) ((void) sizeof (struct { unsigned:-!(x); })) - # define static_assert _Static_assert - #endif --- -2.14.3 -
package/vlc/0010-freerdp-2.patch new file +138 -0
138 lines not on this page · raw message
package/vlc/0011-compat-fix-static_assert.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From 6b9c7e7595f8e36d3b221bedb623fa5334f62ce0 Mon Sep 17 00:00:00 2001 -From: Thomas Guillem <[email protected]> -Date: Mon, 14 Dec 2015 09:08:25 +0100 -Subject: [PATCH] compat: fix static_assert -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -compat: fix static_assert - -It was not possible to use it outside of functions. - -Signed-off-by: R?mi Denis-Courmont <[email protected]> -Signed-off-by: Bernd Kuhls <[email protected]> ---- - include/vlc_fixups.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h -index 0d4fcd0c8d..0990915e5f 100644 ---- a/include/vlc_fixups.h -+++ b/include/vlc_fixups.h -@@ -240,7 +240,9 @@ static inline locale_t newlocale(int mask, const char * locale, locale_t base) - #endif - - #if !defined (HAVE_STATIC_ASSERT) && !defined(__cpp_static_assert) --# define _Static_assert(x, s) ((void) sizeof (struct { unsigned:-!(x); })) -+# define STATIC_ASSERT_CONCAT_(a, b) a##b -+# define STATIC_ASSERT_CONCAT(a, b) STATIC_ASSERT_CONCAT_(a, b) -+# define _Static_assert(x, s) extern char STATIC_ASSERT_CONCAT(static_assert_, __LINE__)[sizeof(struct { unsigned:-!(x); })] - # define static_assert _Static_assert - #endif - --- -2.14.3 -
package/vlc/0012-Fix-build-with-libupnp-above-1.6.23.patch deleted +0 -64
64 lines not on this page · raw message
package/vlc/Config.in +6 -3
@@ -4,6 +4,7 @@ config BR2_PACKAGE_VLC depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 select BR2_PACKAGE_LIBVORBIS if BR2_PACKAGE_OPUS
@@ -27,7 +28,9 @@ config BR2_PACKAGE_VLC_OPENCV3_BACKEND select BR2_PACKAGE_OPENCV3_LIB_IMGPROC select BR2_PACKAGE_OPENCV3_LIB_OBJDETECT -comment "vlc needs a toolchain w/ C++, dynamic library, wchar, threads, headers >= 3.7" +comment "vlc needs a toolchain w/ C++, dynamic library, wchar, threads, gcc >= 4.9, headers >= 3.7" depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ - || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS \ + || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ + || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
package/vlc/vlc.hash +7 -6
@@ -1,8 +1,9 @@ -# From http://download.videolan.org/pub/videolan/vlc/2.2.8/vlc-2.2.8.tar.xz.sha256 -sha256 9bf046848fb56d93518881b39099b8288ee005d5ba0ddf705b6f6643b8d562ec vlc-2.2.8.tar.xz -# From http://download.videolan.org/pub/videolan/vlc/2.2.8/vlc-2.2.8.tar.xz.sha1 -sha1 b960ec5bdb9a51da285430fc68962927ccc87187 vlc-2.2.8.tar.xz -# From http://download.videolan.org/pub/videolan/vlc/2.2.8/vlc-2.2.8.tar.xz.md5 -md5 b721fddf65aaf64eeee5629aa9bf7c9e vlc-2.2.8.tar.xz +# From http://download.videolan.org/pub/videolan/vlc/3.0.3/vlc-3.0.3.tar.xz.sha256 +sha256 9ba8b04bdb13f7860a2041768ac83b47b397a36549c71c530b94028a3cfd5b51 vlc-3.0.3.tar.xz +# From http://download.videolan.org/pub/videolan/vlc/3.0.3/vlc-3.0.3.tar.xz.sha1 +sha1 dd1b7350bb0a7848e172e9dbbe0705ec5bb3d48c vlc-3.0.3.tar.xz +# From http://download.videolan.org/pub/videolan/vlc/3.0.3/vlc-3.0.3.tar.xz.md5 +md5 cf01d4755c719fe1c8605ceb40d8f1d2 vlc-3.0.3.tar.xz +# Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
package/vlc/vlc.mk +53 -34
168 lines not on this page · raw message
Signature · 1 line
2.18.0
PATCH v2 14/23 package/vlc: add optional dependency to gst1-plugins-base
In reply to Bernd Kuhls--- package/vlc/vlc.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
package/vlc/vlc.mk +7 -1
@@ -59,7 +59,6 @@ VLC_CONF_OPTS += \ --disable-fluidsynth \ --disable-gme \ --disable-goom \ - --disable-gst-decode \ --disable-harfbuzz \ --disable-jack \ --disable-jpeg \
@@ -181,6 +180,13 @@ else VLC_CONF_OPTS += --disable-freerdp endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y) +VLC_CONF_OPTS += --enable-gst-decode +VLC_DEPENDENCIES += gst1-plugins-base +else +VLC_CONF_OPTS += --disable-gst-decode +endif + ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) VLC_DEPENDENCIES += libgl endif
Signature · 1 line
2.18.0
PATCH v2 15/23 package/vlc: add optional dependency to harfbuzz
In reply to Bernd Kuhls--- package/vlc/vlc.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
package/vlc/vlc.mk +7 -1
@@ -59,7 +59,6 @@ VLC_CONF_OPTS += \ --disable-fluidsynth \ --disable-gme \ --disable-goom \ - --disable-harfbuzz \ --disable-jack \ --disable-jpeg \ --disable-kai \
@@ -191,6 +190,13 @@ ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) VLC_DEPENDENCIES += libgl endif +ifeq ($(BR2_PACKAGE_HARFBUZZ),y) +VLC_CONF_OPTS += --enable-harfbuzz +VLC_DEPENDENCIES += harfbuzz +else +VLC_CONF_OPTS += --disable-harfbuzz +endif + ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) VLC_CONF_OPTS += --enable-gles2 VLC_DEPENDENCIES += libgles
Signature · 1 line
2.18.0
PATCH v2 16/23 package/vlc: add optional dependency to libarchive
In reply to Bernd Kuhls--- package/vlc/vlc.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
package/vlc/vlc.mk +7 -1
@@ -41,7 +41,6 @@ VLC_CONF_OPTS += \ --disable-a52 \ --disable-addonmanagermodules \ --disable-aom \ - --disable-archive \ --disable-aribb25 \ --disable-aribsub \ --disable-asdcp \
@@ -222,6 +221,13 @@ else VLC_CONF_OPTS += --disable-opus endif +ifeq ($(BR2_PACKAGE_LIBARCHIVE),y) +VLC_CONF_OPTS += --enable-archive +VLC_DEPENDENCIES += libarchive +else +VLC_CONF_OPTS += --disable-archive +endif + ifeq ($(BR2_PACKAGE_LIBASS),y) VLC_CONF_OPTS += --enable-libass VLC_DEPENDENCIES += libass
Signature · 1 line
2.18.0
PATCH v2 17/23 package/vlc: add optional dependency to libnfs
In reply to Bernd Kuhls--- package/vlc/vlc.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
package/vlc/vlc.mk +7 -1
@@ -71,7 +71,6 @@ VLC_CONF_OPTS += \ --disable-mmal \ --disable-mpg123 \ --disable-mtp \ - --disable-nfs \ --disable-notify \ --disable-projectm \ --disable-schroedinger \
@@ -311,6 +310,13 @@ else VLC_CONF_OPTS += --disable-libmpeg2 endif +ifeq ($(BR2_PACKAGE_LIBNFS),y) +VLC_CONF_OPTS += --enable-nfs +VLC_DEPENDENCIES += libnfs +else +VLC_CONF_OPTS += --disable-nfs +endif + ifeq ($(BR2_PACKAGE_LIBPNG),y) VLC_CONF_OPTS += --enable-png VLC_DEPENDENCIES += libpng
Signature · 1 line
2.18.0
PATCH v2 18/23 package/vlc: add optional dependency to libsecret
In reply to Bernd Kuhls--- package/vlc/vlc.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
package/vlc/vlc.mk +7 -1
@@ -74,7 +74,6 @@ VLC_CONF_OPTS += \ --disable-notify \ --disable-projectm \ --disable-schroedinger \ - --disable-secret \ --disable-soxr \ --disable-shine \ --disable-shout \
@@ -338,6 +337,13 @@ else VLC_CONF_OPTS += --disable-samplerate endif +ifeq ($(BR2_PACKAGE_LIBSECRET),y) +VLC_CONF_OPTS += --enable-secret +VLC_DEPENDENCIES += libsecret +else +VLC_CONF_OPTS += --disable-secret +endif + ifeq ($(BR2_PACKAGE_LIBSSH2),y) VLC_CONF_OPTS += --enable-sftp VLC_DEPENDENCIES += libssh2
Signature · 1 line
2.18.0
PATCH v2 19/23 package/vlc: add optional dependency to libsoxr
In reply to Bernd Kuhls--- package/vlc/vlc.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
package/vlc/vlc.mk +7 -1
@@ -74,7 +74,6 @@ VLC_CONF_OPTS += \ --disable-notify \ --disable-projectm \ --disable-schroedinger \ - --disable-soxr \ --disable-shine \ --disable-shout \ --disable-skins2 \
@@ -344,6 +343,13 @@ else VLC_CONF_OPTS += --disable-secret endif +ifeq ($(BR2_PACKAGE_LIBSOXR),y) +VLC_CONF_OPTS += --enable-soxr +VLC_DEPENDENCIES += libsoxr +else +VLC_CONF_OPTS += --disable-soxr +endif + ifeq ($(BR2_PACKAGE_LIBSSH2),y) VLC_CONF_OPTS += --enable-sftp VLC_DEPENDENCIES += libssh2
Signature · 1 line
2.18.0
PATCH v2 20/23 package/vlc: add optional dependency to libva
In reply to Bernd Kuhls--- package/vlc/vlc.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
package/vlc/vlc.mk +8 -1
@@ -64,7 +64,6 @@ VLC_CONF_OPTS += \ --disable-kate \ --disable-kva \ --disable-libplacebo \ - --disable-libva \ --disable-linsys \ --disable-mfx \ --disable-microdns \
@@ -378,6 +377,14 @@ else VLC_CONF_OPTS += --disable-upnp endif +# libva support depends on ffmpeg +ifeq ($(BR2_PACKAGE_FFMPEG)$(BR2_PACKAGE_LIBVA),yy) +VLC_CONF_OPTS += --enable-libva +VLC_DEPENDENCIES += libva +else +VLC_CONF_OPTS += --disable-libva +endif + ifeq ($(BR2_PACKAGE_LIBVNCSERVER),y) VLC_CONF_OPTS += --enable-vnc VLC_DEPENDENCIES += libvncserver
Signature · 1 line
2.18.0
PATCH v2 21/23 package/vlc: add optional dependency to mpg123
In reply to Bernd Kuhls--- package/vlc/vlc.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
package/vlc/vlc.mk +7 -1
@@ -68,7 +68,6 @@ VLC_CONF_OPTS += \ --disable-mfx \ --disable-microdns \ --disable-mmal \ - --disable-mpg123 \ --disable-mtp \ --disable-notify \ --disable-projectm \
@@ -453,6 +452,13 @@ ifeq ($(BR2_PACKAGE_MINIZIP),y) VLC_DEPENDENCIES += minizip endif +ifeq ($(BR2_PACKAGE_MPG123),y) +VLC_CONF_OPTS += --enable-mpg123 +VLC_DEPENDENCIES += mpg123 +else +VLC_CONF_OPTS += --disable-mpg123 +endif + ifeq ($(BR2_PACKAGE_MUSEPACK),y) VLC_CONF_OPTS += --enable-mpc VLC_DEPENDENCIES += musepack
Signature · 1 line
2.18.0
PATCH v2 22/23 package/vlc: add optional dependency to wayland
In reply to Bernd Kuhls--- package/vlc/vlc.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
package/vlc/vlc.mk +7 -1
@@ -84,7 +84,6 @@ VLC_CONF_OPTS += \ --disable-vdpau \ --disable-vsxu \ --disable-wasapi \ - --disable-wayland \ --disable-x262 \ --disable-zvbi \ --enable-run-as-root
@@ -529,6 +528,13 @@ else VLC_CONF_OPTS += --disable-udev endif +ifeq ($(BR2_PACKAGE_WAYLAND),y) +VLC_CONF_OPTS += --enable-wayland +VLC_DEPENDENCIES += wayland +else +VLC_CONF_OPTS += --disable-wayland +endif + ifeq ($(BR2_PACKAGE_X264),y) VLC_CONF_OPTS += --enable-x264 VLC_DEPENDENCIES += x264
Signature · 1 line
2.18.0
PATCH v2 23/23 package/vlc: add optional support for skins2
In reply to Bernd Kuhls--- package/vlc/vlc.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
package/vlc/vlc.mk +7 -1
@@ -74,7 +74,6 @@ VLC_CONF_OPTS += \ --disable-schroedinger \ --disable-shine \ --disable-shout \ - --disable-skins2 \ --disable-sndio \ --disable-spatialaudio \ --disable-srt \
@@ -560,6 +559,13 @@ else VLC_CONF_OPTS += --without-x endif +ifeq ($(BR2_PACKAGE_XLIB_LIBXEXT)$(BR2_PACKAGE_XLIB_LIBXINERAMA)$(BR2_PACKAGE_XLIB_LIBXPM),yyy) +VLC_CONF_OPTS += --enable-skins2 +VLC_DEPENDENCIES += xlib_libXext xlib_libXinerama xlib_libXpm +else +VLC_CONF_OPTS += --disable-skins2 +endif + ifeq ($(BR2_PACKAGE_ZLIB),y) VLC_DEPENDENCIES += zlib endif
Signature · 1 line
2.18.0
v2 cover package/vlc: bump version to 3.0.3
In reply to Bernd KuhlsHello Bernd,
Quoted 16 lines · Bernd Kuhls
Bernd Kuhls (23):
package/vlc: needs speexdsp for optional speex support package/vlc: sortVLC_CONF_OPTS
package/vlc: add optional dependency to x264 package/vlc: add optional dependency to x265 package/vlc: add optional dependency to ncurses package/vlc: add optional dependency to samba4 package/vlc: add optional dependency to pulseaudio package/vlc: add optional dependency to libvpx package/vlc: add optional dependency to libidn package/vlc: add optional dependency to libsamplerate package/vlc: add optional dependency to libdvdread package/vlc: add optional dependency to libdvdnav package/vlc: bump version to 3.0.3
package/vlc: add optional dependency to gst1-plugins-base package/vlc: add optional dependency to harfbuzz
Quoted 8 lines
package/vlc: add optional dependency to libarchive package/vlc: add optional dependency to libnfs package/vlc: add optional dependency to libsecret package/vlc: add optional dependency to libsoxr package/vlc: add optional dependency to libva package/vlc: add optional dependency to mpg123 package/vlc: add optional dependency to wayland package/vlc: add optional support for skins2
Thanks, entire series applied to next. As usual, you forgot to Git format the patches in the 3.0.3 version bump. I still don't get what is the problem with getting the VLC Git repository, applying the patches in a branch based on the 3.0.3 tag, and then running "git format-patch -N". It gives a nice clean series of patches, that you only have to copy in package/vlc/. I fixed that up once again, but it would really, really be nice if you could do that for the next contributions.
Another comment: there is a 3.0.4 tag, and there are quite a few fixes between 3.0.3 and 3.0.4, including the Qt5 build fix. Perhaps you could bump to 3.0.4 ?
Thanks a lot for maintaining this package!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
v2 cover package/vlc: bump version to 3.0.3
Am Thu, 16 Aug 2018 13:41:20 +0200 schrieb Thomas Petazzoni:
Quoted 3 lines
Another comment: there is a 3.0.4 tag, and there are quite a few fixes between 3.0.3 and 3.0.4, including the Qt5 build fix. Perhaps you could bump to 3.0.4 ?
Hi Thomas,
yes, I noticed the bump when I received the new packages from deb- multimedia.org, but upstream did until now not provide a tarball, both sites still show 3.0.3 at the time of writing:
https://www.videolan.org/vlc/download-sources.html
https://get.videolan.org/vlc/
Of course we can switch to a git download but I would like to wait until a tarball is provided, ok?
Regarding git-formatted patches I will try to remember them but this will add an extra workload for me, yvmv. May I ask to add this requirement to
http://buildroot.uclibc.org/downloads/manual/
manual.html#_providing_patches so new users also get to know this?
Regards, Bernd
v2 cover package/vlc: bump version to 3.0.3
Hello,
Quoted 9 lines · Bernd Kuhls
yes, I noticed the bump when I received the new packages from deb- multimedia.org, but upstream did until now not provide a tarball, both sites still show 3.0.3 at the time of writing:
https://www.videolan.org/vlc/download-sources.html
https://get.videolan.org/vlc/Of course we can switch to a git download but I would like to wait until a tarball is provided, ok?
Yes, waiting for a tarball to become available definitely sounds like the right thing to do.
Quoted 2 lines
Regarding git-formatted patches I will try to remember them but this will add an extra workload for me, yvmv.
It may be a little bit of extra workload initially, but once you will get used to it, I'm pretty sure you'll realize that you will save some time.
Quoted 3 lines
May I ask to add this requirement to
http://buildroot.uclibc.org/downloads/manual/
manual.html#_providing_patches so new users also get to know this?
True. Can you send a patch ? :-)
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com