pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
ffmpeg-current: Rename to ffmpeg-git
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Thu Sep 22 23:29:39 2016 +0200
Changeset: 522d78856fa989618dde8ecfdc76b0976d3f6975
Added Files:
ffmpeg-git/DESCR
ffmpeg-git/Makefile
ffmpeg-git/Makefile.common
ffmpeg-git/PLIST
ffmpeg-git/buildlink3.mk
ffmpeg-git/distinfo
ffmpeg-git/options.mk
ffmpeg-git/patches/patch-aa
ffmpeg-git/patches/patch-ac
ffmpeg-git/patches/patch-ap
ffmpeg-git/patches/patch-configure
Removed Files:
ffmpeg-current/DESCR
ffmpeg-current/Makefile
ffmpeg-current/Makefile.common
ffmpeg-current/PLIST
ffmpeg-current/buildlink3.mk
ffmpeg-current/distinfo
ffmpeg-current/options.mk
ffmpeg-current/patches/patch-aa
ffmpeg-current/patches/patch-ac
ffmpeg-current/patches/patch-ap
ffmpeg-current/patches/patch-configure
Log Message:
ffmpeg-current: Rename to ffmpeg-git
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=522d78856fa989618dde8ecfdc76b0976d3f6975
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
ffmpeg-current/DESCR | 3 -
ffmpeg-current/Makefile | 48 ----------
ffmpeg-current/Makefile.common | 80 -----------------
ffmpeg-current/PLIST | 156 --------------------------------
ffmpeg-current/buildlink3.mk | 42 ---------
ffmpeg-current/distinfo | 9 --
ffmpeg-current/options.mk | 157 ---------------------------------
ffmpeg-current/patches/patch-aa | 20 -----
ffmpeg-current/patches/patch-ac | 15 ----
ffmpeg-current/patches/patch-ap | 27 ------
ffmpeg-current/patches/patch-configure | 33 -------
ffmpeg-git/DESCR | 3 +
ffmpeg-git/Makefile | 48 ++++++++++
ffmpeg-git/Makefile.common | 80 +++++++++++++++++
ffmpeg-git/PLIST | 156 ++++++++++++++++++++++++++++++++
ffmpeg-git/buildlink3.mk | 42 +++++++++
ffmpeg-git/distinfo | 9 ++
ffmpeg-git/options.mk | 157 +++++++++++++++++++++++++++++++++
ffmpeg-git/patches/patch-aa | 20 +++++
ffmpeg-git/patches/patch-ac | 15 ++++
ffmpeg-git/patches/patch-ap | 27 ++++++
ffmpeg-git/patches/patch-configure | 33 +++++++
22 files changed, 590 insertions(+), 590 deletions(-)
diffs:
diff --git a/ffmpeg-current/DESCR b/ffmpeg-current/DESCR
deleted file mode 100644
index 7f379ea..0000000
--- a/ffmpeg-current/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-FFmpeg is a complete, cross-platform solution to record, convert
-and stream audio and video. It includes libavcodec - the leading
-audio/video codec library.
diff --git a/ffmpeg-current/Makefile b/ffmpeg-current/Makefile
deleted file mode 100644
index cca84ef..0000000
--- a/ffmpeg-current/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2013/05/10 16:51:09 shattered Exp $
-
-DISTNAME= ffmpeg-${PKGREVISION}
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://ffmpeg.mplayerhq.hu/
-COMMENT= Decoding, encoding and streaming software
-
-GIT_REPOSITORIES= master
-GIT_REPO.master= git://source.ffmpeg.org/ffmpeg.git
-GIT_MODULE.master= ffmpeg
-# _GIT_FLAGS?= --depth 1
-WRKSRC= ${WRKDIR}/ffmpeg
-
-CONFIGURE_ARGS+= --enable-avfilter
-#CONFIGURE_ARGS+= --enable-avfilter-lavf
-CONFIGURE_ARGS+= --enable-postproc
-
-INSTALLATION_DIRS= lib share/examples/ffmpeg share/doc/ffmpeg
-
-CONF_FILES+= ${PREFIX}/share/examples/ffmpeg/ffserver.conf \
- ${PKG_SYSCONFDIR}/ffserver.conf
-
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \
- || !empty(MACHINE_PLATFORM:MSunOS-*-i386)
-CONFIGURE_ARGS+= --disable-asm
-.endif
-
-TEST_TARGET= check
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/doc/*.txt \
- ${DESTDIR}${PREFIX}/share/doc/ffmpeg
- ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \
- ${DESTDIR}${PREFIX}/share/examples/ffmpeg
-
-.include "options.mk"
-
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Mclang)
-CFLAGS+= -no-integrated-as
-.endif
-
-.include "../../wip/mk/git-package.mk"
-
-.include "Makefile.common"
diff --git a/ffmpeg-current/Makefile.common b/ffmpeg-current/Makefile.common
deleted file mode 100644
index 56d4ae3..0000000
--- a/ffmpeg-current/Makefile.common
+++ /dev/null
@@ -1,80 +0,0 @@
-# $NetBSD: Makefile.common,v 1.2 2014/08/10 15:14:40 thomasklausner Exp $
-# used by multimedia/ffplay/Makefile
-# used by multimedia/ffmpeg/Makefile
-
-CATEGORIES= multimedia
-MASTER_SITES= http://www.ffmpeg.org/releases/
-
-LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2
-
-PATCHDIR= ${.CURDIR}/../../wip/ffmpeg-current/patches
-
-USE_LANGUAGES= c99
-USE_LIBTOOL= yes
-USE_TOOLS+= gmake texi2html pod2man
-HAS_CONFIGURE= yes
-CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
-CONFIGURE_ARGS+= --cc=${CC:Q}
-CONFIGURE_ARGS+= --prefix=${PREFIX}
-CONFIGURE_ARGS+= --disable-debug
-CONFIGURE_ARGS+= --disable-optimizations
-CONFIGURE_ARGS+= --disable-stripping
-CONFIGURE_ARGS+= --enable-shared
-CONFIGURE_ARGS+= --enable-pthreads
-CONFIGURE_ARGS+= --enable-gpl
-
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+= --disable-amd3dnow
-CONFIGURE_ARGS+= --disable-amd3dnowext
-CONFIGURE_ARGS+= --disable-mmx
-CONFIGURE_ARGS+= --disable-sse
-CONFIGURE_ARGS+= --disable-ssse3
-.else
-CONFIGURE_ARGS+= --enable-runtime-cpudetect
-.endif
-
-# No posix_memalign() in NetBSD 4.0 and earlier
-.if !empty(MACHINE_PLATFORM:MNetBSD-[1-4].*-*)
-CONFIGURE_ARGS+= --enable-memalign-hack
-.endif
-
-# Let's not put garbage into /tmp
-CONFIGURE_ENV+= TMPDIR=${WRKSRC}/tmp
-
-.include "../../mk/compiler.mk"
-
-.if ${OPSYS} == "SunOS" && empty(CC_VERSION:Mgcc*)
-SUBST_CLASSES+= sunwspro
-SUBST_MESSAGE.sunwspro= Fixing compiler options for SunStudio C compiler.
-SUBST_STAGE.sunwspro= post-configure
-SUBST_FILES.sunwspro= config.mak
-SUBST_SED.sunwspro= -e "s/-O /-KPIC -DPIC /"
-SUBST_SED.sunwspro+= -e "s/-O3/-xO2/g"
-SUBST_SED.sunwspro+= -e "s/-std=c99/-xc99=all/"
-SUBST_SED.sunwspro+= -e "s/-Wl,-rpath-link,/-L /g"
-.endif
-
-BUILD_DEPENDS+= yasm>=0.7.2:../../devel/yasm
-
-REPLACE_PERL+= doc/texi2pod.pl
-REPLACE_SH+= configure version.sh
-
-SUBST_CLASSES+= conf
-SUBST_STAGE.conf= post-patch
-SUBST_FILES.conf= ffserver.c
-SUBST_SED.conf= -e 's,/etc/ffserver.conf,${PKG_SYSCONFDIR}/ffserver.conf,g'
-SUBST_MESSAGE.conf= Fixing configuration path.
-
-PLIST_SRC+= ${PKGDIR}/PLIST
-
-MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q}
-# LOCALBASE=${LOCALBASE:Q}
-
-pre-configure:
- mkdir ${WRKSRC}/tmp
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../archivers/bzip2/buildlink3.mk"
-.include "../../devel/libgetopt/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/ffmpeg-current/PLIST b/ffmpeg-current/PLIST
deleted file mode 100644
index cfea3e0..0000000
--- a/ffmpeg-current/PLIST
+++ /dev/null
@@ -1,156 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2013/05/10 16:51:09 shattered Exp $
-bin/ffmpeg
-bin/ffprobe
-bin/ffserver
-include/libavcodec/avcodec.h
-include/libavcodec/avfft.h
-include/libavcodec/dxva2.h
-include/libavcodec/old_codec_ids.h
-include/libavcodec/vaapi.h
-include/libavcodec/vda.h
-include/libavcodec/vdpau.h
-include/libavcodec/version.h
-include/libavcodec/xvmc.h
-include/libavdevice/avdevice.h
-include/libavdevice/version.h
-include/libavfilter/asrc_abuffer.h
-include/libavfilter/avcodec.h
-include/libavfilter/avfilter.h
-include/libavfilter/avfiltergraph.h
-include/libavfilter/buffersink.h
-include/libavfilter/buffersrc.h
-include/libavfilter/version.h
-include/libavformat/avformat.h
-include/libavformat/avio.h
-include/libavformat/version.h
-include/libavutil/adler32.h
-include/libavutil/aes.h
-include/libavutil/attributes.h
-include/libavutil/audio_fifo.h
-include/libavutil/audioconvert.h
-include/libavutil/avassert.h
-include/libavutil/avconfig.h
-include/libavutil/avstring.h
-include/libavutil/avutil.h
-include/libavutil/base64.h
-include/libavutil/blowfish.h
-include/libavutil/bprint.h
-include/libavutil/bswap.h
-include/libavutil/buffer.h
-include/libavutil/channel_layout.h
-include/libavutil/common.h
-include/libavutil/cpu.h
-include/libavutil/crc.h
-include/libavutil/dict.h
-include/libavutil/error.h
-include/libavutil/eval.h
-include/libavutil/fifo.h
-include/libavutil/file.h
-include/libavutil/frame.h
-include/libavutil/hmac.h
-include/libavutil/imgutils.h
-include/libavutil/intfloat.h
-include/libavutil/intfloat_readwrite.h
-include/libavutil/intreadwrite.h
-include/libavutil/lfg.h
-include/libavutil/log.h
-include/libavutil/lzo.h
-include/libavutil/mathematics.h
-include/libavutil/md5.h
-include/libavutil/mem.h
-include/libavutil/old_pix_fmts.h
-include/libavutil/opt.h
-include/libavutil/parseutils.h
-include/libavutil/pixdesc.h
-include/libavutil/pixfmt.h
-include/libavutil/random_seed.h
-include/libavutil/rational.h
-include/libavutil/samplefmt.h
-include/libavutil/sha.h
-include/libavutil/time.h
-include/libavutil/timecode.h
-include/libavutil/timestamp.h
-include/libavutil/version.h
-include/libavutil/xtea.h
-include/libpostproc/postprocess.h
-include/libpostproc/version.h
-include/libswresample/swresample.h
-include/libswresample/version.h
-include/libswscale/swscale.h
-include/libswscale/version.h
-lib/libavcodec.a
-lib/libavcodec.so
-lib/libavcodec.so.55
-lib/libavcodec.so.55.7.100
-lib/libavdevice.a
-lib/libavdevice.so
-lib/libavdevice.so.55
-lib/libavdevice.so.55.0.100
-lib/libavfilter.a
-lib/libavfilter.so
-lib/libavfilter.so.3
-lib/libavfilter.so.3.63.101
-lib/libavformat.a
-lib/libavformat.so
-lib/libavformat.so.55
-lib/libavformat.so.55.4.101
-lib/libavutil.a
-lib/libavutil.so
-lib/libavutil.so.52
-lib/libavutil.so.52.30.100
-lib/libpostproc.a
-lib/libpostproc.so
-lib/libpostproc.so.52
-lib/libpostproc.so.52.3.100
-lib/libswresample.a
-lib/libswresample.so
-lib/libswresample.so.0
-lib/libswresample.so.0.17.102
-lib/libswscale.a
-lib/libswscale.so
-lib/libswscale.so.2
-lib/libswscale.so.2.3.100
-lib/pkgconfig/libavcodec.pc
-lib/pkgconfig/libavdevice.pc
-lib/pkgconfig/libavfilter.pc
-lib/pkgconfig/libavformat.pc
-lib/pkgconfig/libavutil.pc
-lib/pkgconfig/libpostproc.pc
-lib/pkgconfig/libswresample.pc
-lib/pkgconfig/libswscale.pc
-share/doc/ffmpeg/avutil.txt
-share/doc/ffmpeg/build_system.txt
-share/doc/ffmpeg/errno.txt
-share/doc/ffmpeg/ffmpeg.txt
-share/doc/ffmpeg/filter_design.txt
-share/doc/ffmpeg/git-howto.txt
-share/doc/ffmpeg/issue_tracker.txt
-share/doc/ffmpeg/mips.txt
-share/doc/ffmpeg/multithreading.txt
-share/doc/ffmpeg/optimization.txt
-share/doc/ffmpeg/rate_distortion.txt
-share/doc/ffmpeg/snow.txt
-share/doc/ffmpeg/soc.txt
-share/doc/ffmpeg/swresample.txt
-share/doc/ffmpeg/swscale.txt
-share/doc/ffmpeg/tablegen.txt
-share/doc/ffmpeg/viterbi.txt
-share/examples/ffmpeg/ffserver.conf
-share/ffmpeg/examples/Makefile
-share/ffmpeg/examples/README
-share/ffmpeg/examples/decoding_encoding.c
-share/ffmpeg/examples/demuxing.c
-share/ffmpeg/examples/filtering_audio.c
-share/ffmpeg/examples/filtering_video.c
-share/ffmpeg/examples/metadata.c
-share/ffmpeg/examples/muxing.c
-share/ffmpeg/examples/resampling_audio.c
-share/ffmpeg/examples/scaling_video.c
-share/ffmpeg/ffprobe.xsd
-share/ffmpeg/libvpx-1080p.ffpreset
-share/ffmpeg/libvpx-1080p50_60.ffpreset
-share/ffmpeg/libvpx-360p.ffpreset
-share/ffmpeg/libvpx-720p.ffpreset
-share/ffmpeg/libvpx-720p50_60.ffpreset
-share/ffmpeg/libx264-ipod320.ffpreset
-share/ffmpeg/libx264-ipod640.ffpreset
diff --git a/ffmpeg-current/buildlink3.mk b/ffmpeg-current/buildlink3.mk
deleted file mode 100644
index bf00d01..0000000
--- a/ffmpeg-current/buildlink3.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2013/05/04 10:39:12 shattered Exp $
-
-BUILDLINK_TREE+= ffmpeg
-
-.if !defined(FFMPEG_BUILDLINK3_MK)
-FFMPEG_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.ffmpeg+= ffmpeg>=20120919.0.10.5
-BUILDLINK_ABI_DEPENDS.ffmpeg+= ffmpeg>=20130106.1.1
-BUILDLINK_PKGSRCDIR.ffmpeg?= ../../multimedia/ffmpeg
-
-pkgbase := ffmpeg
-. include "../../mk/pkg-build-options.mk"
-
-.include "../../mk/bsd.fast.prefs.mk"
-
-.if !empty(PKG_BUILD_OPTIONS.ffmpeg:Mtheora)
-. include "../../multimedia/libtheora/buildlink3.mk"
-.endif
-
-.if !empty(PKG_BUILD_OPTIONS.ffmpeg:Mxvid)
-. include "../../multimedia/xvidcore/buildlink3.mk"
-.endif
-
-.if !empty(PKG_BUILD_OPTIONS.ffmpeg:Mx264)
-. include "../../multimedia/x264-devel/buildlink3.mk"
-.endif
-
-.if !empty(PKG_BUILD_OPTIONS.ffmpeg:Mfaac)
-. include "../../audio/faac/buildlink3.mk"
-.endif
-
-.if !empty(PKG_BUILD_OPTIONS.ffmpeg:Mlibvpx)
-. include "../../multimedia/libvpx/buildlink3.mk"
-.endif
-
-.include "../../archivers/bzip2/buildlink3.mk"
-.include "../../devel/libgetopt/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.endif # FFMPEG_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -ffmpeg
diff --git a/ffmpeg-current/distinfo b/ffmpeg-current/distinfo
deleted file mode 100644
index beba278..0000000
--- a/ffmpeg-current/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.1 2013/05/04 10:39:12 shattered Exp $
-
-SHA1 (ffmpeg-1.2.tar.bz2) = e1df2389560da95e1a76f9375f054e630c7e2602
-RMD160 (ffmpeg-1.2.tar.bz2) = f1b1122ee39276cf5eb00b4113794a2c23c1e66f
-Size (ffmpeg-1.2.tar.bz2) = 5969590 bytes
-SHA1 (patch-aa) = 6594f212df313f56db325faf52b4c48be395ea3a
-SHA1 (patch-ac) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253
-SHA1 (patch-ap) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e
-SHA1 (patch-configure) = b7e9915c07d05cee697323ce85ca2b72e8528f42
diff --git a/ffmpeg-current/options.mk b/ffmpeg-current/options.mk
deleted file mode 100644
index ab6c755..0000000
--- a/ffmpeg-current/options.mk
+++ /dev/null
@@ -1,157 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2013/05/10 16:51:09 shattered Exp $
-
-# Global and legacy options
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg
-PKG_SUPPORTED_OPTIONS= faac lame ass libvpx theora vorbis x264 xvid \
- opencore-amr x11
-PKG_SUGGESTED_OPTIONS= lame ass libvpx theora vorbis x264 xvid
-#PKG_OPTIONS_OPTIONAL_GROUPS= aac-decoder
-#PKG_OPTIONS_GROUP.aac-decoder= faac
-
-### Add VDPAU if it is available
-.include "../../multimedia/libvdpau/available.mk"
-.if ${VDPAU_AVAILABLE} == "yes"
-PKG_SUPPORTED_OPTIONS+= vdpau
-PKG_SUGGESTED_OPTIONS+= vdpau
-.endif
-
-### Add VAAPI if it is available
-.include "../../multimedia/libva/available.mk"
-.if ${VAAPI_AVAILABLE} == "yes"
-PKG_SUPPORTED_OPTIONS+= vaapi
-PKG_SUGGESTED_OPTIONS+= vaapi
-.endif
-
-###
-.include "../../mk/bsd.options.mk"
-
-###
-### ass option
-###
-.if !empty(PKG_OPTIONS:Mass)
-USE_TOOLS+= pkg-config
-CONFIGURE_ARGS+= --enable-libass
-.include "../../multimedia/libass/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-libass
-.endif
-
-###
-### faac option
-###
-.if !empty(PKG_OPTIONS:Mfaac)
-RESTRICTED= This software may require the payment of patent royalties
-NO_BIN_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
-CONFIGURE_ARGS+= --enable-libfaac
-CONFIGURE_ARGS+= --enable-nonfree
-.include "../../audio/faac/buildlink3.mk"
-.endif
-
-###
-### opencore-amr option
-###
-.if !empty(PKG_OPTIONS:Mopencore-amr)
-CONFIGURE_ARGS+= --enable-libopencore-amrnb
-CONFIGURE_ARGS+= --enable-libopencore-amrwb
-
-# "The OpenCORE external libraries are under the Apache License
-# 2.0. That license is incompatible with the LGPL v2.1 and the GPL
-# v2, but not with version 3 of those licenses. So to combine the
-# OpenCORE libraries with FFmpeg, the license version needs to be
-# upgraded by passing --enable-version3 to configure."
-CONFIGURE_ARGS+= --enable-version3
-# TODO: LICENSE
-
-.include "../../audio/opencore-amr/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-libopencore-amrnb
-CONFIGURE_ARGS+= --disable-libopencore-amrwb
-.endif
-
-###
-### OGG Theora support
-###
-.if !empty(PKG_OPTIONS:Mtheora)
-CONFIGURE_ARGS+= --enable-libtheora
-.include "../../multimedia/libtheora/buildlink3.mk"
-.endif
-
-###
-### OGG Vorbis support
-###
-.if !empty(PKG_OPTIONS:Mvorbis)
-CONFIGURE_ARGS+= --enable-libvorbis
-.include "../../audio/libvorbis/buildlink3.mk"
-.endif
-
-###
-### LAME MP3 encoder
-###
-.if !empty(PKG_OPTIONS:Mlame)
-# "lame-3.98" isn't compatible with "ffmpeg" which breaks audio encoding.
-BUILDLINK_ABI_DEPENDS.lame+= lame>=3.98.2nb1
-CONFIGURE_ARGS+= --enable-libmp3lame
-.include "../../audio/lame/buildlink3.mk"
-.endif
-
-###
-### XviD support
-###
-.if !empty(PKG_OPTIONS:Mxvid)
-CONFIGURE_ARGS+= --enable-libxvid
-.include "../../multimedia/xvidcore/buildlink3.mk"
-.endif
-
-###
-### x264 support
-###
-.if !empty(PKG_OPTIONS:Mx264)
-# ABI change between 20090326 and 20100201
-BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20111207
-#BUILDLINK_API_DEPENDS.x264-devel+= x264-devel<20110102
-CONFIGURE_ARGS+= --enable-libx264
-.include "../../multimedia/x264-devel/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-libx264
-.endif
-
-###
-### VDPAU support
-###
-.if !empty(PKG_OPTIONS:Mvdpau)
-CONFIGURE_ARGS+= --enable-vdpau
-.include "../../multimedia/libvdpau/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-vdpau
-.endif
-
-###
-### VAAPI support
-###
-.if !empty(PKG_OPTIONS:Mvaapi)
-CONFIGURE_ARGS+= --enable-vaapi
-.include "../../multimedia/libva/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-vaapi
-.endif
-
-###
-### VPX support
-###
-.if !empty(PKG_OPTIONS:Mlibvpx)
-CONFIGURE_ARGS+= --enable-libvpx
-.include "../../multimedia/libvpx/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-libvpx
-.endif
-
-.if !empty(PKG_OPTIONS:Mx11)
-CONFIGURE_ARGS+= --enable-x11grab
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXfixes/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-x11grab
-.endif
diff --git a/ffmpeg-current/patches/patch-aa b/ffmpeg-current/patches/patch-aa
deleted file mode 100644
index ca5ffe2..0000000
--- a/ffmpeg-current/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2013/05/04 10:39:12 shattered Exp $
-
---- libavutil/x86/cpu.c.orig 2016-08-15 08:09:26.108776359 +0000
-+++ libavutil/x86/cpu.c
-@@ -116,6 +116,7 @@ int ff_get_cpu_flags_x86(void)
- #if HAVE_SSE
- if (std_caps & (1 << 25))
- rval |= AV_CPU_FLAG_SSE;
-+#if !defined(__GNUC__) || (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
- if (std_caps & (1 << 26))
- rval |= AV_CPU_FLAG_SSE2;
- if (ecx & 1)
-@@ -140,6 +141,7 @@ int ff_get_cpu_flags_x86(void)
- }
- }
- #endif /* HAVE_AVX */
-+#endif /* gcc >= 4.2 */
- #endif /* HAVE_SSE */
- }
- if (max_std_level >= 7) {
diff --git a/ffmpeg-current/patches/patch-ac b/ffmpeg-current/patches/patch-ac
deleted file mode 100644
index 75cf25c..0000000
--- a/ffmpeg-current/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2013/05/04 10:39:12 shattered Exp $
-
---- Makefile.orig 2012-09-28 01:37:35.000000000 +0000
-+++ Makefile
-@@ -139,8 +139,8 @@ install-progs: install-progs-yes $(PROGS
-
- install-data: $(DATA_FILES) $(EXAMPLES_FILES)
- $(Q)mkdir -p "$(DATADIR)/examples"
-- $(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)"
-- $(INSTALL) -m 644 $(EXAMPLES_FILES) "$(DATADIR)/examples"
-+ $(INSTALL) -c -m 644 $(DATA_FILES) "$(DATADIR)"
-+ $(INSTALL) -c -m 644 $(EXAMPLES_FILES) "$(DATADIR)/examples"
-
- uninstall: uninstall-libs uninstall-headers uninstall-progs uninstall-data
-
diff --git a/ffmpeg-current/patches/patch-ap b/ffmpeg-current/patches/patch-ap
deleted file mode 100644
index e274466..0000000
--- a/ffmpeg-current/patches/patch-ap
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2013/05/04 10:39:12 shattered Exp $
-
---- libavutil/common.h.orig 2013-01-06 21:53:29.000000000 +0000
-+++ libavutil/common.h
-@@ -39,6 +39,22 @@
- #include "version.h"
- #include "libavutil/avconfig.h"
-
-+#if defined(__cplusplus)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__linux__)
-+#undef _STDINT_H_
-+#undef _SYS_STDINT_H_
-+#undef _STDINT_H
-+#undef _GCC_WRAP_STDINT_H
-+#ifndef __STDC_CONSTANT_MACROS
-+#define __STDC_CONSTANT_MACROS
-+#endif
-+#include <stdint.h>
-+#endif /* FreeBSD | OpenBSD | linux */
-+#if defined(__DragonFly__) || defined(__NetBSD__)
-+#include <machine/int_const.h>
-+#endif /* DragonFly | NetBSD */
-+#endif /* __cplusplus */
-+
- #if AV_HAVE_BIGENDIAN
- # define AV_NE(be, le) (be)
- #else
diff --git a/ffmpeg-current/patches/patch-configure b/ffmpeg-current/patches/patch-configure
deleted file mode 100644
index 698e3f9..0000000
--- a/ffmpeg-current/patches/patch-configure
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2013/05/04 10:39:12 shattered Exp $
-
---- configure.orig 2016-08-15 08:09:25.492305991 +0000
-+++ configure
-@@ -4648,6 +4648,11 @@ case $target_os in
- ;;
- netbsd)
- disable symver
-+ # NetBSD/macppc *really* needs PIC enabled. ffmpeg has repeatedly
-+ # broken time and time again because PIC support has been removed
-+ # from architectures that need it. So, if you touch this, please
-+ # be careful and make sure that your changes work.
-+ test "${subarch}" != "x86_32" && enable pic
- oss_indev_extralibs="-lossaudio"
- oss_outdev_extralibs="-lossaudio"
- enabled gcc || check_ldflags -Wl,-zmuldefs
-@@ -5106,10 +5111,13 @@ check_cc <<EOF && enable attribute_may_a
- union { int x; } __attribute__((may_alias)) x;
- EOF
-
--check_cc <<EOF || die "endian test failed"
--unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E';
-+check_exec <<EOF || enable bigendian
-+int main()
-+{
-+ long one = 1;
-+ return !(*((char *)(&one)));
-+}
- EOF
--od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian
-
- if ! enabled ppc64 || enabled bigendian; then
- disable vsx
diff --git a/ffmpeg-git/DESCR b/ffmpeg-git/DESCR
new file mode 100644
index 0000000..7f379ea
--- /dev/null
+++ b/ffmpeg-git/DESCR
@@ -0,0 +1,3 @@
+FFmpeg is a complete, cross-platform solution to record, convert
+and stream audio and video. It includes libavcodec - the leading
+audio/video codec library.
diff --git a/ffmpeg-git/Makefile b/ffmpeg-git/Makefile
new file mode 100644
index 0000000..cca84ef
--- /dev/null
+++ b/ffmpeg-git/Makefile
@@ -0,0 +1,48 @@
+# $NetBSD: Makefile,v 1.2 2013/05/10 16:51:09 shattered Exp $
+
+DISTNAME= ffmpeg-${PKGREVISION}
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= http://ffmpeg.mplayerhq.hu/
+COMMENT= Decoding, encoding and streaming software
+
+GIT_REPOSITORIES= master
+GIT_REPO.master= git://source.ffmpeg.org/ffmpeg.git
+GIT_MODULE.master= ffmpeg
+# _GIT_FLAGS?= --depth 1
+WRKSRC= ${WRKDIR}/ffmpeg
+
+CONFIGURE_ARGS+= --enable-avfilter
+#CONFIGURE_ARGS+= --enable-avfilter-lavf
+CONFIGURE_ARGS+= --enable-postproc
+
+INSTALLATION_DIRS= lib share/examples/ffmpeg share/doc/ffmpeg
+
+CONF_FILES+= ${PREFIX}/share/examples/ffmpeg/ffserver.conf \
+ ${PKG_SYSCONFDIR}/ffserver.conf
+
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \
+ || !empty(MACHINE_PLATFORM:MSunOS-*-i386)
+CONFIGURE_ARGS+= --disable-asm
+.endif
+
+TEST_TARGET= check
+
+post-install:
+ ${INSTALL_DATA} ${WRKSRC}/doc/*.txt \
+ ${DESTDIR}${PREFIX}/share/doc/ffmpeg
+ ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \
+ ${DESTDIR}${PREFIX}/share/examples/ffmpeg
+
+.include "options.mk"
+
+.include "../../mk/compiler.mk"
+
+.if !empty(PKGSRC_COMPILER:Mclang)
+CFLAGS+= -no-integrated-as
+.endif
+
+.include "../../wip/mk/git-package.mk"
+
+.include "Makefile.common"
diff --git a/ffmpeg-git/Makefile.common b/ffmpeg-git/Makefile.common
new file mode 100644
index 0000000..56d4ae3
--- /dev/null
+++ b/ffmpeg-git/Makefile.common
@@ -0,0 +1,80 @@
+# $NetBSD: Makefile.common,v 1.2 2014/08/10 15:14:40 thomasklausner Exp $
+# used by multimedia/ffplay/Makefile
+# used by multimedia/ffmpeg/Makefile
+
+CATEGORIES= multimedia
+MASTER_SITES= http://www.ffmpeg.org/releases/
+
+LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2
+
+PATCHDIR= ${.CURDIR}/../../wip/ffmpeg-current/patches
+
+USE_LANGUAGES= c99
+USE_LIBTOOL= yes
+USE_TOOLS+= gmake texi2html pod2man
+HAS_CONFIGURE= yes
+CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
+CONFIGURE_ARGS+= --cc=${CC:Q}
+CONFIGURE_ARGS+= --prefix=${PREFIX}
+CONFIGURE_ARGS+= --disable-debug
+CONFIGURE_ARGS+= --disable-optimizations
+CONFIGURE_ARGS+= --disable-stripping
+CONFIGURE_ARGS+= --enable-shared
+CONFIGURE_ARGS+= --enable-pthreads
+CONFIGURE_ARGS+= --enable-gpl
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ARGS+= --disable-amd3dnow
+CONFIGURE_ARGS+= --disable-amd3dnowext
+CONFIGURE_ARGS+= --disable-mmx
+CONFIGURE_ARGS+= --disable-sse
+CONFIGURE_ARGS+= --disable-ssse3
+.else
+CONFIGURE_ARGS+= --enable-runtime-cpudetect
+.endif
+
+# No posix_memalign() in NetBSD 4.0 and earlier
+.if !empty(MACHINE_PLATFORM:MNetBSD-[1-4].*-*)
+CONFIGURE_ARGS+= --enable-memalign-hack
+.endif
+
+# Let's not put garbage into /tmp
+CONFIGURE_ENV+= TMPDIR=${WRKSRC}/tmp
+
+.include "../../mk/compiler.mk"
+
+.if ${OPSYS} == "SunOS" && empty(CC_VERSION:Mgcc*)
+SUBST_CLASSES+= sunwspro
+SUBST_MESSAGE.sunwspro= Fixing compiler options for SunStudio C compiler.
+SUBST_STAGE.sunwspro= post-configure
+SUBST_FILES.sunwspro= config.mak
+SUBST_SED.sunwspro= -e "s/-O /-KPIC -DPIC /"
+SUBST_SED.sunwspro+= -e "s/-O3/-xO2/g"
+SUBST_SED.sunwspro+= -e "s/-std=c99/-xc99=all/"
+SUBST_SED.sunwspro+= -e "s/-Wl,-rpath-link,/-L /g"
+.endif
+
+BUILD_DEPENDS+= yasm>=0.7.2:../../devel/yasm
+
+REPLACE_PERL+= doc/texi2pod.pl
+REPLACE_SH+= configure version.sh
+
+SUBST_CLASSES+= conf
+SUBST_STAGE.conf= post-patch
+SUBST_FILES.conf= ffserver.c
+SUBST_SED.conf= -e 's,/etc/ffserver.conf,${PKG_SYSCONFDIR}/ffserver.conf,g'
+SUBST_MESSAGE.conf= Fixing configuration path.
+
+PLIST_SRC+= ${PKGDIR}/PLIST
+
+MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q}
+# LOCALBASE=${LOCALBASE:Q}
+
+pre-configure:
+ mkdir ${WRKSRC}/tmp
+
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../devel/libgetopt/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/ffmpeg-git/PLIST b/ffmpeg-git/PLIST
new file mode 100644
index 0000000..cfea3e0
--- /dev/null
+++ b/ffmpeg-git/PLIST
@@ -0,0 +1,156 @@
+@comment $NetBSD: PLIST,v 1.2 2013/05/10 16:51:09 shattered Exp $
+bin/ffmpeg
+bin/ffprobe
+bin/ffserver
+include/libavcodec/avcodec.h
+include/libavcodec/avfft.h
+include/libavcodec/dxva2.h
+include/libavcodec/old_codec_ids.h
+include/libavcodec/vaapi.h
+include/libavcodec/vda.h
+include/libavcodec/vdpau.h
+include/libavcodec/version.h
+include/libavcodec/xvmc.h
+include/libavdevice/avdevice.h
+include/libavdevice/version.h
+include/libavfilter/asrc_abuffer.h
+include/libavfilter/avcodec.h
+include/libavfilter/avfilter.h
+include/libavfilter/avfiltergraph.h
+include/libavfilter/buffersink.h
+include/libavfilter/buffersrc.h
+include/libavfilter/version.h
+include/libavformat/avformat.h
+include/libavformat/avio.h
+include/libavformat/version.h
+include/libavutil/adler32.h
+include/libavutil/aes.h
+include/libavutil/attributes.h
+include/libavutil/audio_fifo.h
+include/libavutil/audioconvert.h
+include/libavutil/avassert.h
+include/libavutil/avconfig.h
+include/libavutil/avstring.h
+include/libavutil/avutil.h
+include/libavutil/base64.h
+include/libavutil/blowfish.h
+include/libavutil/bprint.h
+include/libavutil/bswap.h
+include/libavutil/buffer.h
+include/libavutil/channel_layout.h
+include/libavutil/common.h
+include/libavutil/cpu.h
+include/libavutil/crc.h
+include/libavutil/dict.h
+include/libavutil/error.h
+include/libavutil/eval.h
+include/libavutil/fifo.h
+include/libavutil/file.h
+include/libavutil/frame.h
+include/libavutil/hmac.h
+include/libavutil/imgutils.h
+include/libavutil/intfloat.h
+include/libavutil/intfloat_readwrite.h
+include/libavutil/intreadwrite.h
+include/libavutil/lfg.h
+include/libavutil/log.h
+include/libavutil/lzo.h
+include/libavutil/mathematics.h
+include/libavutil/md5.h
+include/libavutil/mem.h
+include/libavutil/old_pix_fmts.h
+include/libavutil/opt.h
+include/libavutil/parseutils.h
+include/libavutil/pixdesc.h
+include/libavutil/pixfmt.h
+include/libavutil/random_seed.h
+include/libavutil/rational.h
+include/libavutil/samplefmt.h
+include/libavutil/sha.h
+include/libavutil/time.h
+include/libavutil/timecode.h
+include/libavutil/timestamp.h
+include/libavutil/version.h
+include/libavutil/xtea.h
+include/libpostproc/postprocess.h
+include/libpostproc/version.h
+include/libswresample/swresample.h
+include/libswresample/version.h
+include/libswscale/swscale.h
+include/libswscale/version.h
+lib/libavcodec.a
+lib/libavcodec.so
+lib/libavcodec.so.55
+lib/libavcodec.so.55.7.100
+lib/libavdevice.a
+lib/libavdevice.so
+lib/libavdevice.so.55
+lib/libavdevice.so.55.0.100
+lib/libavfilter.a
+lib/libavfilter.so
+lib/libavfilter.so.3
+lib/libavfilter.so.3.63.101
+lib/libavformat.a
+lib/libavformat.so
+lib/libavformat.so.55
+lib/libavformat.so.55.4.101
+lib/libavutil.a
+lib/libavutil.so
+lib/libavutil.so.52
+lib/libavutil.so.52.30.100
+lib/libpostproc.a
+lib/libpostproc.so
+lib/libpostproc.so.52
+lib/libpostproc.so.52.3.100
+lib/libswresample.a
+lib/libswresample.so
+lib/libswresample.so.0
+lib/libswresample.so.0.17.102
+lib/libswscale.a
+lib/libswscale.so
+lib/libswscale.so.2
+lib/libswscale.so.2.3.100
+lib/pkgconfig/libavcodec.pc
+lib/pkgconfig/libavdevice.pc
+lib/pkgconfig/libavfilter.pc
+lib/pkgconfig/libavformat.pc
+lib/pkgconfig/libavutil.pc
+lib/pkgconfig/libpostproc.pc
+lib/pkgconfig/libswresample.pc
+lib/pkgconfig/libswscale.pc
+share/doc/ffmpeg/avutil.txt
+share/doc/ffmpeg/build_system.txt
+share/doc/ffmpeg/errno.txt
+share/doc/ffmpeg/ffmpeg.txt
+share/doc/ffmpeg/filter_design.txt
+share/doc/ffmpeg/git-howto.txt
+share/doc/ffmpeg/issue_tracker.txt
+share/doc/ffmpeg/mips.txt
+share/doc/ffmpeg/multithreading.txt
+share/doc/ffmpeg/optimization.txt
+share/doc/ffmpeg/rate_distortion.txt
+share/doc/ffmpeg/snow.txt
+share/doc/ffmpeg/soc.txt
+share/doc/ffmpeg/swresample.txt
+share/doc/ffmpeg/swscale.txt
+share/doc/ffmpeg/tablegen.txt
+share/doc/ffmpeg/viterbi.txt
+share/examples/ffmpeg/ffserver.conf
+share/ffmpeg/examples/Makefile
+share/ffmpeg/examples/README
+share/ffmpeg/examples/decoding_encoding.c
+share/ffmpeg/examples/demuxing.c
+share/ffmpeg/examples/filtering_audio.c
+share/ffmpeg/examples/filtering_video.c
+share/ffmpeg/examples/metadata.c
+share/ffmpeg/examples/muxing.c
+share/ffmpeg/examples/resampling_audio.c
+share/ffmpeg/examples/scaling_video.c
+share/ffmpeg/ffprobe.xsd
+share/ffmpeg/libvpx-1080p.ffpreset
+share/ffmpeg/libvpx-1080p50_60.ffpreset
+share/ffmpeg/libvpx-360p.ffpreset
+share/ffmpeg/libvpx-720p.ffpreset
+share/ffmpeg/libvpx-720p50_60.ffpreset
+share/ffmpeg/libx264-ipod320.ffpreset
+share/ffmpeg/libx264-ipod640.ffpreset
diff --git a/ffmpeg-git/buildlink3.mk b/ffmpeg-git/buildlink3.mk
new file mode 100644
index 0000000..bf00d01
--- /dev/null
+++ b/ffmpeg-git/buildlink3.mk
@@ -0,0 +1,42 @@
+# $NetBSD: buildlink3.mk,v 1.1 2013/05/04 10:39:12 shattered Exp $
+
+BUILDLINK_TREE+= ffmpeg
+
+.if !defined(FFMPEG_BUILDLINK3_MK)
+FFMPEG_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.ffmpeg+= ffmpeg>=20120919.0.10.5
+BUILDLINK_ABI_DEPENDS.ffmpeg+= ffmpeg>=20130106.1.1
+BUILDLINK_PKGSRCDIR.ffmpeg?= ../../multimedia/ffmpeg
+
+pkgbase := ffmpeg
+. include "../../mk/pkg-build-options.mk"
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.ffmpeg:Mtheora)
+. include "../../multimedia/libtheora/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.ffmpeg:Mxvid)
+. include "../../multimedia/xvidcore/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.ffmpeg:Mx264)
+. include "../../multimedia/x264-devel/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.ffmpeg:Mfaac)
+. include "../../audio/faac/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.ffmpeg:Mlibvpx)
+. include "../../multimedia/libvpx/buildlink3.mk"
+.endif
+
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../devel/libgetopt/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.endif # FFMPEG_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -ffmpeg
diff --git a/ffmpeg-git/distinfo b/ffmpeg-git/distinfo
new file mode 100644
index 0000000..beba278
--- /dev/null
+++ b/ffmpeg-git/distinfo
@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.1 2013/05/04 10:39:12 shattered Exp $
+
+SHA1 (ffmpeg-1.2.tar.bz2) = e1df2389560da95e1a76f9375f054e630c7e2602
+RMD160 (ffmpeg-1.2.tar.bz2) = f1b1122ee39276cf5eb00b4113794a2c23c1e66f
+Size (ffmpeg-1.2.tar.bz2) = 5969590 bytes
+SHA1 (patch-aa) = 6594f212df313f56db325faf52b4c48be395ea3a
+SHA1 (patch-ac) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253
+SHA1 (patch-ap) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e
+SHA1 (patch-configure) = b7e9915c07d05cee697323ce85ca2b72e8528f42
diff --git a/ffmpeg-git/options.mk b/ffmpeg-git/options.mk
new file mode 100644
index 0000000..ab6c755
--- /dev/null
+++ b/ffmpeg-git/options.mk
@@ -0,0 +1,157 @@
+# $NetBSD: options.mk,v 1.2 2013/05/10 16:51:09 shattered Exp $
+
+# Global and legacy options
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg
+PKG_SUPPORTED_OPTIONS= faac lame ass libvpx theora vorbis x264 xvid \
+ opencore-amr x11
+PKG_SUGGESTED_OPTIONS= lame ass libvpx theora vorbis x264 xvid
+#PKG_OPTIONS_OPTIONAL_GROUPS= aac-decoder
+#PKG_OPTIONS_GROUP.aac-decoder= faac
+
+### Add VDPAU if it is available
+.include "../../multimedia/libvdpau/available.mk"
+.if ${VDPAU_AVAILABLE} == "yes"
+PKG_SUPPORTED_OPTIONS+= vdpau
+PKG_SUGGESTED_OPTIONS+= vdpau
+.endif
+
+### Add VAAPI if it is available
+.include "../../multimedia/libva/available.mk"
+.if ${VAAPI_AVAILABLE} == "yes"
+PKG_SUPPORTED_OPTIONS+= vaapi
+PKG_SUGGESTED_OPTIONS+= vaapi
+.endif
+
+###
+.include "../../mk/bsd.options.mk"
+
+###
+### ass option
+###
+.if !empty(PKG_OPTIONS:Mass)
+USE_TOOLS+= pkg-config
+CONFIGURE_ARGS+= --enable-libass
+.include "../../multimedia/libass/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-libass
+.endif
+
+###
+### faac option
+###
+.if !empty(PKG_OPTIONS:Mfaac)
+RESTRICTED= This software may require the payment of patent royalties
+NO_BIN_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
+CONFIGURE_ARGS+= --enable-libfaac
+CONFIGURE_ARGS+= --enable-nonfree
+.include "../../audio/faac/buildlink3.mk"
+.endif
+
+###
+### opencore-amr option
+###
+.if !empty(PKG_OPTIONS:Mopencore-amr)
+CONFIGURE_ARGS+= --enable-libopencore-amrnb
+CONFIGURE_ARGS+= --enable-libopencore-amrwb
+
+# "The OpenCORE external libraries are under the Apache License
+# 2.0. That license is incompatible with the LGPL v2.1 and the GPL
+# v2, but not with version 3 of those licenses. So to combine the
+# OpenCORE libraries with FFmpeg, the license version needs to be
+# upgraded by passing --enable-version3 to configure."
+CONFIGURE_ARGS+= --enable-version3
+# TODO: LICENSE
+
+.include "../../audio/opencore-amr/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-libopencore-amrnb
+CONFIGURE_ARGS+= --disable-libopencore-amrwb
+.endif
+
+###
+### OGG Theora support
+###
+.if !empty(PKG_OPTIONS:Mtheora)
+CONFIGURE_ARGS+= --enable-libtheora
+.include "../../multimedia/libtheora/buildlink3.mk"
+.endif
+
+###
+### OGG Vorbis support
+###
+.if !empty(PKG_OPTIONS:Mvorbis)
+CONFIGURE_ARGS+= --enable-libvorbis
+.include "../../audio/libvorbis/buildlink3.mk"
+.endif
+
+###
+### LAME MP3 encoder
+###
+.if !empty(PKG_OPTIONS:Mlame)
+# "lame-3.98" isn't compatible with "ffmpeg" which breaks audio encoding.
+BUILDLINK_ABI_DEPENDS.lame+= lame>=3.98.2nb1
+CONFIGURE_ARGS+= --enable-libmp3lame
+.include "../../audio/lame/buildlink3.mk"
+.endif
+
+###
+### XviD support
+###
+.if !empty(PKG_OPTIONS:Mxvid)
+CONFIGURE_ARGS+= --enable-libxvid
+.include "../../multimedia/xvidcore/buildlink3.mk"
+.endif
+
+###
+### x264 support
+###
+.if !empty(PKG_OPTIONS:Mx264)
+# ABI change between 20090326 and 20100201
+BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20111207
+#BUILDLINK_API_DEPENDS.x264-devel+= x264-devel<20110102
+CONFIGURE_ARGS+= --enable-libx264
+.include "../../multimedia/x264-devel/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-libx264
+.endif
+
+###
+### VDPAU support
+###
+.if !empty(PKG_OPTIONS:Mvdpau)
+CONFIGURE_ARGS+= --enable-vdpau
+.include "../../multimedia/libvdpau/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-vdpau
+.endif
+
+###
+### VAAPI support
+###
+.if !empty(PKG_OPTIONS:Mvaapi)
+CONFIGURE_ARGS+= --enable-vaapi
+.include "../../multimedia/libva/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-vaapi
+.endif
+
+###
+### VPX support
+###
+.if !empty(PKG_OPTIONS:Mlibvpx)
+CONFIGURE_ARGS+= --enable-libvpx
+.include "../../multimedia/libvpx/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-libvpx
+.endif
+
+.if !empty(PKG_OPTIONS:Mx11)
+CONFIGURE_ARGS+= --enable-x11grab
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXfixes/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-x11grab
+.endif
diff --git a/ffmpeg-git/patches/patch-aa b/ffmpeg-git/patches/patch-aa
new file mode 100644
index 0000000..ca5ffe2
--- /dev/null
+++ b/ffmpeg-git/patches/patch-aa
@@ -0,0 +1,20 @@
+$NetBSD: patch-aa,v 1.1 2013/05/04 10:39:12 shattered Exp $
+
+--- libavutil/x86/cpu.c.orig 2016-08-15 08:09:26.108776359 +0000
++++ libavutil/x86/cpu.c
+@@ -116,6 +116,7 @@ int ff_get_cpu_flags_x86(void)
+ #if HAVE_SSE
+ if (std_caps & (1 << 25))
+ rval |= AV_CPU_FLAG_SSE;
++#if !defined(__GNUC__) || (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+ if (std_caps & (1 << 26))
+ rval |= AV_CPU_FLAG_SSE2;
+ if (ecx & 1)
+@@ -140,6 +141,7 @@ int ff_get_cpu_flags_x86(void)
+ }
+ }
+ #endif /* HAVE_AVX */
++#endif /* gcc >= 4.2 */
+ #endif /* HAVE_SSE */
+ }
+ if (max_std_level >= 7) {
diff --git a/ffmpeg-git/patches/patch-ac b/ffmpeg-git/patches/patch-ac
new file mode 100644
index 0000000..75cf25c
--- /dev/null
+++ b/ffmpeg-git/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2013/05/04 10:39:12 shattered Exp $
+
+--- Makefile.orig 2012-09-28 01:37:35.000000000 +0000
++++ Makefile
+@@ -139,8 +139,8 @@ install-progs: install-progs-yes $(PROGS
+
+ install-data: $(DATA_FILES) $(EXAMPLES_FILES)
+ $(Q)mkdir -p "$(DATADIR)/examples"
+- $(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)"
+- $(INSTALL) -m 644 $(EXAMPLES_FILES) "$(DATADIR)/examples"
++ $(INSTALL) -c -m 644 $(DATA_FILES) "$(DATADIR)"
++ $(INSTALL) -c -m 644 $(EXAMPLES_FILES) "$(DATADIR)/examples"
+
+ uninstall: uninstall-libs uninstall-headers uninstall-progs uninstall-data
+
diff --git a/ffmpeg-git/patches/patch-ap b/ffmpeg-git/patches/patch-ap
new file mode 100644
index 0000000..e274466
--- /dev/null
+++ b/ffmpeg-git/patches/patch-ap
@@ -0,0 +1,27 @@
+$NetBSD: patch-ap,v 1.1 2013/05/04 10:39:12 shattered Exp $
+
+--- libavutil/common.h.orig 2013-01-06 21:53:29.000000000 +0000
++++ libavutil/common.h
+@@ -39,6 +39,22 @@
+ #include "version.h"
+ #include "libavutil/avconfig.h"
+
++#if defined(__cplusplus)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__linux__)
++#undef _STDINT_H_
++#undef _SYS_STDINT_H_
++#undef _STDINT_H
++#undef _GCC_WRAP_STDINT_H
++#ifndef __STDC_CONSTANT_MACROS
++#define __STDC_CONSTANT_MACROS
++#endif
++#include <stdint.h>
++#endif /* FreeBSD | OpenBSD | linux */
++#if defined(__DragonFly__) || defined(__NetBSD__)
++#include <machine/int_const.h>
++#endif /* DragonFly | NetBSD */
++#endif /* __cplusplus */
++
+ #if AV_HAVE_BIGENDIAN
+ # define AV_NE(be, le) (be)
+ #else
diff --git a/ffmpeg-git/patches/patch-configure b/ffmpeg-git/patches/patch-configure
new file mode 100644
index 0000000..698e3f9
--- /dev/null
+++ b/ffmpeg-git/patches/patch-configure
@@ -0,0 +1,33 @@
+$NetBSD: patch-configure,v 1.1 2013/05/04 10:39:12 shattered Exp $
+
+--- configure.orig 2016-08-15 08:09:25.492305991 +0000
++++ configure
+@@ -4648,6 +4648,11 @@ case $target_os in
+ ;;
+ netbsd)
+ disable symver
++ # NetBSD/macppc *really* needs PIC enabled. ffmpeg has repeatedly
++ # broken time and time again because PIC support has been removed
++ # from architectures that need it. So, if you touch this, please
++ # be careful and make sure that your changes work.
++ test "${subarch}" != "x86_32" && enable pic
+ oss_indev_extralibs="-lossaudio"
+ oss_outdev_extralibs="-lossaudio"
+ enabled gcc || check_ldflags -Wl,-zmuldefs
+@@ -5106,10 +5111,13 @@ check_cc <<EOF && enable attribute_may_a
+ union { int x; } __attribute__((may_alias)) x;
+ EOF
+
+-check_cc <<EOF || die "endian test failed"
+-unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E';
++check_exec <<EOF || enable bigendian
++int main()
++{
++ long one = 1;
++ return !(*((char *)(&one)));
++}
+ EOF
+-od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian
+
+ if ! enabled ppc64 || enabled bigendian; then
+ disable vsx
Home |
Main Index |
Thread Index |
Old Index