[SCM] handbrake/master: drop patches that are no longer needed

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sat Feb 15 15:18:08 UTC 2014


The following commit has been merged in the master branch:
commit 9cdd4471ee102d84e74fb94088225bbd4f5c1dc7
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Feb 15 14:41:31 2014 +0000

    drop patches that are no longer needed

diff --git a/debian/patches/0004-Enable-compilation-on-Debian-arches-other-than-Linux.patch b/debian/patches/0004-Enable-compilation-on-Debian-arches-other-than-Linux.patch
deleted file mode 100644
index cdbaba3..0000000
--- a/debian/patches/0004-Enable-compilation-on-Debian-arches-other-than-Linux.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From: Christian Marillat <marillat at debian.org>
-Date: Tue, 15 May 2012 04:49:36 -0300
-Subject: Enable compilation on Debian arches other than Linux (kFreeBSD,
- HURD).
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-One of the main points here is that udev is present only on Linux (that is,
-it is the exception, not the norm). So, we check if LINUX is defined or not
-in the appropriate places, instead of listing every operating system that is
-not Windows or MacOS X.
-
-Applied-Upstream: https://github.com/HandBrake/HandBrake/commit/cd368d7e
-Forwarded: yes
-Last-Update: 2012-06-07
-
-Reviewed-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
-Reviewed-by: Pino Toscano <pino at debian.org>
-Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
----
- gtk/configure.ac       |    9 +++++++--
- gtk/src/callbacks.c    |   11 ++++++++---
- libhb/ports.h          |    2 +-
- make/include/main.defs |    5 +++++
- 4 files changed, 21 insertions(+), 6 deletions(-)
-
---- a/make/include/main.defs
-+++ b/make/include/main.defs
-@@ -92,6 +92,11 @@
-     MODULES += gtk
- endif
- 
-+ifeq (1-gnu,$(FEATURE.gtk)-$(BUILD.system))
-+    ## build gtk when gtk+gnu
-+    MODULES += gtk
-+endif
-+
- ifeq (1,$(FEATURE.local_yasm))
-     MODULES += contrib/yasm
- endif
---- a/libhb/module.defs
-+++ b/libhb/module.defs
-@@ -55,6 +55,8 @@
- 	LIBHB.GCC.args.extra.dylib++ += -Wl,--enable-auto-import -static
- else ifeq ($(BUILD.system),solaris)
-     LIBHB.GCC.D += SYS_SunOS _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64
-+else ifeq ($(BUILD.system),gnu)
-+    LIBHB.GCC.D += SYS_HURD _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64
- else
-     LIBHB.platform.D = SYS_UNKNOWN
- endif
---- a/libhb/ports.h
-+++ b/libhb/ports.h
-@@ -54,7 +54,7 @@
- #elif defined( SYS_DARWIN )
- #  define HB_LOW_PRIORITY    0
- #  define HB_NORMAL_PRIORITY 31
--#elif defined( SYS_LINUX ) || defined( SYS_FREEBSD ) || defined ( SYS_SunOS ) || defined ( __FreeBSD_kernel__ )
-+#elif defined( SYS_LINUX ) || defined( SYS_FREEBSD ) || defined ( SYS_SunOS ) || defined ( SYS_HURD ) || defined ( __FreeBSD_kernel__ )
- #  define HB_LOW_PRIORITY    0
- #  define HB_NORMAL_PRIORITY 0
- #elif defined( SYS_CYGWIN )
diff --git a/debian/patches/0005-libhb-Fix-compilation-with-mp4v2-v1.9.1.patch b/debian/patches/0005-libhb-Fix-compilation-with-mp4v2-v1.9.1.patch
deleted file mode 100644
index 9d96498..0000000
--- a/debian/patches/0005-libhb-Fix-compilation-with-mp4v2-v1.9.1.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito at ime.usp.br>
-Date: Sun, 22 Apr 2012 05:34:40 -0300
-Subject: libhb: Fix compilation with mp4v2 v1.9.1.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Forwarded: no
-Last-Update: 2012-05-15
-Reviewed-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
-Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
----
- libhb/decmetadata.c |    4 ++--
- libhb/muxmp4.c      |    8 ++++----
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
---- a/libhb/decmetadata.c
-+++ b/libhb/decmetadata.c
-@@ -19,7 +19,7 @@ static int decmp4metadata( hb_title_t *t
-     int result = 0;
-     hb_deep_log( 2, "Got an MP4 input, read the metadata");
- 
--    input_file = MP4Read( title->path, 0 );
-+    input_file = MP4Read(title->path);
- 
-     if( input_file != MP4_INVALID_FILE_HANDLE )
-     { 
-@@ -170,7 +170,7 @@ static int decmp4metadata( hb_title_t *t
-             }
-         }
- 
--        MP4Close( input_file );
-+        MP4Close(input_file, 0);
-     }
-     return result;
- }
---- a/libhb/muxmp4.c
-+++ b/libhb/muxmp4.c
-@@ -121,13 +121,13 @@ static int MP4Init( hb_mux_object_t * m
-     if (job->largeFileSize)
-     /* Use 64-bit MP4 file */
-     {
--        m->file = MP4Create(m->path, MP4_DETAILS_ERROR, MP4_CREATE_64BIT_DATA);
-+        m->file = MP4Create(m->path, MP4_CREATE_64BIT_DATA);
-         hb_deep_log( 2, "muxmp4: using 64-bit MP4 formatting.");
-     }
-     else
-     /* Limit MP4s to less than 4 GB */
-     {
--        m->file = MP4Create(m->path, MP4_DETAILS_ERROR, 0);
-+        m->file = MP4Create(m->path, 0);
-     }
- 
-     if (m->file == MP4_INVALID_FILE_HANDLE)
-@@ -1187,14 +1187,14 @@ static int MP4End( hb_mux_object_t * m )
-             MP4TagsFree( tags );
-         }
- 
--        MP4Close( m->file );
-+        MP4Close( m->file, 0 );
- 
-         if ( job->mp4_optimize )
-         {
-             hb_log( "muxmp4: optimizing file" );
-             char filename[1024]; memset( filename, 0, 1024 );
-             snprintf(filename, 1024, "%s.tmp", m->path);
--            MP4Optimize(m->path, filename, MP4_DETAILS_ERROR);
-+            MP4Optimize(m->path, filename);
-             remove(m->path);
-             rename(filename, m->path);
-         }
diff --git a/debian/patches/0010-Remove-FAAC-dependency.patch b/debian/patches/0010-Remove-FAAC-dependency.patch
deleted file mode 100644
index a105f7d..0000000
--- a/debian/patches/0010-Remove-FAAC-dependency.patch
+++ /dev/null
@@ -1,236 +0,0 @@
-From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito at ime.usp.br>
-Date: Wed, 6 Jun 2012 06:10:20 -0300
-Subject: Remove FAAC dependency.
-
-We actually kill FAAC completely from here, while we should be ifdef'ing
-things (perhaps) and integrating that in upstream's configure system.
-
-With this, we depend on one fewer package of dubious license for handbrake
-to enter Debian.
----
- gtk/src/audiohandler.c |    5 +-
- gtk/src/ghb.ui         |    8 --
- gtk/src/hb-backend.c   |    6 +-
- gtk/src/preset_xlat.c  |    2 +-
- gtk/src/presets.c      |    6 +-
- libhb/common.c         |   20 +--
- libhb/common.h         |    1 -
- libhb/encfaac.c        |  318 ------------------------------------------------
- libhb/hb.c             |    2 -
- libhb/internal.h       |    1 -
- libhb/module.defs      |    4 +-
- libhb/muxmkv.c         |    1 -
- libhb/work.c           |    1 -
- 13 files changed, 13 insertions(+), 362 deletions(-)
- delete mode 100644 libhb/encfaac.c
-
---- a/gtk/src/audiohandler.c
-+++ b/gtk/src/audiohandler.c
-@@ -70,10 +70,7 @@
-         if (hb_audio_encoders[ii].encoder == fallback &&
-             !(hb_audio_encoders[ii].muxers & mux))
-         {
--            if ( mux == HB_MUX_MKV )
-                 fallback = HB_ACODEC_LAME;
--            else
--                fallback = HB_ACODEC_FAAC;
-             break;
-         }
-     }
-@@ -130,7 +127,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
-@@ -3767,7 +3767,7 @@
- gint
- ghb_get_default_acodec()
- {
--    return HB_ACODEC_FAAC;
-+    return HB_ACODEC_LAME;
- }
- 
- static void
-@@ -4505,13 +4505,9 @@
-             {
-                 codec = HB_ACODEC_AC3;
-             }
--            else if (mux == HB_MUX_MKV)
--            {
--                codec = HB_ACODEC_LAME;
--            }
-             else
-             {
--                codec = HB_ACODEC_FAAC;
-+                codec = HB_ACODEC_LAME;
-             }
-             value = ghb_lookup_acodec_value(codec);
-             ghb_settings_take_value(asettings, "AudioEncoder", value);
-@@ -4525,7 +4521,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/gtk/src/presets.c
-+++ b/gtk/src/presets.c
-@@ -2029,8 +2029,6 @@
- 
- static value_map_t acodec_xlat_compat[] =
- {
--    {"AAC (CoreAudio)", "faac"},
--    {"HE-AAC (CoreAudio)", "faac"},
-     {"AC3 (ffmpeg)", "ac3"},
-     {"AC3", "ac3"},
-     {"MP3 Passthru", "mp3pass"},
---- a/libhb/common.c
-+++ b/libhb/common.c
-@@ -126,7 +126,7 @@
-     { "AAC (CoreAudio)",    "ca_aac",     HB_ACODEC_CA_AAC,       HB_MUX_MP4|HB_MUX_MKV },
-     { "HE-AAC (CoreAudio)", "ca_haac",    HB_ACODEC_CA_HAAC,      HB_MUX_MP4|HB_MUX_MKV },
- #endif
--    { "AAC (faac)",         "faac",       HB_ACODEC_FAAC,         HB_MUX_MP4|HB_MUX_MKV },
-+    { "AAC (faac)",         "faac",       HB_ACODEC_FAAC,                             0 },
- #ifdef USE_FDK_AAC
-     { "AAC (FDK)",          "fdk_aac",    HB_ACODEC_FDK_AAC,      HB_MUX_MP4|HB_MUX_MKV },
-     { "HE-AAC (FDK)",       "fdk_haac",   HB_ACODEC_FDK_HAAC,     HB_MUX_MP4|HB_MUX_MKV },
-@@ -754,11 +754,6 @@
-                                                       (samplerate >= 22050)));
-             break;
- 
--        case HB_ACODEC_FAAC:
--            *low  = (nchannels + lfe_count) * 32;
--            *high = (nchannels + lfe_count) * (192 >> sr_shift);
--            break;
--
-         case HB_ACODEC_FFAAC:
-             *low  = ((nchannels + lfe_count) * 32);
-             *high = ((nchannels + lfe_count) *
---- a/libhb/common.h
-+++ b/libhb/common.h
-@@ -945,7 +945,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
-@@ -287,3 +288,4 @@
-     return HB_WORK_OK;
- }
- 
-+#endif /* 0 */
---- a/libhb/hb.c
-+++ b/libhb/hb.c
-@@ -487,7 +487,6 @@
- 	hb_register( &hb_decavcodeca );
- 	hb_register( &hb_decavcodecv );
- 	hb_register( &hb_declpcm );
--	hb_register( &hb_encfaac );
- 	hb_register( &hb_enclame );
- 	hb_register( &hb_encvorbis );
- 	hb_register( &hb_muxer );
-@@ -588,7 +587,6 @@
- 	hb_register( &hb_decavcodeca );
- 	hb_register( &hb_decavcodecv );
- 	hb_register( &hb_declpcm );
--	hb_register( &hb_encfaac );
- 	hb_register( &hb_enclame );
- 	hb_register( &hb_encvorbis );
- 	hb_register( &hb_muxer );
---- a/libhb/internal.h
-+++ b/libhb/internal.h
-@@ -409,7 +409,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
- 
-@@ -97,7 +97,7 @@
- LIBHB.lib = $(LIBHB.build/)hb.lib
- 
- LIBHB.dll.libs = $(foreach n, \
--        a52 ass avcodec avformat avutil avresample dvdnav dvdread faac \
-+        a52 ass avcodec avformat avutil avresample dvdnav dvdread \
-         fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
-         ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \
-         $(CONTRIB.build/)lib/lib$(n).a )
---- a/libhb/muxmkv.c
-+++ b/libhb/muxmkv.c
-@@ -256,7 +256,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);
---- a/test/module.defs
-+++ b/test/module.defs
-@@ -12,7 +12,7 @@
- TEST.libs = $(LIBHB.a)
- 
- TEST.GCC.l = \
--        a52 ass avcodec avformat avutil avresample dvdnav dvdread faac \
-+        a52 ass avcodec avformat avutil avresample dvdnav dvdread \
-         fontconfig freetype mkv mpeg2 mp3lame mp4v2 ogg \
-         samplerate swscale theoraenc theoradec vorbis vorbisenc x264 \
-         bluray xml2 bz2 z
---- a/gtk/configure.ac
-+++ b/gtk/configure.ac
-@@ -203,7 +203,7 @@
-     ;;
- esac
- 
--HB_LIBS="-lhb -la52 -lmkv -lavresample -lavformat -lavcodec -lavutil -ldvdnav -ldvdread -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lmp4v2 -lswscale -ltheoraenc -ltheoradec -lz -lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype -lxml2"
-+HB_LIBS="-lhb -la52 -lmkv -lavresample -lavformat -lavcodec -lavutil -ldvdnav -ldvdread -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lmp4v2 -lswscale -ltheoraenc -ltheoradec -lz -lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype -lxml2"
- 
- if test "x$use_fdk_aac" = "xyes" ; then
-     HB_LIBS+=" -lfdk-aac"
diff --git a/debian/patches/0011-First-try-at-removing-some-of-mp4v2.patch b/debian/patches/0011-First-try-at-removing-some-of-mp4v2.patch
deleted file mode 100644
index ed675c7..0000000
--- a/debian/patches/0011-First-try-at-removing-some-of-mp4v2.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito at ime.usp.br>
-Date: Thu, 7 Jun 2012 07:09:37 -0300
-Subject: First try at removing some of mp4v2.
-
-Forwarded: partially (only first hunk)
-Signed-off-by: Rogério Brito <rbrito at ime.usp.br>
-
---- a/libhb/muxmp4.c
-+++ b/libhb/muxmp4.c
-@@ -1,3 +1,4 @@
-+#if 0
- /* muxmp4.c
- 
-    Copyright (c) 2003-2013 HandBrake Team
-@@ -1413,3 +1414,4 @@
-     return m;
- }
- 
-+#endif /* 0*/
---- a/libhb/muxcommon.c
-+++ b/libhb/muxcommon.c
-@@ -460,8 +460,9 @@
-         switch( job->mux )
-         {
-         case HB_MUX_MP4:
--            mux->m = hb_mux_mp4_init( job );
--            break;
-+            hb_error( "MP4 muxer disabled, exiting" );
-+            *job->die = 1;
-+            return NULL;
-         case HB_MUX_MKV:
-             mux->m = hb_mux_mkv_init( job );
-             break;
---- a/test/module.defs
-+++ b/test/module.defs
-@@ -13,7 +13,7 @@
- 
- TEST.GCC.l = \
-         a52 ass avcodec avformat avutil avresample dvdnav dvdread \
--        fontconfig freetype mkv mpeg2 mp3lame mp4v2 ogg \
-+        fontconfig freetype mkv mpeg2 mp3lame ogg \
-         samplerate swscale theoraenc theoradec vorbis vorbisenc x264 \
-         bluray xml2 bz2 z
- 
---- a/libhb/decmetadata.c
-+++ b/libhb/decmetadata.c
-@@ -7,10 +7,11 @@
-    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
-  */
- 
--#include <mp4v2/mp4v2.h>
--
- #include "common.h"
- 
-+#if 0
-+#include <mp4v2/mp4v2.h>
-+
- static int decmp4metadata( hb_title_t *title )
- {
-     MP4FileHandle input_file;
-@@ -172,6 +173,7 @@
-     }
-     return result;
- }
-+#endif /* 0 */
- 
- /*
-  * decmetadata()
-@@ -190,12 +192,5 @@
-         return 0;
-     }
- 
--    /*
--     * Hacky way of figuring out if this is an MP4, in which case read the data using libmp4v2
--     */
--    if( title->container_name && strcmp(title->container_name, "mov,mp4,m4a,3gp,3g2,mj2") == 0 ) 
--    {
--        return decmp4metadata( title );
--    }
-     return 0;
- }
---- a/gtk/src/hb-backend.c
-+++ b/gtk/src/hb-backend.c
-@@ -176,7 +176,6 @@
- static options_map_t d_container_opts[] =
- {
-     {"MKV", "mkv", HB_MUX_MKV, "mkv"},
--    {"MP4", "mp4", HB_MUX_MP4, "mp4"},
- };
- combo_opts_t container_opts =
- {
---- a/gtk/src/presets.c
-+++ b/gtk/src/presets.c
-@@ -1394,7 +1394,7 @@
-     str = ghb_settings_get_string(ud->settings, "destination_dir");
-     ghb_ui_update(ud, "dest_dir", ghb_string_value(str));
- 
--    gchar *file = g_strdup_printf ("new_video.mp4");
-+    gchar *file = g_strdup_printf ("new_video.mkv");
-     ghb_ui_update(ud, "dest_file", ghb_string_value(file));
-     g_free(str);
-     g_free(file);
---- a/gtk/src/internal_defaults.xml
-+++ b/gtk/src/internal_defaults.xml
-@@ -19,7 +19,7 @@
-         <key>dest_dir</key>
-         <string></string>
-         <key>dest_file</key>
--        <string>new_video.mp4</string>
-+        <string>new_video.mkv</string>
-         <key>end_point</key>
-         <integer>100</integer>
-         <key>folder</key>
-@@ -262,7 +262,7 @@
-         <key>ChapterMarkers</key>
-         <true />
-         <key>FileFormat</key>
--        <string>mp4</string>
-+        <string>mkv</string>
-         <key>Folder</key>
-         <false />
-         <key>PictureLooseCrop</key>
---- a/gtk/configure.ac
-+++ b/gtk/configure.ac
-@@ -203,7 +203,7 @@
-     ;;
- esac
- 
--HB_LIBS="-lhb -la52 -lmkv -lavresample -lavformat -lavcodec -lavutil -ldvdnav -ldvdread -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lmp4v2 -lswscale -ltheoraenc -ltheoradec -lz -lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype -lxml2"
-+HB_LIBS="-lhb -la52 -lmkv -lavresample -lavformat -lavcodec -lavutil -ldvdnav -ldvdread -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lswscale -ltheoraenc -ltheoradec -lz -lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype -lxml2"
- 
- if test "x$use_fdk_aac" = "xyes" ; then
-     HB_LIBS+=" -lfdk-aac"
diff --git a/debian/patches/0014-Use-unpatched-a52.patch b/debian/patches/0014-Use-unpatched-a52.patch
deleted file mode 100644
index 6866663..0000000
--- a/debian/patches/0014-Use-unpatched-a52.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: Reinhard Tartler <siretart at tauware.de>
-Description: Use unpatched a52
-
-In upstream liba52, the state field is private.
-
-Forwarded: no
---- a/libhb/deca52.c
-+++ b/libhb/deca52.c
-@@ -387,12 +387,15 @@ static hb_buffer_t* Decode(hb_work_objec
-             hb_audio_resample_set_channel_layout(pv->resample,
-                                                  pv->channel_layout);
-         }
-+#if 0
-+        // FIXME: debian uses an unpatched liba52
-         if (pv->use_mix_levels)
-         {
-             hb_audio_resample_set_mix_levels(pv->resample,
-                                              (double)pv->state->slev,
-                                              (double)pv->state->clev);
-         }
-+#endif
-         if (hb_audio_resample_update(pv->resample))
-         {
-             hb_log("deca52: hb_audio_resample_update() failed");
diff --git a/debian/patches/0016-use-older-libmkv.patch b/debian/patches/0016-use-older-libmkv.patch
deleted file mode 100644
index 37d7a95..0000000
--- a/debian/patches/0016-use-older-libmkv.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Rogério Brito <rbrito at ime.usp.br>
-Date: Tue Jul 31 19:07:14 2012 -0300
-Subject: debian/patches: Use unpatched libmkv for the moment.
-
-This should be dropped after we have a libmkv that has the patches from
-`contrib/libmkv` applied.
---- a/libhb/muxmkv.c
-+++ b/libhb/muxmkv.c
-@@ -293,8 +293,7 @@
-         {
-             // For HE-AAC, write outputSamplingFreq too
-             // samplingFreq is half of outputSamplingFreq
--            track->extra.audio.outputSamplingFreq = (float)audio->config.out.samplerate;
--            track->extra.audio.samplingFreq = track->extra.audio.outputSamplingFreq / 2.;
-+            track->extra.audio.samplingFreq = audio->config.out.samplerate / 2.;
-         }
-         else
-         {
diff --git a/debian/patches/0017-fixup-libmkv.patch b/debian/patches/0017-fixup-libmkv.patch
deleted file mode 100644
index 9155d00..0000000
--- a/debian/patches/0017-fixup-libmkv.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Author: Reinhard Tartler <siretart at tauware.de>
-Description: Allow compilation with unpatched libmkv
-
-This define was stolen from upstream's A01-hbmv-pgs.patch
-
---- a/libhb/muxmkv.c
-+++ b/libhb/muxmkv.c
-@@ -13,6 +13,11 @@
- 
- #include "libmkv.h"
- 
-+#ifndef MK_SUBTITLE_PGS
-+// stolen from upstream's A01-hbmv-pgs.patch
-+#define MK_SUBTITLE_PGS    "S_HDMV/PGS"
-+#endif
-+
- #include <ogg/ogg.h>
- 
- #include "hb.h"
diff --git a/debian/patches/0018-Fix-compilation-with-gstreamer-1.patch b/debian/patches/0018-Fix-compilation-with-gstreamer-1.patch
deleted file mode 100644
index 3a5fa01..0000000
--- a/debian/patches/0018-Fix-compilation-with-gstreamer-1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- b/gtk/configure.ac
-+++ a/gtk/configure.ac
-@@ -96,7 +96,7 @@
- 	  pkg_gudev="gudev-1.0"
- 	  ;;
-     esac
--    GHB_PACKAGES="gthread-2.0 gio-2.0 libnotify dbus-glib-1 $pkg_gudev"
-+    GHB_PACKAGES="gthread-2.0 gio-2.0 gmodule-2.0 gobject-2.0 libnotify dbus-glib-1 $pkg_gudev"
- 	mingw_flag=no
-     ;;
- esac
diff --git a/debian/patches/series b/debian/patches/series
index 47dc974..1b6eac0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,4 @@
 0019-Do-not-require-wget-or-curl.patch
 0003-Remove-embedded-downloaded-copies-of-various-librari.patch
-0005-libhb-Fix-compilation-with-mp4v2-v1.9.1.patch
-0014-Use-unpatched-a52.patch
-0016-use-older-libmkv.patch
-0017-fixup-libmkv.patch
 0020-include-cpuid.patch
 0021-link-fix-add-ldl.patch

-- 
handbrake packaging



More information about the pkg-multimedia-commits mailing list