Import of pkgsrc-2016Q3

This commit is contained in:
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions

View File

@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.18 2015/09/09 10:42:41 adam Exp $
# $NetBSD: Makefile,v 1.33 2016/09/19 13:04:24 wiz Exp $
PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg2/}
PKGREVISION= 5
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://ffmpeg.mplayerhq.hu/
COMMENT= Decoding, encoding and streaming software (v2.x)
@@ -25,6 +26,9 @@ CONFIGURE_ARGS+= --host-ld=${NATIVE_CC:Q}
CONFIGURE_ARGS+= --target-os=${LOWER_OPSYS}
.endif
PRINT_PLIST_AWK+= /html/ { $$0 = "$${PLIST.doc}" $$0 }
PRINT_PLIST_AWK+= /opencl/ { $$0 = "$${PLIST.opencl}" $$0 }
TEST_TARGET= check
post-install:
@@ -45,7 +49,7 @@ post-install:
|| !empty(CC_VERSION:Mgcc-4.[01].*) \
|| empty(CC_VERSION:Mgcc*)
CONFIGURE_ARGS+= --disable-asm
. elif !empty(CC_VERSION:Mgcc-4.*)
. elif !empty(CC_VERSION:Mgcc-[456].*)
CFLAGS+= -mstackrealign -mpreferred-stack-boundary=4
. endif
.endif

View File

@@ -1,11 +1,11 @@
# $NetBSD: Makefile.common,v 1.37 2015/09/09 10:42:41 adam Exp $
# $NetBSD: Makefile.common,v 1.48 2016/05/05 07:03:47 leot Exp $
# used by multimedia/ffmpeg2/Makefile
# used by multimedia/ffplay2/Makefile
DISTNAME= ffmpeg-2.8
DISTNAME= ffmpeg-2.8.7
CATEGORIES= multimedia
MASTER_SITES= http://www.ffmpeg.org/releases/
EXTRACT_SUFX= .tar.bz2
EXTRACT_SUFX= .tar.xz
LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2
@@ -14,7 +14,7 @@ PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg2/patches
USE_LANGUAGES= c99
USE_LIBTOOL= yes
USE_TOOLS+= gmake texi2html pod2man
USE_TOOLS+= gmake perl pod2man
HAS_CONFIGURE= yes
CONFIGURE_ARGS+= --cc=${CC:Q}
CONFIGURE_ARGS+= --disable-debug
@@ -28,6 +28,7 @@ CONFIGURE_ARGS+= --prefix=${PREFIX}
CONFIGURE_ARGS+= --progs-suffix=2
CONFIGURE_ARGS+= --datadir=${PREFIX}/share/ffmpeg2
CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/ffmpeg2
CONFIGURE_ARGS+= --incdir=${PREFIX}/include/ffmpeg2
CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ffmpeg2
CONFIGURE_ARGS+= --shlibdir=${PREFIX}/lib/ffmpeg2
@@ -87,6 +88,7 @@ pre-configure:
mkdir ${WRKSRC}/tmp
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../archivers/xz/buildlink3.mk"
.include "../../devel/libgetopt/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"

View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.10 2015/09/09 10:42:41 adam Exp $
@comment $NetBSD: PLIST,v 1.12 2016/05/05 07:03:47 leot Exp $
bin/ffmpeg2
bin/ffprobe2
bin/ffserver2
@@ -140,14 +140,65 @@ lib/ffmpeg2/pkgconfig/libavutil.pc
lib/ffmpeg2/pkgconfig/libpostproc.pc
lib/ffmpeg2/pkgconfig/libswresample.pc
lib/ffmpeg2/pkgconfig/libswscale.pc
man/man1/ffmpeg-all2.1
man/man1/ffmpeg-bitstream-filters2.1
man/man1/ffmpeg-codecs2.1
man/man1/ffmpeg-devices2.1
man/man1/ffmpeg-filters2.1
man/man1/ffmpeg-formats2.1
man/man1/ffmpeg-protocols2.1
man/man1/ffmpeg-resampler2.1
man/man1/ffmpeg-scaler2.1
man/man1/ffmpeg-utils2.1
man/man1/ffmpeg2.1
man/man1/ffprobe-all2.1
man/man1/ffprobe2.1
man/man1/ffserver-all2.1
man/man1/ffserver2.1
man/man3/libavcodec2.3
man/man3/libavdevice2.3
man/man3/libavfilter2.3
man/man3/libavformat2.3
man/man3/libavutil2.3
man/man3/libswresample2.3
man/man3/libswscale2.3
share/doc/ffmpeg2/build_system.txt
${PLIST.doc}share/doc/ffmpeg2/developer.html
share/doc/ffmpeg2/errno.txt
${PLIST.doc}share/doc/ffmpeg2/faq.html
${PLIST.doc}share/doc/ffmpeg2/fate.html
${PLIST.doc}share/doc/ffmpeg2/ffmpeg-all.html
${PLIST.doc}share/doc/ffmpeg2/ffmpeg-bitstream-filters.html
${PLIST.doc}share/doc/ffmpeg2/ffmpeg-codecs.html
${PLIST.doc}share/doc/ffmpeg2/ffmpeg-devices.html
${PLIST.doc}share/doc/ffmpeg2/ffmpeg-filters.html
${PLIST.doc}share/doc/ffmpeg2/ffmpeg-formats.html
${PLIST.doc}share/doc/ffmpeg2/ffmpeg-protocols.html
${PLIST.doc}share/doc/ffmpeg2/ffmpeg-resampler.html
${PLIST.doc}share/doc/ffmpeg2/ffmpeg-scaler.html
${PLIST.doc}share/doc/ffmpeg2/ffmpeg-utils.html
${PLIST.doc}share/doc/ffmpeg2/ffmpeg.html
share/doc/ffmpeg2/ffmpeg.txt
${PLIST.doc}share/doc/ffmpeg2/ffprobe-all.html
${PLIST.doc}share/doc/ffmpeg2/ffprobe.html
${PLIST.doc}share/doc/ffmpeg2/ffserver-all.html
${PLIST.doc}share/doc/ffmpeg2/ffserver.html
share/doc/ffmpeg2/filter_design.txt
${PLIST.doc}share/doc/ffmpeg2/general.html
${PLIST.doc}share/doc/ffmpeg2/git-howto.html
share/doc/ffmpeg2/issue_tracker.txt
${PLIST.doc}share/doc/ffmpeg2/libavcodec.html
${PLIST.doc}share/doc/ffmpeg2/libavdevice.html
${PLIST.doc}share/doc/ffmpeg2/libavfilter.html
${PLIST.doc}share/doc/ffmpeg2/libavformat.html
${PLIST.doc}share/doc/ffmpeg2/libavutil.html
${PLIST.doc}share/doc/ffmpeg2/libswresample.html
${PLIST.doc}share/doc/ffmpeg2/libswscale.html
share/doc/ffmpeg2/mips.txt
share/doc/ffmpeg2/multithreading.txt
${PLIST.doc}share/doc/ffmpeg2/nut.html
share/doc/ffmpeg2/optimization.txt
${PLIST.doc}share/doc/ffmpeg2/platform.html
share/doc/ffmpeg2/rate_distortion.txt
share/doc/ffmpeg2/snow.txt
share/doc/ffmpeg2/swresample.txt

View File

@@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.5 2015/06/30 10:02:22 ryoon Exp $
# $NetBSD: buildlink3.mk,v 1.9 2016/08/17 00:06:40 ryoon Exp $
BUILDLINK_TREE+= ffmpeg2
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= ffmpeg2
FFMPEG2_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ffmpeg2+= ffmpeg2>=2.0
BUILDLINK_ABI_DEPENDS.ffmpeg2+= ffmpeg2>=2.7.1nb1
BUILDLINK_ABI_DEPENDS.ffmpeg2+= ffmpeg2>=2.8.7nb4
BUILDLINK_PKGSRCDIR.ffmpeg2?= ../../multimedia/ffmpeg2
pkgbase := ffmpeg2
@@ -14,6 +14,14 @@ pkgbase := ffmpeg2
.include "../../mk/bsd.fast.prefs.mk"
.if !empty(PKG_BUILD_OPTIONS.ffmpeg2:Mfreetype)
. include "../../graphics/freetype2/buildlink3.mk"
.endif
.if !empty(PKG_BUILD_OPTIONS.ffmpeg2:Mfontconfig)
. include "../../fonts/fontconfig/buildlink3.mk"
.endif
.if !empty(PKG_BUILD_OPTIONS.ffmpeg2:Mtheora)
. include "../../multimedia/libtheora/buildlink3.mk"
.endif
@@ -39,6 +47,7 @@ BUILDLINK_LIBDIRS.ffmpeg2+= lib/ffmpeg2
BUILDLINK_FNAME_TRANSFORM.ffmpeg2+= -e 's|lib/ffmpeg2/pkgconfig/|lib/pkgconfig/|'
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../archivers/xz/buildlink3.mk"
.include "../../devel/libgetopt/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.endif # FFMPEG2_BUILDLINK3_MK

View File

@@ -1,12 +1,13 @@
$NetBSD: distinfo,v 1.36 2015/09/09 10:42:41 adam Exp $
$NetBSD: distinfo,v 1.50 2016/08/14 16:27:33 maya Exp $
SHA1 (ffmpeg-2.8.tar.bz2) = b57cbd0d6c9e6ae48edcfce9a46765eeb7291efc
RMD160 (ffmpeg-2.8.tar.bz2) = 70a1710be870599ee338f890a5ba347b634e97ac
Size (ffmpeg-2.8.tar.bz2) = 8563832 bytes
SHA1 (patch-Makefile) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253
SHA1 (patch-configure) = bc0dcdb5605b5a112de556ecb466265ef8ff5ca9
SHA1 (ffmpeg-2.8.7.tar.xz) = 8c0fb21703cf77442338a26f2f645eda68bde6b2
RMD160 (ffmpeg-2.8.7.tar.xz) = ed757d4ed2763af3260ad13937f072831058d52d
SHA512 (ffmpeg-2.8.7.tar.xz) = 1ab6ec0df9aa63f3360863267bbbd39a63ffa004183dfd04a4efc6bf748796eae42de599102d523c08b9a15cf72ed9534b4793cd0468d112c17d95ab7bd447cb
Size (ffmpeg-2.8.7.tar.xz) = 7205628 bytes
SHA1 (patch-Makefile) = e3cb5cedccd2840f36ab90cd2f4b7987e1098a56
SHA1 (patch-configure) = 330e73d68491b7b27b88df9055a7bdbb913b37e3
SHA1 (patch-doc_Makefile) = 48d3b3ccd800303a73fcda79e78533228f79d750
SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = f997271f4f4604987591d7f17c571aaaa8a6188a
SHA1 (patch-libavutil_common.h) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e
SHA1 (patch-libavutil_opencl.c) = 2404f98c677c9fe92bcc49be01ebf76bebba0eea
SHA1 (patch-libavutil_x86_asm.h) = 3fe732ec6da9f0920d3c6e3a5db9bed65b0a3e40
SHA1 (patch-libavutil_x86_cpu.c) = ece66a5b22130754c11c643dae48171d04d3246f
SHA1 (patch-libavutil_common.h) = de36efed3a8a2069e170e5afe77eb122a46d14b2
SHA1 (patch-libavutil_x86_asm.h) = 85c5403e97449639253d3c97391dfbb4cadb2548
SHA1 (patch-libavutil_x86_cpu.c) = 499b0fc3081971a2bba2724bd051aab14c531239

View File

@@ -1,11 +1,15 @@
# $NetBSD: options.mk,v 1.7 2015/02/12 08:54:15 adam Exp $
# $NetBSD: options.mk,v 1.11 2016/05/05 07:03:47 leot Exp $
# Global and legacy options
PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg2
PKG_SUPPORTED_OPTIONS= ass faac fdk-aac gnutls lame libvpx opencore-amr \
openssl theora vorbis x264 x265 xvid
PKG_SUGGESTED_OPTIONS= lame ass libvpx theora vorbis x264 xvid
PKG_SUPPORTED_OPTIONS= ass doc faac fdk-aac fontconfig freetype gnutls lame \
libvpx opencore-amr openssl theora vorbis x264 x265 \
xcb xvid
PKG_SUGGESTED_OPTIONS= lame ass freetype fontconfig libvpx openssl \
theora vorbis x264 xvid
PLIST_VARS+= doc
# Add VDPAU if it is available
.include "../../multimedia/libvdpau/available.mk"
@@ -23,6 +27,24 @@ PKG_SUGGESTED_OPTIONS+= vaapi
.include "../../mk/bsd.options.mk"
# Fontconfig
.if !empty(PKG_OPTIONS:Mfontconfig)
USE_TOOLS+= pkg-config
CONFIGURE_ARGS+= --enable-fontconfig
.include "../../fonts/fontconfig/buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-fontconfig
.endif
# freetype option
.if !empty(PKG_OPTIONS:Mfreetype)
USE_TOOLS+= pkg-config
CONFIGURE_ARGS+= --enable-libfreetype
.include "../../graphics/freetype2/buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-libfreetype
.endif
# ass option
.if !empty(PKG_OPTIONS:Mass)
USE_TOOLS+= pkg-config
@@ -32,6 +54,15 @@ CONFIGURE_ARGS+= --enable-libass
CONFIGURE_ARGS+= --disable-libass
.endif
# doc option
.if !empty(PKG_OPTIONS:Mdoc)
PLIST.doc= yes
USE_TOOLS+= texi2html
CONFIGURE_ARGS+= --enable-htmlpages
.else
CONFIGURE_ARGS+= --disable-htmlpages
.endif
# faac option
.if !empty(PKG_OPTIONS:Mfaac)
RESTRICTED= This software may require the payment of patent royalties
@@ -153,3 +184,14 @@ CONFIGURE_ARGS+= --enable-libvpx
.else
CONFIGURE_ARGS+= --disable-libvpx
.endif
# X11 screen capture support using libxcb
.if !empty(PKG_OPTIONS:Mxcb)
CONFIGURE_ARGS+= --enable-libxcb
CONFIGURE_ARGS+= --enable-libxcb-shape
CONFIGURE_ARGS+= --enable-libxcb-shm
CONFIGURE_ARGS+= --enable-libxcb-xfixes
.include "../../x11/libxcb/buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-libxcb
.endif

View File

@@ -1,8 +1,8 @@
$NetBSD: patch-Makefile,v 1.1 2013/08/04 10:29:02 adam Exp $
$NetBSD: patch-Makefile,v 1.2 2016/01/16 17:04:33 leot Exp $
--- Makefile.orig 2012-09-28 01:37:35.000000000 +0000
--- Makefile.orig 2016-01-15 16:58:32.000000000 +0000
+++ Makefile
@@ -139,8 +139,8 @@ install-progs: install-progs-yes $(PROGS
@@ -159,8 +159,8 @@ install-progs: install-progs-yes $(AVPRO
install-data: $(DATA_FILES) $(EXAMPLES_FILES)
$(Q)mkdir -p "$(DATADIR)/examples"

View File

@@ -1,8 +1,17 @@
$NetBSD: patch-configure,v 1.8 2015/06/29 13:12:27 adam Exp $
$NetBSD: patch-configure,v 1.10 2016/08/03 12:06:47 maya Exp $
--- configure.orig 2015-06-19 20:47:55.000000000 +0000
--- configure.orig 2016-04-29 12:08:16.000000000 +0000
+++ configure
@@ -4197,6 +4197,11 @@ case $target_os in
@@ -3867,7 +3867,7 @@ case "$arch" in
sh4|sh)
arch="sh4"
;;
- sun4u|sparc*)
+ sun4*|sparc*)
arch="sparc"
;;
tilegx|tile-gx)
@@ -4300,6 +4300,11 @@ case $target_os in
;;
netbsd)
disable symver
@@ -14,7 +23,7 @@ $NetBSD: patch-configure,v 1.8 2015/06/29 13:12:27 adam Exp $
oss_indev_extralibs="-lossaudio"
oss_outdev_extralibs="-lossaudio"
enabled gcc || check_ldflags -Wl,-zmuldefs
@@ -4602,10 +4607,13 @@ check_cc <<EOF && enable attribute_may_a
@@ -4718,10 +4723,13 @@ check_cc <<EOF && enable attribute_may_a
union { int x; } __attribute__((may_alias)) x;
EOF
@@ -31,7 +40,7 @@ $NetBSD: patch-configure,v 1.8 2015/06/29 13:12:27 adam Exp $
if ! enabled ppc64 || enabled bigendian; then
disable vsx
@@ -5426,6 +5434,7 @@ enabled xmm_clobber_test &&
@@ -5589,6 +5597,7 @@ enabled xmm_clobber_test &&
-Wl,--wrap,sws_scale ||
disable xmm_clobber_test
@@ -39,7 +48,7 @@ $NetBSD: patch-configure,v 1.8 2015/06/29 13:12:27 adam Exp $
echo "X{};" > $TMPV
if test_ldflags -Wl,--version-script,$TMPV; then
append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver'
@@ -5438,6 +5447,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
@@ -5601,6 +5610,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
void ff_foo(void) {}
EOF
fi
@@ -47,7 +56,7 @@ $NetBSD: patch-configure,v 1.8 2015/06/29 13:12:27 adam Exp $
if [ -z "$optflags" ]; then
if enabled small; then
@@ -6041,7 +6051,7 @@ Version: $version
@@ -6233,7 +6243,7 @@ Version: $version
Requires: $(enabled shared || echo $requires)
Requires.private: $(enabled shared && echo $requires)
Conflicts:

View File

@@ -0,0 +1,31 @@
$NetBSD: patch-doc_Makefile,v 1.1 2016/04/28 09:20:53 leot Exp $
Honor --prog-suffix configure option also for man pages.
--- doc/Makefile.orig 2016-02-01 00:52:15.000000000 +0000
+++ doc/Makefile
@@ -14,8 +14,8 @@ COMPONENTS-$(CONFIG_AVFORMAT) += ffmpe
COMPONENTS-$(CONFIG_AVDEVICE) += ffmpeg-devices
COMPONENTS-$(CONFIG_AVFILTER) += ffmpeg-filters
-MANPAGES1 = $(AVPROGS-yes:%=doc/%.1) $(AVPROGS-yes:%=doc/%-all.1) $(COMPONENTS-yes:%=doc/%.1)
-MANPAGES3 = $(LIBRARIES-yes:%=doc/%.3)
+MANPAGES1 = $(AVPROGS-yes:%=doc/%$(PROGSSUF).1) $(AVPROGS-yes:%=doc/%-all$(PROGSSUF).1) $(COMPONENTS-yes:%=doc/%$(PROGSSUF).1)
+MANPAGES3 = $(LIBRARIES-yes:%=doc/%$(PROGSSUF).3)
MANPAGES = $(MANPAGES1) $(MANPAGES3)
PODPAGES = $(AVPROGS-yes:%=doc/%.pod) $(AVPROGS-yes:%=doc/%-all.pod) $(COMPONENTS-yes:%=doc/%.pod) $(LIBRARIES-yes:%=doc/%.pod)
HTMLPAGES = $(AVPROGS-yes:%=doc/%.html) $(AVPROGS-yes:%=doc/%-all.html) $(COMPONENTS-yes:%=doc/%.html) $(LIBRARIES-yes:%=doc/%.html) \
@@ -114,10 +114,10 @@ doc/%-all.pod: doc/%.texi $(SRC_PATH)/do
$(Q)$(TEXIDEP)
$(M)perl $(SRC_PATH)/doc/texi2pod.pl -Dconfig-all=yes -Idoc $< $@
-doc/%.1 doc/%.3: TAG = MAN
-doc/%.1: doc/%.pod $(GENTEXI)
+doc/%$(PROGSSUF).1 doc/%$(PROGSSUF).3: TAG = MAN
+doc/%$(PROGSSUF).1: doc/%.pod $(GENTEXI)
$(M)pod2man --section=1 --center=" " --release=" " --date=" " $< > $@
-doc/%.3: doc/%.pod $(GENTEXI)
+doc/%$(PROGSSUF).3: doc/%.pod $(GENTEXI)
$(M)pod2man --section=3 --center=" " --release=" " --date=" " $< > $@
$(DOCS) doc/doxy/html: | doc/

View File

@@ -1,8 +1,8 @@
$NetBSD: patch-libavutil_common.h,v 1.1 2013/08/04 10:29:02 adam Exp $
$NetBSD: patch-libavutil_common.h,v 1.2 2016/01/16 17:04:33 leot Exp $
--- libavutil/common.h.orig 2013-01-06 21:53:29.000000000 +0000
--- libavutil/common.h.orig 2016-01-15 16:58:36.000000000 +0000
+++ libavutil/common.h
@@ -39,6 +39,22 @@
@@ -43,6 +43,22 @@
#include "version.h"
#include "libavutil/avconfig.h"

View File

@@ -1,15 +0,0 @@
$NetBSD: patch-libavutil_opencl.c,v 1.2 2015/04/02 22:40:04 wiz Exp $
Fix undeclared identifier error.
--- libavutil/opencl.c.orig 2015-03-16 19:26:04.000000000 +0000
+++ libavutil/opencl.c
@@ -423,7 +423,7 @@ cl_program av_opencl_compile(const char
cl_program program = NULL;
LOCK_OPENCL;
- for (i = 0; i < opencl_ctx.kernel_code_count; i++) {
+ for (int i = 0; i < opencl_ctx.kernel_code_count; i++) {
// identify a program using a unique name within the kernel source
ptr = av_stristr(opencl_ctx.kernel_code[i].kernel_string, program_name);
if (ptr && !opencl_ctx.kernel_code[i].is_compiled) {

View File

@@ -1,8 +1,8 @@
$NetBSD: patch-libavutil_x86_asm.h,v 1.1 2014/08/30 11:22:03 richard Exp $
$NetBSD: patch-libavutil_x86_asm.h,v 1.2 2016/01/16 17:04:33 leot Exp $
avoid SunOS regset.h definition for REG_SP
--- libavutil/x86/asm.h.orig 2014-08-17 13:33:17.000000000 +0000
--- libavutil/x86/asm.h.orig 2016-01-15 16:58:37.000000000 +0000
+++ libavutil/x86/asm.h
@@ -27,6 +27,11 @@
typedef struct xmm_reg { uint64_t a, b; } xmm_reg;

View File

@@ -1,6 +1,6 @@
$NetBSD: patch-libavutil_x86_cpu.c,v 1.3 2014/04/01 10:51:49 adam Exp $
$NetBSD: patch-libavutil_x86_cpu.c,v 1.4 2016/01/16 17:04:33 leot Exp $
--- libavutil/x86/cpu.c.orig 2014-03-23 22:07:55.000000000 +0000
--- libavutil/x86/cpu.c.orig 2016-01-15 16:58:37.000000000 +0000
+++ libavutil/x86/cpu.c
@@ -116,6 +116,7 @@ int ff_get_cpu_flags_x86(void)
#if HAVE_SSE