Fri Jan 30 17:23:21 2009 UTC ()
Pullup ticket #2669 - requested by sborrill
vlc08: build fix

Revisions pulled up:
- multimedia/vlc08/Makefile		1.14
---
Module Name:	pkgsrc
Committed By:	sborrill
Date:		Thu Jan 29 11:32:05 UTC 2009

Modified Files:
	pkgsrc/multimedia/vlc08: Makefile

Log Message:
Force a new version of libcdio for API compatibility (otherwise building
the cdda module fails).


(tron)
diff -r1.13 -r1.13.2.1 pkgsrc/multimedia/vlc08/Makefile

cvs diff -r1.13 -r1.13.2.1 pkgsrc/multimedia/vlc08/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/vlc08/Attic/Makefile 2008/12/18 17:28:16 1.13
+++ pkgsrc/multimedia/vlc08/Attic/Makefile 2009/01/30 17:23:20 1.13.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.13 2008/12/18 17:28:16 bjs Exp $ 1# $NetBSD: Makefile,v 1.13.2.1 2009/01/30 17:23:20 tron Exp $
2# 2#
3 3
4DISTNAME= vlc-${VLC_VER} 4DISTNAME= vlc-${VLC_VER}
5PKGNAME= vlc08-${VLC_VER} 5PKGNAME= vlc08-${VLC_VER}
6VLC_VER= 0.8.6i 6VLC_VER= 0.8.6i
7PKGREVISION= 1 7PKGREVISION= 1
8CATEGORIES= multimedia 8CATEGORIES= multimedia
9MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${VLC_VER}/ 9MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${VLC_VER}/
10EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://www.videolan.org/ 13HOMEPAGE= http://www.videolan.org/
14COMMENT= VideoLAN Client 14COMMENT= VideoLAN Client
@@ -23,26 +23,27 @@ GNU_CONFIGURE= yes @@ -23,26 +23,27 @@ GNU_CONFIGURE= yes
23PTHREAD_OPTS+= require 23PTHREAD_OPTS+= require
24USE_LANGUAGES= c c++ 24USE_LANGUAGES= c c++
25USE_DIRS+= xdg-1.4 25USE_DIRS+= xdg-1.4
26 26
27.include "../../mk/bsd.prefs.mk" 27.include "../../mk/bsd.prefs.mk"
28.include "options.mk" 28.include "options.mk"
29 29
30.if ${OPSYS} == "NetBSD" 30.if ${OPSYS} == "NetBSD"
31CONFIGURE_ARGS+= --disable-vcd 31CONFIGURE_ARGS+= --disable-vcd
32.endif 32.endif
33 33
34BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.0 34BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.0
35BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1 35BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
 36BUILDLINK_API_DEPENDS.libcdio+= libcdio>=0.81
36 37
37CONFIGURE_ARGS+= --disable-speex # needs unstable 1.1.x branch 38CONFIGURE_ARGS+= --disable-speex # needs unstable 1.1.x branch
38CONFIGURE_ARGS+= --disable-gtk 39CONFIGURE_ARGS+= --disable-gtk
39CONFIGURE_ARGS+= --enable-release 40CONFIGURE_ARGS+= --enable-release
40CONFIGURE_ARGS+= --disable-gnomevfs 41CONFIGURE_ARGS+= --disable-gnomevfs
41CONFIGURE_ARGS+= --disable-gnutls 42CONFIGURE_ARGS+= --disable-gnutls
42CONFIGURE_ARGS+= --with-ffmpeg-zlib 43CONFIGURE_ARGS+= --with-ffmpeg-zlib
43CONFIGURE_ARGS+= --disable-smb 44CONFIGURE_ARGS+= --disable-smb
44CONFIGURE_ARGS+= --disable-mpc 45CONFIGURE_ARGS+= --disable-mpc
45CONFIGURE_ARGS+= --disable-dts 46CONFIGURE_ARGS+= --disable-dts
46CONFIGURE_ARGS+= --enable-cddax 47CONFIGURE_ARGS+= --enable-cddax
47CONFIGURE_ARGS+= --enable-dvdread 48CONFIGURE_ARGS+= --enable-dvdread
48CONFIGURE_ARGS+= --enable-flac 49CONFIGURE_ARGS+= --enable-flac