d-two/operating-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add update script (#780)

Browse Source
This commit is contained in:
Pascal Vizeli
2020-07-21 18:06:07 +02:00
parent b9ba103e07
commit eca61d10a7
114 changed files with 1496 additions and 869 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
buildroot/package/mp4v2/0001-Fix-GCC7-build.patch
View File

@@ -10,6 +10,7 @@ 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(-)

50
buildroot/package/mp4v2/0002-src-mp4track.cpp-replace-nullptr-by-NULL.patch Normal file
View File

@@ -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

2
buildroot/package/mp4v2/Config.in
View File

@@ -5,7 +5,7 @@ config BR2_PACKAGE_MP4V2
The MP4v2 library provides functions to read, create, and
modify mp4 files.
https://code.google.com/archive/p/mp4v2/
https://github.com/TechSmith/mp4v2/
if BR2_PACKAGE_MP4V2

3
buildroot/package/mp4v2/mp4v2.hash
View File

@@ -1,4 +1,3 @@
# From https://code.google.com/p/mp4v2/downloads/detail?name=mp4v2-2.0.0.tar.bz2
sha1 193260cfb7201e6ec250137bcca1468d4d20e2f0 mp4v2-2.0.0.tar.bz2
# Locally computed
sha256 e3ad6c2dc451b0875dbe34bfe7f51f4fe278b391434c886083e6d3ecd5fa08c2 mp4v2-4.1.3.tar.gz
sha256 15e38684c940176e2fc76331a2299d2ab5115ac997078f768ef31b896af69fc5 COPYING

6
buildroot/package/mp4v2/mp4v2.mk
View File

@@ -4,9 +4,9 @@
#
################################################################################
MP4V2_VERSION = 2.0.0
MP4V2_SOURCE = mp4v2-$(MP4V2_VERSION).tar.bz2
MP4V2_SITE = https://mp4v2.googlecode.com/files
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