[SCM] handbrake/master: debian/patches: Remove patches applied upstream.
rbrito-guest at users.alioth.debian.org
rbrito-guest at users.alioth.debian.org
Fri Jul 27 07:45:25 UTC 2012
The following commit has been merged in the master branch:
commit 341acbb569cdbfa7d7e047b31565b6a2df1912aa
Author: Rogério Brito <rbrito at ime.usp.br>
Date: Fri Jul 27 04:41:12 2012 -0300
debian/patches: Remove patches applied upstream.
While we are at it, we also remove parts of patches that were applied
upstream.
Signed-off-by: Rogério Brito <rbrito at ime.usp.br>
diff --git a/debian/patches/0001-Remove-encoding-indication-from-desktop-file.patch b/debian/patches/0001-Remove-encoding-indication-from-desktop-file.patch
deleted file mode 100644
index ab35afb..0000000
--- a/debian/patches/0001-Remove-encoding-indication-from-desktop-file.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito at ime.usp.br>
-Date: Sat, 12 May 2012 03:48:24 -0300
-Subject: Remove encoding indication from desktop file.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Applied-Upstream: https://github.com/HandBrake/HandBrake/commit/826dad9e
-Forwarded: yes
-Last-Update: 2012-06-07
-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(-)
-
---- a/gtk/src/ghb.desktop
-+++ b/gtk/src/ghb.desktop
-@@ -5,7 +5,6 @@
- Exec=ghb
- Icon=hb-icon
- Terminal=false
--Encoding=UTF-8
- 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;
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 742ebda..81171b5 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
@@ -25,85 +25,6 @@ Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
make/include/main.defs | 5 +++++
4 files changed, 21 insertions(+), 6 deletions(-)
---- a/gtk/configure.ac
-+++ b/gtk/configure.ac
-@@ -94,10 +94,15 @@
- mingw_flag=yes
- ;;
- *)
-+ case "$host_os" in
-+ linux*)
-+ pkg_gudev="gudev-1.0"
-+ ;;
-+ esac
- 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"
-+ GHB_PACKAGES="gtk+-2.0 >= 2.10 gthread-2.0 gio-2.0 libnotify dbus-glib-1 $pkg_gudev"
- else
-- GHB_PACKAGES="gtk+-2.0 >= 2.10 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10 gstreamer-pbutils-0.10 gio-2.0 libnotify dbus-glib-1 gudev-1.0"
-+ GHB_PACKAGES="gtk+-2.0 >= 2.10 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10 gstreamer-pbutils-0.10 gio-2.0 libnotify dbus-glib-1 $pkg_gudev"
- fi
- mingw_flag=no
- ;;
---- a/gtk/src/callbacks.c
-+++ b/gtk/src/callbacks.c
-@@ -28,7 +28,9 @@
- #if !defined(_WIN32)
- #include <poll.h>
- #define G_UDEV_API_IS_SUBJECT_TO_CHANGE 1
-+#if defined(__linux__)
- #include <gudev/gudev.h>
-+#endif
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
-
-@@ -49,6 +51,9 @@
- #endif
-
- #include <gdk/gdkx.h>
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
- #else
- #define WINVER 0x0500
- #include <winsock2.h>
-@@ -3943,14 +3948,14 @@
- return dvd_devices;
- }
-
--#if !defined(_WIN32)
-+#if defined(__linux__)
- static GUdevClient *udev_ctx = NULL;
- #endif
-
- gboolean
- ghb_is_cd(GDrive *gd)
- {
--#if !defined(_WIN32)
-+#if defined(__linux__)
- gchar *device;
- GUdevDevice *udd;
-
-@@ -3984,7 +3989,7 @@
- void
- ghb_udev_init()
- {
--#if !defined(_WIN32)
-+#if defined(__linux__)
- udev_ctx = g_udev_client_new(NULL);
- #endif
- }
---- 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 )
--- a/make/include/main.defs
+++ b/make/include/main.defs
@@ -64,6 +64,11 @@
diff --git a/debian/patches/0006-LinGUI-Allow-user-to-pass-libavcodec-settings-also-w.patch b/debian/patches/0006-LinGUI-Allow-user-to-pass-libavcodec-settings-also-w.patch
deleted file mode 100644
index 645b11b..0000000
--- a/debian/patches/0006-LinGUI-Allow-user-to-pass-libavcodec-settings-also-w.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito at ime.usp.br>
-Date: Fri, 4 May 2012 13:21:56 -0300
-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
-
-In the present, if the user chooses the video codec to be MPEG2, then he can
-pass "advanced" options to libavcodec, but no advanced options are possible
-if MPEG4 is selected.
-
-This patch fixes it.
-
-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(-)
-
---- a/gtk/src/makedeps.py
-+++ b/gtk/src/makedeps.py
-@@ -47,7 +47,7 @@
- DepEntry("PictureAutoCrop", "PictureLeftCrop", "FALSE", False, False),
- DepEntry("PictureAutoCrop", "PictureRightCrop", "FALSE", False, False),
- DepEntry("VideoEncoder", "x264_tab", "x264", False, True),
-- DepEntry("VideoEncoder", "lavc_mpeg4_tab", "ffmpeg|ffmpeg2", False, True),
-+ DepEntry("VideoEncoder", "lavc_mpeg4_tab", "ffmpeg|ffmpeg4|ffmpeg2", False, True),
- DepEntry("VideoEncoder", "Mp4iPodCompatible", "x264", False, False),
- DepEntry("AudioTrackQualityEnable", "AudioTrackQuality", "FALSE", True, False),
- DepEntry("AudioTrackQualityEnable", "AudioTrackQualityValue", "FALSE", True, False),
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 7c953aa..a71565b 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
@@ -4,20 +4,7 @@ Subject: First try at removing some of mp4v2.
Forwarded: partially (only first hunk)
Signed-off-by: Rogério Brito <rbrito at ime.usp.br>
----
- libhb/stream.c | 1 -
- 1 file changed, 1 deletion(-)
---- a/libhb/stream.c
-+++ b/libhb/stream.c
-@@ -12,7 +12,6 @@
- #include "hbffmpeg.h"
- #include "lang.h"
- #include "a52dec/a52.h"
--#include "mp4v2/mp4v2.h"
- #include "libbluray/bluray.h"
-
- #define min(a, b) a < b ? a : b
--- a/libhb/muxmp4.c
+++ b/libhb/muxmp4.c
@@ -1,3 +1,4 @@
@@ -114,7 +101,7 @@ Signed-off-by: Rogério Brito <rbrito at ime.usp.br>
}
--- a/libhb/scan.c
+++ b/libhb/scan.c
-@@ -303,7 +303,7 @@
+@@ -301,7 +301,7 @@
job->list_audio = hb_list_init();
job->list_subtitle = hb_list_init();
@@ -135,7 +122,7 @@ Signed-off-by: Rogério Brito <rbrito at ime.usp.br>
{
--- a/gtk/src/presets.c
+++ b/gtk/src/presets.c
-@@ -1363,7 +1363,7 @@
+@@ -1366,7 +1366,7 @@
str = ghb_settings_get_string(ud->settings, "destination_dir");
ghb_ui_update(ud, "dest_dir", ghb_string_value(str));
diff --git a/debian/patches/0012-FLAGS.patch b/debian/patches/0012-FLAGS.patch
deleted file mode 100644
index 4a69b7c..0000000
--- a/debian/patches/0012-FLAGS.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Author: Fabian Greffrath <fabian+debian at greffrath.com>
-Subject: Consider CFLAGS, CPPFLAGS and LDFLAGS in libhb build.
-
-Forwarded: yes
---- a/gtk/module.rules
-+++ b/gtk/module.rules
-@@ -17,7 +17,7 @@
- $(GTK.CONFIGURE.extra) \
- PKG_CONFIG_PATH=$(BUILD/)contrib/lib/pkgconfig \
- CFLAGS="$(call fn.ARGS,GTK.GCC,.g .O *D ?extra)" \
-- LDFLAGS="$(call fn.ARGS,GTK.GCC,?strip .g .O) " \
-+ LDFLAGS="$(call fn.ARGS,GTK.GCC,?strip .g .O ?extra.exe) " \
- --prefix=$(PREFIX) \
- --with-hb=$(call fn.ABSOLUTE,$(BUILD/))
- $(TOUCH.exe) $@
---- a/make/include/gcc.defs
-+++ b/make/include/gcc.defs
-@@ -67,15 +67,15 @@
- GCC.args.l = -l$(1)
- GCC.args.end = -Wl,--end-group
-
--GCC.args.extra =
-+GCC.args.extra = $(CFLAGS) $(CPPFLAGS)
- GCC.args.extra.h_o =
- GCC.args.extra.c_o =
--GCC.args.extra.dylib =
--GCC.args.extra.exe =
-+GCC.args.extra.dylib = $(LDFLAGS)
-+GCC.args.extra.exe = $(LDFLAGS)
- GCC.args.extra.hpp_o =
- GCC.args.extra.cpp_o =
--GCC.args.extra.dylib++ =
--GCC.args.extra.exe++ =
-+GCC.args.extra.dylib++ = $(LDFLAGS)
-+GCC.args.extra.exe++ = $(LDFLAGS)
-
- ###############################################################################
-
diff --git a/debian/patches/series b/debian/patches/series
index 4e1e200..8e1f905 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,16 +1,13 @@
0001-libhb-Fix-erroneous-memcpy-used-with-overlapping-mem.patch
-0001-Remove-encoding-indication-from-desktop-file.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
-0006-LinGUI-Allow-user-to-pass-libavcodec-settings-also-w.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
-0012-FLAGS.patch
0013-format-security.patch
#0014-Use-unpatched-a52.patch
#0015-use-metadata-reading-from-libav.patch
--
handbrake packaging
More information about the pkg-multimedia-commits
mailing list