diff -Nru vlc-3.0.12/debian/changelog vlc-3.0.12/debian/changelog --- vlc-3.0.12/debian/changelog 2021-03-09 16:42:00.000000000 +0000 +++ vlc-3.0.12/debian/changelog 2021-03-16 16:39:48.000000000 +0000 @@ -1,3 +1,11 @@ +vlc (3.0.12-3+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 3.0.11.1-1+rpi1 by Peter Michael Green at Sun, 30 Aug 2020 00:37:35 +0000] + * Add extern to three functions for gcc-10 compatibility. + * Partially fix clean target. + + -- Raspbian forward porter Tue, 16 Mar 2021 16:39:48 +0000 + vlc (3.0.12-3) unstable; urgency=medium * debian/patches: Apply upstream patches to prevent process freeze on exit diff -Nru vlc-3.0.12/debian/patches/add-extern-qualifiers.patch vlc-3.0.12/debian/patches/add-extern-qualifiers.patch --- vlc-3.0.12/debian/patches/add-extern-qualifiers.patch 1970-01-01 00:00:00.000000000 +0000 +++ vlc-3.0.12/debian/patches/add-extern-qualifiers.patch 2021-03-16 16:39:48.000000000 +0000 @@ -0,0 +1,18 @@ +Description: Add extern to three functions for gcc-10 compatibility. +Author: Peter Michael Green + +--- vlc-3.0.11.1.orig/modules/codec/omxil/omxil_core.h ++++ vlc-3.0.11.1/modules/codec/omxil/omxil_core.h +@@ -34,9 +34,9 @@ extern OMX_ERRORTYPE (*pf_component_enum + extern OMX_ERRORTYPE (*pf_get_roles_of_component)(OMX_STRING, OMX_U32 *, OMX_U8 **); + + /* Extra IOMX android functions. Can be NULL if we don't link with libiomx */ +-OMX_ERRORTYPE (*pf_enable_graphic_buffers)(OMX_HANDLETYPE, OMX_U32, OMX_BOOL); +-OMX_ERRORTYPE (*pf_get_graphic_buffer_usage)(OMX_HANDLETYPE, OMX_U32, OMX_U32*); +-OMX_ERRORTYPE (*pf_get_hal_format) (const char *, int *); ++extern OMX_ERRORTYPE (*pf_enable_graphic_buffers)(OMX_HANDLETYPE, OMX_U32, OMX_BOOL); ++extern OMX_ERRORTYPE (*pf_get_graphic_buffer_usage)(OMX_HANDLETYPE, OMX_U32, OMX_U32*); ++extern OMX_ERRORTYPE (*pf_get_hal_format) (const char *, int *); + + int InitOmxCore(vlc_object_t *p_this); + void DeinitOmxCore(void); diff -Nru vlc-3.0.12/debian/patches/series vlc-3.0.12/debian/patches/series --- vlc-3.0.12/debian/patches/series 2021-03-09 16:30:13.000000000 +0000 +++ vlc-3.0.12/debian/patches/series 2021-03-16 16:39:48.000000000 +0000 @@ -4,3 +4,4 @@ 0004-qt-add-a-private-structure-for-window-provider.patch 0005-qt-create-another-indirection-X11-window.patch 0006-qt-reparent-video-window-to-root-whence-UI-closes.patch +add-extern-qualifiers.patch diff -Nru vlc-3.0.12/debian/rules vlc-3.0.12/debian/rules --- vlc-3.0.12/debian/rules 2021-03-09 16:29:53.000000000 +0000 +++ vlc-3.0.12/debian/rules 2021-03-16 16:39:48.000000000 +0000 @@ -347,3 +347,8 @@ override_dh_gencontrol-arch: sed -n 's/^# define MODULE_SYMBOL \([0-9][_0-9a-z]*\)/-Vvlc:PluginABI=vlc-plugin-abi-\1/p' \ include/vlc_plugin.h | tr _ - | xargs dh_gencontrol -a -- + +override_dh_auto_clean: + dh_auto_clean + find . -name '*.luac' -delete + rm -f extras/analyser/_vlc