Import of pkgsrc-2013Q2

This commit is contained in:
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions

View File

@@ -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.

View File

@@ -0,0 +1,64 @@
# $NetBSD: Makefile,v 1.12 2013/06/30 12:16:18 wiz Exp $
PKGNAME= ffmpeg010-20130410.${DISTVERSION}
PKGREVISION= 1
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://ffmpeg.mplayerhq.hu/
COMMENT= Decoding, encoding and streaming software
CONFIGURE_ARGS+= --enable-avfilter
#CONFIGURE_ARGS+= --enable-avfilter-lavf
CONFIGURE_ARGS+= --enable-postproc
CONFIGURE_ARGS+= --incdir=${PREFIX}/include/ffmpeg010
CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ffmpeg010
CONFIGURE_ARGS+= --shlibdir=${PREFIX}/lib/ffmpeg010
CONFIGURE_ARGS+= --datadir=${PREFIX}/share/ffmpeg010
#CONFIGURE_ARGS+= --build-suffix=010
CONFIGURE_ARGS+= --progs-suffix=010
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg010
INSTALLATION_DIRS= lib share/examples/ffmpeg010 share/doc/ffmpeg010
CONF_FILES+= ${PREFIX}/share/examples/ffmpeg010/ffserver.conf \
${PKG_SYSCONFDIR}/ffserver.conf
.include "../../mk/bsd.prefs.mk"
.include "../../mk/compiler.mk"
# disable asm on i386 for non-gcc and gcc < 4.2
# no alignment options needed for gcc >= 4.6 on i386
.if ${MACHINE_ARCH} == "i386"
.if !empty(MACHINE_PLATFORM:MDarwin-*-i386)
CONFIGURE_ARGS+= --disable-asm
.elif !empty(CC_VERSION:Mgcc-4.[2345]*)
CFLAGS+=-mstackrealign -mpreferred-stack-boundary=4
.elif !empty(CC_VERSION:Mgcc-[123]*) \
|| !empty(CC_VERSION:Mgcc-4.[01]*) \
|| empty(CC_VERSION:Mgcc*)
CONFIGURE_ARGS+= --disable-asm
.endif
.endif
# "error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'"
CFLAGS.SunOS+= -DBROKEN_RELOCATIONS=1
TEST_TARGET= check
post-install:
${INSTALL_DATA} ${WRKSRC}/doc/*.txt \
${DESTDIR}${PREFIX}/share/doc/ffmpeg010
${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \
${DESTDIR}${PREFIX}/share/examples/ffmpeg010
.include "options.mk"
.include "../../mk/compiler.mk"
.if !empty(PKGSRC_COMPILER:Mclang)
CFLAGS+= -no-integrated-as
.endif
.include "../../multimedia/ffmpeg010/Makefile.common"

View File

@@ -0,0 +1,83 @@
# $NetBSD: Makefile.common,v 1.7 2013/04/11 11:26:23 drochner Exp $
# used by multimedia/ffmpeg010/Makefile
DISTNAME= ffmpeg-${DISTVERSION:S/-//g}
CATEGORIES= multimedia
MASTER_SITES= http://www.ffmpeg.org/releases/
EXTRACT_SUFX= .tar.bz2
DISTVERSION= 0.10.7
PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg010/patches
HAS_CONFIGURE= YES
USE_LANGUAGES+= c99
USE_LIBTOOL= YES
USE_TOOLS+= gmake texi2html pod2man
.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}
# Let's not put garbage into /tmp
CONFIGURE_ENV+= TMPDIR=${WRKSRC}/tmp
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-mmx2
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
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"

129
multimedia/ffmpeg010/PLIST Normal file
View File

@@ -0,0 +1,129 @@
@comment $NetBSD: PLIST,v 1.3 2012/11/28 15:50:03 ryoon Exp $
bin/ffmpeg010
bin/ffprobe010
bin/ffserver010
include/ffmpeg010/libavcodec/avcodec.h
include/ffmpeg010/libavcodec/avfft.h
include/ffmpeg010/libavcodec/dxva2.h
include/ffmpeg010/libavcodec/opt.h
include/ffmpeg010/libavcodec/vaapi.h
include/ffmpeg010/libavcodec/vda.h
include/ffmpeg010/libavcodec/vdpau.h
include/ffmpeg010/libavcodec/version.h
include/ffmpeg010/libavcodec/xvmc.h
include/ffmpeg010/libavdevice/avdevice.h
include/ffmpeg010/libavfilter/avcodec.h
include/ffmpeg010/libavfilter/avfilter.h
include/ffmpeg010/libavfilter/avfiltergraph.h
include/ffmpeg010/libavfilter/buffersink.h
include/ffmpeg010/libavfilter/version.h
include/ffmpeg010/libavfilter/vsrc_buffer.h
include/ffmpeg010/libavformat/avformat.h
include/ffmpeg010/libavformat/avio.h
include/ffmpeg010/libavformat/version.h
include/ffmpeg010/libavutil/adler32.h
include/ffmpeg010/libavutil/aes.h
include/ffmpeg010/libavutil/attributes.h
include/ffmpeg010/libavutil/audioconvert.h
include/ffmpeg010/libavutil/avassert.h
include/ffmpeg010/libavutil/avconfig.h
include/ffmpeg010/libavutil/avstring.h
include/ffmpeg010/libavutil/avutil.h
include/ffmpeg010/libavutil/base64.h
include/ffmpeg010/libavutil/bswap.h
include/ffmpeg010/libavutil/common.h
include/ffmpeg010/libavutil/cpu.h
include/ffmpeg010/libavutil/crc.h
include/ffmpeg010/libavutil/dict.h
include/ffmpeg010/libavutil/error.h
include/ffmpeg010/libavutil/eval.h
include/ffmpeg010/libavutil/fifo.h
include/ffmpeg010/libavutil/file.h
include/ffmpeg010/libavutil/imgutils.h
include/ffmpeg010/libavutil/intfloat.h
include/ffmpeg010/libavutil/intfloat_readwrite.h
include/ffmpeg010/libavutil/intreadwrite.h
include/ffmpeg010/libavutil/lfg.h
include/ffmpeg010/libavutil/log.h
include/ffmpeg010/libavutil/lzo.h
include/ffmpeg010/libavutil/mathematics.h
include/ffmpeg010/libavutil/md5.h
include/ffmpeg010/libavutil/mem.h
include/ffmpeg010/libavutil/opt.h
include/ffmpeg010/libavutil/parseutils.h
include/ffmpeg010/libavutil/pixdesc.h
include/ffmpeg010/libavutil/pixfmt.h
include/ffmpeg010/libavutil/random_seed.h
include/ffmpeg010/libavutil/rational.h
include/ffmpeg010/libavutil/samplefmt.h
include/ffmpeg010/libavutil/sha.h
include/ffmpeg010/libpostproc/postprocess.h
include/ffmpeg010/libswresample/swresample.h
include/ffmpeg010/libswscale/swscale.h
lib/ffmpeg010/libavcodec.a
lib/ffmpeg010/libavcodec.so
lib/ffmpeg010/libavcodec.so.53
lib/ffmpeg010/libavcodec.so.53.61.100
lib/ffmpeg010/libavdevice.a
lib/ffmpeg010/libavdevice.so
lib/ffmpeg010/libavdevice.so.53
lib/ffmpeg010/libavdevice.so.53.4.100
lib/ffmpeg010/libavfilter.a
lib/ffmpeg010/libavfilter.so
lib/ffmpeg010/libavfilter.so.2
lib/ffmpeg010/libavfilter.so.2.61.100
lib/ffmpeg010/libavformat.a
lib/ffmpeg010/libavformat.so
lib/ffmpeg010/libavformat.so.53
lib/ffmpeg010/libavformat.so.53.32.100
lib/ffmpeg010/libavutil.a
lib/ffmpeg010/libavutil.so
lib/ffmpeg010/libavutil.so.51
lib/ffmpeg010/libavutil.so.51.35.100
lib/ffmpeg010/libpostproc.a
lib/ffmpeg010/libpostproc.so
lib/ffmpeg010/libpostproc.so.52
lib/ffmpeg010/libpostproc.so.52.0.100
lib/ffmpeg010/libswresample.a
lib/ffmpeg010/libswresample.so
lib/ffmpeg010/libswresample.so.0
lib/ffmpeg010/libswresample.so.0.6.100
lib/ffmpeg010/libswscale.a
lib/ffmpeg010/libswscale.so
lib/ffmpeg010/libswscale.so.2
lib/ffmpeg010/libswscale.so.2.1.100
lib/ffmpeg010/pkgconfig/libavcodec.pc
lib/ffmpeg010/pkgconfig/libavdevice.pc
lib/ffmpeg010/pkgconfig/libavfilter.pc
lib/ffmpeg010/pkgconfig/libavformat.pc
lib/ffmpeg010/pkgconfig/libavutil.pc
lib/ffmpeg010/pkgconfig/libpostproc.pc
lib/ffmpeg010/pkgconfig/libswresample.pc
lib/ffmpeg010/pkgconfig/libswscale.pc
man/man1/ffmpeg010.1
man/man1/ffprobe010.1
man/man1/ffserver010.1
share/doc/ffmpeg010/avutil.txt
share/doc/ffmpeg010/build_system.txt
share/doc/ffmpeg010/errno.txt
share/doc/ffmpeg010/ffmpeg.txt
share/doc/ffmpeg010/git-howto.txt
share/doc/ffmpeg010/issue_tracker.txt
share/doc/ffmpeg010/multithreading.txt
share/doc/ffmpeg010/optimization.txt
share/doc/ffmpeg010/rate_distortion.txt
share/doc/ffmpeg010/snow.txt
share/doc/ffmpeg010/soc.txt
share/doc/ffmpeg010/swresample.txt
share/doc/ffmpeg010/swscale.txt
share/doc/ffmpeg010/tablegen.txt
share/doc/ffmpeg010/viterbi.txt
share/examples/ffmpeg010/ffserver.conf
share/ffmpeg010/ffprobe.xsd
share/ffmpeg010/libvpx-1080p.ffpreset
share/ffmpeg010/libvpx-1080p50_60.ffpreset
share/ffmpeg010/libvpx-360p.ffpreset
share/ffmpeg010/libvpx-720p.ffpreset
share/ffmpeg010/libvpx-720p50_60.ffpreset
share/ffmpeg010/libx264-ipod320.ffpreset
share/ffmpeg010/libx264-ipod640.ffpreset

View File

@@ -0,0 +1,45 @@
# $NetBSD: buildlink3.mk,v 1.6 2013/04/11 11:26:23 drochner Exp $
BUILDLINK_TREE+= ffmpeg010
.if !defined(FFMPEG010_BUILDLINK3_MK)
FFMPEG010_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ffmpeg010+= ffmpeg010>=20120609.0.10.4
BUILDLINK_PKGSRCDIR.ffmpeg010?= ../../multimedia/ffmpeg010
BUILDLINK_INCDIRS.ffmpeg010+= include/ffmpeg010
BUILDLINK_LIBDIRS.ffmpeg010+= lib/ffmpeg010
BUILDLINK_FNAME_TRANSFORM.ffmpeg010+= -e 's|lib/ffmpeg010/pkgconfig/|lib/pkgconfig/|'
pkgbase := ffmpeg010
. include "../../mk/pkg-build-options.mk"
.include "../../mk/bsd.fast.prefs.mk"
.if !empty(PKG_BUILD_OPTIONS.ffmpeg010:Mtheora)
. include "../../multimedia/libtheora/buildlink3.mk"
.endif
.if !empty(PKG_BUILD_OPTIONS.ffmpeg010:Mxvid)
. include "../../multimedia/xvidcore/buildlink3.mk"
.endif
.if !empty(PKG_BUILD_OPTIONS.ffmpeg010:Mx264)
. include "../../multimedia/x264-devel/buildlink3.mk"
.endif
.if !empty(PKG_BUILD_OPTIONS.ffmpeg010:Mfaac)
. include "../../audio/faac/buildlink3.mk"
.endif
.if !empty(PKG_BUILD_OPTIONS.ffmpeg010:Mlibvpx)
. include "../../multimedia/libvpx/buildlink3.mk"
.endif
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../devel/libgetopt/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.endif # FFMPEG010_BUILDLINK3_MK
BUILDLINK_TREE+= -ffmpeg010

View File

@@ -0,0 +1,11 @@
$NetBSD: distinfo,v 1.8 2013/05/17 21:50:34 jperkin Exp $
SHA1 (ffmpeg-0.10.7.tar.bz2) = 48e49998a665055b586bc8468b64b9aa6342e90e
RMD160 (ffmpeg-0.10.7.tar.bz2) = d404ac7028c8e658088bdcdd9391ed0908e80997
Size (ffmpeg-0.10.7.tar.bz2) = 5782181 bytes
SHA1 (patch-aa) = b30c822e03bb1766181d7b8b8d4122c196fd1d16
SHA1 (patch-ac) = 14b39a2663be41395be0faae8270e18e2ba0891f
SHA1 (patch-ap) = b67db14f412bbca036b5e6573df68b64ac5dabc2
SHA1 (patch-configure) = edc359ba50cdc90ad3ce7529f72e07970b679303
SHA1 (patch-doc_Makefile) = d74bcf7139e298ed1ce9b6efc32b00b45eea7f24
SHA1 (patch-libavformat_nutdec.c) = eb16a4d2757bfc13a745cc62fab7711897bdeb30

View File

@@ -0,0 +1,136 @@
# $NetBSD: options.mk,v 1.5 2013/04/14 00:59:50 cheusov Exp $
# Global and legacy options
PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg010
PKG_SUPPORTED_OPTIONS= faac lame libvpx opencore-amr theora vorbis x264 xvid
PKG_SUGGESTED_OPTIONS= lame 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"
###
### 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

View File

@@ -0,0 +1,20 @@
$NetBSD: patch-aa,v 1.3 2012/11/28 15:50:03 ryoon Exp $
--- libavutil/x86/cpu.c.orig 2012-06-09 20:09:44.000000000 +0000
+++ libavutil/x86/cpu.c
@@ -89,6 +89,7 @@ int ff_get_cpu_flags_x86(void)
rval |= AV_CPU_FLAG_MMX2
#if HAVE_SSE
| 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)
@@ -108,6 +109,7 @@ int ff_get_cpu_flags_x86(void)
rval |= AV_CPU_FLAG_AVX;
}
#endif
+#endif /* gcc >= 4.2 */
#endif
;
}

View File

@@ -0,0 +1,13 @@
$NetBSD: patch-ac,v 1.3 2012/11/28 15:50:03 ryoon Exp $
--- Makefile.orig 2012-06-09 20:09:44.000000000 +0000
+++ Makefile
@@ -124,7 +124,7 @@ install-progs: install-progs-yes $(PROGS
install-data: $(DATA_FILES)
$(Q)mkdir -p "$(DATADIR)"
- $(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)"
+ $(INSTALL) -c -m 644 $(DATA_FILES) "$(DATADIR)"
uninstall: uninstall-libs uninstall-headers uninstall-progs uninstall-data

View File

@@ -0,0 +1,27 @@
$NetBSD: patch-ap,v 1.3 2012/11/28 15:50:03 ryoon Exp $
--- libavutil/common.h.orig 2012-06-09 20:09:44.000000000 +0000
+++ libavutil/common.h
@@ -37,6 +37,22 @@
#include "attributes.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

View File

@@ -0,0 +1,67 @@
$NetBSD: patch-configure,v 1.3 2012/11/28 15:50:03 ryoon Exp $
--- configure.orig 2012-06-09 20:09:44.000000000 +0000
+++ configure
@@ -2604,6 +2604,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"
;;
@@ -2835,10 +2840,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 alpha; then
@@ -3195,7 +3203,7 @@ else
fi
enabled sdl && add_cflags $sdl_cflags && add_extralibs $sdl_libs
-texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html
+which texi2html > /dev/null 2>&1 && enable texi2html || disable texi2html
makeinfo --version > /dev/null 2>&1 && enable makeinfo || disable makeinfo
check_header linux/fb.h
@@ -3291,6 +3299,7 @@ check_ldflags -Wl,--warn-common
check_ldflags -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil
test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic
+if false; then
echo "X{};" > $TMPV
if test_ldflags -Wl,--version-script,$TMPV; then
append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver'
@@ -3303,6 +3312,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
void ff_foo(void) {}
EOF
fi
+fi
if [ -n "$optflags" ]; then
add_cflags $optflags
@@ -3726,7 +3736,7 @@ Version: $version
Requires: $(enabled shared || echo $requires)
Requires.private: $(enabled shared && echo $requires)
Conflicts:
-Libs: -L\${libdir} -l${shortname} $(enabled shared || echo $libs)
+Libs: -L\${libdir} -Wl,-R\${libdir} -l${shortname} $(enabled shared || echo $libs)
Libs.private: $(enabled shared && echo $libs)
Cflags: -I\${includedir}
EOF

View File

@@ -0,0 +1,21 @@
$NetBSD: patch-doc_Makefile,v 1.1 2012/11/28 15:50:03 ryoon Exp $
--- doc/Makefile.orig 2012-06-09 20:09:44.000000000 +0000
+++ doc/Makefile
@@ -1,4 +1,4 @@
-MANPAGES = $(PROGS-yes:%=doc/%.1)
+MANPAGES = $(PROGS-yes:%=doc/%010.1)
PODPAGES = $(PROGS-yes:%=doc/%.pod)
HTMLPAGES = $(PROGS-yes:%=doc/%.html) \
doc/developer.html \
@@ -38,8 +38,8 @@ doc/%.pod: doc/%.texi
$(Q)$(TEXIDEP)
$(M)$(SRC_PATH)/doc/texi2pod.pl $< $@
-doc/%.1: TAG = MAN
-doc/%.1: doc/%.pod
+doc/%010.1: TAG = MAN
+doc/%010.1: doc/%.pod
$(M)pod2man --section=1 --center=" " --release=" " $< > $@
$(DOCS): | doc

View File

@@ -0,0 +1,15 @@
$NetBSD: patch-libavformat_nutdec.c,v 1.1 2013/05/17 21:50:34 jperkin Exp $
Avoid -Werror=return-type failure.
--- libavformat/nutdec.c.orig 2013-04-10 01:52:17.000000000 +0000
+++ libavformat/nutdec.c
@@ -849,7 +849,7 @@ av_log(s, AV_LOG_DEBUG, "read_timestamp(
if (stream_index == -1) return pts;
else if(stream_index == -2) return back_ptr;
-assert(0);
+ return AV_NOPTS_VALUE;
}
static int read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags){