Skip to content

Commit

Permalink
fixup! ffmpeg: Add v4l2 support
Browse files Browse the repository at this point in the history
  • Loading branch information
popcornmix committed Mar 2, 2023
1 parent 4b60bcc commit 5edd31f
Showing 1 changed file with 4,029 additions and 4,332 deletions.
Loading

1 comment on commit 5edd31f

@graysky2
Copy link

@graysky2 graysky2 commented on 5edd31f Apr 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@popcornmix - I noticed that ffmpeg 6.0 was officially merged. Can you please update your gbm branch to reflect this? If I simply update myself, ffmpeg fails to build. I am thinking that you have some extra cherry-picks on top of https://github.com/jc-kynesim/rpi-ffmpeg/tree/dev/6.0/rpi_import_1 ?

Errors:

[ 88%] Linking CXX static library videoshaders.a
[ 88%] Building CXX object build/platform/posix/CMakeFiles/platform_posix.dir/ConvUtils.cpp.o
[ 88%] Built target videoshaders
[ 88%] Building CXX object build/platform/posix/CMakeFiles/platform_posix.dir/CPUInfoPosix.cpp.o
In file included from /usr/include/c++/12.1.0/cstring:42,
                 from /usr/include/fmt/format.h:38,
                 from /build/kodi-rpi-git/src/xbmc-99abb3e49a786f6ef75b2a7e37fe482ae8ca6a93/xbmc/utils/StringUtils.h:37,
                 from /build/kodi-rpi-git/src/xbmc-99abb3e49a786f6ef75b2a7e37fe482ae8ca6a93/xbmc/cores/VideoPlayer/DVDSubtitles/webvtt/WebVTTHandler.cpp:20:
In function 'const char* strchr(const char*, int)',
    inlined from 'bool {anonymous}::ValidateSignature(const std::string&, const char*)' at /build/kodi-rpi-git/src/xbmc-99abb3e49a786f6ef75b2a7e37fe482ae8ca6a93/xbmc/cores/VideoPlayer/DVDSubtitles/webvtt/WebVTTHandler.cpp:98:22,
    inlined from 'bool CWebVTTHandler::CheckSignature(const std::string&)' at /build/kodi-rpi-git/src/xbmc-99abb3e49a786f6ef75b2a7e37fe482ae8ca6a93/xbmc/cores/VideoPlayer/DVDSubtitles/webvtt/WebVTTHandler.cpp:253:24:
/usr/include/string.h:241:27: warning: 'char* __builtin_strchr(const char*, int)' argument missing terminating nul [-Wstringop-overread]
  241 |   return __builtin_strchr (__s, __c);
      |          ~~~~~~~~~~~~~~~~~^~~~~~~~~~
/build/kodi-rpi-git/src/xbmc-99abb3e49a786f6ef75b2a7e37fe482ae8ca6a93/xbmc/cores/VideoPlayer/DVDSubtitles/webvtt/WebVTTHandler.cpp: In member function 'bool CWebVTTHandler::CheckSignature(const std::string&)':
/build/kodi-rpi-git/src/xbmc-99abb3e49a786f6ef75b2a7e37fe482ae8ca6a93/xbmc/cores/VideoPlayer/DVDSubtitles/webvtt/WebVTTHandler.cpp:41:16: note: referenced argument declared here
In function 'const char* strchr(const char*, int)',
    inlined from 'bool {anonymous}::ValidateSignature(const std::string&, const char*)' at /build/kodi-rpi-git/src/xbmc-99abb3e49a786f6ef75b2a7e37fe482ae8ca6a93/xbmc/cores/VideoPlayer/DVDSubtitles/webvtt/WebVTTHandler.cpp:98:22,
    inlined from 'bool CWebVTTHandler::CheckSignature(const std::string&)' at /build/kodi-rpi-git/src/xbmc-99abb3e49a786f6ef75b2a7e37fe482ae8ca6a93/xbmc/cores/VideoPlayer/DVDSubtitles/webvtt/WebVTTHandler.cpp:253:70:
/usr/include/string.h:241:27: warning: 'char* __builtin_strchr(const char*, int)' argument missing terminating nul [-Wstringop-overread]
  241 |   return __builtin_strchr (__s, __c);
      |          ~~~~~~~~~~~~~~~~~^~~~~~~~~~
/build/kodi-rpi-git/src/xbmc-99abb3e49a786f6ef75b2a7e37fe482ae8ca6a93/xbmc/cores/VideoPlayer/DVDSubtitles/webvtt/WebVTTHandler.cpp: In member function 'bool CWebVTTHandler::CheckSignature(const std::string&)':
/build/kodi-rpi-git/src/xbmc-99abb3e49a786f6ef75b2a7e37fe482ae8ca6a93/xbmc/cores/VideoPlayer/DVDSubtitles/webvtt/WebVTTHandler.cpp:41:16: note: referenced argument declared here
[ 88%] Linking CXX static library subtitles_webvtt.a
[ 88%] Building CXX object build/platform/posix/CMakeFiles/platform_posix.dir/Filesystem.cpp.o
[ 88%] Building CXX object build/platform/linux/powermanagement/CMakeFiles/platform_linux_powermanagement.dir/LogindUPowerSyscall.cpp.o
[ 88%] Linking CXX static library platform_linux_network.a
[ 88%] Building CXX object build/platform/linux/input/CMakeFiles/input_linux.dir/LibInputKeyboard.cpp.o
[ 88%] Building CXX object build/platform/posix/filesystem/CMakeFiles/platform_posix_filesystem.dir/PosixDirectory.cpp.o
[ 88%] Linking CXX static library dvdinputstreams.a
[ 88%] Built target subtitles_webvtt
[ 88%] Building CXX object build/platform/linux/input/CMakeFiles/input_linux.dir/LibInputPointer.cpp.o
[ 88%] Built target platform_linux_network
[ 88%] Building CXX object build/platform/linux/input/CMakeFiles/input_linux.dir/LibInputSettings.cpp.o
[ 88%] Built target dvdinputstreams
[ 88%] Building CXX object build/platform/linux/input/CMakeFiles/input_linux.dir/LibInputTouch.cpp.o
[ 88%] Linking CXX static library platform_linux_threads.a
[ 88%] Building CXX object build/platform/posix/network/CMakeFiles/platform_posix_network.dir/NetworkPosix.cpp.o
[ 88%] Linking CXX static library platform_linux_peripherals.a
[ 88%] Linking CXX static library videorenderers_hwdec.a
[ 88%] Built target platform_linux_threads
[ 88%] Building CXX object build/platform/posix/storage/discs/CMakeFiles/platform_posix_storage_discs.dir/DiscDriveHandlerPosix.cpp.o
[ 88%] Building CXX object build/platform/posix/CMakeFiles/platform_posix.dir/MessagePrinter.cpp.o
[ 88%] Building CXX object build/platform/posix/threads/CMakeFiles/platform_posix_threads.dir/RecursiveMutex.cpp.o
[ 88%] Building CXX object build/platform/linux/CMakeFiles/linuxsupport.dir/OptionalsReg.cpp.o
[ 88%] Building CXX object build/platform/posix/utils/CMakeFiles/platform_posix_utils.dir/Mmap.cpp.o
[ 88%] Building CXX object build/platform/linux/CMakeFiles/linuxsupport.dir/PlatformLinux.cpp.o
[ 88%] Building CXX object build/platform/posix/utils/CMakeFiles/platform_posix_utils.dir/PosixInterfaceForCLog.cpp.o
[ 88%] Built target platform_linux_peripherals
[ 88%] Built target videorenderers_hwdec
[ 88%] Building CXX object build/platform/linux/CMakeFiles/linuxsupport.dir/SysfsPath.cpp.o
[ 88%] Building CXX object build/platform/linux/CMakeFiles/linuxsupport.dir/TimeUtils.cpp.o
[ 88%] Building CXX object build/windowing/linux/CMakeFiles/windowing_linux.dir/OSScreenSaverFreedesktop.cpp.o
[ 88%] Building CXX object build/platform/linux/powermanagement/CMakeFiles/platform_linux_powermanagement.dir/UPowerSyscall.cpp.o
[ 88%] Building CXX object build/platform/posix/filesystem/CMakeFiles/platform_posix_filesystem.dir/PosixFile.cpp.o
[ 88%] Building CXX object build/platform/posix/utils/CMakeFiles/platform_posix_utils.dir/SharedMemory.cpp.o
[ 88%] Building CXX object build/platform/posix/filesystem/CMakeFiles/platform_posix_filesystem.dir/SMBDirectory.cpp.o
[ 88%] Building CXX object build/platform/posix/filesystem/CMakeFiles/platform_posix_filesystem.dir/SMBFile.cpp.o
[ 88%] Building CXX object build/platform/posix/filesystem/CMakeFiles/platform_posix_filesystem.dir/SMBWSDiscovery.cpp.o
[ 89%] Building CXX object build/input/touch/generic/CMakeFiles/input_touch_generic.dir/GenericTouchInputHandler.cpp.o
[ 89%] Building CXX object build/utils/CMakeFiles/utils.dir/XMLUtils.cpp.o
[ 90%] Building CXX object build/platform/posix/CMakeFiles/platform_posix.dir/PlatformPosix.cpp.o
[ 90%] Linking CXX static library input_touch.a
[ 90%] Building CXX object build/platform/posix/CMakeFiles/platform_posix.dir/PosixMountProvider.cpp.o
[ 90%] Building CXX object build/cores/VideoPlayer/videorenderers/CMakeFiles/videorenderers.dir/RenderCapture.cpp.o
[ 90%] Built target input_touch
[ 90%] Linking CXX static library platform_posix_network.a
[ 90%] Linking CXX static library platform_linux_storage.a
[ 90%] Building CXX object build/platform/linux/network/zeroconf/CMakeFiles/platform_linux_network_zeroconf.dir/ZeroconfAvahi.cpp.o
[ 90%] Built target platform_posix_network
[ 90%] Linking CXX static library platform_posix_utils.a
[ 90%] Building CXX object build/platform/linux/network/zeroconf/CMakeFiles/platform_linux_network_zeroconf.dir/ZeroconfBrowserAvahi.cpp.o
[ 90%] Built target platform_linux_storage
[ 90%] Building CXX object build/platform/posix/CMakeFiles/platform_posix.dir/PosixResourceCounter.cpp.o
distcc[37807] ERROR: compile /build/kodi-rpi-git/src/xbmc-99abb3e49a786f6ef75b2a7e37fe482ae8ca6a93/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp on localhost failed
make[2]: *** [build/cores/VideoPlayer/codecs/video/CMakeFiles/dvdvideocodecs.dir/build.make:132: build/cores/VideoPlayer/codecs/video/CMakeFiles/dvdvideocodecs.dir/DVDVideoCodecDRMPRIME.cpp.o] Error 1
make[1]: *** [CMakeFiles/Makefile2:11528: build/cores/VideoPlayer/codecs/video/CMakeFiles/dvdvideocodecs.dir/all] Error 2
make[1]: *** Waiting for unfinished jobs....

Please sign in to comment.