summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Holzer <mholzer@gentoo.org>2004-02-01 01:29:30 +0000
committerMartin Holzer <mholzer@gentoo.org>2004-02-01 01:29:30 +0000
commit361f49407e2a90088175e7302db5f0d94bbc2e90 (patch)
tree4894d3d9c3d2e618b938bcd130cc604231a1015f /media-video/avidemux
parentadding filter. Closes 39980. (diff)
downloadhistorical-361f49407e2a90088175e7302db5f0d94bbc2e90.tar.gz
historical-361f49407e2a90088175e7302db5f0d94bbc2e90.tar.bz2
historical-361f49407e2a90088175e7302db5f0d94bbc2e90.zip
adding alsa.patch Closes 38982
Diffstat (limited to 'media-video/avidemux')
-rw-r--r--media-video/avidemux/ChangeLog6
-rw-r--r--media-video/avidemux/Manifest13
-rw-r--r--media-video/avidemux/avidemux-2.0.18.ebuild3
-rw-r--r--media-video/avidemux/files/alsa.patch16
4 files changed, 30 insertions, 8 deletions
diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 05f3dc40d815..b36fb8ad6f72 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/avidemux
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.34 2004/02/01 01:15:55 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.35 2004/02/01 01:29:02 mholzer Exp $
+
+ 01 Feb 2004; Martin Holzer <mholzer@gentoo.org> avidemux-2.0.18.ebuild,
+ files/alsa.patch:
+ adding alsa.patch Closes 38982
01 Feb 2004; Martin Holzer <mholzer@gentoo.org> avidemux-2.0.18.ebuild,
avidemux-2.0.20.ebuild:
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index f0e2978e2cff..6975d0e4eca7 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,13 +1,14 @@
-MD5 0a8891d6faa22afc06b83fba3e7b873e avidemux-2.0.18.ebuild 2466
+MD5 edfc022343e752edf63f96ae1765121f ChangeLog 7206
MD5 f9d985ce32bf8c84815ab0c4204da12f avidemux-0.9-r1.ebuild 2026
-MD5 c30d4be87d6cd003258ffe41314a6f3a avidemux-2.0.20.ebuild 2347
+MD5 1fe5a4df651f672bf21ad1ccc8af69eb avidemux-2.0.18.ebuild 2497
MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 021b4b772fa0a0e7221db12770f7e371 ChangeLog 7078
-MD5 c8b0002f8b446ffe1d4ae7e2440caf7f files/resize_crash.patch 618
+MD5 c30d4be87d6cd003258ffe41314a6f3a avidemux-2.0.20.ebuild 2347
+MD5 c235b3c2a9d464d8729ec6698895866e files/alsa.patch 607
MD5 09aa754d6dec1bcd2694695ed63b45a4 files/avidemux-0.9-libxml2.5.7.patch 717
-MD5 6be6f74f2af672e3571d3a450af4aeb3 files/digest-avidemux-0.9-r1 62
MD5 e2ad26556058864a7ca0eb97a34b5471 files/avidemux-2.0.16-ppc-configure.patch 926
-MD5 bc99c120921cdbc84402a1ac014f0786 files/gcc2.patch 1044
+MD5 6be6f74f2af672e3571d3a450af4aeb3 files/digest-avidemux-0.9-r1 62
MD5 7f9945862f4c68c59549897fe020eb2c files/digest-avidemux-2.0.18 68
+MD5 bc99c120921cdbc84402a1ac014f0786 files/gcc2.patch 1044
MD5 17fbb9e32a12d47d86a3f135c74da118 files/patch_jpeg.diff 1819
+MD5 c8b0002f8b446ffe1d4ae7e2440caf7f files/resize_crash.patch 618
MD5 41d1cf2e682c0023c0c445822c13c7ad files/digest-avidemux-2.0.20 68
diff --git a/media-video/avidemux/avidemux-2.0.18.ebuild b/media-video/avidemux/avidemux-2.0.18.ebuild
index ce9132123ee4..1c2513489a74 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-2004 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.8 2004/02/01 01:15:55 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.18.ebuild,v 1.9 2004/02/01 01:29:02 mholzer Exp $
inherit eutils flag-o-matic
@@ -44,6 +44,7 @@ src_compile() {
cd ${S}/avidemux/mpeg2enc; epatch ${FILESDIR}/gcc2.patch; cd ${S}
cd ${S}/avidemux/ADM_dialog; epatch ${FILESDIR}/resize_crash.patch; cd ${S}
+ epatch ${FILESDIR}/alsa.patch
export WANT_AUTOCONF=2.5
autoconf
diff --git a/media-video/avidemux/files/alsa.patch b/media-video/avidemux/files/alsa.patch
new file mode 100644
index 000000000000..49d2625a42d3
--- /dev/null
+++ b/media-video/avidemux/files/alsa.patch
@@ -0,0 +1,16 @@
+diff -ur avidemux/ADM_audiodevice/ADM_deviceALSA.cpp.org avidemux/ADM_audiodevice/ADM_deviceALSA.cpp
+--- avidemux/ADM_audiodevice/ADM_deviceALSA.cpp.org 2003-09-16 12:57:53.000000000 -0500
++++ avidemux/ADM_audiodevice/ADM_deviceALSA.cpp 2004-01-21 23:10:09.382307080 -0600
+@@ -37,7 +37,11 @@
+ #include "ADM_audiodevice/ADM_deviceoss.h"
+ #include "ADM_audiodevice/ADM_deviceALSA.h"
+
+-
++#include <alsa/version.h>
++#if SND_LIB_MAJOR==1
++#define ALSA_PCM_OLD_HW_PARAMS_API
++#define ALSA_PCM_NEW_HW_PARAMS_API
++#endif
+ #include <alsa/asoundlib.h>
+ /* Handle for the PCM device */
+ snd_pcm_t *pcm_handle;