diff options
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/ffmpeg/Makefile | 5 | ||||
-rw-r--r-- | multimedia/ffmpeg/PLIST | 16 | ||||
-rw-r--r-- | multimedia/ffmpeg/distinfo | 4 | ||||
-rw-r--r-- | multimedia/ffmpeg/options.mk | 15 | ||||
-rw-r--r-- | multimedia/ffmpeg/patches/patch-imgconvert.c | 18 | ||||
-rw-r--r-- | multimedia/ffmpeg/patches/patch-libavcodec_Makefile | 12 | ||||
-rw-r--r-- | multimedia/vlc08/DESCR | 7 |
7 files changed, 47 insertions, 30 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 15848d208a3..cef47c1fb23 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.43 2008/09/13 21:19:34 jmcneill Exp $ +# $NetBSD: Makefile,v 1.44 2008/09/15 21:24:00 sborrill Exp $ DISTNAME= ffmpeg-${DISTVERSION} PKGNAME= ffmpeg-${DISTVERSION:S/-//g} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_FREEBSD} EXTRACT_SUFX= .tar.bz2 @@ -49,6 +49,7 @@ CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} \ --enable-postproc \ --enable-pthreads \ --enable-shared \ + --enable-swscale \ --enable-libvorbis \ --enable-libmp3lame \ --disable-stripping diff --git a/multimedia/ffmpeg/PLIST b/multimedia/ffmpeg/PLIST index fdb8fd80613..a171d11c409 100644 --- a/multimedia/ffmpeg/PLIST +++ b/multimedia/ffmpeg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2008/09/12 13:44:23 sborrill Exp $ +@comment $NetBSD: PLIST,v 1.10 2008/09/15 21:24:00 sborrill Exp $ bin/ffmpeg bin/ffserver ${PLIST.sdl}bin/ffplay @@ -28,8 +28,8 @@ include/libavutil/random.h include/libavutil/rational.h include/libavutil/sha1.h include/libpostproc/postprocess.h -${PLIST.swscale}include/libswscale/rgb2rgb.h -${PLIST.swscale}include/libswscale/swscale.h +include/libswscale/rgb2rgb.h +include/libswscale/swscale.h lib/libavcodec.a lib/libavcodec.so lib/libavcodec.so.51 @@ -54,17 +54,17 @@ lib/libpostproc.a lib/libpostproc.so lib/libpostproc.so.51 lib/libpostproc.so.51.1.0 -${PLIST.swscale}lib/libswscale.a -${PLIST.swscale}lib/libswscale.so -${PLIST.swscale}lib/libswscale.so.0 -${PLIST.swscale}lib/libswscale.so.0.5.1 +lib/libswscale.a +lib/libswscale.so +lib/libswscale.so.0 +lib/libswscale.so.0.5.1 lib/pkgconfig/libavcodec.pc lib/pkgconfig/libavdevice.pc lib/pkgconfig/libavfilter.pc lib/pkgconfig/libavformat.pc lib/pkgconfig/libavutil.pc lib/pkgconfig/libpostproc.pc -${PLIST.swscale}lib/pkgconfig/libswscale.pc +lib/pkgconfig/libswscale.pc man/man1/ffmpeg.1 man/man1/ffserver.1 share/doc/ffmpeg/README diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo index e2086031a69..7c77afdbffa 100644 --- a/multimedia/ffmpeg/distinfo +++ b/multimedia/ffmpeg/distinfo @@ -1,10 +1,12 @@ -$NetBSD: distinfo,v 1.19 2008/09/12 12:21:07 ahoka Exp $ +$NetBSD: distinfo,v 1.20 2008/09/15 21:24:00 sborrill Exp $ SHA1 (ffmpeg-2008-07-27.tar.bz2) = 103acde7a0f02aa1c32d5dab5bf187c94441c479 RMD160 (ffmpeg-2008-07-27.tar.bz2) = e69128fc034a3f8b0fd561f1e6ecc04dd118a977 Size (ffmpeg-2008-07-27.tar.bz2) = 2581976 bytes SHA1 (patch-bktr) = dddf7149810d227f531e5a198445fc0d1893bece SHA1 (patch-configure) = 747593b082f428ac1f79c6d9cad8773326351a83 +SHA1 (patch-imgconvert.c) = 3c0a9f98ddb767db6f46a02fc64451c0a79b1cbc +SHA1 (patch-libavcodec_Makefile) = 14a31e2ea9080aa1cc3999e3fbb745018ac5e4de SHA1 (patch-mem.c) = b31dd3c0a53da58be34e5f6c0cbf36454649a85f SHA1 (patch-oldx246) = a1042c9f718ec57676cc3cb66c715c948d1782b3 SHA1 (patch-r14477) = fb68f691fe68b6dc4ddd31c4c366d0dae11ab999 diff --git a/multimedia/ffmpeg/options.mk b/multimedia/ffmpeg/options.mk index 0a1a2ea8714..7e43b98cfc9 100644 --- a/multimedia/ffmpeg/options.mk +++ b/multimedia/ffmpeg/options.mk @@ -1,10 +1,10 @@ -# $NetBSD: options.mk,v 1.10 2008/09/12 13:44:23 sborrill Exp $ +# $NetBSD: options.mk,v 1.11 2008/09/15 21:24:00 sborrill Exp $ # Global and legacy options PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg -PKG_SUPPORTED_OPTIONS= sdl theora xvid faad faac swscale x264 -PKG_SUGGESTED_OPTIONS= faac theora xvid swscale x264 +PKG_SUPPORTED_OPTIONS= sdl theora xvid faad faac x264 +PKG_SUGGESTED_OPTIONS= faac theora xvid x264 #PKG_OPTIONS_OPTIONAL_GROUPS= aac-decoder #PKG_OPTIONS_GROUP.aac-decoder= faad faac @@ -47,15 +47,6 @@ CONFIGURE_ARGS+= --disable-ffplay .endif ### -### swscale option -### - -.if !empty(PKG_OPTIONS:Mswscale) -CONFIGURE_ARGS+= --enable-swscale -PLIST.swscale= yes -.endif - -### ### OGG Theora support ### diff --git a/multimedia/ffmpeg/patches/patch-imgconvert.c b/multimedia/ffmpeg/patches/patch-imgconvert.c new file mode 100644 index 00000000000..1995ccedbf8 --- /dev/null +++ b/multimedia/ffmpeg/patches/patch-imgconvert.c @@ -0,0 +1,18 @@ +--- libavcodec/imgconvert.c.orig 2008-09-14 21:59:57.000000000 +0100 ++++ libavcodec/imgconvert.c 2008-09-14 22:00:56.000000000 +0100 +@@ -2108,7 +2108,6 @@ + } + #endif + +-#ifndef CONFIG_SWSCALE + static uint8_t y_ccir_to_jpeg[256]; + static uint8_t y_jpeg_to_ccir[256]; + static uint8_t c_ccir_to_jpeg[256]; +@@ -2628,7 +2627,6 @@ + avpicture_free(tmp); + return ret; + } +-#endif + + /* NOTE: we scan all the pixels to have an exact information */ + static int get_alpha_info_pal8(const AVPicture *src, int width, int height) diff --git a/multimedia/ffmpeg/patches/patch-libavcodec_Makefile b/multimedia/ffmpeg/patches/patch-libavcodec_Makefile new file mode 100644 index 00000000000..ec1dd3fbfca --- /dev/null +++ b/multimedia/ffmpeg/patches/patch-libavcodec_Makefile @@ -0,0 +1,12 @@ +--- libavcodec/Makefile.orig 2008-09-14 21:58:12.000000000 +0100 ++++ libavcodec/Makefile 2008-09-14 21:58:36.000000000 +0100 +@@ -373,9 +373,7 @@ + + OBJS-$(HAVE_XVMC) += xvmcvideo.o + +-ifndef CONFIG_SWSCALE + OBJS += imgresample.o +-endif + + # processor-specific code + ifdef HAVE_MMX diff --git a/multimedia/vlc08/DESCR b/multimedia/vlc08/DESCR index 1da7ff93df0..6ea7f1224c6 100644 --- a/multimedia/vlc08/DESCR +++ b/multimedia/vlc08/DESCR @@ -8,10 +8,3 @@ and display it. It can also be used to display video read locally on the computer : DVDs, VCDs, MPEG and DivX files and from a satellite card. It is multi-plaform : Linux, Windows, Mac OS X, BeOS, BSD, Solaris, QNX, iPaq... The VideoLAN Client and Server now have a full IPv6 support. - -*** Please note: ffmpeg must NOT be built with the swscale option *** -For more information see: http://trac.videolan.org/vlc/ticket/1594 - -To disable swscale, please add the following to your /etc/mk.conf before -building ffmpeg: -PKG_OPTIONS.ffmpeg=-swscale |