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 (expand / 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,17 +1,18 @@ @@ -1,17 +1,18 @@
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
cvs diff -r1.7 -r1.8 pkgsrc/multimedia/ffmpeg/Attic/PLIST (expand / 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,17 +1,18 @@ @@ -1,17 +1,18 @@
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
@@ -55,25 +56,24 @@ lib/libpostproc.so.51 @@ -55,25 +56,24 @@ lib/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 (expand / 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,57 +1,59 @@ @@ -1,57 +1,59 @@
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
File Deleted: pkgsrc/multimedia/ffmpeg/Attic/PLIST.sdl