media-video/avi-ogminfo: Fix deps for gnome3, Version Bump, Build against recent ffmpeg

svn path=/sunrise/; revision=11964

5 files changed, 90 insertions, 34 deletions

diff --git a/media-video/avi-ogminfo/ChangeLog b/media-video/avi-ogminfo/ChangeLog
index 1e3d04d99..063e1ba1d 100644
--- a/media-video/avi-ogminfo/ChangeLog
+++ b/media-video/avi-ogminfo/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for media-video/avi-ogminfo
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Apr 2011; Justin Lecher <jlec@gentoo.org> -avi-ogminfo-2.0.3.ebuild,
+  +avi-ogminfo-2.0.5.ebuild, +files/avi-ogminfo-2.0.5-ffmpeg.patch:
+  Fix deps for gnome3, Version Bump, Build against recent ffmpeg
+
   19 Jan 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   avi-ogminfo-2.0.3.ebuild:
   Add suggested RDEPEND=${DEPEND}, add die statements, drop unneeded die
diff --git a/media-video/avi-ogminfo/Manifest b/media-video/avi-ogminfo/Manifest
index fbdd42f6f..68c201b52 100644
--- a/media-video/avi-ogminfo/Manifest
+++ b/media-video/avi-ogminfo/Manifest
@@ -1,4 +1,5 @@
-DIST avi-ogminfo-2.0.3.tar.bz2 298498 RMD160 ebcf3eb99cfc88703309854b5ace6f3cff45aa74 SHA1 8d39dc99fdb25f3443e0b7dded0840926dce82e6 SHA256 3514dd971d60cd5ab9349f685605ad3776964bdea92b39f5bced98b2e60c7dbe
-EBUILD avi-ogminfo-2.0.3.ebuild 717 RMD160 98072bb2d4f55191af138799456e6e32d9a92941 SHA1 0459ed2c8033ec9d8fbdb173c436d0f8ad1c6d1e SHA256 ed3afd9c986b9365dfb93c7faa98d31591912354108aa2d35cddc76bc507f032
-MISC ChangeLog 638 RMD160 d83b9f2637cb4b48a7f1d5e30e63952fc6650982 SHA1 a6f6b8b5b19685233fddcb4874e35973e1c2fe37 SHA256 f443bd2342ae2d8b64b7e1c342930510bd14c5216d70529783a9e45abca265e5
+AUX avi-ogminfo-2.0.5-ffmpeg.patch 1897 RMD160 679411094279fc529619db6f46cd273267510f53 SHA1 28135a0bfb19836f0864e1313a792b53c9e1b9fe SHA256 62eff6e1cbd6ed1cdabc138812cfe5c93959a1fc33b608c410c3a5a688349ac6
+DIST avi-ogminfo-2.0.5.tar.bz2 303021 RMD160 f1d42f4f1a887da8c9aacde0e03826a3d161a476 SHA1 2d15ff1335059717c18b8ad8a7566f61439d93dc SHA256 2b482f28402ce19aff82b7dcbc79db54c3cd55cca50481b699cb2a152bc156d4
+EBUILD avi-ogminfo-2.0.5.ebuild 672 RMD160 bad4b9cc40173ba8ddadf76a8d3e2281bfc187c5 SHA1 01e70a1c2ed99ef0e2b5fa6f574180b1ead1282b SHA256 7785b0c90e577ecaab523a0ce0436cb5459ffa8ccb3f96e30434de4b28952671
+MISC ChangeLog 846 RMD160 f60f11e9ee544e71d8b1f1d27c5defc7ba2d4958 SHA1 ed92767159ff0e36cc7d01df2a3d4e6b28baa820 SHA256 0cb672f1b8ea0165dc8be1f49c14c92dd86557cbeb0d4a166314acccb4433b76
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/media-video/avi-ogminfo/avi-ogminfo-2.0.3.ebuild b/media-video/avi-ogminfo/avi-ogminfo-2.0.3.ebuild
deleted file mode 100644
index 49cb23e02..000000000
--- a/media-video/avi-ogminfo/avi-ogminfo-2.0.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION="A small program for getting information about media files"
-HOMEPAGE="http://avi-ogminfo.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-DEPEND="dev-libs/libxml2
-	>=x11-libs/gtk+-2.4
-	>=dev-cpp/gtkmm-2.6
-	>=media-video/ffmpeg-0.4.9_p20050906
-	>=media-libs/libogg-1.1
-	>=media-libs/libvorbis-1.0"
-RDEPEND=${DEPEND}
-
-src_compile() {
-	econf $(use_enable nls)
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc Changelog README{,.en} || die
-}
diff --git a/media-video/avi-ogminfo/avi-ogminfo-2.0.5.ebuild b/media-video/avi-ogminfo/avi-ogminfo-2.0.5.ebuild
new file mode 100644
index 000000000..78c0890d8
--- /dev/null
+++ b/media-video/avi-ogminfo/avi-ogminfo-2.0.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+inherit autotools eutils
+
+DESCRIPTION="A small program for getting information about media files"
+HOMEPAGE="http://avi-ogminfo.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+DEPEND="
+	dev-libs/libxml2
+	x11-libs/gtk+:2
+	dev-cpp/gtkmm:2.4
+	media-video/ffmpeg
+	media-libs/libogg
+	media-libs/libvorbis"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ffmpeg.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--disable-rpath
+}
diff --git a/media-video/avi-ogminfo/files/avi-ogminfo-2.0.5-ffmpeg.patch b/media-video/avi-ogminfo/files/avi-ogminfo-2.0.5-ffmpeg.patch
new file mode 100644
index 000000000..f14fa8829
--- /dev/null
+++ b/media-video/avi-ogminfo/files/avi-ogminfo-2.0.5-ffmpeg.patch
@@ -0,0 +1,45 @@
+ configure.in |    8 ++++----
+ src/mpeg.h   |    4 ++--
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 1315e77..17fe2bd 100644
+--- a/configure.in
++++ b/configure.in
+@@ -33,8 +33,8 @@ PKG_CHECK_MODULES(FFMPEG, libavcodec >= 49.0.1 libavformat >= 49.0.0,,[
+             [prefix to ffmpeg source, if libavcodec and libavformat are not in /usr (default = /usr)]),
+         ffmpegprefix="$withval", ffmpegprefix="/usr")
+     AC_CHECK_FILES([${ffmpegprefix}/lib/libavcodec.so ${ffmpegprefix}/lib/libavformat.so],[HAVE_FFMPEG=yes])
+-    AC_CHECK_HEADER(${ffmpegprefix}/include/ffmpeg/avcodec.h,[HAVE_SHARED_AVCODEC=yes])
+-    AC_CHECK_HEADER(${ffmpegprefix}/include/ffmpeg/avformat.h, [HAVE_SHARED_AVFORMAT=yes])
++    AC_CHECK_HEADER(${ffmpegprefix}/include/libavcodec/avcodec.h,[HAVE_SHARED_AVCODEC=yes])
++    AC_CHECK_HEADER(${ffmpegprefix}/include/libavformat/avformat.h, [HAVE_SHARED_AVFORMAT=yes])
+     if test "x$HAVE_FFMPEG$HAVE_SHARED_AVCODEC$HAVE_SHARED_AVCODEC" != "xyesyesyes"
+     then
+         AC_MSG_ERROR([missing shared ffmpeg libraries])
+@@ -47,8 +47,8 @@ PKG_CHECK_MODULES(FFMPEG, libavcodec >= 49.0.1 libavformat >= 49.0.0,,[
+     AC_RUN_IFELSE(
+         [AC_LANG_PROGRAM([[
+     #include <stdlib.h>
+-    #include <ffmpeg/avformat.h>
+-    #include <ffmpeg/avcodec.h>
++    #include <libavformat/avformat.h>
++    #include <libavcodec/avcodec.h>
+     ]],
+     [[
+     if (LIBAVCODEC_VERSION_INT >= ((49<<16)+(0<<8)+1) && LIBAVFORMAT_VERSION_INT >= ((49<<16)+(0<<8)+0))
+diff --git a/src/mpeg.h b/src/mpeg.h
+index f7d41d4..d5fca1c 100644
+--- a/src/mpeg.h
++++ b/src/mpeg.h
+@@ -32,8 +32,8 @@ Class working on MPEG files
+ #include <gtkmm.h>
+ // ffmpeg Bindings
+ extern "C" {
+-    #include <ffmpeg/avcodec.h>
+-    #include <ffmpeg/avformat.h>
++    #include <libavcodec/avcodec.h>
++    #include <libavformat/avformat.h>
+ }
+ 
+ #include "info.h"