initial buildroot for linux 5.15
This commit is contained in:
Huan.Feng
@@ -0,0 +1,33 @@
|
||||
From 855e9674232808ff3be7191b697dfb56917db21f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
|
||||
Date: Wed, 8 Feb 2017 00:56:32 +0000
|
||||
Subject: [PATCH] Fix GCC7 build
|
||||
|
||||
if (*pSlash != '\0') {
|
||||
|
||||
As it stands the body of that if will always execute and when there are
|
||||
no encoding parameters ppEncodingParams will be returned as a pointer to
|
||||
an empty string rather than as a null pointer
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
[Upstream status: https://github.com/TechSmith/mp4v2/pull/36]
|
||||
---
|
||||
src/rtphint.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/rtphint.cpp b/src/rtphint.cpp
|
||||
index e07309d..1eb01f5 100644
|
||||
--- a/src/rtphint.cpp
|
||||
+++ b/src/rtphint.cpp
|
||||
@@ -339,7 +339,7 @@ void MP4RtpHintTrack::GetPayload(
|
||||
pSlash = strchr(pSlash, '/');
|
||||
if (pSlash != NULL) {
|
||||
pSlash++;
|
||||
- if (pSlash != '\0') {
|
||||
+ if (*pSlash != '\0') {
|
||||
length = (uint32_t)strlen(pRtpMap) - (pSlash - pRtpMap);
|
||||
*ppEncodingParams = (char *)MP4Calloc(length + 1);
|
||||
strncpy(*ppEncodingParams, pSlash, length);
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
From 78cf76b5d661e37e958163c37c0ad95940c09591 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sat, 30 May 2020 11:42:19 +0200
|
||||
Subject: [PATCH] src/mp4track.cpp: replace nullptr by NULL
|
||||
|
||||
Commit 15ec11166ba9ee7b77631d0d9234522f656cfd66 added code that uses
|
||||
nullptr. nullptr is C++11, it will break the build with gcc < 5.
|
||||
|
||||
Semantically, NULL and nullptr are different, so should not be mixed.
|
||||
In this situaiton, m_File.FindAtom() indeed does not return nullptr,
|
||||
but NULL (on error, that is).
|
||||
|
||||
Switch back to comparing against NULL.
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/14937c96a82fb3d10e5d83bd7b2905b846fb09f9
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: not sent yet]
|
||||
---
|
||||
src/mp4track.cpp | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/mp4track.cpp b/src/mp4track.cpp
|
||||
index 4b8fc9d..42489eb 100644
|
||||
--- a/src/mp4track.cpp
|
||||
+++ b/src/mp4track.cpp
|
||||
@@ -908,16 +908,16 @@ File* MP4Track::GetSampleFile( MP4SampleId sampleId )
|
||||
MP4FtypAtom *pFtypAtom = reinterpret_cast<MP4FtypAtom *>( m_File.FindAtom( "ftyp" ) );
|
||||
|
||||
// MOV spec does not require "ftyp" atom...
|
||||
- if ( pFtypAtom == nullptr )
|
||||
+ if ( pFtypAtom == NULL )
|
||||
{
|
||||
- return nullptr;
|
||||
+ return NULL;
|
||||
}
|
||||
else
|
||||
{
|
||||
// ... but most often it is present with a "qt " value
|
||||
const char *majorBrand = pFtypAtom->majorBrand.GetValue();
|
||||
if ( ::strcmp( pFtypAtom->majorBrand.GetValue(), "qt " ) == 0 )
|
||||
- return nullptr;
|
||||
+ return NULL;
|
||||
}
|
||||
throw new Exception( "invalid stsd entry", __FILE__, __LINE__, __FUNCTION__ );
|
||||
}
|
||||
--
|
||||
2.26.2
|
||||
|
||||
@@ -0,0 +1,99 @@
|
||||
From a5ca35b044bbf13c0b16f0066bf24646604bb218 Mon Sep 17 00:00:00 2001
|
||||
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
|
||||
Date: Thu, 6 Aug 2020 15:22:04 +0200
|
||||
Subject: [PATCH] Static cast to unsigned int for cases
|
||||
|
||||
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
||||
[Retrieved from:
|
||||
https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/libmp4v2/files/libmp4v2-2.0.0-unsigned-int-cast.patch]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
libutil/Utility.cpp | 2 +-
|
||||
util/mp4art.cpp | 2 +-
|
||||
util/mp4chaps.cpp | 2 +-
|
||||
util/mp4file.cpp | 2 +-
|
||||
util/mp4subtitle.cpp | 2 +-
|
||||
util/mp4track.cpp | 2 +-
|
||||
6 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/libutil/Utility.cpp b/libutil/Utility.cpp
|
||||
index 76cdd12..d6739d4 100644
|
||||
--- a/libutil/Utility.cpp
|
||||
+++ b/libutil/Utility.cpp
|
||||
@@ -493,7 +493,7 @@ Utility::process_impl()
|
||||
if( codes.find( code ) == codes.end() )
|
||||
continue;
|
||||
|
||||
- switch( code ) {
|
||||
+ switch( static_cast<unsigned int>( code ) ) {
|
||||
case 'z':
|
||||
_optimize = true;
|
||||
break;
|
||||
diff --git a/util/mp4art.cpp b/util/mp4art.cpp
|
||||
index add935e..6e7f531 100644
|
||||
--- a/util/mp4art.cpp
|
||||
+++ b/util/mp4art.cpp
|
||||
@@ -376,7 +376,7 @@ ArtUtility::utility_option( int code, bool& handled )
|
||||
{
|
||||
handled = true;
|
||||
|
||||
- switch( code ) {
|
||||
+ switch( static_cast<unsigned int> ( code ) ) {
|
||||
case LC_ART_ANY:
|
||||
_artFilter = numeric_limits<uint32_t>::max();
|
||||
break;
|
||||
diff --git a/util/mp4chaps.cpp b/util/mp4chaps.cpp
|
||||
index 98400f8..ccc8b70 100644
|
||||
--- a/util/mp4chaps.cpp
|
||||
+++ b/util/mp4chaps.cpp
|
||||
@@ -632,7 +632,7 @@ ChapterUtility::utility_option( int code, bool& handled )
|
||||
{
|
||||
handled = true;
|
||||
|
||||
- switch( code ) {
|
||||
+ switch( static_cast<unsigned int> ( code ) ) {
|
||||
case 'A':
|
||||
case LC_CHPT_ANY:
|
||||
_ChapterType = MP4ChapterTypeAny;
|
||||
diff --git a/util/mp4file.cpp b/util/mp4file.cpp
|
||||
index c27844b..b127cd1 100644
|
||||
--- a/util/mp4file.cpp
|
||||
+++ b/util/mp4file.cpp
|
||||
@@ -189,7 +189,7 @@ FileUtility::utility_option( int code, bool& handled )
|
||||
{
|
||||
handled = true;
|
||||
|
||||
- switch( code ) {
|
||||
+ switch( static_cast<unsigned int>( code ) ) {
|
||||
case LC_LIST:
|
||||
_action = &FileUtility::actionList;
|
||||
break;
|
||||
diff --git a/util/mp4subtitle.cpp b/util/mp4subtitle.cpp
|
||||
index 7462153..19d977d 100644
|
||||
--- a/util/mp4subtitle.cpp
|
||||
+++ b/util/mp4subtitle.cpp
|
||||
@@ -164,7 +164,7 @@ SubtitleUtility::utility_option( int code, bool& handled )
|
||||
{
|
||||
handled = true;
|
||||
|
||||
- switch( code ) {
|
||||
+ switch( static_cast<unsigned int>( code ) ) {
|
||||
case LC_LIST:
|
||||
_action = &SubtitleUtility::actionList;
|
||||
break;
|
||||
diff --git a/util/mp4track.cpp b/util/mp4track.cpp
|
||||
index d550506..cd63d7e 100644
|
||||
--- a/util/mp4track.cpp
|
||||
+++ b/util/mp4track.cpp
|
||||
@@ -788,7 +788,7 @@ TrackUtility::utility_option( int code, bool& handled )
|
||||
{
|
||||
handled = true;
|
||||
|
||||
- switch( code ) {
|
||||
+ switch( static_cast<unsigned int>( code ) ) {
|
||||
case LC_TRACK_WILDCARD:
|
||||
_trackMode = TM_WILDCARD;
|
||||
break;
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
config BR2_PACKAGE_MP4V2
|
||||
bool "mp4v2"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
help
|
||||
The MP4v2 library provides functions to read, create, and
|
||||
modify mp4 files.
|
||||
|
||||
https://github.com/TechSmith/mp4v2/
|
||||
|
||||
if BR2_PACKAGE_MP4V2
|
||||
|
||||
config BR2_PACKAGE_MP4V2_UTIL
|
||||
bool "Install mp4 command line tools"
|
||||
help
|
||||
Enable to install the mp4 command line tools mp4art,
|
||||
mp4chaps, mp4extract, mp4info, mp4subtitle, mp4tags, and
|
||||
mp4trackdump.
|
||||
|
||||
endif
|
||||
|
||||
comment "mp4v2 needs a toolchain w/ C++"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP
|
||||
@@ -0,0 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 e3ad6c2dc451b0875dbe34bfe7f51f4fe278b391434c886083e6d3ecd5fa08c2 mp4v2-4.1.3.tar.gz
|
||||
sha256 15e38684c940176e2fc76331a2299d2ab5115ac997078f768ef31b896af69fc5 COPYING
|
||||
@@ -0,0 +1,25 @@
|
||||
################################################################################
|
||||
#
|
||||
# mp4v2
|
||||
#
|
||||
################################################################################
|
||||
|
||||
MP4V2_VERSION = 4.1.3
|
||||
MP4V2_SITE = \
|
||||
$(call github,TechSmith,mp4v2,Release-ThirdParty-MP4v2-$(MP4V2_VERSION))
|
||||
MP4V2_INSTALL_STAGING = YES
|
||||
MP4V2_LICENSE = MPL-1.1
|
||||
MP4V2_LICENSE_FILES = COPYING
|
||||
|
||||
# help2man expects to be able to run utilities on the build machine to
|
||||
# grab --help output which doesn't work when cross compiling, so
|
||||
# disable it
|
||||
MP4V2_CONF_ENV = ac_cv_prog_FOUND_HELP2MAN=no
|
||||
|
||||
ifeq ($(BR2_PACKAGE_MP4V2_UTIL),y)
|
||||
MP4V2_CONF_OPTS += --enable-util
|
||||
else
|
||||
MP4V2_CONF_OPTS += --disable-util
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user