From af0df8ffc27b4659613ed5c5d569beb77c77a55a Mon Sep 17 00:00:00 2001 From: ryoon Date: Wed, 28 Nov 2012 15:50:03 +0000 Subject: Import ffmpeg010-20120609.0.10.4 as multimedia/ffmpeg010. Re-import ffmpeg 0.10 branch. Upcomming gstreamer1-1.0.3 will use this. This package can co-exist with ffmpeg 1.0. --- multimedia/ffmpeg010/DESCR | 3 + multimedia/ffmpeg010/Makefile | 51 ++++++++++ multimedia/ffmpeg010/Makefile.common | 85 ++++++++++++++++ multimedia/ffmpeg010/PLIST | 129 ++++++++++++++++++++++++ multimedia/ffmpeg010/buildlink3.mk | 46 +++++++++ multimedia/ffmpeg010/distinfo | 10 ++ multimedia/ffmpeg010/options.mk | 114 +++++++++++++++++++++ multimedia/ffmpeg010/patches/patch-aa | 20 ++++ multimedia/ffmpeg010/patches/patch-ac | 13 +++ multimedia/ffmpeg010/patches/patch-ap | 27 +++++ multimedia/ffmpeg010/patches/patch-configure | 67 ++++++++++++ multimedia/ffmpeg010/patches/patch-doc_Makefile | 21 ++++ 12 files changed, 586 insertions(+) create mode 100644 multimedia/ffmpeg010/DESCR create mode 100644 multimedia/ffmpeg010/Makefile create mode 100644 multimedia/ffmpeg010/Makefile.common create mode 100644 multimedia/ffmpeg010/PLIST create mode 100644 multimedia/ffmpeg010/buildlink3.mk create mode 100644 multimedia/ffmpeg010/distinfo create mode 100644 multimedia/ffmpeg010/options.mk create mode 100644 multimedia/ffmpeg010/patches/patch-aa create mode 100644 multimedia/ffmpeg010/patches/patch-ac create mode 100644 multimedia/ffmpeg010/patches/patch-ap create mode 100644 multimedia/ffmpeg010/patches/patch-configure create mode 100644 multimedia/ffmpeg010/patches/patch-doc_Makefile (limited to 'multimedia') diff --git a/multimedia/ffmpeg010/DESCR b/multimedia/ffmpeg010/DESCR new file mode 100644 index 00000000000..7f379ea9c4b --- /dev/null +++ b/multimedia/ffmpeg010/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/multimedia/ffmpeg010/Makefile b/multimedia/ffmpeg010/Makefile new file mode 100644 index 00000000000..2e7fd76d05d --- /dev/null +++ b/multimedia/ffmpeg010/Makefile @@ -0,0 +1,51 @@ +# $NetBSD: Makefile,v 1.6 2012/11/28 15:50:03 ryoon Exp $ + +PKGNAME= ffmpeg010-20120609.${DISTVERSION} + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://ffmpeg.mplayerhq.hu/ +COMMENT= Decoding, encoding and streaming software + +PKG_DESTDIR_SUPPORT= user-destdir + +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 + +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" + +.if ${OPSYS} == "Darwin" +CONFIGURE_ARGS+= --disable-asm +.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" diff --git a/multimedia/ffmpeg010/Makefile.common b/multimedia/ffmpeg010/Makefile.common new file mode 100644 index 00000000000..b58a6dfe60d --- /dev/null +++ b/multimedia/ffmpeg010/Makefile.common @@ -0,0 +1,85 @@ +# $NetBSD: Makefile.common,v 1.4 2012/11/28 15:50:03 ryoon Exp $ +# used by multimedia/ffplay/Makefile +# used by multimedia/ffmpeg/Makefile + +DISTNAME= ffmpeg-${DISTVERSION:S/-//g} +CATEGORIES= multimedia +MASTER_SITES= http://www.ffmpeg.org/releases/ +EXTRACT_SUFX= .tar.bz2 + +DISTVERSION= 0.10.4 +PREV_PKGPATH= multimedia/ffmpeg-devel +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" diff --git a/multimedia/ffmpeg010/PLIST b/multimedia/ffmpeg010/PLIST new file mode 100644 index 00000000000..f6d0df6ee0d --- /dev/null +++ b/multimedia/ffmpeg010/PLIST @@ -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 diff --git a/multimedia/ffmpeg010/buildlink3.mk b/multimedia/ffmpeg010/buildlink3.mk new file mode 100644 index 00000000000..bf065ee002f --- /dev/null +++ b/multimedia/ffmpeg010/buildlink3.mk @@ -0,0 +1,46 @@ +# $NetBSD: buildlink3.mk,v 1.3 2012/11/28 15:50:03 ryoon Exp $ + +BUILDLINK_TREE+= ffmpeg010 + +.if !defined(FFMPEG010_BUILDLINK3_MK) +FFMPEG010_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.ffmpeg010+= ffmpeg010>=20120609.0.10.4<20121028.1.0 +BUILDLINK_ABI_DEPENDS.ffmpeg010+= ffmpeg010>=20111104.0.7.7nb1 +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.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 # FFMPEG010_BUILDLINK3_MK + +BUILDLINK_TREE+= -ffmpeg010 diff --git a/multimedia/ffmpeg010/distinfo b/multimedia/ffmpeg010/distinfo new file mode 100644 index 00000000000..803366fa48c --- /dev/null +++ b/multimedia/ffmpeg010/distinfo @@ -0,0 +1,10 @@ +$NetBSD: distinfo,v 1.4 2012/11/28 15:50:03 ryoon Exp $ + +SHA1 (ffmpeg-0.10.4.tar.bz2) = 5f165dd055eb762b588a090f13bc29055a1a11ae +RMD160 (ffmpeg-0.10.4.tar.bz2) = 97ec2a7690cf610a72f4198da91a59191cee3f4a +Size (ffmpeg-0.10.4.tar.bz2) = 5853766 bytes +SHA1 (patch-aa) = b30c822e03bb1766181d7b8b8d4122c196fd1d16 +SHA1 (patch-ac) = 14b39a2663be41395be0faae8270e18e2ba0891f +SHA1 (patch-ap) = b67db14f412bbca036b5e6573df68b64ac5dabc2 +SHA1 (patch-configure) = edc359ba50cdc90ad3ce7529f72e07970b679303 +SHA1 (patch-doc_Makefile) = d74bcf7139e298ed1ce9b6efc32b00b45eea7f24 diff --git a/multimedia/ffmpeg010/options.mk b/multimedia/ffmpeg010/options.mk new file mode 100644 index 00000000000..22b705fe9bd --- /dev/null +++ b/multimedia/ffmpeg010/options.mk @@ -0,0 +1,114 @@ +# $NetBSD: options.mk,v 1.3 2012/11/28 15:50:03 ryoon Exp $ + +# Global and legacy options + +PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg +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 + +.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) +.include "../../multimedia/libvdpau/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-vdpau +.endif + +.if !empty(PKG_OPTIONS:Mlibvpx) +CONFIGURE_ARGS+= --enable-libvpx +.include "../../multimedia/libvpx/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-libvpx +.endif diff --git a/multimedia/ffmpeg010/patches/patch-aa b/multimedia/ffmpeg010/patches/patch-aa new file mode 100644 index 00000000000..c0d5f7d943d --- /dev/null +++ b/multimedia/ffmpeg010/patches/patch-aa @@ -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 + ; + } diff --git a/multimedia/ffmpeg010/patches/patch-ac b/multimedia/ffmpeg010/patches/patch-ac new file mode 100644 index 00000000000..aba1442b76c --- /dev/null +++ b/multimedia/ffmpeg010/patches/patch-ac @@ -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 + diff --git a/multimedia/ffmpeg010/patches/patch-ap b/multimedia/ffmpeg010/patches/patch-ap new file mode 100644 index 00000000000..d7e367e5363 --- /dev/null +++ b/multimedia/ffmpeg010/patches/patch-ap @@ -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 ++#endif /* FreeBSD | OpenBSD | linux */ ++#if defined(__DragonFly__) || defined(__NetBSD__) ++#include ++#endif /* DragonFly | NetBSD */ ++#endif /* __cplusplus */ ++ + #if AV_HAVE_BIGENDIAN + # define AV_NE(be, le) (be) + #else diff --git a/multimedia/ffmpeg010/patches/patch-configure b/multimedia/ffmpeg010/patches/patch-configure new file mode 100644 index 00000000000..3c086e3b89b --- /dev/null +++ b/multimedia/ffmpeg010/patches/patch-configure @@ -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 < /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 diff --git a/multimedia/ffmpeg010/patches/patch-doc_Makefile b/multimedia/ffmpeg010/patches/patch-doc_Makefile new file mode 100644 index 00000000000..c144460022f --- /dev/null +++ b/multimedia/ffmpeg010/patches/patch-doc_Makefile @@ -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 -- cgit v1.2.3