[SCM] handbrake/master: refresh patches
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sat Feb 15 15:18:07 UTC 2014
The following commit has been merged in the master branch:
commit 3e6f5c29c8185e263c759da8dcfe7c2f2f2b5ebc
Author: Reinhard Tartler <siretart at tauware.de>
Date: Wed Feb 12 01:24:52 2014 +0000
refresh 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 4aeff15..fba6e26 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
@@ -21,7 +21,7 @@ Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
--- a/make/include/main.defs
+++ b/make/include/main.defs
-@@ -19,8 +19,6 @@
+@@ -23,8 +23,6 @@ else
AUTOTOOL_MODULES =
endif
@@ -30,24 +30,21 @@ Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
ifneq (,$(filter $(BUILD.system),cygwin mingw))
ifneq ($(HAS.bz2),1)
MODULES += contrib/bzip2
-@@ -43,24 +41,12 @@
- MODULES += contrib/fdk-aac
+@@ -59,12 +57,6 @@ ifeq (1,$(FEATURE.libmkv))
+ MODULES += contrib/libmkv
endif
-MODULES += contrib/lame
--MODULES += contrib/faac
-MODULES += contrib/ffmpeg
-MODULES += contrib/libdvdread
-MODULES += contrib/libdvdnav
-MODULES += contrib/libbluray
--MODULES += contrib/libmkv
--MODULES += contrib/mp4v2
--MODULES += contrib/mpeg2dec
-
ifneq (,$(filter $(BUILD.system),mingw))
ifneq ($(HAS.pthread),1)
MODULES += contrib/pthreadw32
- endif
+@@ -75,8 +67,6 @@ ifeq (1,$(FEATURE.qsv))
+ MODULES += contrib/libmfx
endif
-MODULES += contrib/x264
@@ -55,7 +52,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
-@@ -101,6 +87,11 @@
+@@ -117,6 +107,11 @@ ifeq (1-gnu,$(FEATURE.gtk)-$(BUILD.syste
MODULES += gtk
endif
@@ -69,7 +66,7 @@ Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
endif
--- a/test/module.defs
+++ b/test/module.defs
-@@ -9,13 +9,11 @@
+@@ -9,13 +9,11 @@ TEST.c.o = $(patsubst $(SRC/)%.c,$(BUILD
TEST.exe = $(BUILD/)$(call TARGET.exe,$(HB.name)CLI)
@@ -78,9 +75,9 @@ Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
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 \
+ a52 ass avcodec avformat avutil avresample dvdnav dvdread \
+- fontconfig fribidi mp3lame ogg \
++ fontconfig mp3lame ogg \
samplerate swscale theoraenc theoradec vorbis vorbisenc x264 \
- bluray xml2 bz2 z
+ bluray freetype xml2 bz2 z
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 ae2cd18..9d96498 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,7 +16,7 @@ Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
--- a/libhb/decmetadata.c
+++ b/libhb/decmetadata.c
-@@ -17,7 +17,7 @@
+@@ -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");
@@ -25,7 +25,7 @@ Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
if( input_file != MP4_INVALID_FILE_HANDLE )
{
-@@ -168,7 +168,7 @@
+@@ -170,7 +170,7 @@ static int decmp4metadata( hb_title_t *t
}
}
@@ -36,23 +36,23 @@ Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
}
--- a/libhb/muxmp4.c
+++ b/libhb/muxmp4.c
-@@ -100,13 +100,13 @@
+@@ -121,13 +121,13 @@ static int MP4Init( hb_mux_object_t * m
if (job->largeFileSize)
/* Use 64-bit MP4 file */
{
-- m->file = MP4Create( job->file, MP4_DETAILS_ERROR, MP4_CREATE_64BIT_DATA );
-+ m->file = MP4Create( job->file, MP4_CREATE_64BIT_DATA );
+- 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( job->file, MP4_DETAILS_ERROR, 0 );
-+ m->file = MP4Create( job->file, 0 );
+- m->file = MP4Create(m->path, MP4_DETAILS_ERROR, 0);
++ m->file = MP4Create(m->path, 0);
}
if (m->file == MP4_INVALID_FILE_HANDLE)
-@@ -1387,14 +1387,14 @@
+@@ -1187,14 +1187,14 @@ static int MP4End( hb_mux_object_t * m )
MP4TagsFree( tags );
}
@@ -63,9 +63,9 @@ Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
{
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 );
+ 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/0014-Use-unpatched-a52.patch b/debian/patches/0014-Use-unpatched-a52.patch
index 944df0e..6866663 100644
--- a/debian/patches/0014-Use-unpatched-a52.patch
+++ b/debian/patches/0014-Use-unpatched-a52.patch
@@ -6,9 +6,9 @@ In upstream liba52, the state field is private.
Forwarded: no
--- a/libhb/deca52.c
+++ b/libhb/deca52.c
-@@ -387,12 +387,15 @@
- pv->channel_layout,
- pv->nchannels);
+@@ -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
diff --git a/debian/patches/0017-fixup-libmkv.patch b/debian/patches/0017-fixup-libmkv.patch
index 53451da..9155d00 100644
--- a/debian/patches/0017-fixup-libmkv.patch
+++ b/debian/patches/0017-fixup-libmkv.patch
@@ -5,8 +5,8 @@ This define was stolen from upstream's A01-hbmv-pgs.patch
--- a/libhb/muxmkv.c
+++ b/libhb/muxmkv.c
-@@ -10,6 +10,11 @@
- /* libmkv header */
+@@ -13,6 +13,11 @@
+
#include "libmkv.h"
+#ifndef MK_SUBTITLE_PGS
diff --git a/debian/patches/0019-Do-not-require-wget-or-curl.patch b/debian/patches/0019-Do-not-require-wget-or-curl.patch
index 362ff71..78300b6 100644
--- a/debian/patches/0019-Do-not-require-wget-or-curl.patch
+++ b/debian/patches/0019-Do-not-require-wget-or-curl.patch
@@ -3,7 +3,7 @@ Description: Do not require neither wget nor curl to build
--- a/make/configure.py
+++ b/make/configure.py
-@@ -949,6 +949,7 @@ class SelectTool( Action ):
+@@ -977,6 +977,7 @@ class SelectTool( Action ):
self.name = name
self.pool = pool
self.kwargs = kwargs
@@ -11,7 +11,7 @@ Description: Do not require neither wget nor curl to build
def _action( self ):
self.session = []
-@@ -1382,7 +1383,7 @@ try:
+@@ -1437,7 +1438,7 @@ try:
xcodebuild = ToolProbe( 'XCODEBUILD.exe', 'xcodebuild', abort=False )
lipo = ToolProbe( 'LIPO.exe', 'lipo', abort=False )
--
handbrake packaging
More information about the pkg-multimedia-commits
mailing list