r113 - tarballs unstable/mkvtoolnix/debian
unstable/mkvtoolnix/debian/patches
zorglub at alioth.debian.org
zorglub at alioth.debian.org
Wed Mar 14 14:21:05 CET 2007
Author: zorglub
Date: 2006-11-13 22:47:57 +0000 (Mon, 13 Nov 2006)
New Revision: 113
Added:
tarballs/mkvtoolnix_1.8.0.orig.tar.gz
unstable/mkvtoolnix/debian/patches/20-honor-strip.diff
unstable/mkvtoolnix/debian/patches/30-fix-attachement-segfault.diff
Removed:
tarballs/mkvtoolnix_1.6.5.orig.tar.gz
unstable/mkvtoolnix/debian/patches/10-look-for-help.diff
unstable/mkvtoolnix/debian/patches/10-manpage-error.dpatch
unstable/mkvtoolnix/debian/patches/20-malloc-crash-fix.diff
Modified:
unstable/mkvtoolnix/debian/changelog
unstable/mkvtoolnix/debian/control
unstable/mkvtoolnix/debian/patches/10-manpage-error.diff
unstable/mkvtoolnix/debian/patches/series
Log:
mkvtoolnix 1.8
Deleted: tarballs/mkvtoolnix_1.6.5.orig.tar.gz
===================================================================
(Binary files differ)
Added: tarballs/mkvtoolnix_1.8.0.orig.tar.gz
===================================================================
(Binary files differ)
Property changes on: tarballs/mkvtoolnix_1.8.0.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: unstable/mkvtoolnix/debian/changelog
===================================================================
--- unstable/mkvtoolnix/debian/changelog 2006-11-01 19:04:58 UTC (rev 112)
+++ unstable/mkvtoolnix/debian/changelog 2006-11-13 22:47:57 UTC (rev 113)
@@ -1,3 +1,14 @@
+mkvtoolnix (1.8.0-1) unstable; urgency=low
+
+ * New upstream version
+ - Tighten WX dependency
+ - Add libpcre dependency
+ - Add patch by upstream to fix attachement segfault (Closes:#393984)
+ * Add patch to honor nostrip option, thanks to Robert Millan
+ (Closes:#393961)
+
+ -- Clément Stenac <zorglub at debian.org> Sun, 12 Oct 2006 08:18:27 +0200
+
mkvtoolnix (1.7.0-2) unstable; urgency=high
* Fix WAV handling crash (Closes:#370144)
Modified: unstable/mkvtoolnix/debian/control
===================================================================
--- unstable/mkvtoolnix/debian/control 2006-11-01 19:04:58 UTC (rev 112)
+++ unstable/mkvtoolnix/debian/control 2006-11-13 22:47:57 UTC (rev 113)
@@ -2,7 +2,7 @@
Section: graphics
Priority: optional
Maintainer: Clément Stenac <zorglub at debian.org>
-Build-Depends: debhelper (>= 4.0.0) , libogg-dev, libvorbis-dev, zlib1g-dev, libwxgtk2.6-dev|libwxgtk2.4-dev, libflac-dev, libexpat1-dev, libbz2-dev, liblzo-dev, libebml-dev (>= 0.7.7), libmatroska-dev (>= 0.7.7), quilt, libmagic-dev
+Build-Depends: debhelper (>= 4.0.0) , libogg-dev, libvorbis-dev, zlib1g-dev, libwxgtk2.6-dev, libflac-dev, libexpat1-dev, libbz2-dev, liblzo-dev, libebml-dev (>= 0.7.7), libmatroska-dev (>= 0.7.7), quilt, libmagic-dev, libpcre3-dev
Standards-Version: 3.7.2
Package: mkvtoolnix
Deleted: unstable/mkvtoolnix/debian/patches/10-look-for-help.diff
===================================================================
--- unstable/mkvtoolnix/debian/patches/10-look-for-help.diff 2006-11-01 19:04:58 UTC (rev 112)
+++ unstable/mkvtoolnix/debian/patches/10-look-for-help.diff 2006-11-13 22:47:57 UTC (rev 113)
@@ -1,69 +0,0 @@
---- mkvtoolnix.orig/Makefile.in (revision 3064)
-+++ mkvtoolnix.orig/Makefile.in (revision 3065)
-@@ -87,7 +87,8 @@ LDFLAGS = @LDFLAGS@
-
- CFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\"
- CXXFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\"
--CXXFLAGS += -DMTX_LOCALE_DIR=\"$(localedir)\"
-+CXXFLAGS += -DMTX_LOCALE_DIR=\"$(localedir)\" \
-+ -DMTX_PKG_DATA_DIR=\"$(pkgdatadir)\"
-
- # Which additional stuff to compile
- USE_WXWINDOWS = @USE_WXWINDOWS@
-@@ -136,7 +137,7 @@ HTMLHELPBOOKS = mkvmerge-gui-book
-
- all: $(APPLICATIONS) $(TRANSLATIONS_MOS) $(HTMLHELPBOOKS)
-
--install: install-programs install-mans install-trans
-+install: install-programs install-mans install-trans install-guide
-
- install-programs: $(APPLICATIONS)
- $(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -152,18 +153,29 @@ install-programs: $(APPLICATIONS)
-
- install-mans:
- $(mkinstalldirs) $(DESTDIR)$(man1dir)
-- for i in $(MANPAGES); do \
-+ @for i in $(MANPAGES); do \
- inst=`echo $$i | sed -e 's/^.*\///'`; \
- echo " $(INSTALL_DATA) $$i $(DESTDIR)$(man1dir)/$$inst"; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(man1dir)/$$inst; \
- done
-
- install-trans:
-- for i in $(TRANSLATIONS); do \
-- echo "$(mkinstalldirs) $(DESTDIR)$(localedir)/$$i/LC_MESSAGES"; \
-- $(mkinstalldirs) $(DESTDIR)$(localedir)/$$i/LC_MESSAGES; \
-- echo "$(INSTALL_DATA) po/$$i.mo $(DESTDIR)$(localedir)/$$i/LC_MESSAGES/mkvtoolnix.mo"; \
-- $(INSTALL_DATA) po/$$i.mo $(DESTDIR)$(localedir)/$$i/LC_MESSAGES/mkvtoolnix.mo; \
-+ @for i in $(TRANSLATIONS); do \
-+ echo "$(mkinstalldirs) $(DESTDIR)$(localedir)/$$i/LC_MESSAGES"; \
-+ $(mkinstalldirs) $(DESTDIR)$(localedir)/$$i/LC_MESSAGES; \
-+ echo "$(INSTALL_DATA) po/$$i.mo $(DESTDIR)$(localedir)/$$i/LC_MESSAGES/mkvtoolnix.mo"; \
-+ $(INSTALL_DATA) po/$$i.mo $(DESTDIR)$(localedir)/$$i/LC_MESSAGES/mkvtoolnix.mo; \
-+ done
-+
-+install-guide:
-+ $(mkinstalldirs) $(pkgdatadir)
-+ @for i in doc/mkvmerge-gui.*; do \
-+ echo " $(INSTALL_DATA) $$i $(pkgdatadir)/"; \
-+ $(INSTALL_DATA) $$i $(pkgdatadir)/; \
-+ done
-+ @for i in doc/images/*gif; do \
-+ echo " $(INSTALL_DATA) $$i $(pkgdatadir)/"; \
-+ $(INSTALL_DATA) $$i $(pkgdatadir)/; \
- done
-
- SYSTEM_INCLUDES = $(AVILIB_INCLUDES) \
---- mkvtoolnix.orig/src/mmg/mmg.cpp (revision 3064)
-+++ mkvtoolnix/src/mmg/mmg.cpp (revision 3065)
-@@ -1181,6 +1181,9 @@ mmg_dialog::on_help(wxCommandEvent &evt)
- potential_help_paths.push_back(wxT("/usr/local/share/doc/mkvtoolnix"));
- potential_help_paths.push_back(wxT("/usr/local/share/doc/packages/mkvtoolnix"));
- potential_help_paths.push_back(wxT("/usr/local/share/doc/mkvtoolnix-" VERSION));
-+ // New location
-+ potential_help_paths.push_back(wxT(MTX_PKG_DATA_DIR));
-+ potential_help_paths.push_back(wxT(MTX_PKG_DATA_DIR "-" VERSION));
- #endif
- if (cfg->Read(wxT("help_path"), &help_path))
- potential_help_paths.push_back(help_path);
Modified: unstable/mkvtoolnix/debian/patches/10-manpage-error.diff
===================================================================
--- unstable/mkvtoolnix/debian/patches/10-manpage-error.diff 2006-11-01 19:04:58 UTC (rev 112)
+++ unstable/mkvtoolnix/debian/patches/10-manpage-error.diff 2006-11-13 22:47:57 UTC (rev 113)
@@ -6,9 +6,11 @@
. debian/patches/00template
@DPATCH@
---- mkvtoolnix-1.5.5.orig/doc/mkvmerge.1
-+++ mkvtoolnix-1.5.5/doc/mkvmerge.1
-@@ -213,8 +213,8 @@
+Index: mkvtoolnix-1.8.0/doc/mkvmerge.1
+===================================================================
+--- mkvtoolnix-1.8.0.orig/doc/mkvmerge.1 2006-11-12 11:32:16.000000000 +0100
++++ mkvtoolnix-1.8.0/doc/mkvmerge.1 2006-11-12 11:32:18.000000000 +0100
+@@ -218,8 +218,8 @@
MIME type of the following attachment. Applies to the next
\fB\-\-attach\-file\fR or \fB\-\-attach\-file\-once\fR command.
A list of officially recognized MIME types can be found e.g. at
@@ -18,4 +20,4 @@
+<ftp://ftp.isi.edu/in-notes/iana/assignments/ - media-types/media-types>
The MIME type is mandatory for an attachment.
.TP
- \fB\-\-attach\-file\fR <\fIfile name\fR>
+ \fB\-\-attachment\-name\fR <\fIname\fR>
Deleted: unstable/mkvtoolnix/debian/patches/10-manpage-error.dpatch
===================================================================
--- unstable/mkvtoolnix/debian/patches/10-manpage-error.dpatch 2006-11-01 19:04:58 UTC (rev 112)
+++ unstable/mkvtoolnix/debian/patches/10-manpage-error.dpatch 2006-11-13 22:47:57 UTC (rev 113)
@@ -1,21 +0,0 @@
-#! /bin/sh -e
-##
-## DP: Patch for a formatting problem in the manpage
-
-
-. debian/patches/00template
-
- at DPATCH@
---- mkvtoolnix-1.5.5.orig/doc/mkvmerge.1
-+++ mkvtoolnix-1.5.5/doc/mkvmerge.1
-@@ -213,8 +213,8 @@
- MIME type of the following attachment. Applies to the next
- \fB\-\-attach\-file\fR or \fB\-\-attach\-file\-once\fR command.
- A list of officially recognized MIME types can be found e.g. at
--.UR ftp://ftp.isi.edu/in-notes/iana/assignments/media-types/media-types
--<ftp://ftp.isi.edu/in-notes/iana/assignments/media-types/media-types>
-+.UR ftp://ftp.isi.edu/in-notes/iana/assignments/ - media-types/media-types
-+<ftp://ftp.isi.edu/in-notes/iana/assignments/ - media-types/media-types>
- The MIME type is mandatory for an attachment.
- .TP
- \fB\-\-attach\-file\fR <\fIfile name\fR>
Added: unstable/mkvtoolnix/debian/patches/20-honor-strip.diff
===================================================================
--- unstable/mkvtoolnix/debian/patches/20-honor-strip.diff 2006-11-01 19:04:58 UTC (rev 112)
+++ unstable/mkvtoolnix/debian/patches/20-honor-strip.diff 2006-11-13 22:47:57 UTC (rev 113)
@@ -0,0 +1,180 @@
+Index: mkvtoolnix-1.8.0/configure.in
+===================================================================
+--- mkvtoolnix-1.8.0.orig/configure.in 2006-11-12 11:32:50.000000000 +0100
++++ mkvtoolnix-1.8.0/configure.in 2006-11-12 11:52:34.000000000 +0100
+@@ -19,7 +19,6 @@
+ AC_PROG_MAKE_SET
+ AC_PROG_INSTALL
+ AC_CHECK_TOOL(RANLIB, ranlib, :)
+-AC_CHECK_TOOL(STRIP, strip, :)
+ AC_CHECK_TOOL(AR, ar, :)
+ AC_CHECK_TOOL(LD, ld, :)
+
+Index: mkvtoolnix-1.8.0/Makefile.in
+===================================================================
+--- mkvtoolnix-1.8.0.orig/Makefile.in 2006-11-12 11:32:50.000000000 +0100
++++ mkvtoolnix-1.8.0/Makefile.in 2006-11-12 11:52:34.000000000 +0100
+@@ -45,7 +45,6 @@
+ PROFILING_CFLAGS = @PROFILING_CFLAGS@
+ PROFILING_LIBS = @PROFILING_LIBS@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -151,7 +150,6 @@
+ f=`echo "$$p1" | sed 's,^.*/,,;s/$$/$(EXEEXT)/'`; \
+ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
+ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
+- $(STRIP) $(DESTDIR)$(bindir)/$$f; \
+ else :; fi; \
+ done
+
+Index: mkvtoolnix-1.8.0/configure
+===================================================================
+--- mkvtoolnix-1.8.0.orig/configure 2006-11-12 11:53:12.000000000 +0100
++++ mkvtoolnix-1.8.0/configure 2006-11-12 11:53:16.000000000 +0100
+@@ -653,7 +653,6 @@
+ INSTALL_SCRIPT
+ INSTALL_DATA
+ RANLIB
+-STRIP
+ AR
+ LD
+ GREP
+@@ -3787,102 +3786,6 @@
+ fi
+
+ if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}strip; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_prog_STRIP+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$STRIP"; then
+- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-STRIP=$ac_cv_prog_STRIP
+-if test -n "$STRIP"; then
+- { echo "$as_me:$LINENO: result: $STRIP" >&5
+-echo "${ECHO_T}$STRIP" >&6; }
+-else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_prog_STRIP"; then
+- ac_ct_STRIP=$STRIP
+- # Extract the first word of "strip", so it can be a program name with args.
+-set dummy strip; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$ac_ct_STRIP"; then
+- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_ac_ct_STRIP="strip"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+-if test -n "$ac_ct_STRIP"; then
+- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+-else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-
+- if test "x$ac_ct_STRIP" = x; then
+- STRIP=":"
+- else
+- case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet. If you think this
+-configuration is useful to you, please write to autoconf at gnu.org." >&5
+-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet. If you think this
+-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+-ac_tool_warned=yes ;;
+-esac
+- STRIP=$ac_ct_STRIP
+- fi
+-else
+- STRIP="$ac_cv_prog_STRIP"
+-fi
+-
+-if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ar; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+@@ -11429,7 +11332,6 @@
+ INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+ INSTALL_DATA!$INSTALL_DATA$ac_delim
+ RANLIB!$RANLIB$ac_delim
+-STRIP!$STRIP$ac_delim
+ AR!$AR$ac_delim
+ LD!$LD$ac_delim
+ GREP!$GREP$ac_delim
+@@ -11471,6 +11373,7 @@
+ WXWINDOWS_LIBS!$WXWINDOWS_LIBS$ac_delim
+ MMG_SUBDIRS!$MMG_SUBDIRS$ac_delim
+ USE_WXWINDOWS!$USE_WXWINDOWS$ac_delim
++LIBINTL_LIBS!$LIBINTL_LIBS$ac_delim
+ _ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -11512,7 +11415,6 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
+-LIBINTL_LIBS!$LIBINTL_LIBS$ac_delim
+ TRANSLATIONS_POS!$TRANSLATIONS_POS$ac_delim
+ TRANSLATIONS!$TRANSLATIONS$ac_delim
+ MAGIC_LIBS!$MAGIC_LIBS$ac_delim
+@@ -11520,7 +11422,7 @@
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 6; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 5; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Deleted: unstable/mkvtoolnix/debian/patches/20-malloc-crash-fix.diff
===================================================================
--- unstable/mkvtoolnix/debian/patches/20-malloc-crash-fix.diff 2006-11-01 19:04:58 UTC (rev 112)
+++ unstable/mkvtoolnix/debian/patches/20-malloc-crash-fix.diff 2006-11-13 22:47:57 UTC (rev 113)
@@ -1,14 +0,0 @@
---- mkvtoolnix-1.7.0-orig/src/output/p_pcm.cpp 2005-10-09 04:30:24.000000000 -0500
-+++ mkvtoolnix-1.7.0/src/output/p_pcm.cpp 2006-08-13 19:36:15.000000000 -0500
-@@ -51,7 +51,10 @@
- set_track_default_duration((int64_t)(1000000000.0 * ti.async.linear *
- packet_size / samples_per_sec));
-
-- packet_size *= channels * bits_per_sample / 8;
-+ /* It could happen that (channels * bits_per_sample < 8). Because of this,
-+ we mustn't divide by 8 in the same line, or the result would be hosed. */
-+ packet_size *= channels * bits_per_sample;
-+ packet_size /= 8;
- }
-
- pcm_packetizer_c::~pcm_packetizer_c() {
Added: unstable/mkvtoolnix/debian/patches/30-fix-attachement-segfault.diff
===================================================================
--- unstable/mkvtoolnix/debian/patches/30-fix-attachement-segfault.diff 2006-11-01 19:04:58 UTC (rev 112)
+++ unstable/mkvtoolnix/debian/patches/30-fix-attachement-segfault.diff 2006-11-13 22:47:57 UTC (rev 113)
@@ -0,0 +1,19 @@
+Index: mkv/src/merge/mkvmerge.cpp
+===================================================================
+--- mkv.old/src/merge/mkvmerge.cpp (revision 3363)
++++ mkv/src/merge/mkvmerge.cpp (revision 3364)
+@@ -1610,6 +1610,14 @@ parse_args(vector<string> args) {
+ if (no_next_arg)
+ mxerror(_("'%s' lacks the file name.\n"), this_arg.c_str());
+
++ try {
++ mm_file_io_c test(next_arg);
++ } catch (...) {
++ mxerror(_("The file '%s' cannot be attached because "
++ "it does not exist or cannot be read.\n"),
++ next_arg.c_str());
++ }
++
+ attachment.name = next_arg;
+ if (attachment.mime_type == "")
+ attachment.mime_type = guess_mime_type_and_report(next_arg);
Modified: unstable/mkvtoolnix/debian/patches/series
===================================================================
--- unstable/mkvtoolnix/debian/patches/series 2006-11-01 19:04:58 UTC (rev 112)
+++ unstable/mkvtoolnix/debian/patches/series 2006-11-13 22:47:57 UTC (rev 113)
@@ -1,2 +1,3 @@
10-manpage-error.diff
-20-malloc-crash-fix.diff
+20-honor-strip.diff
+30-fix-attachement-segfault.diff
More information about the Pkg-multimedia-commits
mailing list