libmkv: rm old HandBrake patches

Patches no longer used in HandBrake upstream
This commit is contained in:
Anton-Latukha 2018-05-10 11:23:26 +03:00
parent 3d879e0fcf
commit e619a49e2e
4 changed files with 4 additions and 75 deletions

View file

@ -1,12 +0,0 @@
diff --git a/include/libmkv.h b/include/libmkv.h
index 146a91f..f03d608 100644
--- a/include/libmkv.h
+++ b/include/libmkv.h
@@ -94,6 +94,7 @@ extern "C" {
#define MK_SUBTITLE_USF "S_TEXT/USF"
#define MK_SUBTITLE_VOBSUB "S_VOBSUB"
#define MK_SUBTITLE_BMP "S_IMAGE/BMP"
+#define MK_SUBTITLE_PGS "S_HDMV/PGS"
/* Official Tags */
#define MK_TAG_TITLE "TITLE"

View file

@ -1,28 +0,0 @@
diff --git a/include/libmkv.h b/include/libmkv.h
index 146a91f..f03d608 100644
--- a/include/libmkv.h
+++ b/include/libmkv.h
@@ -203,6 +204,7 @@ struct mk_TrackConfig_s {
} video;
struct {
float samplingFreq; /* Sampling Frequency in Hz */
+ float outputSamplingFreq; /* Playback Sampling Frequency in Hz (e.g. for AAC w/SBR) */
unsigned channels; /* Number of channels for this track */
unsigned bitDepth; /* Bits per sample (PCM) */
} audio;
diff --git a/src/tracks.c b/src/tracks.c
index f9c7e48..a2a60ca 100644
--- a/src/tracks.c
+++ b/src/tracks.c
@@ -174,6 +174,11 @@ mk_Track *mk_createTrack(mk_Writer *w, mk_TrackConfig *tc)
/* SamplingFrequency */
if (mk_writeFloat(v, MATROSKA_ID_AUDIOSAMPLINGFREQ, tc->extra.audio.samplingFreq) < 0)
return NULL;
+ if (tc->extra.audio.outputSamplingFreq) {
+ /* Output SamplingFrequency */
+ if (mk_writeFloat(v, MATROSKA_ID_AUDIOOUTSAMPLINGFREQ, tc->extra.audio.outputSamplingFreq) < 0)
+ return NULL;
+ }
/* Channels */
if (mk_writeUInt(v, MATROSKA_ID_AUDIOCHANNELS, tc->extra.audio.channels) < 0)
return NULL;

View file

@ -1,24 +0,0 @@
--- libmkv.orig/src/matroska.c 2009-01-12 23:14:26.000000000 -0800
+++ libmkv/src/matroska.c 2009-03-25 15:22:30.000000000 -0700
@@ -27,6 +27,11 @@
#include <sys/time.h>
+#if defined( __MINGW32__ )
+#undef fseeko
+#define fseeko fseeko64
+#endif
+
#define RESERVED_SEEKHEAD 0x100
/* 256 bytes should be enough room for our Seek entries. */
#define RESERVED_CHAPTERS 0x800
@@ -34,7 +39,7 @@
int mk_seekFile(mk_Writer *w, uint64_t pos)
{
- if (fseek(w->fp, pos, SEEK_SET))
+ if (fseeko(w->fp, pos, SEEK_SET))
return -1;
w->f_pos = pos;

View file

@ -1,26 +1,19 @@
{ stdenv, fetchgit, libtool, autoconf, automake }:
stdenv.mkDerivation rec {
name = "libmkv-0.6.5.1p2";
name = "libmkv-${version}";
version = "0.6.5.1";
src = fetchgit {
url = https://github.com/saintdev/libmkv.git;
rev = "refs/tags/0.6.5.1";
rev = "refs/tags/${version}";
sha256 = "0pr9q7yprndl8d15ir7i7cznvmf1yqpvnsyivv763n6wryssq6dl";
};
nativeBuildInputs = [ libtool autoconf automake ];
# TODO fix library version
preConfigure = "sh bootstrap.sh";
# From Handbrake
patches = [
./A01-hbmv-pgs.patch
./A02-audio-out-sampling-freq.patch
./P00-mingw-large-file.patch
];
meta = {
homepage = https://github.com/saintdev/libmkv;
license = stdenv.lib.licenses.gpl2;