diff options
| author | ahoka <ahoka@pkgsrc.org> | 2008-09-12 12:21:07 +0000 |
|---|---|---|
| committer | ahoka <ahoka@pkgsrc.org> | 2008-09-12 12:21:07 +0000 |
| commit | 010964ba5b877bd7ed8b1f13ee6dd61e91be8bc8 (patch) | |
| tree | 8314a817658f51b5f4f5ea75d9a08d371bab9769 | |
| parent | c060fe1dea5e484cd7885cab7d095a17b79cada9 (diff) | |
| download | pkgsrc-010964ba5b877bd7ed8b1f13ee6dd61e91be8bc8.tar.gz | |
Patch libavcodec to build with our slightly older version of x264.
This reenables the x264 option and makes it default again.
This patch should be removed after an x264 update.
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/ffmpeg/options.mk | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 1e60d56ece0..f0d0ba3b71c 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.40 2008/09/11 12:08:41 joerg Exp $ +# $NetBSD: Makefile,v 1.41 2008/09/12 12:21:07 ahoka Exp $ DISTNAME= ffmpeg-${DISTVERSION} PKGNAME= ffmpeg-${DISTVERSION:S/-//g} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_FREEBSD} EXTRACT_SUFX= .tar.bz2 diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo index ad28bae176c..e2086031a69 100644 --- a/multimedia/ffmpeg/distinfo +++ b/multimedia/ffmpeg/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.18 2008/09/11 12:08:41 joerg Exp $ +$NetBSD: distinfo,v 1.19 2008/09/12 12:21:07 ahoka Exp $ SHA1 (ffmpeg-2008-07-27.tar.bz2) = 103acde7a0f02aa1c32d5dab5bf187c94441c479 RMD160 (ffmpeg-2008-07-27.tar.bz2) = e69128fc034a3f8b0fd561f1e6ecc04dd118a977 @@ -6,5 +6,6 @@ Size (ffmpeg-2008-07-27.tar.bz2) = 2581976 bytes SHA1 (patch-bktr) = dddf7149810d227f531e5a198445fc0d1893bece SHA1 (patch-configure) = 747593b082f428ac1f79c6d9cad8773326351a83 SHA1 (patch-mem.c) = b31dd3c0a53da58be34e5f6c0cbf36454649a85f +SHA1 (patch-oldx246) = a1042c9f718ec57676cc3cb66c715c948d1782b3 SHA1 (patch-r14477) = fb68f691fe68b6dc4ddd31c4c366d0dae11ab999 SHA1 (patch-v4l2) = ed35dbd2d08337239f051c74c414e01609fb6ef6 diff --git a/multimedia/ffmpeg/options.mk b/multimedia/ffmpeg/options.mk index ac9bbb44850..70f3c8cda35 100644 --- a/multimedia/ffmpeg/options.mk +++ b/multimedia/ffmpeg/options.mk @@ -1,10 +1,10 @@ -# $NetBSD: options.mk,v 1.8 2008/09/08 17:57:02 ahoka Exp $ +# $NetBSD: options.mk,v 1.9 2008/09/12 12:21:07 ahoka Exp $ # Global and legacy options PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg -PKG_SUPPORTED_OPTIONS= sdl theora xvid faad faac #x264 -PKG_SUGGESTED_OPTIONS= faac theora xvid +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 |