diff options
| author | gdt <gdt@pkgsrc.org> | 2008-01-03 13:34:36 +0000 |
|---|---|---|
| committer | gdt <gdt@pkgsrc.org> | 2008-01-03 13:34:36 +0000 |
| commit | c5a59a21ce5d562f6e1d775b215fa297e371440e (patch) | |
| tree | 5e28617962bbe641b90db8d06d4121ff1317cb2e /multimedia | |
| parent | 814b1065daac69b1cc3e0372323a7097f1739687 (diff) | |
| download | pkgsrc-c5a59a21ce5d562f6e1d775b215fa297e371440e.tar.gz | |
Fix parallel builds by adding dependencies, and reenable them.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/mplayer-share/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/mplayer-share/patches/patch-ai | 24 | ||||
| -rw-r--r-- | multimedia/mplayer/Makefile | 7 |
3 files changed, 27 insertions, 7 deletions
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo index f483cd0edda..840d5051fd2 100644 --- a/multimedia/mplayer-share/distinfo +++ b/multimedia/mplayer-share/distinfo @@ -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-ae) = 24ac251b3f8d7a94cf61dbe4c960ac76884649f9 SHA1 (patch-af) = e8b6f2b914f9b8e9f12d92cb49b91b4381a46ce5 SHA1 (patch-ag) = b46d902d88e05d6f61a017e8a1be79fad5a1fa00 SHA1 (patch-ah) = 7aeb9f04d622fcad8c40dc9edbb0a58277fc622b +SHA1 (patch-ai) = ec79d6a1b0c2790ca826a91a48040c64632ac988 SHA1 (patch-tc) = 89f802ff0ebfc14d6f2a4b17177915f66c9f9038 diff --git a/multimedia/mplayer-share/patches/patch-ai b/multimedia/mplayer-share/patches/patch-ai new file mode 100644 index 00000000000..d86d83bc220 --- /dev/null +++ b/multimedia/mplayer-share/patches/patch-ai @@ -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 --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 7475e392619..94943c33902 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -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 @@ COMMENT= Software-only MPEG-1/2/4 video decoder .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 |