Update faac and a52 patching in live ebuild; fixes bug #503122, reported by sven.a.jonsson.

(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

3 files changed, 91 insertions, 180 deletions

diff --git a/media-video/handbrake/ChangeLog b/media-video/handbrake/ChangeLog
index f4de76f0b306..6af0e1c3e2bd 100644
--- a/media-video/handbrake/ChangeLog
+++ b/media-video/handbrake/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/handbrake
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.18 2014/02/06 21:35:41 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.19 2014/03/19 15:19:44 tomwij Exp $
+
+  19 Mar 2014; Tom Wijsman <TomWij@gentoo.org>
+  files/handbrake-9999-remove-faac-dependency.patch, handbrake-9999.ebuild:
+  Update faac and a52 patching in live ebuild; fixes bug #503122, reported by
+  sven.a.jonsson.
 
   06 Feb 2014; Ian Whyman <thev00d00@gentoo.org> handbrake-0.9.9.ebuild,
   handbrake-9999.ebuild:
diff --git a/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch b/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch
index 05c8e7962d4a..7e8ab99730a8 100644
--- a/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch
+++ b/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch
@@ -1,172 +1,84 @@
---- a/gtk/src/audiohandler.c	
-+++ b/gtk/src/audiohandler.c	
-@@ -71,10 +71,7 @@
-         if (enc->codec == fallback &&
-             !(enc->muxers & mux))
-         {
--            if ( mux & HB_MUX_MASK_MKV )
--                fallback = HB_ACODEC_LAME;
--            else
--                fallback = HB_ACODEC_FAAC;
-+            fallback = HB_ACODEC_LAME;
-             break;
-         }
-     }
-@@ -132,7 +129,7 @@
-             return HB_ACODEC_LAME;
- 
-         case HB_ACODEC_AAC_PASS:
--            return HB_ACODEC_FAAC;
-+            return HB_ACODEC_FFAAC;
- 
-         case HB_ACODEC_AC3_PASS:
-             return HB_ACODEC_AC3;
---- a/gtk/src/hb-backend.c	
-+++ b/gtk/src/hb-backend.c	
-@@ -3843,7 +3843,7 @@
- gint
- ghb_get_default_acodec()
+--- a/libhb/common.c
++++ b/libhb/common.c
+@@ -243,7 +243,6 @@
  {
--    return HB_ACODEC_FAAC;
-+    return HB_ACODEC_LAME;
- }
- 
- static void
-@@ -4581,13 +4581,9 @@
-             {
-                 codec = HB_ACODEC_AC3;
-             }
--            else if (mux & HB_MUX_MASK_MKV)
--            {
--                codec = HB_ACODEC_LAME;
--            }
-             else
-             {
--                codec = HB_ACODEC_FAAC;
-+                codec = HB_ACODEC_LAME;
-             }
-             value = ghb_lookup_audio_encoder_value(codec);
-             ghb_settings_take_value(asettings, "AudioEncoder", value);
-@@ -4601,7 +4597,7 @@
-             if (codec == HB_ACODEC_VORBIS)
-             {
-                 a_unsup = "Vorbis";
--                codec = HB_ACODEC_FAAC;
-+                codec = HB_ACODEC_LAME;
-             }
-         }
-         if (a_unsup)
---- a/gtk/src/preset_xlat.c	
-+++ b/gtk/src/preset_xlat.c	
-@@ -260,7 +260,6 @@
- 
- static value_map_t acodec_xlat[] =
- {
--    {"AAC (faac)", "faac"},
-     {"AC3 Passthru", "ac3"},
-     {"MP3 (lame)", "lame"},
-     {"Vorbis (vorbis)", "vorbis"},
---- a/libhb/common.c	
-+++ b/libhb/common.c	
-@@ -227,7 +227,6 @@
-     // actual encoders
-     { { "AAC (CoreAudio)",    "ca_aac",     HB_ACODEC_CA_AAC,       HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_AAC,        },
-     { { "HE-AAC (CoreAudio)", "ca_haac",    HB_ACODEC_CA_HAAC,      HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_AAC_HE,     },
--    { { "AAC (faac)",         "faac",       HB_ACODEC_FAAC,         HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_AAC,        },
-     { { "AAC (avcodec)",      "av_aac",     HB_ACODEC_FFAAC,        HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_AAC,        },
-     { { "AAC (FDK)",          "fdk_aac",    HB_ACODEC_FDK_AAC,      HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_AAC,        },
-     { { "HE-AAC (FDK)",       "fdk_haac",   HB_ACODEC_FDK_HAAC,     HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_AAC_HE,     },
---- a/libhb/common.h	
-+++ b/libhb/common.h	
-@@ -1005,7 +1005,6 @@
- extern hb_work_object_t hb_decavcodeca;
- extern hb_work_object_t hb_decavcodecv;
- extern hb_work_object_t hb_declpcm;
--extern hb_work_object_t hb_encfaac;
- extern hb_work_object_t hb_enclame;
- extern hb_work_object_t hb_encvorbis;
- extern hb_work_object_t hb_muxer;
---- a/libhb/encfaac.c	
-+++ b/libhb/encfaac.c	
-@@ -1,3 +1,4 @@
-+#if 0
- /* encfaac.c
- 
-    Copyright (c) 2003-2013 HandBrake Team
-@@ -289,3 +290,4 @@
-     return HB_WORK_OK;
- }
- #endif // USE_FAAC
-+#endif /* 0 */
-\ No newline at end of file
---- a/libhb/hb.c	
-+++ b/libhb/hb.c	
-@@ -1656,9 +1656,6 @@
-     hb_register(&hb_encca_aac);
-     hb_register(&hb_encca_haac);
- #endif
--#ifdef USE_FAAC
--    hb_register(&hb_encfaac);
--#endif
-     hb_register(&hb_enclame);
-     hb_register(&hb_enctheora);
-     hb_register(&hb_encvorbis);
---- a/libhb/internal.h	
-+++ b/libhb/internal.h	
-@@ -410,7 +410,6 @@
-     WORK_DECAVCODEC,
-     WORK_DECAVCODECV,
-     WORK_DECLPCM,
--    WORK_ENCFAAC,
-     WORK_ENCLAME,
-     WORK_ENCVORBIS,
-     WORK_ENC_CA_AAC,
---- a/libhb/module.defs	
-+++ b/libhb/module.defs	
-@@ -1,4 +1,4 @@
--__deps__ := A52DEC BZIP2 FAAC FFMPEG FONTCONFIG FREETYPE LAME LIBASS LIBDCA \
-+__deps__ := A52DEC BZIP2 FFMPEG FONTCONFIG FREETYPE LAME LIBASS LIBDCA \
-     LIBDVDREAD LIBDVDNAV LIBICONV LIBMKV LIBOGG LIBSAMPLERATE LIBTHEORA LIBVORBIS LIBXML2 \
-     MP4V2 MPEG2DEC PTHREADW32 X264 ZLIB LIBBLURAY FDKAAC
- 
-@@ -43,9 +43,6 @@
- ifeq (1,$(FEATURE.libav_aac))
- LIBHB.GCC.D += USE_LIBAV_AAC
- endif
--ifeq (1,$(FEATURE.faac))
--LIBHB.GCC.D += USE_FAAC
--endif
- ifeq (1,$(FEATURE.mp4v2))
- LIBHB.GCC.D += USE_MP4V2
- endif
-@@ -119,10 +116,6 @@
- LIBHB.dll.libs += $(CONTRIB.build/)lib/libfdk-aac.a
- endif
- 
--ifeq (1,$(FEATURE.faac))
--LIBHB.dll.libs += $(CONTRIB.build/)lib/libfaac.a
--endif
--
- ifeq (1,$(FEATURE.qsv))
- LIBHB.dll.libs += $(CONTRIB.build/)lib/libmfx.a
- endif
---- a/libhb/muxmkv.c	
-+++ b/libhb/muxmkv.c	
-@@ -263,7 +263,6 @@
-                 }
-                 track->codecID = MK_ACODEC_FLAC;
-                 break;
--            case HB_ACODEC_FAAC:
-             case HB_ACODEC_FFAAC:
-             case HB_ACODEC_CA_AAC:
-             case HB_ACODEC_CA_HAAC:
---- a/libhb/work.c	
-+++ b/libhb/work.c	
-@@ -135,7 +135,6 @@
-     switch (codec)
-     {
-         case HB_ACODEC_AC3:     return hb_get_work(WORK_ENCAVCODEC_AUDIO);
--        case HB_ACODEC_FAAC:    return hb_get_work(WORK_ENCFAAC);
-         case HB_ACODEC_LAME:    return hb_get_work(WORK_ENCLAME);
-         case HB_ACODEC_VORBIS:  return hb_get_work(WORK_ENCVORBIS);
-         case HB_ACODEC_CA_AAC:  return hb_get_work(WORK_ENC_CA_AAC);
+     // 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"
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index b446de979fa7..6726b1629ad3 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild,v 1.15 2014/02/06 21:35:41 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild,v 1.16 2014/03/19 15:19:44 tomwij Exp $
 
 EAPI="5"
 
@@ -98,17 +98,12 @@ src_prepare() {
 	# It may work this way; if not, we should try to mimic the duplication.
 	epatch "${FILESDIR}"/${PN}-9999-remove-dvdnav-dup.patch
 
-	# Remove faac dependency until its compilation errors can be resolved.
-	# TODO: If --disable-faac works then this patch can be removed;
-	#       we also need to figure out if this is still needed, maybe things are patched.
+	# Remove faac dependency; TODO: figure out if we need to do this at all.
 	epatch "${FILESDIR}"/${PN}-9999-remove-faac-dependency.patch
 
 	# Make use of an older version of libmkv.
 	epatch "${FILESDIR}"/${PN}-9999-use-older-libmkv.patch
 
-	# Make use of an unpatched version of a52 that does not make a private field public.
-	epatch "${FILESDIR}"/${PN}-9999-use-unpatched-a52.patch
-
 	# Fixup configure.ac with newer automake.
 	# TODO: Would like to see this shorten towards the future;
 	#       see which are still needed, put those in a patch instead of 6 lines here.
@@ -137,7 +132,6 @@ src_configure() {
 		--force \
 		--prefix="${EPREFIX}/usr" \
 		--disable-gtk-update-checks \
-		--disable-faac \
 		--enable-avformat \
 		--disable-libav-aac \
 		--enable-libmkv \