reinit the tree, so we can have metadata

4 files changed, 193 insertions, 0 deletions

diff --git a/media-video/handbrake/files/handbrake-0.10.3-nolibav.patch b/media-video/handbrake/files/handbrake-0.10.3-nolibav.patch
new file mode 100644
index 000000000000..8539186aaa56
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-0.10.3-nolibav.patch
@@ -0,0 +1,76 @@
+From 75549414927212d4d1666730133805b33447de79 Mon Sep 17 00:00:00 2001
+From: John Stebbins <jstebbins.hb@gmail.com>
+Date: Tue, 3 Nov 2015 10:16:01 -0800
+Subject: [PATCH] muxavformat: add support for mp4 fallback audio signalling
+
+---
+diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c
+index 0d70597..373c2ab 100644
+--- a/libhb/muxavformat.c
++++ b/libhb/muxavformat.c
+@@ -121,7 +121,7 @@ static int avformatInit( hb_mux_object_t * m )
+     hb_mux_data_t * track;
+     int meta_mux;
+     int max_tracks;
+-    int ii, ret;
++    int ii, jj, ret;
+ 
+     int clock_min, clock_max, clock;
+     hb_video_framerate_get_limits(&clock_min, &clock_max, &clock);
+@@ -589,6 +589,56 @@ static int avformatInit( hb_mux_object_t * m )
+         }
+     }
+ 
++    // Check for audio track associations
++    for (ii = 0; ii < hb_list_count(job->list_audio); ii++)
++    {
++        audio = hb_list_item(job->list_audio, ii);
++        switch (audio->config.out.codec & HB_ACODEC_MASK)
++        {
++            case HB_ACODEC_FFAAC:
++            case HB_ACODEC_CA_AAC:
++            case HB_ACODEC_CA_HAAC:
++            case HB_ACODEC_FDK_AAC:
++            case HB_ACODEC_FDK_HAAC:
++                break;
++
++            default:
++            {
++                // Mark associated fallback audio tracks for any non-aac track
++                for(jj = 0; jj < hb_list_count( job->list_audio ); jj++ )
++                {
++                    hb_audio_t    * fallback;
++                    int             codec;
++
++                    if (ii == jj) continue;
++
++                    fallback = hb_list_item( job->list_audio, jj );
++                    codec = fallback->config.out.codec & HB_ACODEC_MASK;
++                    if (fallback->config.in.track == audio->config.in.track &&
++                        (codec == HB_ACODEC_FFAAC ||
++                         codec == HB_ACODEC_CA_AAC ||
++                         codec == HB_ACODEC_CA_HAAC ||
++                         codec == HB_ACODEC_FDK_AAC ||
++                         codec == HB_ACODEC_FDK_HAAC))
++                    {
++                        hb_mux_data_t * fallback_track;
++                        int           * sd;
++
++                        track = audio->priv.mux_data;
++                        fallback_track = fallback->priv.mux_data;
++                        sd = (int*)av_stream_new_side_data(track->st,
++                                                     AV_PKT_DATA_FALLBACK_TRACK,
++                                                     sizeof(int));
++                        if (sd != NULL)
++                        {
++                            *sd = fallback_track->st->index;
++                        }
++                    }
++                }
++            } break;
++        }
++    }
++
+     char * subidx_fmt =
+         "size: %dx%d\n"
+         "org: %d, %d\n"
diff --git a/media-video/handbrake/files/handbrake-9999-fix-missing-x265-link-flag.patch b/media-video/handbrake/files/handbrake-9999-fix-missing-x265-link-flag.patch
new file mode 100644
index 000000000000..a963fe0af216
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-9999-fix-missing-x265-link-flag.patch
@@ -0,0 +1,13 @@
+Written by: Peter Foley <pefoley2@pefoley.com>
+Gentoo Bug: #552792
+
+--- a/test/module.defs
++++ b/test/module.defs
+@@ -25,6 +25,7 @@
+ 
+ ifeq (1,$(FEATURE.x265))
+     TEST.GCC.D += USE_X265
++    TEST.GCC.l += x265
+ endif
+ 
+ TEST.GCC.l += $(foreach m,$(MODULES.NAMES),$($m.OSL.libs))
diff --git a/media-video/handbrake/files/handbrake-9999-remove-dvdnav-dup.patch b/media-video/handbrake/files/handbrake-9999-remove-dvdnav-dup.patch
new file mode 100644
index 000000000000..7dc1f69328ea
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-9999-remove-dvdnav-dup.patch
@@ -0,0 +1,20 @@
+--- a/libhb/dvdnav.c
++++ b/libhb/dvdnav.c
+@@ -1225,16 +1225,7 @@
+                 {
+                     for (kk = 0; kk < buttons; kk++)
+                     {
+-                        dvdnav_t *dvdnav_copy;
+-
+-                        result = dvdnav_dup( &dvdnav_copy, d->dvdnav );
+-                        if (result != DVDNAV_STATUS_OK)
+-                        {
+-                            hb_log("dvdnav dup failed: %s", dvdnav_err_to_string(d->dvdnav));
+-                            goto done;
+-                        }
+-                        title = try_button( dvdnav_copy, kk, list_title );
+-                        dvdnav_free_dup( dvdnav_copy );
++                        title = try_button( d->dvdnav, kk, list_title );
+ 
+                         if ( title >= 0 )
+                         {
diff --git a/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch b/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch
new file mode 100644
index 000000000000..7e8ab99730a8
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch
@@ -0,0 +1,84 @@
+--- a/libhb/common.c
++++ b/libhb/common.c
+@@ -243,7 +243,6 @@
+ {
+     // legacy encoders, back to HB 0.9.4 whenever possible (disabled)
+     { { "",                   "dts",        NULL,                          HB_ACODEC_DCA_PASS,    HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_DTS_PASS,   },
+-    { { "AAC (faac)",         "faac",       NULL,                          0,                     HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC,        },
+     { { "AAC (ffmpeg)",       "ffaac",      NULL,                          HB_ACODEC_FFAAC,       HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC,        },
+     { { "AC3 (ffmpeg)",       "ffac3",      NULL,                          HB_ACODEC_AC3,         HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AC3,        },
+     { { "MP3 (lame)",         "lame",       NULL,                          HB_ACODEC_LAME,        HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_MP3,        },
+--- a/scripts/manicure.rb
++++ b/scripts/manicure.rb
+@@ -349,7 +349,7 @@
+           audioEncoders << "copy:dtshd"
+         when /AAC Pass/
+           audioEncoders << "copy:aac"
+-        when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++        when "AAC (ffmpeg)", "AAC (avcodec)"
+           audioEncoders << "av_aac"
+         when "AAC (FDK)"
+           audioEncoders << "fdk_aac"
+@@ -466,7 +466,7 @@
+     case hash["AudioEncoderFallback"]
+       when /AC3/
+         audioEncoderFallback << "ac3"
+-      when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++      when "AAC (ffmpeg)", "AAC (avcodec)"
+         audioEncoderFallback << "av_aac"
+       when "AAC (FDK)"
+         audioEncoderFallback << "fdk_aac"
+@@ -753,7 +753,7 @@
+           audioEncoders << "copy:dtshd"
+         when /AAC Pass/
+           audioEncoders << "copy:aac"
+-        when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++        when "AAC (ffmpeg)", "AAC (avcodec)"
+           audioEncoders << "av_aac"
+         when "AAC (FDK)"
+           audioEncoders << "fdk_aac"
+@@ -870,7 +870,7 @@
+     case hash["AudioEncoderFallback"]
+       when /AC3/
+         audioEncoderFallback << "ac3"
+-      when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++      when "AAC (ffmpeg)", "AAC (avcodec)"
+         audioEncoderFallback << "av_aac"
+       when "AAC (FDK)"
+         audioEncoderFallback << "fdk_aac"
+@@ -1163,7 +1163,7 @@
+           audioEncoders << "copy:dtshd"
+         when /AAC Pass/
+           audioEncoders << "copy:aac"
+-        when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++        when "AAC (ffmpeg)", "AAC (avcodec)"
+           audioEncoders << "av_aac"
+         when "AAC (FDK)"
+           audioEncoders << "fdk_aac"
+@@ -1298,7 +1298,7 @@
+     case hash["AudioEncoderFallback"]
+       when /AC3/
+         audioEncoderFallback << "ac3"
+-      when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++      when "AAC (ffmpeg)", "AAC (avcodec)"
+         audioEncoderFallback << "av_aac"
+       when "AAC (FDK)"
+         audioEncoderFallback << "fdk_aac"
+@@ -1615,7 +1615,7 @@
+           audioEncoders << "copy:dtshd"
+         when /AAC Pass/
+           audioEncoders << "copy:aac"
+-        when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++        when "AAC (ffmpeg)", "AAC (avcodec)"
+           audioEncoders << "av_aac"
+         when "AAC (FDK)"
+           audioEncoders << "fdk_aac"
+@@ -1732,7 +1732,7 @@
+     case hash["AudioEncoderFallback"]
+       when /AC3/
+         audioEncoderFallback << "ac3"
+-      when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++      when "AAC (ffmpeg)", "AAC (avcodec)"
+         audioEncoderFallback << "av_aac"
+       when "AAC (FDK)"
+         audioEncoderFallback << "fdk_aac"