summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2011-09-20 10:21:44 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2011-09-20 10:21:44 +0000
commita9beba90232e483050d1548f0f0c61c68ef0941f (patch)
tree599e76d2117777f5b22852507622271d7fb2b885 /media-video/ogmrip
parentx86 stable, see bug 383399 (diff)
downloadgentoo-2-a9beba90232e483050d1548f0f0c61c68ef0941f.tar.gz
gentoo-2-a9beba90232e483050d1548f0f0c61c68ef0941f.tar.bz2
gentoo-2-a9beba90232e483050d1548f0f0c61c68ef0941f.zip
Add libpng-1.5 patch thanks to Olivier Rolland <billl@users.sf.net>. Bug #383593
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Diffstat (limited to 'media-video/ogmrip')
-rw-r--r--media-video/ogmrip/ChangeLog7
-rw-r--r--media-video/ogmrip/files/ogmrip-0.13.6-libpng15.patch21
-rw-r--r--media-video/ogmrip/ogmrip-0.13.6.ebuild7
3 files changed, 31 insertions, 4 deletions
diff --git a/media-video/ogmrip/ChangeLog b/media-video/ogmrip/ChangeLog
index 68a9918d8b3a..3de888354ab3 100644
--- a/media-video/ogmrip/ChangeLog
+++ b/media-video/ogmrip/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-video/ogmrip
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ChangeLog,v 1.44 2011/02/06 17:01:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ChangeLog,v 1.45 2011/09/20 10:21:44 hwoarang Exp $
+
+ 20 Sep 2011; Markos Chandras <hwoarang@gentoo.org> ogmrip-0.13.6.ebuild,
+ +files/ogmrip-0.13.6-libpng15.patch:
+ Add libpng-1.5 patch thanks to Olivier Rolland <billl@users.sf.net>. Bug
+ #383593
06 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> ogmrip-0.13.6.ebuild,
+files/ogmrip-0.13.6-libnotify-0.7.patch:
diff --git a/media-video/ogmrip/files/ogmrip-0.13.6-libpng15.patch b/media-video/ogmrip/files/ogmrip-0.13.6-libpng15.patch
new file mode 100644
index 000000000000..fd07c27d8713
--- /dev/null
+++ b/media-video/ogmrip/files/ogmrip-0.13.6-libpng15.patch
@@ -0,0 +1,21 @@
+--- configure.in (révision 2054)
++++ configure.in (copie de travail)
+@@ -80,7 +80,7 @@
+ AC_SUBST(LIBXML_CFLAGS)
+ AC_SUBST(LIBXML_LIBS)
+
+-PKG_CHECK_MODULES(LIBPNG, "libpng", [have_png_support=yes], [have_png_support=no])
++PKG_CHECK_MODULES(LIBPNG, "libpng zlib", [have_png_support=yes], [have_png_support=no])
+ AC_SUBST(LIBPNG_CFLAGS)
+ AC_SUBST(LIBPNG_LIBS)
+
+--- subrip/subp2pgm.c (révision 2054)
++++ subrip/subp2pgm.c (copie de travail)
+@@ -44,6 +44,7 @@
+
+ #ifdef HAVE_PNG_SUPPORT
+ #include <png.h>
++#include <zlib.h>
+ #endif
+
+ #ifdef HAVE_TIFF_SUPPORT
diff --git a/media-video/ogmrip/ogmrip-0.13.6.ebuild b/media-video/ogmrip/ogmrip-0.13.6.ebuild
index 1fbe11e33dc8..c1783192745c 100644
--- a/media-video/ogmrip/ogmrip-0.13.6.ebuild
+++ b/media-video/ogmrip/ogmrip-0.13.6.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.13.6.ebuild,v 1.2 2011/02/06 17:01:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.13.6.ebuild,v 1.3 2011/09/20 10:21:44 hwoarang Exp $
EAPI=2
GCONF_DEBUG=no
-inherit eutils gnome2
+inherit autotools eutils gnome2
DESCRIPTION="Graphical frontend and libraries for ripping DVDs and encoding to AVI/OGM/MKV/MP4"
HOMEPAGE="http://ogmrip.sourceforge.net/"
@@ -79,7 +79,8 @@ src_prepare() {
configure || die
epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
-
+ epatch "${FILESDIR}"/${P}-libpng15.patch
+ eautoreconf
gnome2_src_prepare
}