diff options
| author | Anton-Latukha <anton.latukha@gmail.com> | 2018-05-10 11:25:40 +0300 |
|---|---|---|
| committer | Anton-Latukha <anton.latukha@gmail.com> | 2018-05-10 11:29:51 +0300 |
| commit | fd3466d8d89494ba3406829a78394762be2511a9 (patch) | |
| tree | 7382d950efe5ebed121bc5950609a686ff9c644e /pkgs/development/libraries/mp4v2 | |
| parent | e619a49e2e66f061922d9377af1abd899e1c7b23 (diff) | |
mp4v2: rm old HandBrake patch
Patch no longer used by HandBrake upstream
Diffstat (limited to 'pkgs/development/libraries/mp4v2')
| -rw-r--r-- | pkgs/development/libraries/mp4v2/A02-meaningful-4gb-warning.patch | 14 | ||||
| -rw-r--r-- | pkgs/development/libraries/mp4v2/default.nix | 4 |
2 files changed, 0 insertions, 18 deletions
diff --git a/pkgs/development/libraries/mp4v2/A02-meaningful-4gb-warning.patch b/pkgs/development/libraries/mp4v2/A02-meaningful-4gb-warning.patch deleted file mode 100644 index 987298bd5b002..0000000000000 --- a/pkgs/development/libraries/mp4v2/A02-meaningful-4gb-warning.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur mp4v2-trunk-r355/src/mp4atom.cpp mp4v2-trunk-r355/src/mp4atom.cpp ---- mp4v2-trunk-r355/src/mp4atom.cpp 2012-02-21 19:40:03.000000000 +0100 -+++ mp4v2-trunk-r355/src/mp4atom.cpp 2012-02-21 19:36:38.000000000 +0100 -@@ -543,6 +543,10 @@ - m_pFile->SetPosition(m_start + 8); - m_pFile->WriteUInt64(m_size); - } else { -+ if (!(m_size <= (uint64_t)0xFFFFFFFF)) { -+ // Let the user know what the following assert is all about -+ fprintf(stderr, "MP4ERROR: File size exceeded 4 GB; output unplayable. Enable \"Large file size\" to fix it.\n"); -+ } - ASSERT(m_size <= (uint64_t)0xFFFFFFFF); - m_pFile->SetPosition(m_start); - m_pFile->WriteUInt32(m_size); diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix index a5542ebb659ab..e55d9989bffcf 100644 --- a/pkgs/development/libraries/mp4v2/default.nix +++ b/pkgs/development/libraries/mp4v2/default.nix @@ -9,10 +9,6 @@ stdenv.mkDerivation rec { }; patches = [ - # From Handbrake - # mp4v2 doesn't seem to be actively maintained any more :-/ - ./A02-meaningful-4gb-warning.patch - (fetchurl { name = "gcc-7.patch"; url = "https://src.fedoraproject.org/cgit/rpms/libmp4v2.git/plain/" |