Mon Sep 8 17:57:02 2008 UTC ()
Fix the PLIST handling of the SDL option.

Problem reported by Amitai Schlair.


(ahoka)
diff -r1.38 -r1.39 pkgsrc/multimedia/ffmpeg/Makefile
diff -r1.7 -r1.8 pkgsrc/multimedia/ffmpeg/PLIST
diff -r1.7 -r1.8 pkgsrc/multimedia/ffmpeg/options.mk
diff -r1.1 -r0 pkgsrc/multimedia/ffmpeg/PLIST.sdl
cvs diff -r1.38 -r1.39 pkgsrc/multimedia/ffmpeg/Attic/Makefile (switch to unified diff)

--- pkgsrc/multimedia/ffmpeg/Attic/Makefile 2008/09/08 00:16:35 1.38
+++ pkgsrc/multimedia/ffmpeg/Attic/Makefile 2008/09/08 17:57:02 1.39
@@ -1,79 +1,80 @@ @@ -1,79 +1,80 @@
1# $NetBSD: Makefile,v 1.38 2008/09/08 00:16:35 ahoka Exp $ 1# $NetBSD: Makefile,v 1.39 2008/09/08 17:57:02 ahoka Exp $
2 2
3DISTNAME= ffmpeg-${DISTVERSION} 3DISTNAME= ffmpeg-${DISTVERSION}
4PKGNAME= ffmpeg-${DISTVERSION:S/-//g} 4PKGNAME= ffmpeg-${DISTVERSION:S/-//g}
 5PKGREVISION= 1
5CATEGORIES= multimedia 6CATEGORIES= multimedia
6MASTER_SITES= ${MASTER_SITE_FREEBSD} 7MASTER_SITES= ${MASTER_SITE_FREEBSD}
7EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
8 9
9MAINTAINER= ahoka@NetBSD.org 10MAINTAINER= ahoka@NetBSD.org
10HOMEPAGE= http://ffmpeg.mplayerhq.hu/ 11HOMEPAGE= http://ffmpeg.mplayerhq.hu/
11COMMENT= MPEG decoding, encoding and streaming software 12COMMENT= MPEG decoding, encoding and streaming software
12 13
13DISTVERSION= 2008-07-27 14DISTVERSION= 2008-07-27
14PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
15 16
16HAS_CONFIGURE= YES 17HAS_CONFIGURE= YES
17USE_LIBTOOL= YES 18USE_LIBTOOL= YES
18USE_TOOLS+= gmake texi2html pod2man 19USE_TOOLS+= gmake texi2html pod2man
19 20
20REPLACE_PERL+= doc/texi2pod.pl 21REPLACE_PERL+= doc/texi2pod.pl
21 22
22SUBST_CLASSES+= conf 23SUBST_CLASSES+= conf
23SUBST_STAGE.conf= post-patch 24SUBST_STAGE.conf= post-patch
24SUBST_FILES.conf= ffserver.c 25SUBST_FILES.conf= ffserver.c
25SUBST_SED.conf= -e 's,/etc/ffserver.conf,${PKG_SYSCONFDIR}/ffserver.conf,g' 26SUBST_SED.conf= -e 's,/etc/ffserver.conf,${PKG_SYSCONFDIR}/ffserver.conf,g'
26SUBST_MESSAGE.conf= Fixing configuration path. 27SUBST_MESSAGE.conf= Fixing configuration path.
27 28
28CONFLICTS+= ffmpeg-devel-[0-9]* 29CONFLICTS+= ffmpeg-devel-[0-9]*
29 30
30PLIST_SRC+= ${PKGDIR}/PLIST 31PLIST_SRC+= ${PKGDIR}/PLIST
31 32
32CONF_FILES+= ${PREFIX}/share/examples/ffmpeg/ffserver.conf \ 33CONF_FILES+= ${PREFIX}/share/examples/ffmpeg/ffserver.conf \
33 ${PKG_SYSCONFDIR}/ffserver.conf 34 ${PKG_SYSCONFDIR}/ffserver.conf
34 35
35MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q} 36MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q}
36# LOCALBASE=${LOCALBASE:Q} 37# LOCALBASE=${LOCALBASE:Q}
37 38
38# Let's not put garbage into /tmp 39# Let's not put garbage into /tmp
39CONFIGURE_ENV+= TMPDIR=${WRKDIR:Q} 40CONFIGURE_ENV+= TMPDIR=${WRKDIR:Q}
40 41
41CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} \ 42CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} \
42 --cc=${CC:Q} \ 43 --cc=${CC:Q} \
43 --prefix=${PREFIX:Q} \ 44 --prefix=${PREFIX:Q} \
44 --disable-debug \ 45 --disable-debug \
45 --disable-vhook \ 46 --disable-vhook \
46 --enable-avfilter \ 47 --enable-avfilter \
47 --enable-swscale \ 48 --enable-swscale \
48 --enable-gpl \ 49 --enable-gpl \
49 --enable-postproc \ 50 --enable-postproc \
50 --enable-pthreads \ 51 --enable-pthreads \
51 --enable-shared \ 52 --enable-shared \
52 --enable-libvorbis \ 53 --enable-libvorbis \
53 --enable-libmp3lame 54 --enable-libmp3lame
54 55
55# Doesn't work without memalign and memalign looks buggy. 56# Doesn't work without memalign and memalign looks buggy.
56.if !empty(MACHINE_ARCH:Mi386) 57.if !empty(MACHINE_ARCH:Mi386)
57CONFIGURE_ARGS+= --disable-mmx \ 58CONFIGURE_ARGS+= --disable-mmx \
58 --disable-mmx2 \ 59 --disable-mmx2 \
59 --disable-ssse3 60 --disable-ssse3
60.endif 61.endif
61 62
62INSTALLATION_DIRS= lib share/examples/ffmpeg share/doc/ffmpeg 63INSTALLATION_DIRS= lib share/examples/ffmpeg share/doc/ffmpeg
63 64
64.include "options.mk" 65.include "options.mk"
65 66
66post-install: 67post-install:
67 ${INSTALL_DATA} ${WRKSRC}/libavcodec/apiexample.c \ 68 ${INSTALL_DATA} ${WRKSRC}/libavcodec/apiexample.c \
68 ${DESTDIR}${PREFIX}/share/doc/ffmpeg 69 ${DESTDIR}${PREFIX}/share/doc/ffmpeg
69 ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/doc/TODO \ 70 ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/doc/TODO \
70 ${DESTDIR}${PREFIX}/share/doc/ffmpeg 71 ${DESTDIR}${PREFIX}/share/doc/ffmpeg
71 ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DESTDIR}${PREFIX}/share/doc/ffmpeg 72 ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DESTDIR}${PREFIX}/share/doc/ffmpeg
72 ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \ 73 ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \
73 ${DESTDIR}${PREFIX}/share/examples/ffmpeg 74 ${DESTDIR}${PREFIX}/share/examples/ffmpeg
74 75
75.include "../../audio/lame/buildlink3.mk" 76.include "../../audio/lame/buildlink3.mk"
76.include "../../audio/libvorbis/buildlink3.mk" 77.include "../../audio/libvorbis/buildlink3.mk"
77.include "../../mk/pthread.buildlink3.mk" 78.include "../../mk/pthread.buildlink3.mk"
78.include "../../devel/libgetopt/buildlink3.mk" 79.include "../../devel/libgetopt/buildlink3.mk"
79.include "../../mk/bsd.pkg.mk" 80.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/multimedia/ffmpeg/Attic/PLIST (switch to unified diff)

--- pkgsrc/multimedia/ffmpeg/Attic/PLIST 2008/09/07 23:39:37 1.7
+++ pkgsrc/multimedia/ffmpeg/Attic/PLIST 2008/09/08 17:57:02 1.8
@@ -1,79 +1,79 @@ @@ -1,79 +1,79 @@
1@comment $NetBSD: PLIST,v 1.7 2008/09/07 23:39:37 ahoka Exp $ 1@comment $NetBSD: PLIST,v 1.8 2008/09/08 17:57:02 ahoka Exp $
2bin/ffmpeg 2bin/ffmpeg
3bin/ffplay 
4bin/ffserver 3bin/ffserver
 4${PLIST.sdl}bin/ffplay
 5${PLIST.sdl}man/man1/ffplay.1
5include/libavcodec/avcodec.h 6include/libavcodec/avcodec.h
6include/libavcodec/opt.h 7include/libavcodec/opt.h
7include/libavdevice/avdevice.h 8include/libavdevice/avdevice.h
8include/libavfilter/avfilter.h 9include/libavfilter/avfilter.h
9include/libavformat/avformat.h 10include/libavformat/avformat.h
10include/libavformat/avio.h 11include/libavformat/avio.h
11include/libavformat/rtsp.h 12include/libavformat/rtsp.h
12include/libavformat/rtspcodes.h 13include/libavformat/rtspcodes.h
13include/libavutil/adler32.h 14include/libavutil/adler32.h
14include/libavutil/avstring.h 15include/libavutil/avstring.h
15include/libavutil/avutil.h 16include/libavutil/avutil.h
16include/libavutil/base64.h 17include/libavutil/base64.h
17include/libavutil/common.h 18include/libavutil/common.h
18include/libavutil/crc.h 19include/libavutil/crc.h
19include/libavutil/fifo.h 20include/libavutil/fifo.h
20include/libavutil/intfloat_readwrite.h 21include/libavutil/intfloat_readwrite.h
21include/libavutil/log.h 22include/libavutil/log.h
22include/libavutil/lzo.h 23include/libavutil/lzo.h
23include/libavutil/mathematics.h 24include/libavutil/mathematics.h
24include/libavutil/md5.h 25include/libavutil/md5.h
25include/libavutil/mem.h 26include/libavutil/mem.h
26include/libavutil/random.h 27include/libavutil/random.h
27include/libavutil/rational.h 28include/libavutil/rational.h
28include/libavutil/sha1.h 29include/libavutil/sha1.h
29include/libpostproc/postprocess.h 30include/libpostproc/postprocess.h
30include/libswscale/rgb2rgb.h 31include/libswscale/rgb2rgb.h
31include/libswscale/swscale.h 32include/libswscale/swscale.h
32lib/libavcodec.a 33lib/libavcodec.a
33lib/libavcodec.so 34lib/libavcodec.so
34lib/libavcodec.so.51 35lib/libavcodec.so.51
35lib/libavcodec.so.51.61.0 36lib/libavcodec.so.51.61.0
36lib/libavdevice.a 37lib/libavdevice.a
37lib/libavdevice.so 38lib/libavdevice.so
38lib/libavdevice.so.52 39lib/libavdevice.so.52
39lib/libavdevice.so.52.0.0 40lib/libavdevice.so.52.0.0
40lib/libavfilter.a 41lib/libavfilter.a
41lib/libavfilter.so 42lib/libavfilter.so
42lib/libavfilter.so.0 43lib/libavfilter.so.0
43lib/libavfilter.so.0.0.0 44lib/libavfilter.so.0.0.0
44lib/libavformat.a 45lib/libavformat.a
45lib/libavformat.so 46lib/libavformat.so
46lib/libavformat.so.52 47lib/libavformat.so.52
47lib/libavformat.so.52.18.0 48lib/libavformat.so.52.18.0
48lib/libavutil.a 49lib/libavutil.a
49lib/libavutil.so 50lib/libavutil.so
50lib/libavutil.so.49 51lib/libavutil.so.49
51lib/libavutil.so.49.7.0 52lib/libavutil.so.49.7.0
52lib/libpostproc.a 53lib/libpostproc.a
53lib/libpostproc.so 54lib/libpostproc.so
54lib/libpostproc.so.51 55lib/libpostproc.so.51
55lib/libpostproc.so.51.1.0 56lib/libpostproc.so.51.1.0
56lib/libswscale.a 57lib/libswscale.a
57lib/libswscale.so 58lib/libswscale.so
58lib/libswscale.so.0 59lib/libswscale.so.0
59lib/libswscale.so.0.5.1 60lib/libswscale.so.0.5.1
60lib/pkgconfig/libavcodec.pc 61lib/pkgconfig/libavcodec.pc
61lib/pkgconfig/libavdevice.pc 62lib/pkgconfig/libavdevice.pc
62lib/pkgconfig/libavfilter.pc 63lib/pkgconfig/libavfilter.pc
63lib/pkgconfig/libavformat.pc 64lib/pkgconfig/libavformat.pc
64lib/pkgconfig/libavutil.pc 65lib/pkgconfig/libavutil.pc
65lib/pkgconfig/libpostproc.pc 66lib/pkgconfig/libpostproc.pc
66lib/pkgconfig/libswscale.pc 67lib/pkgconfig/libswscale.pc
67man/man1/ffmpeg.1 68man/man1/ffmpeg.1
68man/man1/ffplay.1 
69man/man1/ffserver.1 69man/man1/ffserver.1
70share/doc/ffmpeg/README 70share/doc/ffmpeg/README
71share/doc/ffmpeg/TODO 71share/doc/ffmpeg/TODO
72share/doc/ffmpeg/apiexample.c 72share/doc/ffmpeg/apiexample.c
73share/doc/ffmpeg/avutil.txt 73share/doc/ffmpeg/avutil.txt
74share/doc/ffmpeg/ffmpeg_powerpc_performance_evaluation_howto.txt 74share/doc/ffmpeg/ffmpeg_powerpc_performance_evaluation_howto.txt
75share/doc/ffmpeg/issue_tracker.txt 75share/doc/ffmpeg/issue_tracker.txt
76share/doc/ffmpeg/optimization.txt 76share/doc/ffmpeg/optimization.txt
77share/doc/ffmpeg/snow.txt 77share/doc/ffmpeg/snow.txt
78share/doc/ffmpeg/soc.txt 78share/doc/ffmpeg/soc.txt
79share/examples/ffmpeg/ffserver.conf 79share/examples/ffmpeg/ffserver.conf
cvs diff -r1.7 -r1.8 pkgsrc/multimedia/ffmpeg/Attic/options.mk (switch to unified diff)

--- pkgsrc/multimedia/ffmpeg/Attic/options.mk 2008/09/07 23:39:37 1.7
+++ pkgsrc/multimedia/ffmpeg/Attic/options.mk 2008/09/08 17:57:02 1.8
@@ -1,73 +1,75 @@ @@ -1,73 +1,75 @@
1# $NetBSD: options.mk,v 1.7 2008/09/07 23:39:37 ahoka Exp $ 1# $NetBSD: options.mk,v 1.8 2008/09/08 17:57:02 ahoka Exp $
2 2
3# Global and legacy options 3# Global and legacy options
4 4
5PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg 5PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg
6PKG_SUPPORTED_OPTIONS= sdl theora xvid faad faac #x264 6PKG_SUPPORTED_OPTIONS= sdl theora xvid faad faac #x264
7PKG_SUGGESTED_OPTIONS= faac theora xvid 7PKG_SUGGESTED_OPTIONS= faac theora xvid
8#PKG_OPTIONS_OPTIONAL_GROUPS= aac-decoder 8#PKG_OPTIONS_OPTIONAL_GROUPS= aac-decoder
9#PKG_OPTIONS_GROUP.aac-decoder= faad faac 9#PKG_OPTIONS_GROUP.aac-decoder= faad faac
10 10
11.include "../../mk/bsd.options.mk" 11.include "../../mk/bsd.options.mk"
12.include "../../mk/bsd.prefs.mk" 12.include "../../mk/bsd.prefs.mk"
13 13
 14PLIST_VARS+= sdl
 15
14### 16###
15### faad option 17### faad option
16### 18###
17 19
18.if !empty(PKG_OPTIONS:Mfaad) 20.if !empty(PKG_OPTIONS:Mfaad)
19CONFIGURE_ARGS+= --enable-libfaad 21CONFIGURE_ARGS+= --enable-libfaad
20.include "../../audio/faad2/buildlink3.mk" 22.include "../../audio/faad2/buildlink3.mk"
21.endif 23.endif
22 24
23 25
24### 26###
25### faac option 27### faac option
26### 28###
27 29
28.if !empty(PKG_OPTIONS:Mfaac) 30.if !empty(PKG_OPTIONS:Mfaac)
29CONFIGURE_ARGS+= --enable-libfaac 31CONFIGURE_ARGS+= --enable-libfaac
30.include "../../audio/faac/buildlink3.mk" 32.include "../../audio/faac/buildlink3.mk"
31.endif 33.endif
32 34
33### 35###
34### SDL support 36### SDL support
35### 37###
36### You can build the frontend with SDL support enabled 38### You can build the frontend with SDL support enabled
37### 39###
38 40
39.if !empty(PKG_OPTIONS:Msdl) 41.if !empty(PKG_OPTIONS:Msdl)
40 
41CONFIGURE_ARGS+= --enable-ffplay 42CONFIGURE_ARGS+= --enable-ffplay
42PLIST_SRC+= ${PKGDIR}/PLIST.sdl 43PLIST.sdl= yes
43 
44.include "../../devel/SDL/buildlink3.mk" 44.include "../../devel/SDL/buildlink3.mk"
 45.else
 46CONFIGURE_ARGS+= --disable-ffplay
45.endif 47.endif
46 48
47### 49###
48### OGG Theora support 50### OGG Theora support
49### 51###
50 52
51.if !empty(PKG_OPTIONS:Mtheora) 53.if !empty(PKG_OPTIONS:Mtheora)
52CONFIGURE_ARGS+= --enable-libtheora 54CONFIGURE_ARGS+= --enable-libtheora
53.include "../../multimedia/libtheora/buildlink3.mk" 55.include "../../multimedia/libtheora/buildlink3.mk"
54.endif 56.endif
55 57
56### 58###
57### XviD support 59### XviD support
58### 60###
59 61
60.if !empty(PKG_OPTIONS:Mxvid) 62.if !empty(PKG_OPTIONS:Mxvid)
61CONFIGURE_ARGS+= --enable-libxvid 63CONFIGURE_ARGS+= --enable-libxvid
62.include "../../multimedia/xvidcore/buildlink3.mk" 64.include "../../multimedia/xvidcore/buildlink3.mk"
63.endif 65.endif
64 66
65### 67###
66### x264 support 68### x264 support
67### 69###
68 70
69.if !empty(PKG_OPTIONS:Mx264) 71.if !empty(PKG_OPTIONS:Mx264)
70BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20071218 72BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20071218
71CONFIGURE_ARGS+= --enable-libx264 73CONFIGURE_ARGS+= --enable-libx264
72.include "../../multimedia/x264-devel/buildlink3.mk" 74.include "../../multimedia/x264-devel/buildlink3.mk"
73.endif 75.endif
File Deleted: pkgsrc/multimedia/ffmpeg/Attic/PLIST.sdl