[SCM] handbrake/master: Update or remove patches
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sat Mar 16 08:58:27 UTC 2013
The following commit has been merged in the master branch:
commit 6285cc6d34e5a60f1b529aad5166920a60d18a91
Author: Paul Gevers <elbrus at debian.org>
Date: Thu Mar 14 21:28:23 2013 +0100
Update or remove patches
diff --git a/debian/patches/0003-Remove-embedded-downloaded-copies-of-various-librari.patch b/debian/patches/0003-Remove-embedded-downloaded-copies-of-various-librari.patch
index 0db5ea1..4aeff15 100644
--- a/debian/patches/0003-Remove-embedded-downloaded-copies-of-various-librari.patch
+++ b/debian/patches/0003-Remove-embedded-downloaded-copies-of-various-librari.patch
@@ -19,49 +19,28 @@ Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
test/module.defs | 10 +++-------
3 files changed, 10 insertions(+), 30 deletions(-)
---- a/gtk/src/Makefile.am
-+++ b/gtk/src/Makefile.am
-@@ -10,7 +10,7 @@
- HB_LIBS= \
- -lhb -la52 -lmkv -lavformat -lavcodec -lavutil -ldca -ldvdnav -ldvdread \
- -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate \
-- -lx264 -lmp4v2 -lswscale -ltheora -lz \
-+ -lx264 -lmp4v2 -lswscale -ltheoraenc -ltheoradec -lz -lxml2 \
- -lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype
- endif
-
--- a/make/include/main.defs
+++ b/make/include/main.defs
-@@ -8,8 +8,6 @@
-
- ###############################################################################
+@@ -19,8 +19,6 @@
+ AUTOTOOL_MODULES =
+ endif
-MODULES += contrib/a52dec
-
ifneq (,$(filter $(BUILD.system),cygwin mingw))
ifneq ($(HAS.bz2),1)
MODULES += contrib/bzip2
-@@ -20,34 +18,12 @@
- MODULES += contrib/fribidi
+@@ -43,24 +41,12 @@
+ MODULES += contrib/fdk-aac
endif
--
+-MODULES += contrib/lame
-MODULES += contrib/faac
-MODULES += contrib/ffmpeg
--MODULES += contrib/fontconfig
--MODULES += contrib/freetype
--MODULES += contrib/lame
--MODULES += contrib/libass
--MODULES += contrib/libdca
-MODULES += contrib/libdvdread
-MODULES += contrib/libdvdnav
-MODULES += contrib/libbluray
-MODULES += contrib/libmkv
--MODULES += contrib/libogg
--MODULES += contrib/libsamplerate
--MODULES += contrib/libtheora
--MODULES += contrib/libvorbis
--MODULES += contrib/libxml2
-MODULES += contrib/mp4v2
-MODULES += contrib/mpeg2dec
-
@@ -76,7 +55,7 @@ Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
ifneq (,$(filter $(BUILD.system),cygwin mingw))
ifneq ($(HAS.iconv),1)
MODULES += contrib/libiconv
-@@ -88,6 +64,11 @@
+@@ -101,6 +87,11 @@
MODULES += gtk
endif
@@ -90,28 +69,18 @@ Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
endif
--- a/test/module.defs
+++ b/test/module.defs
-@@ -9,10 +9,8 @@
+@@ -9,13 +9,11 @@
TEST.exe = $(BUILD/)$(call TARGET.exe,$(HB.name)CLI)
--TEST.libs = $(LIBHB.a) $(foreach n, \
-- a52 ass avcodec avformat avutil dca dvdnav dvdread faac fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
-- ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \
-- $(CONTRIB.build/)lib/lib$(n).a )
-+TEST.libs = $(LIBHB.a)
-+TEST.libs += -lass -lfaac -lmp3lame -lsamplerate -lvorbisenc -ltheoraenc -ltheoradec -lvorbis -lx264 -lmkv -lz -lbz2 -lpthread -ldl -lmp4v2 -lxml2 -ldca -la52 -lbluray -lavcodec -lavformat -lavutil -lswscale -lmpeg2 -ldvdnav -ldvdread
-
- TEST.install.exe = $(DESTDIR)$(PREFIX/)bin/$(notdir $(TEST.exe))
-
-@@ -32,11 +30,6 @@
- else
- TEST.GCC.l += z
- endif
--ifeq (1,$(FRIBIDI.enabled))
-- TEST.libs += $(CONTRIB.build/)lib/libfribidi.a
--else
-- TEST.GCC.l += fribidi
--endif
+-TEST.GCC.L = $(CONTRIB.build/)lib
+-
+ TEST.libs = $(LIBHB.a)
- ###############################################################################
+ TEST.GCC.l = \
+ a52 ass avcodec avformat avutil avresample dvdnav dvdread faac \
+- fontconfig freetype fribidi mkv mpeg2 mp3lame mp4v2 ogg \
++ fontconfig freetype mkv mpeg2 mp3lame mp4v2 ogg \
+ samplerate swscale theoraenc theoradec vorbis vorbisenc x264 \
+ bluray xml2 bz2 z
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
index 5ae31c5..cdbaba3 100644
--- 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
@@ -27,7 +27,7 @@ Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
--- a/make/include/main.defs
+++ b/make/include/main.defs
-@@ -69,6 +69,11 @@ ifeq (1-kfreebsd,$(FEATURE.gtk)-$(BUILD.
+@@ -92,6 +92,11 @@
MODULES += gtk
endif
@@ -41,7 +41,7 @@ Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
endif
--- a/libhb/module.defs
+++ b/libhb/module.defs
-@@ -52,6 +52,8 @@ else ifeq ($(BUILD.system),mingw)
+@@ -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
@@ -52,7 +52,7 @@ Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
endif
--- a/libhb/ports.h
+++ b/libhb/ports.h
-@@ -51,7 +51,7 @@ typedef struct hb_thread_s hb_thread_t;
+@@ -54,7 +54,7 @@
#elif defined( SYS_DARWIN )
# define HB_LOW_PRIORITY 0
# define HB_NORMAL_PRIORITY 31
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
index 0ee167f..f8ee2c3 100644
--- 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
@@ -16,8 +16,8 @@ Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
--- a/libhb/decmetadata.c
+++ b/libhb/decmetadata.c
-@@ -13,7 +13,7 @@
- MP4FileHandle input_file;
+@@ -17,7 +17,7 @@
+ int result = 0;
hb_deep_log( 2, "Got an MP4 input, read the metadata");
- input_file = MP4Read( title->path, 0 );
@@ -25,18 +25,18 @@ Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
if( input_file != MP4_INVALID_FILE_HANDLE )
{
-@@ -92,7 +92,7 @@
+@@ -168,7 +168,7 @@
}
}
- MP4Close( input_file );
+ MP4Close(input_file, 0);
}
+ return result;
}
-
--- a/libhb/muxmp4.c
+++ b/libhb/muxmp4.c
-@@ -93,13 +93,13 @@
+@@ -96,13 +96,13 @@
if (job->largeFileSize)
/* Use 64-bit MP4 file */
{
@@ -52,20 +52,20 @@ Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
}
if (m->file == MP4_INVALID_FILE_HANDLE)
-@@ -1331,14 +1331,14 @@
- MP4TagsFree( tags );
- }
+@@ -1373,14 +1373,14 @@
+ MP4TagsFree( tags );
+ }
-- MP4Close( m->file );
-+ MP4Close( m->file, 0 );
+- 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", job->file );
-- MP4Optimize( job->file, filename, MP4_DETAILS_ERROR );
-+ MP4Optimize( job->file, filename );
- remove( job->file );
- rename( filename, job->file );
- }
+ if ( job->mp4_optimize )
+ {
+ hb_log( "muxmp4: optimizing file" );
+ char filename[1024]; memset( filename, 0, 1024 );
+ snprintf( filename, 1024, "%s.tmp", job->file );
+- MP4Optimize( job->file, filename, MP4_DETAILS_ERROR );
++ MP4Optimize( job->file, filename );
+ remove( job->file );
+ rename( filename, job->file );
+ }
diff --git a/debian/patches/0010-Remove-FAAC-dependency.patch b/debian/patches/0010-Remove-FAAC-dependency.patch
index 18369f9..f4aa024 100644
--- a/debian/patches/0010-Remove-FAAC-dependency.patch
+++ b/debian/patches/0010-Remove-FAAC-dependency.patch
@@ -24,157 +24,110 @@ to enter Debian.
13 files changed, 13 insertions(+), 362 deletions(-)
delete mode 100644 libhb/encfaac.c
---- a/gtk/src/Makefile.am
-+++ b/gtk/src/Makefile.am
-@@ -3,13 +3,13 @@
- if MINGW
- HB_LIBS= \
- -lhb -la52 -lmkv -lavformat -lavcodec -lavutil -ldca -ldvdnav -ldvdread \
-- -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate \
-+ -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate \
- -lx264 -lmp4v2 -lswscale -ltheora -lz \
- -lbz2 -liberty -lpthreadGC2 -lbluray -lass -lfontconfig -lfreetype
- else
- HB_LIBS= \
- -lhb -la52 -lmkv -lavformat -lavcodec -lavutil -ldca -ldvdnav -ldvdread \
-- -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate \
-+ -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate \
- -lx264 -lmp4v2 -lswscale -ltheoraenc -ltheoradec -lz -lxml2 \
- -lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype
- endif
--- a/gtk/src/audiohandler.c
+++ b/gtk/src/audiohandler.c
-@@ -69,10 +69,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;
- }
- }
+@@ -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;
+ return HB_ACODEC_LAME;
- case HB_ACODEC_AAC_PASS:
-- return HB_ACODEC_FAAC;
-+ return HB_ACODEC_FFAAC;
+ case HB_ACODEC_AAC_PASS:
+- return HB_ACODEC_FAAC;
++ return HB_ACODEC_FFAAC;
- case HB_ACODEC_AC3_PASS:
- return HB_ACODEC_AC3;
-@@ -144,7 +141,6 @@
- {
- mask = HB_ACODEC_LAME |
- HB_ACODEC_FFAAC |
-- HB_ACODEC_FAAC |
- HB_ACODEC_AC3;
- }
- if ( mux == HB_MUX_MKV )
+ case HB_ACODEC_AC3_PASS:
+ return HB_ACODEC_AC3;
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
-@@ -3729,7 +3729,7 @@
+@@ -3767,7 +3767,7 @@
gint
ghb_get_default_acodec()
{
-- return HB_ACODEC_FAAC;
-+ return HB_ACODEC_LAME;
+- return HB_ACODEC_FAAC;
++ return HB_ACODEC_LAME;
}
static void
-@@ -4485,13 +4485,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);
-@@ -4505,7 +4501,7 @@
- if (codec == HB_ACODEC_VORBIS)
- {
- a_unsup = "Vorbis";
-- codec = HB_ACODEC_FAAC;
-+ codec = HB_ACODEC_LAME;
- }
- }
- if (a_unsup)
+@@ -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"},
+- {"AAC (faac)", "faac"},
+ {"AC3 Passthru", "ac3"},
+ {"MP3 (lame)", "lame"},
+ {"Vorbis (vorbis)", "vorbis"},
--- a/gtk/src/presets.c
+++ b/gtk/src/presets.c
-@@ -2004,9 +2004,6 @@
- static value_map_t acodec_xlat[] =
+@@ -2029,8 +2029,6 @@
+
+ static value_map_t acodec_xlat_compat[] =
{
- {"AAC (ffmpeg)", "ffaac"},
-- {"AAC (faac)", "faac"},
-- {"AAC (CoreAudio)", "faac"},
-- {"HE-AAC (CoreAudio)", "faac"},
- {"AC3 (ffmpeg)", "ffac3"},
- {"AC3 (ffmpeg)", "ac3"},
- {"AC3", "ac3"}, // Backwards compatibility with mac ui
+- {"AAC (CoreAudio)", "faac"},
+- {"HE-AAC (CoreAudio)", "faac"},
+ {"AC3 (ffmpeg)", "ac3"},
+ {"AC3", "ac3"},
+ {"MP3 Passthru", "mp3pass"},
--- a/libhb/common.c
+++ b/libhb/common.c
-@@ -66,7 +66,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 },
+@@ -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 },
- { "AAC (ffmpeg)", "ffaac", HB_ACODEC_FFAAC, HB_MUX_MP4|HB_MUX_MKV },
- { "AAC Passthru", "copy:aac", HB_ACODEC_AAC_PASS, HB_MUX_MP4|HB_MUX_MKV },
- { "AC3 (ffmpeg)", "ffac3", HB_ACODEC_AC3, HB_MUX_MP4|HB_MUX_MKV },
-@@ -415,22 +415,6 @@
- }
+- { "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 = 32 * channels;
-- if (samplerate > 24000)
-- {
-- *high = 160 * channels;
-- if (*high > 768)
-- *high = 768;
-- }
-- else
-- {
-- *high = 96 * channels;
-- if (*high > 480)
-- *high = 480;
-- }
+- *low = (nchannels + lfe_count) * 32;
+- *high = (nchannels + lfe_count) * (192 >> sr_shift);
- break;
-
case HB_ACODEC_FFAAC:
- *low = 32 * channels;
- if (samplerate > 24000)
-@@ -1560,7 +1544,7 @@
-
- /* Initalize some sensable defaults */
- audiocfg->in.track = audiocfg->out.track = 0;
-- audiocfg->out.codec = HB_ACODEC_FAAC;
-+ audiocfg->out.codec = HB_ACODEC_LAME;
- audiocfg->out.bitrate = -1;
- audiocfg->out.quality = HB_INVALID_AUDIO_QUALITY;
- audiocfg->out.compression_level = -1;
+ *low = ((nchannels + lfe_count) * 32);
+ *high = ((nchannels + lfe_count) *
--- a/libhb/common.h
+++ b/libhb/common.h
-@@ -857,7 +857,6 @@
+@@ -948,7 +948,6 @@
extern hb_work_object_t hb_decavcodeca;
extern hb_work_object_t hb_decavcodecv;
extern hb_work_object_t hb_declpcm;
@@ -186,17 +139,17 @@ to enter Debian.
+++ b/libhb/encfaac.c
@@ -1,3 +1,4 @@
+#if 0
- /* $Id: encfaac.c,v 1.13 2005/03/03 17:21:57 titer Exp $
+ /* encfaac.c
- This file is part of the HandBrake source code.
-@@ -316,3 +317,4 @@
+ Copyright (c) 2003-2012 HandBrake Team
+@@ -287,3 +288,4 @@
return HB_WORK_OK;
}
+#endif /* 0 */
--- a/libhb/hb.c
+++ b/libhb/hb.c
-@@ -455,7 +455,6 @@
+@@ -480,7 +480,6 @@
hb_register( &hb_decavcodeca );
hb_register( &hb_decavcodecv );
hb_register( &hb_declpcm );
@@ -204,7 +157,7 @@ to enter Debian.
hb_register( &hb_enclame );
hb_register( &hb_encvorbis );
hb_register( &hb_muxer );
-@@ -555,7 +554,6 @@
+@@ -581,7 +580,6 @@
hb_register( &hb_decavcodeca );
hb_register( &hb_decavcodecv );
hb_register( &hb_declpcm );
@@ -214,7 +167,7 @@ to enter Debian.
hb_register( &hb_muxer );
--- a/libhb/internal.h
+++ b/libhb/internal.h
-@@ -360,7 +360,6 @@
+@@ -411,7 +411,6 @@
WORK_DECAVCODEC,
WORK_DECAVCODECV,
WORK_DECLPCM,
@@ -228,20 +181,20 @@ to enter Debian.
-__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
+ MP4V2 MPEG2DEC PTHREADW32 X264 ZLIB LIBBLURAY FDKAAC
-@@ -92,7 +92,7 @@
+@@ -97,7 +97,7 @@
LIBHB.lib = $(LIBHB.build/)hb.lib
LIBHB.dll.libs = $(foreach n, \
-- a52 ass avcodec avformat avutil dca dvdnav dvdread faac fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
-+ a52 ass avcodec avformat avutil dca dvdnav dvdread fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
+- 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
-@@ -255,7 +255,6 @@
+@@ -256,7 +256,6 @@
}
track->codecID = MK_ACODEC_FLAC;
break;
@@ -251,22 +204,33 @@ to enter Debian.
case HB_ACODEC_CA_HAAC:
--- a/libhb/work.c
+++ b/libhb/work.c
-@@ -128,7 +128,6 @@
- hb_work_object_t * w;
- switch( codec )
+@@ -143,7 +143,6 @@
+ switch (codec)
{
-- 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 );
+ 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
-@@ -10,7 +10,7 @@
- TEST.exe = $(BUILD/)$(call TARGET.exe,$(HB.name)CLI)
-
+@@ -12,7 +12,7 @@
TEST.libs = $(LIBHB.a)
--TEST.libs += -lass -lfaac -lmp3lame -lsamplerate -lvorbisenc -ltheoraenc -ltheoradec -lvorbis -lx264 -lmkv -lz -lbz2 -lpthread -ldl -lmp4v2 -lxml2 -ldca -la52 -lbluray -lavcodec -lavformat -lavutil -lswscale -lmpeg2 -ldvdnav -ldvdread
-+TEST.libs += -lass -lmp3lame -lsamplerate -lvorbisenc -ltheoraenc -ltheoradec -lvorbis -lx264 -lmkv -lz -lbz2 -lpthread -ldl -lmp4v2 -lxml2 -ldca -la52 -lbluray -lavcodec -lavformat -lavutil -lswscale -lmpeg2 -ldvdnav -ldvdread
- TEST.install.exe = $(DESTDIR)$(PREFIX/)bin/$(notdir $(TEST.exe))
+ 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
index a71565b..e2a2d2c 100644
--- a/debian/patches/0011-First-try-at-removing-some-of-mp4v2.patch
+++ b/debian/patches/0011-First-try-at-removing-some-of-mp4v2.patch
@@ -9,35 +9,17 @@ Signed-off-by: Rogério Brito <rbrito at ime.usp.br>
+++ b/libhb/muxmp4.c
@@ -1,3 +1,4 @@
+#if 0
- /* $Id: muxmp4.c,v 1.24 2005/11/04 13:09:41 titer Exp $
+ /* muxmp4.c
- This file is part of the HandBrake source code.
-@@ -1356,3 +1357,4 @@
+ Copyright (c) 2003-2012 HandBrake Team
+@@ -1399,3 +1400,4 @@
return m;
}
+#endif /* 0*/
---- a/gtk/src/Makefile.am
-+++ b/gtk/src/Makefile.am
-@@ -4,13 +4,13 @@
- HB_LIBS= \
- -lhb -la52 -lmkv -lavformat -lavcodec -lavutil -ldca -ldvdnav -ldvdread \
- -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate \
-- -lx264 -lmp4v2 -lswscale -ltheora -lz \
-+ -lx264 -lswscale -ltheora -lz \
- -lbz2 -liberty -lpthreadGC2 -lbluray -lass -lfontconfig -lfreetype
- else
- HB_LIBS= \
- -lhb -la52 -lmkv -lavformat -lavcodec -lavutil -ldca -ldvdnav -ldvdread \
- -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate \
-- -lx264 -lmp4v2 -lswscale -ltheoraenc -ltheoradec -lz -lxml2 \
-+ -lx264 -lswscale -ltheoraenc -ltheoradec -lz -lxml2 \
- -lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype
- endif
-
--- a/libhb/muxcommon.c
+++ b/libhb/muxcommon.c
-@@ -459,8 +459,9 @@
+@@ -460,8 +460,9 @@
switch( job->mux )
{
case HB_MUX_MP4:
@@ -51,20 +33,20 @@ Signed-off-by: Rogério Brito <rbrito at ime.usp.br>
break;
--- a/test/module.defs
+++ b/test/module.defs
-@@ -10,7 +10,7 @@
- TEST.exe = $(BUILD/)$(call TARGET.exe,$(HB.name)CLI)
-
- TEST.libs = $(LIBHB.a)
--TEST.libs += -lass -lmp3lame -lsamplerate -lvorbisenc -ltheoraenc -ltheoradec -lvorbis -lx264 -lmkv -lz -lbz2 -lpthread -ldl -lmp4v2 -lxml2 -ldca -la52 -lbluray -lavcodec -lavformat -lavutil -lswscale -lmpeg2 -ldvdnav -ldvdread
-+TEST.libs += -lass -lmp3lame -lsamplerate -lvorbisenc -ltheoraenc -ltheoradec -lvorbis -lx264 -lmkv -lz -lbz2 -lpthread -ldl -lxml2 -ldca -la52 -lbluray -lavcodec -lavformat -lavutil -lswscale -lmpeg2 -ldvdnav -ldvdread
+@@ -13,7 +13,7 @@
- TEST.install.exe = $(DESTDIR)$(PREFIX/)bin/$(notdir $(TEST.exe))
+ 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
-@@ -4,10 +4,11 @@
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License. */
+@@ -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>
-
@@ -73,19 +55,19 @@ Signed-off-by: Rogério Brito <rbrito at ime.usp.br>
+#if 0
+#include <mp4v2/mp4v2.h>
+
- static void decmp4metadata( hb_title_t *title )
+ static int decmp4metadata( hb_title_t *title )
{
MP4FileHandle input_file;
-@@ -95,6 +96,7 @@
- MP4Close(input_file, 0);
+@@ -172,6 +173,7 @@
}
+ return result;
}
+#endif /* 0 */
/*
* decmetadata()
-@@ -121,14 +123,6 @@
- return;
+@@ -190,12 +192,5 @@
+ return 0;
}
- /*
@@ -93,61 +75,59 @@ Signed-off-by: Rogério Brito <rbrito at ime.usp.br>
- */
- if( title->container_name && strcmp(title->container_name, "mov,mp4,m4a,3gp,3g2,mj2") == 0 )
- {
-- decmp4metadata( title );
-- } else {
- free( title->metadata );
- title->metadata = NULL;
+- return decmp4metadata( title );
- }
+ return 0;
}
---- a/libhb/scan.c
-+++ b/libhb/scan.c
-@@ -301,7 +301,7 @@
- job->list_audio = hb_list_init();
- job->list_subtitle = hb_list_init();
-
-- job->mux = HB_MUX_MP4;
-+ job->mux = HB_MUX_MKV;
- }
-
- finish:
--- 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"},
+ {"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
-@@ -1366,7 +1366,7 @@
- str = ghb_settings_get_string(ud->settings, "destination_dir");
- ghb_ui_update(ud, "dest_dir", ghb_string_value(str));
+@@ -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);
+- 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>
-@@ -238,7 +238,7 @@
- <key>ChapterMarkers</key>
- <true />
- <key>FileFormat</key>
-- <string>mp4</string>
-+ <string>mkv</string>
- <key>Folder</key>
- <false />
- <key>PictureLooseCrop</key>
+ <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/0016-use-older-libmkv.patch b/debian/patches/0016-use-older-libmkv.patch
index a9bccb2..ef92371 100644
--- a/debian/patches/0016-use-older-libmkv.patch
+++ b/debian/patches/0016-use-older-libmkv.patch
@@ -1,6 +1,6 @@
--- a/libhb/muxmkv.c
+++ b/libhb/muxmkv.c
-@@ -289,8 +289,7 @@
+@@ -293,8 +293,7 @@
{
// For HE-AAC, write outputSamplingFreq too
// samplingFreq is half of outputSamplingFreq
diff --git a/debian/patches/series b/debian/patches/series
index 79f5560..bb1ba71 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,14 +1,9 @@
-0001-libhb-Fix-erroneous-memcpy-used-with-overlapping-mem.patch
-0002-Fix-include-with-the-system-s-libav.patch
0003-Remove-embedded-downloaded-copies-of-various-librari.patch
0004-Enable-compilation-on-Debian-arches-other-than-Linux.patch
0005-libhb-Fix-compilation-with-mp4v2-v1.9.1.patch
-0007-Fix-for-compilation-with-Debian-s-libbluray.patch
-0008-Fix-for-compilation-with-Debian-s-libdca.patch
#0009-Remove-forcing-PGS-subtitles-to-be-included.patch
0010-Remove-FAAC-dependency.patch
0011-First-try-at-removing-some-of-mp4v2.patch
-0013-format-security.patch
#0014-Use-unpatched-a52.patch
#0015-use-metadata-reading-from-libav.patch
0016-use-older-libmkv.patch
--
handbrake packaging
More information about the pkg-multimedia-commits
mailing list