Mon Dec 3 17:26:41 2012 UTC ()
Fix build - it seems vlc 1.1.3 needs the older ffmpeg


(prlw1)
diff -r1.144 -r1.145 pkgsrc/multimedia/vlc/Makefile
diff -r1.43 -r1.44 pkgsrc/multimedia/vlc/buildlink3.mk
cvs diff -r1.144 -r1.145 pkgsrc/multimedia/vlc/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/vlc/Makefile 2012/10/08 23:02:13 1.144
+++ pkgsrc/multimedia/vlc/Makefile 2012/12/03 17:26:40 1.145
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.144 2012/10/08 23:02:13 adam Exp $ 1# $NetBSD: Makefile,v 1.145 2012/12/03 17:26:40 prlw1 Exp $
2# 2#
3 3
4DISTNAME= vlc-${VLC_VERSION} 4DISTNAME= vlc-${VLC_VERSION}
5PKGREVISION= 18 5PKGREVISION= 18
6CATEGORIES= multimedia 6CATEGORIES= multimedia
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vlc/} \ 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vlc/} \
8 http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/ 8 http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11VLC_VERSION= 1.1.13 11VLC_VERSION= 1.1.13
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= http://www.videolan.org/ 14HOMEPAGE= http://www.videolan.org/
@@ -120,27 +120,27 @@ CHECK_WRKREF_SKIP= lib/libvlccore.a \ @@ -120,27 +120,27 @@ CHECK_WRKREF_SKIP= lib/libvlccore.a \
120 120
121.include "../../mk/jpeg.buildlink3.mk" 121.include "../../mk/jpeg.buildlink3.mk"
122.include "../../graphics/png/buildlink3.mk" 122.include "../../graphics/png/buildlink3.mk"
123.include "../../net/liblive/buildlink3.mk" 123.include "../../net/liblive/buildlink3.mk"
124.include "../../converters/fribidi/buildlink3.mk" 124.include "../../converters/fribidi/buildlink3.mk"
125.include "../../devel/libebml/buildlink3.mk" 125.include "../../devel/libebml/buildlink3.mk"
126.include "../../devel/gettext-lib/buildlink3.mk" 126.include "../../devel/gettext-lib/buildlink3.mk"
127.include "../../devel/pcre/buildlink3.mk" 127.include "../../devel/pcre/buildlink3.mk"
128.include "../../devel/zlib/buildlink3.mk" 128.include "../../devel/zlib/buildlink3.mk"
129.include "../../textproc/libxml2/buildlink3.mk" 129.include "../../textproc/libxml2/buildlink3.mk"
130.include "../../security/libgcrypt/buildlink3.mk" 130.include "../../security/libgcrypt/buildlink3.mk"
131.include "../../security/gnutls/buildlink3.mk" 131.include "../../security/gnutls/buildlink3.mk"
132 132
133.include "../../multimedia/ffmpeg/buildlink3.mk" 133.include "../../multimedia/ffmpeg010/buildlink3.mk"
134.include "../../multimedia/libdvdplay/buildlink3.mk" 134.include "../../multimedia/libdvdplay/buildlink3.mk"
135.include "../../multimedia/libdvbpsi/buildlink3.mk" 135.include "../../multimedia/libdvbpsi/buildlink3.mk"
136.include "../../multimedia/libdvdnav/buildlink3.mk" 136.include "../../multimedia/libdvdnav/buildlink3.mk"
137.include "../../multimedia/libdvdread/buildlink3.mk" 137.include "../../multimedia/libdvdread/buildlink3.mk"
138.include "../../multimedia/libmatroska/buildlink3.mk" 138.include "../../multimedia/libmatroska/buildlink3.mk"
139.include "../../multimedia/libmpeg2/buildlink3.mk" 139.include "../../multimedia/libmpeg2/buildlink3.mk"
140.include "../../multimedia/libogg/buildlink3.mk" 140.include "../../multimedia/libogg/buildlink3.mk"
141.include "../../multimedia/libtheora/buildlink3.mk" 141.include "../../multimedia/libtheora/buildlink3.mk"
142# libX11 should be built with xcb enabled 142# libX11 should be built with xcb enabled
143BUILDLINK_API_DEPENDS.libX11+= libX11>=1.3.5 143BUILDLINK_API_DEPENDS.libX11+= libX11>=1.3.5
144.include "../../x11/libX11/buildlink3.mk" 144.include "../../x11/libX11/buildlink3.mk"
145# needs x264_encoder_delayed_frames 145# needs x264_encoder_delayed_frames
146BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20100201 146BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20100201
cvs diff -r1.43 -r1.44 pkgsrc/multimedia/vlc/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/vlc/buildlink3.mk 2012/09/23 05:36:23 1.43
+++ pkgsrc/multimedia/vlc/buildlink3.mk 2012/12/03 17:26:40 1.44
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: buildlink3.mk,v 1.43 2012/09/23 05:36:23 obache Exp $ 1# $NetBSD: buildlink3.mk,v 1.44 2012/12/03 17:26:40 prlw1 Exp $
2 2
3BUILDLINK_TREE+= vlc 3BUILDLINK_TREE+= vlc
4 4
5.if !defined(VLC_BUILDLINK3_MK) 5.if !defined(VLC_BUILDLINK3_MK)
6VLC_BUILDLINK3_MK:= 6VLC_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.vlc+= vlc>=1.0.0 8BUILDLINK_API_DEPENDS.vlc+= vlc>=1.0.0
9BUILDLINK_ABI_DEPENDS.vlc+= vlc>=1.1.13nb14 9BUILDLINK_ABI_DEPENDS.vlc+= vlc>=1.1.13nb14
10BUILDLINK_PKGSRCDIR.vlc?= ../../multimedia/vlc 10BUILDLINK_PKGSRCDIR.vlc?= ../../multimedia/vlc
11 11
12pkgbase:= vlc 12pkgbase:= vlc
13.include "../../mk/pkg-build-options.mk" 13.include "../../mk/pkg-build-options.mk"
14 14
@@ -20,27 +20,27 @@ pkgbase:= vlc @@ -20,27 +20,27 @@ pkgbase:= vlc
20.include "../../audio/liba52/buildlink3.mk" 20.include "../../audio/liba52/buildlink3.mk"
21.include "../../audio/libcddb/buildlink3.mk" 21.include "../../audio/libcddb/buildlink3.mk"
22.include "../../audio/libid3tag/buildlink3.mk" 22.include "../../audio/libid3tag/buildlink3.mk"
23.include "../../audio/libmad/buildlink3.mk" 23.include "../../audio/libmad/buildlink3.mk"
24.include "../../audio/libvorbis/buildlink3.mk" 24.include "../../audio/libvorbis/buildlink3.mk"
25.include "../../converters/fribidi/buildlink3.mk" 25.include "../../converters/fribidi/buildlink3.mk"
26.include "../../devel/SDL/buildlink3.mk" 26.include "../../devel/SDL/buildlink3.mk"
27.include "../../devel/gettext-lib/buildlink3.mk" 27.include "../../devel/gettext-lib/buildlink3.mk"
28.include "../../devel/pcre/buildlink3.mk" 28.include "../../devel/pcre/buildlink3.mk"
29.include "../../devel/zlib/buildlink3.mk" 29.include "../../devel/zlib/buildlink3.mk"
30.include "../../graphics/SDL_image/buildlink3.mk" 30.include "../../graphics/SDL_image/buildlink3.mk"
31.include "../../graphics/freetype2/buildlink3.mk" 31.include "../../graphics/freetype2/buildlink3.mk"
32.include "../../misc/libcdio/buildlink3.mk" 32.include "../../misc/libcdio/buildlink3.mk"
33.include "../../multimedia/ffmpeg/buildlink3.mk" 33.include "../../multimedia/ffmpeg010/buildlink3.mk"
34.include "../../multimedia/libdvdplay/buildlink3.mk" 34.include "../../multimedia/libdvdplay/buildlink3.mk"
35.include "../../multimedia/libdvbpsi/buildlink3.mk" 35.include "../../multimedia/libdvbpsi/buildlink3.mk"
36.include "../../multimedia/libdvdnav/buildlink3.mk" 36.include "../../multimedia/libdvdnav/buildlink3.mk"
37.include "../../multimedia/libdvdread/buildlink3.mk" 37.include "../../multimedia/libdvdread/buildlink3.mk"
38.include "../../multimedia/libmatroska/buildlink3.mk" 38.include "../../multimedia/libmatroska/buildlink3.mk"
39.include "../../multimedia/libmpeg2/buildlink3.mk" 39.include "../../multimedia/libmpeg2/buildlink3.mk"
40.include "../../multimedia/libogg/buildlink3.mk" 40.include "../../multimedia/libogg/buildlink3.mk"
41.include "../../textproc/libxml2/buildlink3.mk" 41.include "../../textproc/libxml2/buildlink3.mk"
42.include "../../x11/libXv/buildlink3.mk" 42.include "../../x11/libXv/buildlink3.mk"
43.include "../../x11/libXxf86vm/buildlink3.mk" 43.include "../../x11/libXxf86vm/buildlink3.mk"
44.endif # VLC_BUILDLINK3_MK 44.endif # VLC_BUILDLINK3_MK
45 45
46BUILDLINK_TREE+= -vlc 46BUILDLINK_TREE+= -vlc