summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Holzer <mholzer@gentoo.org>2003-11-27 17:59:38 +0000
committerMartin Holzer <mholzer@gentoo.org>2003-11-27 17:59:38 +0000
commitf458f866a0fcb659631cecd70b64ccbd76f4d66c (patch)
tree28e277f6dc30acea4916bedf2da76b7275a21cde /media-video/avidemux
parentnew release, mark 1.2.1 stable x86 'n cleanup old build (diff)
downloadhistorical-f458f866a0fcb659631cecd70b64ccbd76f4d66c.tar.gz
historical-f458f866a0fcb659631cecd70b64ccbd76f4d66c.tar.bz2
historical-f458f866a0fcb659631cecd70b64ccbd76f4d66c.zip
adding patch. Closes #33993.
Diffstat (limited to 'media-video/avidemux')
-rw-r--r--media-video/avidemux/ChangeLog6
-rw-r--r--media-video/avidemux/Manifest15
-rw-r--r--media-video/avidemux/avidemux-2.0.18.ebuild3
-rw-r--r--media-video/avidemux/files/resize_crash.patch27
4 files changed, 42 insertions, 9 deletions
diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 20d1d36e3d21..a3792fc5b222 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/avidemux
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.31 2003/11/02 18:28:22 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.32 2003/11/27 17:59:23 mholzer Exp $
+
+ 27 Nov 2003; Martin Holzer <mholzer@gentoo.org> avidemux-2.0.18.ebuild,
+ files/resize_crash.patch:
+ adding patch. Closes #33993.
02 Nov 2003; Martin Holzer <mholzer@gentoo.org>
avidemux-2.0.16.ebuild, avidemux-2.0.18.ebuild, files/gcc2.patch:
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 84afc40f4c35..ccb68b63979c 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,12 +1,13 @@
-MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 b68838cb6eeeed4c3a20a5b9d82a9822 avidemux-2.0.18.ebuild 2422
MD5 7c65ce7f366fbee86def6c81706adec0 avidemux-0.9-r1.ebuild 2003
-MD5 62238fc1cd6683eb2f532a960e6e7952 ChangeLog 6673
MD5 b90e9852eb9a69bf98340e82d8525c92 avidemux-2.0.16.ebuild 2646
-MD5 936225b04bd4c92f8b2ab32c5d81afc1 avidemux-2.0.18.ebuild 2345
-MD5 bc99c120921cdbc84402a1ac014f0786 files/gcc2.patch 1044
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 444de0313c566b6a65f9134c515c2513 ChangeLog 6807
+MD5 d3a15e32d4fc018661893e1f28337b1d files/digest-avidemux-2.0.16 68
+MD5 c8b0002f8b446ffe1d4ae7e2440caf7f files/resize_crash.patch 618
MD5 09aa754d6dec1bcd2694695ed63b45a4 files/avidemux-0.9-libxml2.5.7.patch 717
-MD5 e2ad26556058864a7ca0eb97a34b5471 files/avidemux-2.0.16-ppc-configure.patch 926
MD5 6be6f74f2af672e3571d3a450af4aeb3 files/digest-avidemux-0.9-r1 62
-MD5 d3a15e32d4fc018661893e1f28337b1d files/digest-avidemux-2.0.16 68
-MD5 17fbb9e32a12d47d86a3f135c74da118 files/patch_jpeg.diff 1819
+MD5 e2ad26556058864a7ca0eb97a34b5471 files/avidemux-2.0.16-ppc-configure.patch 926
+MD5 bc99c120921cdbc84402a1ac014f0786 files/gcc2.patch 1044
MD5 7f9945862f4c68c59549897fe020eb2c files/digest-avidemux-2.0.18 68
+MD5 17fbb9e32a12d47d86a3f135c74da118 files/patch_jpeg.diff 1819
diff --git a/media-video/avidemux/avidemux-2.0.18.ebuild b/media-video/avidemux/avidemux-2.0.18.ebuild
index 0080f34f81e8..0d4ab128c032 100644
--- a/media-video/avidemux/avidemux-2.0.18.ebuild
+++ b/media-video/avidemux/avidemux-2.0.18.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.18.ebuild,v 1.3 2003/11/02 18:28:22 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.18.ebuild,v 1.4 2003/11/27 17:59:23 mholzer Exp $
IUSE="debug nls oggvorbis arts truetype alsa"
filter-flags "-funroll-loops"
@@ -42,6 +42,7 @@ src_compile() {
touch -r *
cd ${S}/avidemux/mpeg2enc; epatch ${FILESDIR}/gcc2.patch; cd ${S}
+ cd ${S}/avidemux/ADM_dialog; epatch ${FILESDIR}/resize_crash.patch; cd ${S}
export WANT_AUTOCONF_2_5=1
autoconf
diff --git a/media-video/avidemux/files/resize_crash.patch b/media-video/avidemux/files/resize_crash.patch
new file mode 100644
index 000000000000..87c0d668412e
--- /dev/null
+++ b/media-video/avidemux/files/resize_crash.patch
@@ -0,0 +1,27 @@
+? DIA_prefs.lo
+? DIA_resize.lo
+Index: DIA_resize.cpp
+===================================================================
+RCS file: /cvsroot/avidemux2/avidemux2/avidemux2/avidemux/ADM_dialog/DIA_resize.cpp,v
+retrieving revision 1.1.1.1
+diff -u -r1.1.1.1 DIA_resize.cpp
+--- DIA_resize.cpp 16 Sep 2003 17:58:25 -0000 1.1.1.1
++++ DIA_resize.cpp 21 Nov 2003 17:29:53 -0000
+@@ -132,15 +132,14 @@
+ ret=1;
+ stop=1;
+ break;
++ default:
+ case GTK_RESPONSE_CANCEL:
+ stop=1;
+ break;
+ case GTK_RESPONSE_APPLY:
+ drag(NULL,NULL);
+ break;
+- default:
+- assert(0);
+- break;
++
+ }
+
+ }