From aadbc77f8e132301403c1187e8d0488d526f8817 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 8 Jun 2020 01:30:01 +0200 Subject: vlc: Fix build with qt5 in PACKAGECONFIG and Qt >= 5.15 / renumber patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller Signed-off-by: Khem Raj --- ...-Use-packageconfig-to-detect-mmal-support.patch | 61 ------ .../vlc/vlc/0001-make-opencv-configurable.patch | 29 +++ .../vlc/vlc/0002-use-vorbisidec.patch | 19 ++ .../vlc/vlc/0003-fix-luaL-checkint.patch | 233 +++++++++++++++++++++ ...-Use-packageconfig-to-detect-mmal-support.patch | 61 ++++++ .../vlc/vlc/0005-Fix-build-with-Qt-5.15.patch | 56 +++++ .../vlc/vlc/0006-make-opencv-configurable.patch | 29 --- .../vlc/vlc/0007-use-vorbisidec.patch | 19 -- .../vlc/vlc/0008-fix-luaL-checkint.patch | 233 --------------------- .../recipes-multimedia/vlc/vlc_3.0.9.2.bb | 9 +- 10 files changed, 403 insertions(+), 346 deletions(-) delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0001-Use-packageconfig-to-detect-mmal-support.patch create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0001-make-opencv-configurable.patch create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0002-use-vorbisidec.patch create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0003-fix-luaL-checkint.patch create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0004-Use-packageconfig-to-detect-mmal-support.patch create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0006-make-opencv-configurable.patch delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0007-use-vorbisidec.patch delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0008-fix-luaL-checkint.patch (limited to 'meta-multimedia') diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0001-Use-packageconfig-to-detect-mmal-support.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0001-Use-packageconfig-to-detect-mmal-support.patch deleted file mode 100644 index 424aaa2815..0000000000 --- a/meta-multimedia/recipes-multimedia/vlc/vlc/0001-Use-packageconfig-to-detect-mmal-support.patch +++ /dev/null @@ -1,61 +0,0 @@ -From e8716a7755eef93e1033bb913e1eb4faee54658f Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 15 Apr 2020 18:29:26 -0700 -Subject: [PATCH] Use packageconfig to detect mmal support - -This needs userland graphics libraries, because distros may install it -in different locations, therefore its best to rely on pkgconf to find -the libs and header locations instead of assuming /opt/vc which might -work on some distros ( like raspbian ) but not everywhere - -Signed-off-by: Khem Raj ---- - configure.ac | 31 +++++++++++-------------------- - 1 file changed, 11 insertions(+), 20 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d7cf692..f81b99d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3427,27 +3427,18 @@ AC_ARG_ENABLE(mmal, - AS_HELP_STRING([--enable-mmal], - [Multi-Media Abstraction Layer (MMAL) hardware plugin (default enable)])) - if test "${enable_mmal}" != "no"; then -- VLC_SAVE_FLAGS -- LDFLAGS="${LDFLAGS} -L/opt/vc/lib -lvchostif" -- CPPFLAGS="${CPPFLAGS} -isystem /opt/vc/include -isystem /opt/vc/include/interface/vcos/pthreads -isystem /opt/vc/include/interface/vmcs_host/linux" -- AC_CHECK_HEADERS(interface/mmal/mmal.h, -- [ AC_CHECK_LIB(bcm_host, vc_tv_unregister_callback_full, [ -- have_mmal="yes" -- VLC_ADD_PLUGIN([mmal]) -- VLC_ADD_LDFLAGS([mmal],[ -L/opt/vc/lib ]) -- VLC_ADD_CFLAGS([mmal],[ -isystem /opt/vc/include -isystem /opt/vc/include/interface/vcos/pthreads -isystem /opt/vc/include/interface/vmcs_host/linux ]) -- VLC_ADD_LIBS([mmal],[ -lbcm_host -lmmal -lmmal_core -lmmal_components -lmmal_util -lvchostif ]) ], [ -- AS_IF([test "${enable_mmal}" = "yes"], -- [ AC_MSG_ERROR([Cannot find bcm library...]) ], -- [ AC_MSG_WARN([Cannot find bcm library...]) ]) -- ], -- []) -- ] , [ AS_IF([test "${enable_mmal}" = "yes"], -- [ AC_MSG_ERROR([Cannot find development headers for mmal...]) ], -- [ AC_MSG_WARN([Cannot find development headers for mmal...]) ]) ]) -- VLC_RESTORE_FLAGS -+ PKG_CHECK_MODULES(BCMHOST, [bcm_host], [ -+ HAVE_BCMHOST=yes -+ AC_DEFINE(HAVE_BCMHOST, 1, [Define this if you have have userlang graphics installed]) -+ VLC_ADD_LIBS([bcmhost],[$BCMHOST_LIBS]) -+ VLC_ADD_CFLAGS([bcmhost],[$BCMHOST_CFLAGS]) -+ ],: -+ [AC_MSG_WARN([${BCMHOST_PKG_ERRORS}: userland graphics not available.]) -+ HAVE_BCMHOST=no]) -+ -+ AC_CHECK_HEADERS(interface/mmal/mmal.h) - fi --AM_CONDITIONAL([HAVE_MMAL], [test "${have_mmal}" = "yes"]) -+AM_CONDITIONAL([HAVE_MMAL], [test "${have_bcmhost}" = "yes"]) - - dnl - dnl evas plugin --- -2.26.1 - diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0001-make-opencv-configurable.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0001-make-opencv-configurable.patch new file mode 100644 index 0000000000..950c09b8ae --- /dev/null +++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0001-make-opencv-configurable.patch @@ -0,0 +1,29 @@ +Recent opencv API changes break upstream filter and example. +Make opencv explicitly configurable. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Tim Orling + +Index: vlc-2.1.4/configure.ac +=================================================================== +--- vlc-2.1.4.orig/configure.ac ++++ vlc-2.1.4/configure.ac +@@ -1693,7 +1693,16 @@ PKG_ENABLE_MODULES_VLC([BLURAY], [libblu + dnl + dnl OpenCV wrapper and example filters + dnl +-PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [opencv > 2.0], (OpenCV (computer vision) filter), [auto]) ++AC_ARG_ENABLE(opencv, ++ [AS_HELP_STRING([--disable-opencv], ++ [disable OpenCV computer vision filter and example (default auto)])]) ++if test "${enable_opencv}" != "no" ++then ++ PKG_ENABLE_MODULES_VLC([OPENCV], ++ [opencv_example opencv_wrapper], ++ [opencv > 2.0], ++ (OpenCV (computer vision) filter), [auto]) ++fi + + + dnl diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0002-use-vorbisidec.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0002-use-vorbisidec.patch new file mode 100644 index 0000000000..d05cf02b71 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0002-use-vorbisidec.patch @@ -0,0 +1,19 @@ +* tremor provides libvorbisidec, use it instead of libvorbisdec + +Upstream-status: Pending + +Signed-off-by: Tim Orling + +Index: vlc-2.2.1/modules/codec/Makefile.am +=================================================================== +--- vlc-2.2.1.orig/modules/codec/Makefile.am ++++ vlc-2.2.1/modules/codec/Makefile.am +@@ -234,7 +234,7 @@ codec_LTLIBRARIES += $(LTLIBtheora) + libtremor_plugin_la_SOURCES = codec/vorbis.c + libtremor_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_tremor + libtremor_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' +-libtremor_plugin_la_LIBADD = -lvorbisdec -logg ++libtremor_plugin_la_LIBADD = -lvorbisidec -logg + EXTRA_LTLIBRARIES += libtremor_plugin.la + codec_LTLIBRARIES += $(LTLIBtremor) + diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0003-fix-luaL-checkint.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0003-fix-luaL-checkint.patch new file mode 100644 index 0000000000..96b5d2d246 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0003-fix-luaL-checkint.patch @@ -0,0 +1,233 @@ +* luaL_checkint and luaL_optint were deprecated in lua 5.3 +* replacement functions are luaL_checkinteger and luaL_optinteger + +Upstream-status: Pending + +Signed-off-by: Tim Orling + +--- a/modules/lua/demux.c ++++ b/modules/lua/demux.c +@@ -52,7 +52,7 @@ struct vlclua_playlist + static int vlclua_demux_peek( lua_State *L ) + { + stream_t *s = (stream_t *)vlclua_get_this(L); +- int n = luaL_checkint( L, 1 ); ++ int n = luaL_checkinteger( L, 1 ); + const uint8_t *p_peek; + + ssize_t val = vlc_stream_Peek(s->p_source, &p_peek, n); +@@ -66,7 +66,7 @@ static int vlclua_demux_peek( lua_State + static int vlclua_demux_read( lua_State *L ) + { + stream_t *s = (stream_t *)vlclua_get_this(L); +- int n = luaL_checkint( L, 1 ); ++ int n = luaL_checkinteger( L, 1 ); + char *buf = malloc(n); + + if (buf != NULL) +--- a/modules/lua/libs/net.c ++++ b/modules/lua/libs/net.c +@@ -179,7 +179,7 @@ static int vlclua_net_listen_tcp( lua_St + { + vlc_object_t *p_this = vlclua_get_this( L ); + const char *psz_host = luaL_checkstring( L, 1 ); +- int i_port = luaL_checkint( L, 2 ); ++ int i_port = luaL_checkinteger( L, 2 ); + int *pi_fd = net_ListenTCP( p_this, psz_host, i_port ); + if( pi_fd == NULL ) + return luaL_error( L, "Cannot listen on %s:%d", psz_host, i_port ); +@@ -251,7 +251,7 @@ static int vlclua_net_connect_tcp( lua_S + { + vlc_object_t *p_this = vlclua_get_this( L ); + const char *psz_host = luaL_checkstring( L, 1 ); +- int i_port = luaL_checkint( L, 2 ); ++ int i_port = luaL_checkinteger( L, 2 ); + int i_fd = net_ConnectTCP( p_this, psz_host, i_port ); + lua_pushinteger( L, vlclua_fd_map_safe( L, i_fd ) ); + return 1; +@@ -259,14 +259,14 @@ static int vlclua_net_connect_tcp( lua_S + + static int vlclua_net_close( lua_State *L ) + { +- int i_fd = luaL_checkint( L, 1 ); ++ int i_fd = luaL_checkinteger( L, 1 ); + vlclua_fd_unmap_safe( L, i_fd ); + return 0; + } + + static int vlclua_net_send( lua_State *L ) + { +- int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) ); ++ int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) ); + size_t i_len; + const char *psz_buffer = luaL_checklstring( L, 2, &i_len ); + +@@ -278,7 +278,7 @@ static int vlclua_net_send( lua_State *L + + static int vlclua_net_recv( lua_State *L ) + { +- int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) ); ++ int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) ); + size_t i_len = (size_t)luaL_optinteger( L, 2, 1 ); + char psz_buffer[i_len]; + +@@ -312,7 +312,7 @@ static int vlclua_net_poll( lua_State *L + lua_pushnil( L ); + for( int i = 0; lua_next( L, 1 ); i++ ) + { +- luafds[i] = luaL_checkint( L, -2 ); ++ luafds[i] = luaL_checkinteger( L, -2 ); + p_fds[i].fd = vlclua_fd_get( L, luafds[i] ); + p_fds[i].events = luaL_checkinteger( L, -1 ); + p_fds[i].events &= POLLIN | POLLOUT | POLLPRI; +@@ -360,7 +360,7 @@ static int vlclua_fd_open( lua_State *L + #ifndef _WIN32 + static int vlclua_fd_write( lua_State *L ) + { +- int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) ); ++ int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) ); + size_t i_len; + const char *psz_buffer = luaL_checklstring( L, 2, &i_len ); + +@@ -371,7 +371,7 @@ static int vlclua_fd_write( lua_State *L + + static int vlclua_fd_read( lua_State *L ) + { +- int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) ); ++ int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) ); + size_t i_len = (size_t)luaL_optinteger( L, 2, 1 ); + char psz_buffer[i_len]; + +--- a/modules/lua/libs/osd.c ++++ b/modules/lua/libs/osd.c +@@ -154,7 +154,7 @@ static int vlc_osd_slider_type_from_stri + + static int vlclua_osd_slider( lua_State *L ) + { +- int i_position = luaL_checkint( L, 1 ); ++ int i_position = luaL_checkinteger( L, 1 ); + const char *psz_type = luaL_checkstring( L, 2 ); + int i_type = vlc_osd_slider_type_from_string( psz_type ); + int i_chan = (int)luaL_optinteger( L, 3, VOUT_SPU_CHANNEL_OSD ); +@@ -198,7 +198,7 @@ static int vlclua_spu_channel_register( + + static int vlclua_spu_channel_clear( lua_State *L ) + { +- int i_chan = luaL_checkint( L, 1 ); ++ int i_chan = luaL_checkinteger( L, 1 ); + input_thread_t *p_input = vlclua_get_input_internal( L ); + if( !p_input ) + return luaL_error( L, "Unable to find input." ); +--- a/modules/lua/libs/playlist.c ++++ b/modules/lua/libs/playlist.c +@@ -69,7 +69,7 @@ static int vlclua_playlist_next( lua_Sta + + static int vlclua_playlist_skip( lua_State * L ) + { +- int i_skip = luaL_checkint( L, 1 ); ++ int i_skip = luaL_checkinteger( L, 1 ); + playlist_t *p_playlist = vlclua_get_playlist_internal( L ); + playlist_Skip( p_playlist, i_skip ); + return 0; +@@ -127,7 +127,7 @@ static int vlclua_playlist_random( lua_S + + static int vlclua_playlist_gotoitem( lua_State * L ) + { +- int i_id = luaL_checkint( L, 1 ); ++ int i_id = luaL_checkinteger( L, 1 ); + playlist_t *p_playlist = vlclua_get_playlist_internal( L ); + PL_LOCK; + playlist_ViewPlay( p_playlist, NULL, +@@ -138,7 +138,7 @@ static int vlclua_playlist_gotoitem( lua + + static int vlclua_playlist_delete( lua_State * L ) + { +- int i_id = luaL_checkint( L, 1 ); ++ int i_id = luaL_checkinteger( L, 1 ); + playlist_t *p_playlist = vlclua_get_playlist_internal( L ); + + PL_LOCK; +@@ -152,8 +152,8 @@ static int vlclua_playlist_delete( lua_S + + static int vlclua_playlist_move( lua_State * L ) + { +- int i_item = luaL_checkint( L, 1 ); +- int i_target = luaL_checkint( L, 2 ); ++ int i_item = luaL_checkinteger( L, 1 ); ++ int i_target = luaL_checkinteger( L, 2 ); + playlist_t *p_playlist = vlclua_get_playlist_internal( L ); + PL_LOCK; + playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_item ); +--- a/modules/lua/libs/stream.c ++++ b/modules/lua/libs/stream.c +@@ -123,7 +123,7 @@ static int vlclua_stream_read( lua_State + { + int i_read; + stream_t **pp_stream = (stream_t **)luaL_checkudata( L, 1, "stream" ); +- int n = luaL_checkint( L, 2 ); ++ int n = luaL_checkinteger( L, 2 ); + uint8_t *p_read = malloc( n ); + if( !p_read ) return vlclua_error( L ); + +--- a/modules/lua/libs/volume.c ++++ b/modules/lua/libs/volume.c +@@ -48,7 +48,7 @@ + static int vlclua_volume_set( lua_State *L ) + { + playlist_t *p_this = vlclua_get_playlist_internal( L ); +- int i_volume = luaL_checkint( L, 1 ); ++ int i_volume = luaL_checkinteger( L, 1 ); + if( i_volume < 0 ) + i_volume = 0; + int i_ret = playlist_VolumeSet( p_this, i_volume/(float)AOUT_VOLUME_DEFAULT ); +--- a/modules/lua/libs/dialog.c ++++ b/modules/lua/libs/dialog.c +@@ -382,7 +382,7 @@ static int lua_GetDialogUpdate( lua_Stat + /* Read entry in the Lua registry */ + lua_pushlightuserdata( L, (void*) &key_update ); + lua_gettable( L, LUA_REGISTRYINDEX ); +- return luaL_checkint( L, -1 ); ++ return luaL_checkinteger( L, -1 ); + } + + /** Manually update a dialog +@@ -573,22 +573,22 @@ static int vlclua_create_widget_inner( l + + /* Set common arguments: col, row, hspan, vspan, width, height */ + if( lua_isnumber( L, arg ) ) +- p_widget->i_column = luaL_checkint( L, arg ); ++ p_widget->i_column = luaL_checkinteger( L, arg ); + else goto end_of_args; + if( lua_isnumber( L, ++arg ) ) +- p_widget->i_row = luaL_checkint( L, arg ); ++ p_widget->i_row = luaL_checkinteger( L, arg ); + else goto end_of_args; + if( lua_isnumber( L, ++arg ) ) +- p_widget->i_horiz_span = luaL_checkint( L, arg ); ++ p_widget->i_horiz_span = luaL_checkinteger( L, arg ); + else goto end_of_args; + if( lua_isnumber( L, ++arg ) ) +- p_widget->i_vert_span = luaL_checkint( L, arg ); ++ p_widget->i_vert_span = luaL_checkinteger( L, arg ); + else goto end_of_args; + if( lua_isnumber( L, ++arg ) ) +- p_widget->i_width = luaL_checkint( L, arg ); ++ p_widget->i_width = luaL_checkinteger( L, arg ); + else goto end_of_args; + if( lua_isnumber( L, ++arg ) ) +- p_widget->i_height = luaL_checkint( L, arg ); ++ p_widget->i_height = luaL_checkinteger( L, arg ); + else goto end_of_args; + + end_of_args: +--- a/modules/lua/libs/io.c ++++ b/modules/lua/libs/io.c +@@ -139,7 +139,7 @@ static int vlclua_io_file_seek( lua_Stat + const char* psz_mode = luaL_optstring( L, 2, NULL ); + if ( psz_mode != NULL ) + { +- long i_offset = luaL_optlong( L, 3, 0 ); ++ long i_offset = (long)luaL_optinteger( L, 3, 0 ); + int i_mode; + if ( !strcmp( psz_mode, "set" ) ) + i_mode = SEEK_SET; diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0004-Use-packageconfig-to-detect-mmal-support.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0004-Use-packageconfig-to-detect-mmal-support.patch new file mode 100644 index 0000000000..424aaa2815 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0004-Use-packageconfig-to-detect-mmal-support.patch @@ -0,0 +1,61 @@ +From e8716a7755eef93e1033bb913e1eb4faee54658f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 15 Apr 2020 18:29:26 -0700 +Subject: [PATCH] Use packageconfig to detect mmal support + +This needs userland graphics libraries, because distros may install it +in different locations, therefore its best to rely on pkgconf to find +the libs and header locations instead of assuming /opt/vc which might +work on some distros ( like raspbian ) but not everywhere + +Signed-off-by: Khem Raj +--- + configure.ac | 31 +++++++++++-------------------- + 1 file changed, 11 insertions(+), 20 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d7cf692..f81b99d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3427,27 +3427,18 @@ AC_ARG_ENABLE(mmal, + AS_HELP_STRING([--enable-mmal], + [Multi-Media Abstraction Layer (MMAL) hardware plugin (default enable)])) + if test "${enable_mmal}" != "no"; then +- VLC_SAVE_FLAGS +- LDFLAGS="${LDFLAGS} -L/opt/vc/lib -lvchostif" +- CPPFLAGS="${CPPFLAGS} -isystem /opt/vc/include -isystem /opt/vc/include/interface/vcos/pthreads -isystem /opt/vc/include/interface/vmcs_host/linux" +- AC_CHECK_HEADERS(interface/mmal/mmal.h, +- [ AC_CHECK_LIB(bcm_host, vc_tv_unregister_callback_full, [ +- have_mmal="yes" +- VLC_ADD_PLUGIN([mmal]) +- VLC_ADD_LDFLAGS([mmal],[ -L/opt/vc/lib ]) +- VLC_ADD_CFLAGS([mmal],[ -isystem /opt/vc/include -isystem /opt/vc/include/interface/vcos/pthreads -isystem /opt/vc/include/interface/vmcs_host/linux ]) +- VLC_ADD_LIBS([mmal],[ -lbcm_host -lmmal -lmmal_core -lmmal_components -lmmal_util -lvchostif ]) ], [ +- AS_IF([test "${enable_mmal}" = "yes"], +- [ AC_MSG_ERROR([Cannot find bcm library...]) ], +- [ AC_MSG_WARN([Cannot find bcm library...]) ]) +- ], +- []) +- ] , [ AS_IF([test "${enable_mmal}" = "yes"], +- [ AC_MSG_ERROR([Cannot find development headers for mmal...]) ], +- [ AC_MSG_WARN([Cannot find development headers for mmal...]) ]) ]) +- VLC_RESTORE_FLAGS ++ PKG_CHECK_MODULES(BCMHOST, [bcm_host], [ ++ HAVE_BCMHOST=yes ++ AC_DEFINE(HAVE_BCMHOST, 1, [Define this if you have have userlang graphics installed]) ++ VLC_ADD_LIBS([bcmhost],[$BCMHOST_LIBS]) ++ VLC_ADD_CFLAGS([bcmhost],[$BCMHOST_CFLAGS]) ++ ],: ++ [AC_MSG_WARN([${BCMHOST_PKG_ERRORS}: userland graphics not available.]) ++ HAVE_BCMHOST=no]) ++ ++ AC_CHECK_HEADERS(interface/mmal/mmal.h) + fi +-AM_CONDITIONAL([HAVE_MMAL], [test "${have_mmal}" = "yes"]) ++AM_CONDITIONAL([HAVE_MMAL], [test "${have_bcmhost}" = "yes"]) + + dnl + dnl evas plugin +-- +2.26.1 + diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch new file mode 100644 index 0000000000..c4465b6af3 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch @@ -0,0 +1,56 @@ +From c805c6f64da6d8b03355b4796865b75e2f3b500d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 8 Jun 2020 00:50:08 +0200 +Subject: [PATCH] Fix build with Qt >= 5.15 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + modules/gui/qt/components/playlist/views.cpp | 1 + + modules/gui/qt/dialogs/plugins.cpp | 1 + + modules/gui/qt/util/timetooltip.hpp | 1 + + 3 files changed, 3 insertion(+) + +diff --git a/modules/gui/qt/components/playlist/views.cpp b/modules/gui/qt/components/playlist/views.cpp +index 24db9d9..71d8514 100644 +--- a/modules/gui/qt/components/playlist/views.cpp ++++ b/modules/gui/qt/components/playlist/views.cpp +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + + #include + +diff --git a/modules/gui/qt/dialogs/plugins.cpp b/modules/gui/qt/dialogs/plugins.cpp +index d233382..9ae9a63 100644 +--- a/modules/gui/qt/dialogs/plugins.cpp ++++ b/modules/gui/qt/dialogs/plugins.cpp +@@ -66,6 +66,7 @@ + #include + #include + #include ++#include + + //match the image source (width/height) + #define SCORE_ICON_WIDTH_SCALE 4 +diff --git a/modules/gui/qt/util/timetooltip.hpp b/modules/gui/qt/util/timetooltip.hpp +index 6a1329e..9f50b18 100644 +--- a/modules/gui/qt/util/timetooltip.hpp ++++ b/modules/gui/qt/util/timetooltip.hpp +@@ -25,6 +25,7 @@ + #include "qt.hpp" + + #include ++#include + + class TimeTooltip : public QWidget + { +-- +2.26.2 + diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0006-make-opencv-configurable.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0006-make-opencv-configurable.patch deleted file mode 100644 index 950c09b8ae..0000000000 --- a/meta-multimedia/recipes-multimedia/vlc/vlc/0006-make-opencv-configurable.patch +++ /dev/null @@ -1,29 +0,0 @@ -Recent opencv API changes break upstream filter and example. -Make opencv explicitly configurable. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Tim Orling - -Index: vlc-2.1.4/configure.ac -=================================================================== ---- vlc-2.1.4.orig/configure.ac -+++ vlc-2.1.4/configure.ac -@@ -1693,7 +1693,16 @@ PKG_ENABLE_MODULES_VLC([BLURAY], [libblu - dnl - dnl OpenCV wrapper and example filters - dnl --PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [opencv > 2.0], (OpenCV (computer vision) filter), [auto]) -+AC_ARG_ENABLE(opencv, -+ [AS_HELP_STRING([--disable-opencv], -+ [disable OpenCV computer vision filter and example (default auto)])]) -+if test "${enable_opencv}" != "no" -+then -+ PKG_ENABLE_MODULES_VLC([OPENCV], -+ [opencv_example opencv_wrapper], -+ [opencv > 2.0], -+ (OpenCV (computer vision) filter), [auto]) -+fi - - - dnl diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0007-use-vorbisidec.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0007-use-vorbisidec.patch deleted file mode 100644 index d05cf02b71..0000000000 --- a/meta-multimedia/recipes-multimedia/vlc/vlc/0007-use-vorbisidec.patch +++ /dev/null @@ -1,19 +0,0 @@ -* tremor provides libvorbisidec, use it instead of libvorbisdec - -Upstream-status: Pending - -Signed-off-by: Tim Orling - -Index: vlc-2.2.1/modules/codec/Makefile.am -=================================================================== ---- vlc-2.2.1.orig/modules/codec/Makefile.am -+++ vlc-2.2.1/modules/codec/Makefile.am -@@ -234,7 +234,7 @@ codec_LTLIBRARIES += $(LTLIBtheora) - libtremor_plugin_la_SOURCES = codec/vorbis.c - libtremor_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_tremor - libtremor_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' --libtremor_plugin_la_LIBADD = -lvorbisdec -logg -+libtremor_plugin_la_LIBADD = -lvorbisidec -logg - EXTRA_LTLIBRARIES += libtremor_plugin.la - codec_LTLIBRARIES += $(LTLIBtremor) - diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0008-fix-luaL-checkint.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0008-fix-luaL-checkint.patch deleted file mode 100644 index 96b5d2d246..0000000000 --- a/meta-multimedia/recipes-multimedia/vlc/vlc/0008-fix-luaL-checkint.patch +++ /dev/null @@ -1,233 +0,0 @@ -* luaL_checkint and luaL_optint were deprecated in lua 5.3 -* replacement functions are luaL_checkinteger and luaL_optinteger - -Upstream-status: Pending - -Signed-off-by: Tim Orling - ---- a/modules/lua/demux.c -+++ b/modules/lua/demux.c -@@ -52,7 +52,7 @@ struct vlclua_playlist - static int vlclua_demux_peek( lua_State *L ) - { - stream_t *s = (stream_t *)vlclua_get_this(L); -- int n = luaL_checkint( L, 1 ); -+ int n = luaL_checkinteger( L, 1 ); - const uint8_t *p_peek; - - ssize_t val = vlc_stream_Peek(s->p_source, &p_peek, n); -@@ -66,7 +66,7 @@ static int vlclua_demux_peek( lua_State - static int vlclua_demux_read( lua_State *L ) - { - stream_t *s = (stream_t *)vlclua_get_this(L); -- int n = luaL_checkint( L, 1 ); -+ int n = luaL_checkinteger( L, 1 ); - char *buf = malloc(n); - - if (buf != NULL) ---- a/modules/lua/libs/net.c -+++ b/modules/lua/libs/net.c -@@ -179,7 +179,7 @@ static int vlclua_net_listen_tcp( lua_St - { - vlc_object_t *p_this = vlclua_get_this( L ); - const char *psz_host = luaL_checkstring( L, 1 ); -- int i_port = luaL_checkint( L, 2 ); -+ int i_port = luaL_checkinteger( L, 2 ); - int *pi_fd = net_ListenTCP( p_this, psz_host, i_port ); - if( pi_fd == NULL ) - return luaL_error( L, "Cannot listen on %s:%d", psz_host, i_port ); -@@ -251,7 +251,7 @@ static int vlclua_net_connect_tcp( lua_S - { - vlc_object_t *p_this = vlclua_get_this( L ); - const char *psz_host = luaL_checkstring( L, 1 ); -- int i_port = luaL_checkint( L, 2 ); -+ int i_port = luaL_checkinteger( L, 2 ); - int i_fd = net_ConnectTCP( p_this, psz_host, i_port ); - lua_pushinteger( L, vlclua_fd_map_safe( L, i_fd ) ); - return 1; -@@ -259,14 +259,14 @@ static int vlclua_net_connect_tcp( lua_S - - static int vlclua_net_close( lua_State *L ) - { -- int i_fd = luaL_checkint( L, 1 ); -+ int i_fd = luaL_checkinteger( L, 1 ); - vlclua_fd_unmap_safe( L, i_fd ); - return 0; - } - - static int vlclua_net_send( lua_State *L ) - { -- int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) ); -+ int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) ); - size_t i_len; - const char *psz_buffer = luaL_checklstring( L, 2, &i_len ); - -@@ -278,7 +278,7 @@ static int vlclua_net_send( lua_State *L - - static int vlclua_net_recv( lua_State *L ) - { -- int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) ); -+ int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) ); - size_t i_len = (size_t)luaL_optinteger( L, 2, 1 ); - char psz_buffer[i_len]; - -@@ -312,7 +312,7 @@ static int vlclua_net_poll( lua_State *L - lua_pushnil( L ); - for( int i = 0; lua_next( L, 1 ); i++ ) - { -- luafds[i] = luaL_checkint( L, -2 ); -+ luafds[i] = luaL_checkinteger( L, -2 ); - p_fds[i].fd = vlclua_fd_get( L, luafds[i] ); - p_fds[i].events = luaL_checkinteger( L, -1 ); - p_fds[i].events &= POLLIN | POLLOUT | POLLPRI; -@@ -360,7 +360,7 @@ static int vlclua_fd_open( lua_State *L - #ifndef _WIN32 - static int vlclua_fd_write( lua_State *L ) - { -- int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) ); -+ int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) ); - size_t i_len; - const char *psz_buffer = luaL_checklstring( L, 2, &i_len ); - -@@ -371,7 +371,7 @@ static int vlclua_fd_write( lua_State *L - - static int vlclua_fd_read( lua_State *L ) - { -- int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) ); -+ int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) ); - size_t i_len = (size_t)luaL_optinteger( L, 2, 1 ); - char psz_buffer[i_len]; - ---- a/modules/lua/libs/osd.c -+++ b/modules/lua/libs/osd.c -@@ -154,7 +154,7 @@ static int vlc_osd_slider_type_from_stri - - static int vlclua_osd_slider( lua_State *L ) - { -- int i_position = luaL_checkint( L, 1 ); -+ int i_position = luaL_checkinteger( L, 1 ); - const char *psz_type = luaL_checkstring( L, 2 ); - int i_type = vlc_osd_slider_type_from_string( psz_type ); - int i_chan = (int)luaL_optinteger( L, 3, VOUT_SPU_CHANNEL_OSD ); -@@ -198,7 +198,7 @@ static int vlclua_spu_channel_register( - - static int vlclua_spu_channel_clear( lua_State *L ) - { -- int i_chan = luaL_checkint( L, 1 ); -+ int i_chan = luaL_checkinteger( L, 1 ); - input_thread_t *p_input = vlclua_get_input_internal( L ); - if( !p_input ) - return luaL_error( L, "Unable to find input." ); ---- a/modules/lua/libs/playlist.c -+++ b/modules/lua/libs/playlist.c -@@ -69,7 +69,7 @@ static int vlclua_playlist_next( lua_Sta - - static int vlclua_playlist_skip( lua_State * L ) - { -- int i_skip = luaL_checkint( L, 1 ); -+ int i_skip = luaL_checkinteger( L, 1 ); - playlist_t *p_playlist = vlclua_get_playlist_internal( L ); - playlist_Skip( p_playlist, i_skip ); - return 0; -@@ -127,7 +127,7 @@ static int vlclua_playlist_random( lua_S - - static int vlclua_playlist_gotoitem( lua_State * L ) - { -- int i_id = luaL_checkint( L, 1 ); -+ int i_id = luaL_checkinteger( L, 1 ); - playlist_t *p_playlist = vlclua_get_playlist_internal( L ); - PL_LOCK; - playlist_ViewPlay( p_playlist, NULL, -@@ -138,7 +138,7 @@ static int vlclua_playlist_gotoitem( lua - - static int vlclua_playlist_delete( lua_State * L ) - { -- int i_id = luaL_checkint( L, 1 ); -+ int i_id = luaL_checkinteger( L, 1 ); - playlist_t *p_playlist = vlclua_get_playlist_internal( L ); - - PL_LOCK; -@@ -152,8 +152,8 @@ static int vlclua_playlist_delete( lua_S - - static int vlclua_playlist_move( lua_State * L ) - { -- int i_item = luaL_checkint( L, 1 ); -- int i_target = luaL_checkint( L, 2 ); -+ int i_item = luaL_checkinteger( L, 1 ); -+ int i_target = luaL_checkinteger( L, 2 ); - playlist_t *p_playlist = vlclua_get_playlist_internal( L ); - PL_LOCK; - playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_item ); ---- a/modules/lua/libs/stream.c -+++ b/modules/lua/libs/stream.c -@@ -123,7 +123,7 @@ static int vlclua_stream_read( lua_State - { - int i_read; - stream_t **pp_stream = (stream_t **)luaL_checkudata( L, 1, "stream" ); -- int n = luaL_checkint( L, 2 ); -+ int n = luaL_checkinteger( L, 2 ); - uint8_t *p_read = malloc( n ); - if( !p_read ) return vlclua_error( L ); - ---- a/modules/lua/libs/volume.c -+++ b/modules/lua/libs/volume.c -@@ -48,7 +48,7 @@ - static int vlclua_volume_set( lua_State *L ) - { - playlist_t *p_this = vlclua_get_playlist_internal( L ); -- int i_volume = luaL_checkint( L, 1 ); -+ int i_volume = luaL_checkinteger( L, 1 ); - if( i_volume < 0 ) - i_volume = 0; - int i_ret = playlist_VolumeSet( p_this, i_volume/(float)AOUT_VOLUME_DEFAULT ); ---- a/modules/lua/libs/dialog.c -+++ b/modules/lua/libs/dialog.c -@@ -382,7 +382,7 @@ static int lua_GetDialogUpdate( lua_Stat - /* Read entry in the Lua registry */ - lua_pushlightuserdata( L, (void*) &key_update ); - lua_gettable( L, LUA_REGISTRYINDEX ); -- return luaL_checkint( L, -1 ); -+ return luaL_checkinteger( L, -1 ); - } - - /** Manually update a dialog -@@ -573,22 +573,22 @@ static int vlclua_create_widget_inner( l - - /* Set common arguments: col, row, hspan, vspan, width, height */ - if( lua_isnumber( L, arg ) ) -- p_widget->i_column = luaL_checkint( L, arg ); -+ p_widget->i_column = luaL_checkinteger( L, arg ); - else goto end_of_args; - if( lua_isnumber( L, ++arg ) ) -- p_widget->i_row = luaL_checkint( L, arg ); -+ p_widget->i_row = luaL_checkinteger( L, arg ); - else goto end_of_args; - if( lua_isnumber( L, ++arg ) ) -- p_widget->i_horiz_span = luaL_checkint( L, arg ); -+ p_widget->i_horiz_span = luaL_checkinteger( L, arg ); - else goto end_of_args; - if( lua_isnumber( L, ++arg ) ) -- p_widget->i_vert_span = luaL_checkint( L, arg ); -+ p_widget->i_vert_span = luaL_checkinteger( L, arg ); - else goto end_of_args; - if( lua_isnumber( L, ++arg ) ) -- p_widget->i_width = luaL_checkint( L, arg ); -+ p_widget->i_width = luaL_checkinteger( L, arg ); - else goto end_of_args; - if( lua_isnumber( L, ++arg ) ) -- p_widget->i_height = luaL_checkint( L, arg ); -+ p_widget->i_height = luaL_checkinteger( L, arg ); - else goto end_of_args; - - end_of_args: ---- a/modules/lua/libs/io.c -+++ b/modules/lua/libs/io.c -@@ -139,7 +139,7 @@ static int vlclua_io_file_seek( lua_Stat - const char* psz_mode = luaL_optstring( L, 2, NULL ); - if ( psz_mode != NULL ) - { -- long i_offset = luaL_optlong( L, 3, 0 ); -+ long i_offset = (long)luaL_optinteger( L, 3, 0 ); - int i_mode; - if ( !strcmp( psz_mode, "set" ) ) - i_mode = SEEK_SET; diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.9.2.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.9.2.bb index f6c7a606d5..24898a5a7f 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.9.2.bb +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.9.2.bb @@ -19,10 +19,11 @@ LDFLAGS_append_riscv64 = " -latomic" LICENSE_FLAGS = "commercial" SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz \ - file://0006-make-opencv-configurable.patch \ - file://0007-use-vorbisidec.patch \ - file://0008-fix-luaL-checkint.patch \ - file://0001-Use-packageconfig-to-detect-mmal-support.patch \ + file://0001-make-opencv-configurable.patch \ + file://0002-use-vorbisidec.patch \ + file://0003-fix-luaL-checkint.patch \ + file://0004-Use-packageconfig-to-detect-mmal-support.patch \ + file://0005-Fix-build-with-Qt-5.15.patch \ " SRC_URI[sha256sum] = "a9bdad293d81cd48516abad8d490d8ab4012964ae541ff19e00021e071e47601" -- cgit 1.2.3-korg