summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2005-03-13 12:55:11 +0000
committerLuca Barbato <lu_zero@gentoo.org>2005-03-13 12:55:11 +0000
commitf1c66baeb332d0d931009fd2f2477fdcf8e2095f (patch)
tree2e846aa8b7080891a23e0772f7fc12a40a99ea0e
parentVersion bumped. This closes bug #83862. (diff)
downloadgentoo-2-f1c66baeb332d0d931009fd2f2477fdcf8e2095f.tar.gz
gentoo-2-f1c66baeb332d0d931009fd2f2477fdcf8e2095f.tar.bz2
gentoo-2-f1c66baeb332d0d931009fd2f2477fdcf8e2095f.zip
minor fix
(Portage version: 2.0.51.19)
-rw-r--r--media-video/mjpegtools/ChangeLog6
-rw-r--r--media-video/mjpegtools/files/mjpegtools-1.6.2-dv.patch21
-rw-r--r--media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild3
3 files changed, 28 insertions, 2 deletions
diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index a535495d5534..f60478b5d254 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mjpegtools
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.80 2005/03/10 21:55:03 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.81 2005/03/13 12:55:11 lu_zero Exp $
+
+ 13 Mar 2005; Luca Barbato <lu_zero@gentoo.org>
+ +files/mjpegtools-1.6.2-dv.patch, mjpegtools-1.6.2-r3.ebuild:
+ Fixed libdv issues
10 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
mjpegtools-1.6.2-r3.ebuild:
diff --git a/media-video/mjpegtools/files/mjpegtools-1.6.2-dv.patch b/media-video/mjpegtools/files/mjpegtools-1.6.2-dv.patch
new file mode 100644
index 000000000000..cf2725f0b58a
--- /dev/null
+++ b/media-video/mjpegtools/files/mjpegtools-1.6.2-dv.patch
@@ -0,0 +1,21 @@
+--- mjpegtools-1.6.2.orig/configure.in 2004-02-03 23:57:29.000000000 +0100
++++ mjpegtools-1.6.2/configure.in 2005-03-13 12:46:28.000000000 +0100
+@@ -293,7 +293,9 @@
+ with_dv=/usr/local
+ fi
+
++if test x$with_dv = xno ; then
+ have_dv=false
++else
+ EXTRA_LIBS=" $LIBM_LIBS $GLIB_LIBS $PTHREAD_LIBS"
+ AC_CHECK_LIB(dv, dv_decoder_free,
+ [ DV_LIBS="-L${with_dv}/lib -ldv ${EXTRA_LIBS}"
+@@ -302,7 +304,7 @@
+ [libdv is present])
+ have_dv=true],,
+ -L${with_dv}/lib -ldv ${EXTRA_LIBS})
+-
++fi
+ dnl *********************************************************************
+ dnl Check for libDV YV12 read-support
+ have_dv_yv12=false
diff --git a/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild b/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild
index 4168164ed907..cd3da80e3dbe 100644
--- a/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild,v 1.16 2005/03/10 21:55:03 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild,v 1.17 2005/03/13 12:55:11 lu_zero Exp $
inherit flag-o-matic gcc eutils
@@ -36,6 +36,7 @@ src_unpack() {
epatch ${FILESDIR}/${P}-fPIC.patch
epatch ${FILESDIR}/${P}-gcc34.patch
epatch ${FILESDIR}/${P}-gcc34-altivec.patch
+ epatch ${FILESDIR}/${P}-dv.patch
# remove checks for gtk in configure in
use gtk || epatch ${FILESDIR}/${P}-nogtk.patch