Sun Aug 9 12:18:17 2009 UTC ()
add fix for SA26156
Bump PKGREVISION


(kefren)
diff -r1.79 -r1.80 pkgsrc/multimedia/vlc/Makefile
diff -r1.28 -r1.29 pkgsrc/multimedia/vlc/distinfo
diff -r0 -r1.7 pkgsrc/multimedia/vlc/patches/patch-aa
cvs diff -r1.79 -r1.80 pkgsrc/multimedia/vlc/Makefile (switch to unified diff)

--- pkgsrc/multimedia/vlc/Makefile 2009/07/22 09:01:39 1.79
+++ pkgsrc/multimedia/vlc/Makefile 2009/08/09 12:18:17 1.80
@@ -1,157 +1,158 @@ @@ -1,157 +1,158 @@
1# $NetBSD: Makefile,v 1.79 2009/07/22 09:01:39 wiz Exp $ 1# $NetBSD: Makefile,v 1.80 2009/08/09 12:18:17 kefren Exp $
2# 2#
3 3
4DISTNAME= vlc-${VLC_VERSION} 4DISTNAME= vlc-${VLC_VERSION}
5CATEGORIES= multimedia 5CATEGORIES= multimedia
 6PKGREVISION= 1
6MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/ 7MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
7EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
8 9
9VLC_VERSION= 1.0.0 10VLC_VERSION= 1.0.0
10 11
11MAINTAINER= ahoka@NetBSD.org 12MAINTAINER= ahoka@NetBSD.org
12HOMEPAGE= http://videolan.org/ 13HOMEPAGE= http://videolan.org/
13COMMENT= VLC media player and streaming server 14COMMENT= VLC media player and streaming server
14 15
15CONFLICTS= vlc07-[0-9]* vlc08-[0-9]* 16CONFLICTS= vlc07-[0-9]* vlc08-[0-9]*
16 17
17PKG_DESTDIR_SUPPORT= user-destdir 18PKG_DESTDIR_SUPPORT= user-destdir
18USE_LIBTOOL= yes 19USE_LIBTOOL= yes
19USE_TOOLS+= gmake perl pkg-config \ 20USE_TOOLS+= gmake perl pkg-config \
20 autoconf automake autoreconf 21 autoconf automake autoreconf
21USE_PKGLOCALEDIR= yes 22USE_PKGLOCALEDIR= yes
22GNU_CONFIGURE= yes 23GNU_CONFIGURE= yes
23PTHREAD_OPTS+= require 24PTHREAD_OPTS+= require
24USE_LANGUAGES= c99 c++ 25USE_LANGUAGES= c99 c++
25PLIST_VARS+= x86simd altivec v4l2 vcd cdda 26PLIST_VARS+= x86simd altivec v4l2 vcd cdda
26 27
27.include "../../mk/bsd.prefs.mk" 28.include "../../mk/bsd.prefs.mk"
28.include "options.mk" 29.include "options.mk"
29 30
30.if ${OPSYS} == "NetBSD" 31.if ${OPSYS} == "NetBSD"
31CONFIGURE_ARGS+= --disable-vcd 32CONFIGURE_ARGS+= --disable-vcd
32.else 33.else
33PLIST.vcd= yes 34PLIST.vcd= yes
34# This may need a closer look. 35# This may need a closer look.
35PLIST.cdda= yes 36PLIST.cdda= yes
36.endif 37.endif
37 38
38BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.0 39BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.0
39BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1 40BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
40 41
41CONFIGURE_ARGS+= --disable-speex # needs unstable 1.1.x branch 42CONFIGURE_ARGS+= --disable-speex # needs unstable 1.1.x branch
42CONFIGURE_ARGS+= --disable-smb 43CONFIGURE_ARGS+= --disable-smb
43 44
44CONFIGURE_ARGS+= --enable-cddax \ 45CONFIGURE_ARGS+= --enable-cddax \
45 --enable-dvdread \ 46 --enable-dvdread \
46 --enable-flac \ 47 --enable-flac \
47 --enable-live555 \ 48 --enable-live555 \
48 --enable-theora 49 --enable-theora
49 50
50# Build optimalized modules 51# Build optimalized modules
51.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 52.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
52PLIST.x86simd= yes 53PLIST.x86simd= yes
53CONFIGURE_ARGS+= --enable-mmx \ 54CONFIGURE_ARGS+= --enable-mmx \
54 --enable-sse 55 --enable-sse
55.endif 56.endif
56.if ${MACHINE_ARCH} == "powerpc" 57.if ${MACHINE_ARCH} == "powerpc"
57PLIST.altivec= yes 58PLIST.altivec= yes
58CONFIGURE_ARGS+= --enable-altivec 59CONFIGURE_ARGS+= --enable-altivec
59.endif 60.endif
60 61
61# Enable when cleanly builds 62# Enable when cleanly builds
62.if exists(/usr/include/linux/videodev2.h) # || exists(/usr/include/sys/videoio.h) 63.if exists(/usr/include/linux/videodev2.h) # || exists(/usr/include/sys/videoio.h)
63CONFIGURE_ARGS+= --enable-v4l2 64CONFIGURE_ARGS+= --enable-v4l2
64PLIST.v4l2= yes 65PLIST.v4l2= yes
65.else 66.else
66CONFIGURE_ARGS+= --disable-v4l2 67CONFIGURE_ARGS+= --disable-v4l2
67.endif 68.endif
68 69
69INSTALLATION_DIRS+= share/vlc/http/dialogs share/vlc/http/images \ 70INSTALLATION_DIRS+= share/vlc/http/dialogs share/vlc/http/images \
70 share/vlc/http/js share/vlc/http/old \ 71 share/vlc/http/js share/vlc/http/old \
71 share/vlc/http/old/admin share/vlc/http/old/vlm \ 72 share/vlc/http/old/admin share/vlc/http/old/vlm \
72 share/vlc/http/requests share/vlc/osdmenu/default \ 73 share/vlc/http/requests share/vlc/osdmenu/default \
73 share/vlc/osdmenu/default/selected \ 74 share/vlc/osdmenu/default/selected \
74 share/vlc/osdmenu/default/selection \ 75 share/vlc/osdmenu/default/selection \
75 share/vlc/osdmenu/default/volume \ 76 share/vlc/osdmenu/default/volume \
76 share/vlc/osdmenu/dvd/selected \ 77 share/vlc/osdmenu/dvd/selected \
77 share/vlc/osdmenu/dvd/volume \ 78 share/vlc/osdmenu/dvd/volume \
78 share/vlc/osdmenu/dvd/unselect \ 79 share/vlc/osdmenu/dvd/unselect \
79 share/vlc/osdmenu/dvd/selection \ 80 share/vlc/osdmenu/dvd/selection \
80 share/vlc/skins2 share/vlc/skins2/fonts \ 81 share/vlc/skins2 share/vlc/skins2/fonts \
81 ${PKGMANDIR}/man1 82 ${PKGMANDIR}/man1
82pre-configure: 83pre-configure:
83 cd ${WRKSRC} && autoreconf -f 84 cd ${WRKSRC} && autoreconf -f
84 85
85post-install: 86post-install:
86 ${INSTALL_DATA} ${WRKSRC}/doc/vlc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 87 ${INSTALL_DATA} ${WRKSRC}/doc/vlc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
87 ${INSTALL_DATA} ${WRKSRC}/doc/vlc-config.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 88 ${INSTALL_DATA} ${WRKSRC}/doc/vlc-config.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
88 89
89# Let's use dejavu-ttf as it has nice unicode support 90# Let's use dejavu-ttf as it has nice unicode support
90# 91#
91ORIGFNT= /usr/share/fonts/truetype/freefont/FreeSerifBold.ttf 92ORIGFNT= /usr/share/fonts/truetype/freefont/FreeSerifBold.ttf
92DEFAULT_FONT?= ${PREFIX}/lib/X11/fonts/TTF/DejaVuSans.ttf 93DEFAULT_FONT?= ${PREFIX}/lib/X11/fonts/TTF/DejaVuSans.ttf
93DEPENDS+= dejavu-ttf>=2.26:../../fonts/dejavu-ttf 94DEPENDS+= dejavu-ttf>=2.26:../../fonts/dejavu-ttf
94 95
95SUBST_CLASSES+= oss 96SUBST_CLASSES+= oss
96SUBST_STAGE.oss= pre-configure 97SUBST_STAGE.oss= pre-configure
97SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g" 98SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
98SUBST_FILES.oss+= modules/access/oss.c 99SUBST_FILES.oss+= modules/access/oss.c
99SUBST_FILES.oss+= modules/audio_output/oss.c 100SUBST_FILES.oss+= modules/audio_output/oss.c
100SUBST_FILES.oss+= modules/gui/pda/pda_interface.c 101SUBST_FILES.oss+= modules/gui/pda/pda_interface.c
101SUBST_FILES.oss+= modules/gui/pda/pda.glade 102SUBST_FILES.oss+= modules/gui/pda/pda.glade
102SUBST_FILES.oss+= po/*.po 103SUBST_FILES.oss+= po/*.po
103SUBST_MESSAGE.oss= Fixing hardcoded audio device. 104SUBST_MESSAGE.oss= Fixing hardcoded audio device.
104 105
105SUBST_CLASSES+= fnt 106SUBST_CLASSES+= fnt
106SUBST_STAGE.fnt= pre-configure 107SUBST_STAGE.fnt= pre-configure
107SUBST_SED.fnt= -e "s,${ORIGFNT},${DEFAULT_FONT}," 108SUBST_SED.fnt= -e "s,${ORIGFNT},${DEFAULT_FONT},"
108SUBST_FILES.fnt= modules/misc/freetype.c 109SUBST_FILES.fnt= modules/misc/freetype.c
109SUBST_MESSAGE.fnt= Fixing hardcoded paths. 110SUBST_MESSAGE.fnt= Fixing hardcoded paths.
110 111
111REPLACE_SH+= vlc-config.in.in 112REPLACE_SH+= vlc-config.in.in
112 113
113# VLC embeds the build environment info to help debuging 114# VLC embeds the build environment info to help debuging
114# 115#
115CHECK_WRKREF_SKIP= lib/libvlccore.a \ 116CHECK_WRKREF_SKIP= lib/libvlccore.a \
116 lib/libvlccore.so \ 117 lib/libvlccore.so \
117 lib/libvlccore.so.2 \ 118 lib/libvlccore.so.2 \
118 lib/libvlccore.so.2.0.0 119 lib/libvlccore.so.2.0.0
119 120
120.include "../../audio/libmpcdec/buildlink3.mk" 121.include "../../audio/libmpcdec/buildlink3.mk"
121.include "../../audio/flac/buildlink3.mk" 122.include "../../audio/flac/buildlink3.mk"
122.include "../../audio/libmad/buildlink3.mk" 123.include "../../audio/libmad/buildlink3.mk"
123.include "../../audio/libvorbis/buildlink3.mk" 124.include "../../audio/libvorbis/buildlink3.mk"
124.include "../../audio/liba52/buildlink3.mk" 125.include "../../audio/liba52/buildlink3.mk"
125.include "../../audio/libcddb/buildlink3.mk" 126.include "../../audio/libcddb/buildlink3.mk"
126.include "../../audio/libid3tag/buildlink3.mk" 127.include "../../audio/libid3tag/buildlink3.mk"
127.include "../../audio/libdca/buildlink3.mk" 128.include "../../audio/libdca/buildlink3.mk"
128.include "../../audio/taglib/buildlink3.mk" 129.include "../../audio/taglib/buildlink3.mk"
129.include "../../audio/libcddb/buildlink3.mk" 130.include "../../audio/libcddb/buildlink3.mk"
130.include "../../misc/libcdio/buildlink3.mk" 131.include "../../misc/libcdio/buildlink3.mk"
131 132
132.include "../../graphics/jpeg/buildlink3.mk" 133.include "../../graphics/jpeg/buildlink3.mk"
133.include "../../net/liblive/buildlink3.mk" 134.include "../../net/liblive/buildlink3.mk"
134.include "../../converters/fribidi/buildlink3.mk" 135.include "../../converters/fribidi/buildlink3.mk"
135.include "../../devel/libebml/buildlink3.mk" 136.include "../../devel/libebml/buildlink3.mk"
136.include "../../devel/gettext-lib/buildlink3.mk" 137.include "../../devel/gettext-lib/buildlink3.mk"
137.include "../../devel/pcre/buildlink3.mk" 138.include "../../devel/pcre/buildlink3.mk"
138.include "../../devel/zlib/buildlink3.mk" 139.include "../../devel/zlib/buildlink3.mk"
139.include "../../textproc/libxml2/buildlink3.mk" 140.include "../../textproc/libxml2/buildlink3.mk"
140.include "../../security/libgcrypt/buildlink3.mk" 141.include "../../security/libgcrypt/buildlink3.mk"
141.include "../../security/gnutls/buildlink3.mk" 142.include "../../security/gnutls/buildlink3.mk"
142 143
143.include "../../multimedia/ffmpeg/buildlink3.mk" 144.include "../../multimedia/ffmpeg/buildlink3.mk"
144.include "../../multimedia/libdvdplay/buildlink3.mk" 145.include "../../multimedia/libdvdplay/buildlink3.mk"
145.include "../../multimedia/libdvbpsi/buildlink3.mk" 146.include "../../multimedia/libdvbpsi/buildlink3.mk"
146.include "../../multimedia/libdvdnav/buildlink3.mk" 147.include "../../multimedia/libdvdnav/buildlink3.mk"
147.include "../../multimedia/libdvdread/buildlink3.mk" 148.include "../../multimedia/libdvdread/buildlink3.mk"
148.include "../../multimedia/libmatroska/buildlink3.mk" 149.include "../../multimedia/libmatroska/buildlink3.mk"
149.include "../../multimedia/libmpeg2/buildlink3.mk" 150.include "../../multimedia/libmpeg2/buildlink3.mk"
150.include "../../multimedia/libogg/buildlink3.mk" 151.include "../../multimedia/libogg/buildlink3.mk"
151.include "../../multimedia/libtheora/buildlink3.mk" 152.include "../../multimedia/libtheora/buildlink3.mk"
152.include "../../multimedia/x264-devel/buildlink3.mk" 153.include "../../multimedia/x264-devel/buildlink3.mk"
153 154
154.include "../../sysutils/desktop-file-utils/desktopdb.mk" 155.include "../../sysutils/desktop-file-utils/desktopdb.mk"
155.include "../../mk/oss.buildlink3.mk" 156.include "../../mk/oss.buildlink3.mk"
156.include "../../mk/pthread.buildlink3.mk" 157.include "../../mk/pthread.buildlink3.mk"
157.include "../../mk/bsd.pkg.mk" 158.include "../../mk/bsd.pkg.mk"
cvs diff -r1.28 -r1.29 pkgsrc/multimedia/vlc/distinfo (switch to unified diff)

--- pkgsrc/multimedia/vlc/distinfo 2009/07/07 16:17:47 1.28
+++ pkgsrc/multimedia/vlc/distinfo 2009/08/09 12:18:17 1.29
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.28 2009/07/07 16:17:47 tnn Exp $ 1$NetBSD: distinfo,v 1.29 2009/08/09 12:18:17 kefren Exp $
2 2
3SHA1 (vlc-1.0.0.tar.bz2) = fff08528d97d26f6f7faeafba94b445e0e3562e8 3SHA1 (vlc-1.0.0.tar.bz2) = fff08528d97d26f6f7faeafba94b445e0e3562e8
4RMD160 (vlc-1.0.0.tar.bz2) = 7d0ed52c580c75d09003788f5a2d27b7de18b410 4RMD160 (vlc-1.0.0.tar.bz2) = 7d0ed52c580c75d09003788f5a2d27b7de18b410
5Size (vlc-1.0.0.tar.bz2) = 19973964 bytes 5Size (vlc-1.0.0.tar.bz2) = 19973964 bytes
 6SHA1 (patch-aa) = 49157d57e4e7755be87b22234d6c04ef997f91b6
6SHA1 (patch-configure) = 88a32710eea4987975839bf982d7a6958b977a5c 7SHA1 (patch-configure) = 88a32710eea4987975839bf982d7a6958b977a5c
7SHA1 (patch-v4l2) = 1f91206f8e2f78514056386977a6c2230a710211 8SHA1 (patch-v4l2) = 1f91206f8e2f78514056386977a6c2230a710211
File Added: pkgsrc/multimedia/vlc/patches/Attic/patch-aa
--- modules/access/rtsp/real.c.orig	2009-08-09 13:00:43.000000000 +0300
+++ modules/access/rtsp/real.c	2009-08-09 13:01:54.000000000 +0300
@@ -592,6 +592,8 @@ int real_get_rdt_chunk(rtsp_client_t *rt
 
   int n;
   rmff_dump_pheader(ph, (char*)*buffer);
+  if (ph->length < 12)
+	return 0;
   n=rtsp_read_data(rtsp_session, (uint8_t*)(*buffer + 12), ph->length - 12);
   return (n <= 0) ? 0 : n+12;
 }