From ea8089defb07445ca4b4b21edbce530aed5c86c1 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 16 Jan 2010 03:28:32 +0100
Subject: [PATCH] libmp4v2: sanitize deps, split build stuff into do_build().

--HG--
extra : convert_revision : ebce793f6010b1f5850085d7dcaa7637d9b2146c
---
 srcpkgs/libmp4v2/mpeg4ip.template |  5 +++++
 srcpkgs/libmp4v2/template         | 20 +++++++++++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/libmp4v2/mpeg4ip.template b/srcpkgs/libmp4v2/mpeg4ip.template
index 690a994166..42f3c425eb 100644
--- a/srcpkgs/libmp4v2/mpeg4ip.template
+++ b/srcpkgs/libmp4v2/mpeg4ip.template
@@ -5,6 +5,11 @@ long_desc="${long_desc}
 
  This package contains tools for processing MPEG-4 files."
 
+revision=1
+
+Add_dependency run glibc
+Add_dependency run libstdc++
+Add_dependency run libgcc
 Add_dependency run libmp4v2
 
 do_install()
diff --git a/srcpkgs/libmp4v2/template b/srcpkgs/libmp4v2/template
index 7ffde51071..ce1f7a4eca 100644
--- a/srcpkgs/libmp4v2/template
+++ b/srcpkgs/libmp4v2/template
@@ -1,6 +1,7 @@
 # Template file for 'libmp4v2'
 pkgname=libmp4v2
 version=1.6.1
+revision=1
 wrksrc="mpeg4ip-${version}"
 distfiles="http://repository.slacky.eu/slackware-12.1/multimedia/mpeg4ip/$version/src/mpeg4ip-$version.tar.gz"
 build_style=custom-install
@@ -15,9 +16,10 @@ long_desc="
 
 subpackages="$pkgname-devel mpeg4ip"
 Add_dependency run glibc
+Add_dependency run libgcc
 Add_dependency run libstdc++
 
-do_install()
+do_build()
 {
 	cd ${wrksrc} || return 1
 	touch bootstrapped && echo "" > lib/rtp/configure && \
@@ -26,12 +28,20 @@ do_install()
 	for dir in lib/gnu lib/mp4av lib/mp4v2; do
 		cd ${wrksrc}/${dir}
 		make || return 1
+	done
+}
+
+do_install()
+{
+	for dir in lib/gnu lib/mp4av lib/mp4v2; do
+		cd ${wrksrc}/${dir}
 		make DESTDIR=${DESTDIR} install || return 1
 	done
-	cd ${wrksrc}
 	install -d ${DESTDIR}/usr/include
-	install -m644 include/mpeg4ip.h ${DESTDIR}/usr/include || return 1
-	install -m644 include/mpeg4ip_version.h \
+	install -m644 ${wrksrc}/include/mpeg4ip.h \
+		${DESTDIR}/usr/include || return 1
+	install -m644 ${wrksrc}/include/mpeg4ip_version.h \
+		${DESTDIR}/usr/include || return 1
+	install -m644 ${wrksrc}/mpeg4ip_config.h \
 		${DESTDIR}/usr/include || return 1
-	install -m644 mpeg4ip_config.h ${DESTDIR}/usr/include || return 1
 }