[pkgsrc/trunk]: pkgsrc/multimedia Fix parallel builds by adding dependencies,...

[gdt <gdt%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f49dac8b405a
branches:  trunk
changeset: 537070:f49dac8b405a
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Thu Jan 03 13:34:36 2008 +0000

description:
Fix parallel builds by adding dependencies, and reenable them.

diffstat:

 multimedia/mplayer-share/distinfo         |   3 ++-
 multimedia/mplayer-share/patches/patch-ai |  24 ++++++++++++++++++++++++
 multimedia/mplayer/Makefile               |   7 +------
 3 files changed, 27 insertions(+), 7 deletions(-)

diffs (64 lines):

diff -r 9272c1f7ce9a -r f49dac8b405a multimedia/mplayer-share/distinfo
--- a/multimedia/mplayer-share/distinfo Thu Jan 03 13:30:37 2008 +0000
+++ b/multimedia/mplayer-share/distinfo Thu Jan 03 13:34:36 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.45 2007/12/21 16:07:48 tron Exp $
+$NetBSD: distinfo,v 1.46 2008/01/03 13:34:37 gdt Exp $
 
 SHA1 (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = e9b496f3527c552004ec6d01d6b43f196b43ce2d
 RMD160 (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = 3b5cba1529856a177a5191e22f8dcc00b5a83c52
@@ -11,4 +11,5 @@
 SHA1 (patch-af) = e8b6f2b914f9b8e9f12d92cb49b91b4381a46ce5
 SHA1 (patch-ag) = b46d902d88e05d6f61a017e8a1be79fad5a1fa00
 SHA1 (patch-ah) = 7aeb9f04d622fcad8c40dc9edbb0a58277fc622b
+SHA1 (patch-ai) = ec79d6a1b0c2790ca826a91a48040c64632ac988
 SHA1 (patch-tc) = 89f802ff0ebfc14d6f2a4b17177915f66c9f9038
diff -r 9272c1f7ce9a -r f49dac8b405a multimedia/mplayer-share/patches/patch-ai
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mplayer-share/patches/patch-ai Thu Jan 03 13:34:36 2008 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-ai,v 1.5 2008/01/03 13:34:37 gdt Exp $
+
+Fix parallel build failure by expressing dependencies.
+Filed upstream as http://bugzilla.mplayerhq.hu/show_bug.cgi?id=967
+
+--- vidix/Makefile.orig        2007-10-07 15:49:27.000000000 -0400
++++ vidix/Makefile
+@@ -40,13 +40,13 @@ dep depend:: pci_names.c
+ 
+ include ../mpcommon.mak
+ 
+-mga_crtc2_vid.o: mga_vid.c
++mga_crtc2_vid.o: mga_vid.c pci_ids.h
+       $(CC) -c $(CFLAGS) -DCRTC2 -o $@ $<
+ 
+-rage128_vid.o: radeon_vid.c
++rage128_vid.o: radeon_vid.c pci_ids.h
+       $(CC) -c $(CFLAGS) -DRAGE128 -o $@ $<
+ 
+-pci_names.c pci_dev_ids.c: pci.db
++pci_vendors.h pci_ids.h pci_names.c pci_names.h pci_dev_ids.c: pci.db
+       LC_ALL=C awk -f pci_db2c.awk $<
+ 
+ clean::
diff -r 9272c1f7ce9a -r f49dac8b405a multimedia/mplayer/Makefile
--- a/multimedia/mplayer/Makefile       Thu Jan 03 13:30:37 2008 +0000
+++ b/multimedia/mplayer/Makefile       Thu Jan 03 13:34:36 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2007/12/23 16:02:27 gdt Exp $
+# $NetBSD: Makefile,v 1.51 2008/01/03 13:34:36 gdt Exp $
 
 PKGNAME=       mplayer-${MPLAYER_PKG_VERSION}
 PKGREVISION=   1
@@ -7,11 +7,6 @@
 
 .include "../../multimedia/mplayer-share/Makefile.common"
 
-# pci_ids.c is created and then used without adequate dependencies
-# being expressed.
-# Filed upstream as http://bugzilla.mplayerhq.hu/show_bug.cgi?id=967
-MAKE_JOBS_SAFE=                no
-
 CONFIGURE_ARGS+=       --disable-mencoder
 CONFIGURE_ARGS+=       --confdir=${PREFIX}/share/mplayer