[SCM] handbrake/master: Regenerate patches cleanly from the 'patch-queue/master' branch.
rbrito-guest at users.alioth.debian.org
rbrito-guest at users.alioth.debian.org
Tue May 15 08:28:35 UTC 2012
The following commit has been merged in the master branch:
commit 96c42c346d715cf296675922522b10ac4194a230
Author: Rogério Brito <rbrito at ime.usp.br>
Date: Tue May 15 05:03:54 2012 -0300
Regenerate patches cleanly from the 'patch-queue/master' branch.
diff --git a/debian/patches/0001-Remove-encoding-indication-from-desktop-file.patch b/debian/patches/0001-Remove-encoding-indication-from-desktop-file.patch
index a92d372..0feddfd 100644
--- a/debian/patches/0001-Remove-encoding-indication-from-desktop-file.patch
+++ b/debian/patches/0001-Remove-encoding-indication-from-desktop-file.patch
@@ -1,8 +1,14 @@
-From 84b7e4a52037200d3171e93527af85162330b8fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito at ime.usp.br>
Date: Sat, 12 May 2012 03:48:24 -0300
-Subject: [PATCH] Remove encoding indication from desktop file.
+Subject: Remove encoding indication from desktop file.
+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>
---
gtk/src/ghb.desktop | 1 -
1 file changed, 1 deletion(-)
@@ -19,6 +25,3 @@ index 1547d29..3583fdd 100644
Type=Application
Categories=GTK;AudioVideo;Video;
MimeType=application/ogg;application/x-extension-mp4;application/x-flac;application/x-matroska;application/x-ogg;audio/ac3;audio/mp4;audio/mpeg;audio/ogg;audio/x-flac;audio/x-matroska;audio/x-mp3;audio/x-mpeg;audio/x-vorbis;video/mp4;video/mp4v-es;video/mpeg;video/msvideo;video/quicktime;video/vnd.divx;video/x-avi;video/x-m4v;video/x-matroska;video/x-mpeg;video/x-ogm+ogg;video/x-theora+ogg;x-content/video-dvd;x-content/video-vcd;x-content/video-svcd;
---
-1.7.10
-
diff --git a/debian/patches/0001-Fix-include-with-the-system-s-libav.patch b/debian/patches/0002-Fix-include-with-the-system-s-libav.patch
similarity index 84%
rename from debian/patches/0001-Fix-include-with-the-system-s-libav.patch
rename to debian/patches/0002-Fix-include-with-the-system-s-libav.patch
index 5451b88..4cd2ba3 100644
--- a/debian/patches/0001-Fix-include-with-the-system-s-libav.patch
+++ b/debian/patches/0002-Fix-include-with-the-system-s-libav.patch
@@ -1,22 +1,25 @@
-From 151a0b3ceccdb081e05f0a030071bafeb88ff962 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito at ime.usp.br>
Date: Sat, 12 May 2012 01:53:49 -0300
-Subject: [PATCH] Fix include with the system's libav.
+Subject: Fix include with the system's libav.
+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/audioconvert.h | 119 +++++++++++++++++++++++++++++++++++++++++++++++
+ libhb/decavcodec.c | 2 +-
+ libhb/encavcodecaudio.c | 2 +-
+ libhb/module.defs | 2 +-
+ 4 files changed, 122 insertions(+), 3 deletions(-)
+ create mode 100644 libhb/audioconvert.h
-diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c
-index fd58c5c..0cfe80d 100644
---- a/libhb/decavcodec.c
-+++ b/libhb/decavcodec.c
-@@ -38,7 +38,7 @@
- #include "hb.h"
- #include "hbffmpeg.h"
- #include "downmix.h"
--#include "libavcodec/audioconvert.h"
-+#include "audioconvert.h"
-
- static void compute_frame_duration( hb_work_private_t *pv );
- static void flushDelayQueue( hb_work_private_t *pv );
+diff --git a/libhb/audioconvert.h b/libhb/audioconvert.h
+new file mode 100644
+index 0000000..f50eb3e
--- /dev/null
+++ b/libhb/audioconvert.h
@@ -0,0 +1,119 @@
@@ -139,6 +142,21 @@ index fd58c5c..0cfe80d 100644
+ const void * const in[6], const int in_stride[6], int len);
+
+#endif /* AVCODEC_AUDIOCONVERT_H */
+diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c
+index fd58c5c..5ada89a 100644
+--- a/libhb/decavcodec.c
++++ b/libhb/decavcodec.c
+@@ -38,7 +38,7 @@
+ #include "hb.h"
+ #include "hbffmpeg.h"
+ #include "downmix.h"
+-#include "libavcodec/audioconvert.h"
++#include "audioconvert.h"
+
+ static void compute_frame_duration( hb_work_private_t *pv );
+ static void flushDelayQueue( hb_work_private_t *pv );
+diff --git a/libhb/encavcodecaudio.c b/libhb/encavcodecaudio.c
+index 3a23256..0d97e8f 100644
--- a/libhb/encavcodecaudio.c
+++ b/libhb/encavcodecaudio.c
@@ -7,7 +7,7 @@
@@ -150,9 +168,11 @@ index fd58c5c..0cfe80d 100644
struct hb_work_private_s
{
+diff --git a/libhb/module.defs b/libhb/module.defs
+index 3fefae8..3a5d10d 100644
--- a/libhb/module.defs
+++ b/libhb/module.defs
-@@ -38,7 +38,7 @@
+@@ -38,7 +38,7 @@ ifeq (1,$(FEATURE.ff.mpeg2))
LIBHB.GCC.D += USE_FF_MPEG2
endif
LIBHB.GCC.D += __LIBHB__ USE_PTHREAD
diff --git a/debian/patches/01_build.diff b/debian/patches/0003-Remove-embedded-downloaded-copies-of-various-librari.patch
similarity index 77%
rename from debian/patches/01_build.diff
rename to debian/patches/0003-Remove-embedded-downloaded-copies-of-various-librari.patch
index e42630c..3e71365 100644
--- a/debian/patches/01_build.diff
+++ b/debian/patches/0003-Remove-embedded-downloaded-copies-of-various-librari.patch
@@ -1,19 +1,51 @@
-Subject: Remove embedded/downloaded copies of various libraries
From: Christian Marillat <marillat at debian.org>
Date: Tue, 15 May 2012 04:48:54 -0300
+Subject: Remove embedded/downloaded copies of various libraries
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
Once this is acceptable, this should be forwarded upstream so that the
use of system libraries is an option, instead of downloading libraries
and programs at build time.
+Forwarded: no
Last-Update: 2012-05-15
-Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
Reviewed-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
-Forwarded: no
+Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
+---
+ gtk/src/Makefile.am | 4 ++--
+ make/include/main.defs | 26 +++++---------------------
+ test/module.defs | 10 +++-------
+ 3 files changed, 10 insertions(+), 30 deletions(-)
+diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am
+index 9c1dbd2..8a0be50 100644
+--- a/gtk/src/Makefile.am
++++ b/gtk/src/Makefile.am
+@@ -10,7 +10,7 @@ else
+ 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
+
+@@ -108,7 +108,7 @@ ghb_LDFLAGS = \
+ -mwindows -Wl,--export-dynamic -Wl,--exclude-libs,ALL
+ else
+ ghb_LDFLAGS = \
+- -Wl,--export-dynamic -Wl,--exclude-libs,ALL
++ -Wl,--export-dynamic -Wl,--exclude-libs,ALL -Wl,-z,defs -Wl,--as-needed
+ endif
+
+ ghb_LDADD = $(HB_LIBS) $(GHB_LIBS)
+diff --git a/make/include/main.defs b/make/include/main.defs
+index e68f679..9770de1 100644
--- a/make/include/main.defs
+++ b/make/include/main.defs
-@@ -8,8 +8,6 @@
+@@ -8,8 +8,6 @@ include $(SRC/)make/include/tool.defs
###############################################################################
@@ -22,7 +54,7 @@ Forwarded: no
ifneq (,$(filter $(BUILD.system),cygwin mingw))
ifneq ($(HAS.bz2),1)
MODULES += contrib/bzip2
-@@ -20,25 +18,8 @@
+@@ -20,25 +18,8 @@ ifneq (,$(filter $(BUILD.system),darwin cygwin mingw))
MODULES += contrib/fribidi
endif
@@ -48,7 +80,7 @@ Forwarded: no
ifneq (,$(filter $(BUILD.system),mingw))
ifneq ($(HAS.pthread),1)
-@@ -46,8 +27,6 @@
+@@ -46,8 +27,6 @@ ifneq ($(HAS.pthread),1)
endif
endif
@@ -57,21 +89,23 @@ Forwarded: no
ifneq (,$(filter $(BUILD.system),cygwin mingw))
ifneq ($(HAS.iconv),1)
MODULES += contrib/libiconv
-@@ -82,6 +61,11 @@
- ## build gtk when gtk+linux
+@@ -83,6 +62,11 @@ ifeq (1-linux,$(FEATURE.gtk)-$(BUILD.system))
MODULES += gtk
endif
-+
+
+ifeq (1-kfreebsd,$(FEATURE.gtk)-$(BUILD.system))
+ ## build gtk when gtk+linux
+ MODULES += gtk
+endif
-
++
ifeq (1,$(FEATURE.local_yasm))
MODULES += contrib/yasm
+ endif
+diff --git a/test/module.defs b/test/module.defs
+index 5030e6f..69f9166 100644
--- a/test/module.defs
+++ b/test/module.defs
-@@ -10,10 +10,11 @@
+@@ -10,10 +10,11 @@ TEST.c.o = $(patsubst $(SRC/)%.c,$(BUILD/)%.o,$(TEST.c))
TEST.exe = $(BUILD/)$(call TARGET.exe,$(HB.name)CLI)
TEST.libs = $(LIBHB.a) $(foreach n, \
@@ -85,7 +119,7 @@ Forwarded: no
TEST.install.exe = $(DESTDIR)$(PREFIX/)bin/$(notdir $(TEST.exe))
ifeq (1,$(PTHREADW32.enabled))
-@@ -32,11 +33,6 @@
+@@ -32,11 +33,6 @@ ifeq (1,$(ZLIB.enabled))
else
TEST.GCC.l += z
endif
@@ -97,23 +131,3 @@ Forwarded: no
###############################################################################
---- 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
-
-@@ -108,7 +108,7 @@
- -mwindows -Wl,--export-dynamic -Wl,--exclude-libs,ALL
- else
- ghb_LDFLAGS = \
-- -Wl,--export-dynamic -Wl,--exclude-libs,ALL
-+ -Wl,--export-dynamic -Wl,--exclude-libs,ALL -Wl,-z,defs -Wl,--as-needed
- endif
-
- ghb_LDADD = $(HB_LIBS) $(GHB_LIBS)
diff --git a/debian/patches/03_kfreebsd.diff b/debian/patches/0004-Enable-compilation-on-kFreeBSD-arches.patch
similarity index 73%
rename from debian/patches/03_kfreebsd.diff
rename to debian/patches/0004-Enable-compilation-on-kFreeBSD-arches.patch
index b966586..bf5d261 100644
--- a/debian/patches/03_kfreebsd.diff
+++ b/debian/patches/0004-Enable-compilation-on-kFreeBSD-arches.patch
@@ -1,25 +1,25 @@
-Subject: Enable compilation on kFreeBSD arches.
From: Christian Marillat <marillat at debian.org>
Date: Tue, 15 May 2012 04:49:36 -0300
+Subject: Enable compilation on kFreeBSD arches.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
-Reviewed-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
-Last-Update: 2012-05-15
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>
+---
+ gtk/configure.ac | 3 +++
+ gtk/src/callbacks.c | 11 ++++++++---
+ libhb/ports.h | 2 +-
+ 3 files changed, 12 insertions(+), 4 deletions(-)
---- a/libhb/ports.h
-+++ b/libhb/ports.h
-@@ -51,7 +51,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 )
-+#elif defined( SYS_LINUX ) || defined( SYS_FREEBSD ) || defined ( SYS_SunOS ) || defined ( __FreeBSD_kernel__ )
- # define HB_LOW_PRIORITY 0
- # define HB_NORMAL_PRIORITY 0
- #elif defined( SYS_CYGWIN )
+diff --git a/gtk/configure.ac b/gtk/configure.ac
+index d2db300..f16dc9d 100644
--- a/gtk/configure.ac
+++ b/gtk/configure.ac
-@@ -93,6 +93,9 @@
+@@ -93,6 +93,9 @@ case $host in
fi
mingw_flag=yes
;;
@@ -29,6 +29,8 @@ Forwarded: no
*)
if test "x$gst_disable" = "xyes" ; then
GHB_PACKAGES="gtk+-2.0 >= 2.10 gthread-2.0 gio-2.0 libnotify dbus-glib-1 gudev-1.0"
+diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
+index 94a932d..eb67315 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -28,7 +28,9 @@
@@ -51,7 +53,7 @@ Forwarded: no
#else
#define WINVER 0x0500
#include <winsock2.h>
-@@ -3943,14 +3948,14 @@
+@@ -3943,14 +3948,14 @@ dvd_device_list()
return dvd_devices;
}
@@ -68,7 +70,7 @@ Forwarded: no
gchar *device;
GUdevDevice *udd;
-@@ -3984,7 +3989,7 @@
+@@ -3984,7 +3989,7 @@ ghb_is_cd(GDrive *gd)
void
ghb_udev_init()
{
@@ -77,3 +79,16 @@ Forwarded: no
udev_ctx = g_udev_client_new(NULL);
#endif
}
+diff --git a/libhb/ports.h b/libhb/ports.h
+index 7b743c4..5e17799 100644
+--- a/libhb/ports.h
++++ b/libhb/ports.h
+@@ -51,7 +51,7 @@ typedef struct hb_thread_s hb_thread_t;
+ #elif defined( SYS_DARWIN )
+ # define HB_LOW_PRIORITY 0
+ # define HB_NORMAL_PRIORITY 31
+-#elif defined( SYS_LINUX ) || defined( SYS_FREEBSD ) || defined ( SYS_SunOS )
++#elif defined( SYS_LINUX ) || defined( SYS_FREEBSD ) || defined ( SYS_SunOS ) || defined ( __FreeBSD_kernel__ )
+ # define HB_LOW_PRIORITY 0
+ # define HB_NORMAL_PRIORITY 0
+ #elif defined( SYS_CYGWIN )
diff --git a/debian/patches/0001-libhb-Fix-compilation-with-mp4v2-v1.9.1.patch b/debian/patches/0005-libhb-Fix-compilation-with-mp4v2-v1.9.1.patch
similarity index 69%
rename from debian/patches/0001-libhb-Fix-compilation-with-mp4v2-v1.9.1.patch
rename to debian/patches/0005-libhb-Fix-compilation-with-mp4v2-v1.9.1.patch
index 6928916..fff26ca 100644
--- a/debian/patches/0001-libhb-Fix-compilation-with-mp4v2-v1.9.1.patch
+++ b/debian/patches/0005-libhb-Fix-compilation-with-mp4v2-v1.9.1.patch
@@ -1,16 +1,24 @@
-From 4b36c8735eebfaa5da2201e72e78e7b6c3ac3d49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito at ime.usp.br>
Date: Sun, 22 Apr 2012 05:34:40 -0300
-Subject: [PATCH] libhb: Fix compilation with mp4v2 v1.9.1.
+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(-)
+diff --git a/libhb/decmetadata.c b/libhb/decmetadata.c
+index bd848a9..030188a 100644
--- a/libhb/decmetadata.c
+++ b/libhb/decmetadata.c
-@@ -13,7 +13,7 @@
+@@ -13,7 +13,7 @@ static void decmp4metadata( hb_title_t *title )
MP4FileHandle input_file;
hb_deep_log( 2, "Got an MP4 input, read the metadata");
@@ -19,7 +27,7 @@ Subject: [PATCH] libhb: Fix compilation with mp4v2 v1.9.1.
if( input_file != MP4_INVALID_FILE_HANDLE )
{
-@@ -92,7 +92,7 @@
+@@ -92,7 +92,7 @@ static void decmp4metadata( hb_title_t *title )
}
}
@@ -28,9 +36,11 @@ Subject: [PATCH] libhb: Fix compilation with mp4v2 v1.9.1.
}
}
+diff --git a/libhb/muxmp4.c b/libhb/muxmp4.c
+index d03326b..887c821 100644
--- a/libhb/muxmp4.c
+++ b/libhb/muxmp4.c
-@@ -93,13 +93,13 @@
+@@ -93,13 +93,13 @@ static int MP4Init( hb_mux_object_t * m )
if (job->largeFileSize)
/* Use 64-bit MP4 file */
{
@@ -46,7 +56,7 @@ Subject: [PATCH] libhb: Fix compilation with mp4v2 v1.9.1.
}
if (m->file == MP4_INVALID_FILE_HANDLE)
-@@ -1331,14 +1331,14 @@
+@@ -1331,14 +1331,14 @@ static int MP4End( hb_mux_object_t * m )
MP4TagsFree( tags );
}
diff --git a/debian/patches/0001-LinGUI-Allow-user-to-pass-libavcodec-settings-also-w.patch b/debian/patches/0006-LinGUI-Allow-user-to-pass-libavcodec-settings-also-w.patch
similarity index 81%
rename from debian/patches/0001-LinGUI-Allow-user-to-pass-libavcodec-settings-also-w.patch
rename to debian/patches/0006-LinGUI-Allow-user-to-pass-libavcodec-settings-also-w.patch
index cefb8d9..a0cd9c2 100644
--- a/debian/patches/0001-LinGUI-Allow-user-to-pass-libavcodec-settings-also-w.patch
+++ b/debian/patches/0006-LinGUI-Allow-user-to-pass-libavcodec-settings-also-w.patch
@@ -1,8 +1,7 @@
-From 78e03944f836db76bd61fb000595f5313634a8f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito at ime.usp.br>
Date: Fri, 4 May 2012 13:21:56 -0300
-Subject: [PATCH] LinGUI: Allow user to pass libavcodec settings also with
- MPEG4 video.
+Subject: LinGUI: Allow user to pass libavcodec settings also with MPEG4
+ video.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -13,7 +12,10 @@ if MPEG4 is selected.
This patch fixes it.
-Signed-off-by: Rogério Brito <rbrito at ime.usp.br>
+Applied-Upstream: https://github.com/HandBrake/HandBrake/commit/6bfa70d2543a5defd582236d7ecc2e38d2675bdf
+Forwarded: yes
+Last-Update: 2012-05-15
+Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
---
gtk/src/makedeps.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
@@ -31,6 +33,3 @@ index d7c2fa7..674c56d 100644
DepEntry("VideoEncoder", "Mp4iPodCompatible", "x264", False, False),
DepEntry("AudioTrackQualityEnable", "AudioTrackQuality", "FALSE", True, False),
DepEntry("AudioTrackQualityEnable", "AudioTrackQualityValue", "FALSE", True, False),
---
-1.7.10
-
diff --git a/debian/patches/series b/debian/patches/series
index 0894491..e21666b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
0001-Remove-encoding-indication-from-desktop-file.patch
-0001-Fix-include-with-the-system-s-libav.patch
-01_build.diff
-03_kfreebsd.diff
-0001-libhb-Fix-compilation-with-mp4v2-v1.9.1.patch
-0001-LinGUI-Allow-user-to-pass-libavcodec-settings-also-w.patch
+0002-Fix-include-with-the-system-s-libav.patch
+0003-Remove-embedded-downloaded-copies-of-various-librari.patch
+0004-Enable-compilation-on-kFreeBSD-arches.patch
+0005-libhb-Fix-compilation-with-mp4v2-v1.9.1.patch
+0006-LinGUI-Allow-user-to-pass-libavcodec-settings-also-w.patch
--
handbrake packaging
More information about the pkg-multimedia-commits
mailing list