fix include location

(Portage version: 2.1.4)

4 files changed, 51 insertions, 5 deletions

diff --git a/media-libs/gavl/ChangeLog b/media-libs/gavl/ChangeLog
index 4c635b9795c0..3d192fc9c9dc 100644
--- a/media-libs/gavl/ChangeLog
+++ b/media-libs/gavl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/gavl
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gavl/ChangeLog,v 1.1 2008/01/21 20:44:35 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gavl/ChangeLog,v 1.2 2008/01/25 18:49:10 drac Exp $
+
+*gavl-0.2.7-r1 (25 Jan 2008)
+
+  25 Jan 2008; Samuli Suominen <drac@gentoo.org>
+  +files/gavl-0.2.7-cflags-and-includedir.patch, -gavl-0.2.7.ebuild,
+  +gavl-0.2.7-r1.ebuild:
+  Fix gavlconfig.h include location.
 
 *gavl-0.2.7 (21 Jan 2008)
 
diff --git a/media-libs/gavl/files/digest-gavl-0.2.7-r1 b/media-libs/gavl/files/digest-gavl-0.2.7-r1
new file mode 100644
index 000000000000..2b9ded3f3b0c
--- /dev/null
+++ b/media-libs/gavl/files/digest-gavl-0.2.7-r1
@@ -0,0 +1,3 @@
+MD5 a52fdbd94ed9432c956d269bc8893915 gavl-0.2.7.tar.gz 1100939
+RMD160 9ad2ebda6539a40c0e8e8e8b36141395b55e67f3 gavl-0.2.7.tar.gz 1100939
+SHA256 0cf3417d522fcedb4d3fa3f42d8696c2d1742aec75a866b685a965f8b9d5a078 gavl-0.2.7.tar.gz 1100939
diff --git a/media-libs/gavl/files/gavl-0.2.7-cflags-and-includedir.patch b/media-libs/gavl/files/gavl-0.2.7-cflags-and-includedir.patch
new file mode 100644
index 000000000000..66519f4fda79
--- /dev/null
+++ b/media-libs/gavl/files/gavl-0.2.7-cflags-and-includedir.patch
@@ -0,0 +1,32 @@
+diff -ur gavl-0.2.7.orig/configure.ac gavl-0.2.7/configure.ac
+--- gavl-0.2.7.orig/configure.ac	2008-01-03 19:52:52.000000000 +0200
++++ gavl-0.2.7/configure.ac	2008-01-25 20:43:16.000000000 +0200
+@@ -91,7 +91,7 @@
+ dnl Build optimization flags
+ dnl
+ 
+-LQT_OPT_CFLAGS($host_cpu, ["-O3 -funroll-all-loops -fomit-frame-pointer -ffast-math"])
++LQT_OPT_CFLAGS($host_cpu, [""])
+ 
+ dnl
+ dnl Check for SIMD
+diff -ur gavl-0.2.7.orig/include/Makefile.am gavl-0.2.7/include/Makefile.am
+--- gavl-0.2.7.orig/include/Makefile.am	2007-10-20 17:28:35.000000000 +0300
++++ gavl-0.2.7/include/Makefile.am	2008-01-25 20:42:08.000000000 +0200
+@@ -1,7 +1,5 @@
+ SUBDIRS = gavl
+ 
+-includedir = $(prefix)/lib/gavl/include
+-
+ private_headers = \
+ accel.h \
+ arith128.h \
+@@ -21,7 +19,7 @@
+ video.h \
+ volume.h
+ 
+-include_HEADERS = gavlconfig.h
++pkginclude_HEADERS = gavlconfig.h
+ 
+ noinst_HEADERS =  $(private_headers)
+ 
diff --git a/media-libs/gavl/gavl-0.2.7.ebuild b/media-libs/gavl/gavl-0.2.7-r1.ebuild
index 51d1f2b45896..93b0e61e5ecb 100644
--- a/media-libs/gavl/gavl-0.2.7.ebuild
+++ b/media-libs/gavl/gavl-0.2.7-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gavl/gavl-0.2.7.ebuild,v 1.1 2008/01/21 20:44:35 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gavl/gavl-0.2.7-r1.ebuild,v 1.1 2008/01/25 18:49:10 drac Exp $
+
+inherit autotools eutils
 
 DESCRIPTION="library for handling uncompressed audio and video data"
 HOMEPAGE="http://gmerlin.sourceforge.net"
@@ -16,12 +18,14 @@ DEPEND=""
 
 src_unpack() {
 	unpack ${A}
-	sed -i -e 's:-O3 -funroll-all-loops -fomit-frame-pointer -ffast-math::' \
-		"${S}"/configure || die "sed failed."
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-cflags-and-includedir.patch
+	AT_M4DIR="m4" eautoreconf
 }
 
 src_compile() {
-	econf --without-cpuflags --docdir=/usr/share/doc/${PF}/html
+	econf --disable-libpng --without-cpuflags \
+		--docdir=/usr/share/doc/${PF}/html
 	emake || die "emake failed."
 }