head 1.20; access; symbols pkgsrc-2014Q2:1.19.0.8 pkgsrc-2014Q2-base:1.19 pkgsrc-2014Q1:1.19.0.6 pkgsrc-2014Q1-base:1.19 pkgsrc-2013Q4:1.19.0.4 pkgsrc-2013Q4-base:1.19 pkgsrc-2013Q3:1.19.0.2 pkgsrc-2013Q3-base:1.19 pkgsrc-2013Q2:1.18.0.4 pkgsrc-2013Q2-base:1.18 pkgsrc-2013Q1:1.18.0.2 pkgsrc-2013Q1-base:1.18 pkgsrc-2012Q4:1.17.0.2 pkgsrc-2012Q4-base:1.17 pkgsrc-2012Q3:1.15.0.8 pkgsrc-2012Q3-base:1.15 pkgsrc-2012Q2:1.15.0.6 pkgsrc-2012Q2-base:1.15 pkgsrc-2012Q1:1.15.0.4 pkgsrc-2012Q1-base:1.15 pkgsrc-2011Q4:1.15.0.2 pkgsrc-2011Q4-base:1.15 pkgsrc-2011Q3:1.13.0.2 pkgsrc-2011Q3-base:1.13 pkgsrc-2011Q2:1.11.0.4 pkgsrc-2011Q2-base:1.11 pkgsrc-2011Q1:1.11.0.2 pkgsrc-2011Q1-base:1.11 pkgsrc-2010Q4:1.10.0.6 pkgsrc-2010Q4-base:1.10 pkgsrc-2010Q3:1.10.0.4 pkgsrc-2010Q3-base:1.10 pkgsrc-2010Q2:1.10.0.2 pkgsrc-2010Q2-base:1.10 pkgsrc-2010Q1:1.9.0.2 pkgsrc-2010Q1-base:1.9 pkgsrc-2009Q4:1.8.0.4 pkgsrc-2009Q4-base:1.8 pkgsrc-2009Q3:1.8.0.2 pkgsrc-2009Q3-base:1.8 pkgsrc-2009Q2:1.6.0.2 pkgsrc-2009Q2-base:1.6 pkgsrc-2009Q1:1.3.0.8 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.6 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.4 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.2 cube-native-xorg-base:1.3; locks; strict; comment @# @; 1.20 date 2014.08.11.23.10.51; author wiz; state dead; branches; next 1.19; commitid gwOp7aGgPrCMYZLx; 1.19 date 2013.08.02.18.24.18; author adam; state Exp; branches; next 1.18; commitid CaKLOi7ltOTQpUZw; 1.18 date 2013.01.16.20.55.47; author adam; state Exp; branches; next 1.17; 1.17 date 2012.11.08.19.57.29; author adam; state Exp; branches; next 1.16; 1.16 date 2012.10.10.13.33.44; author drochner; state Exp; branches; next 1.15; 1.15 date 2011.11.29.17.58.17; author jmmv; state Exp; branches; next 1.14; 1.14 date 2011.11.07.10.43.35; author drochner; state Exp; branches; next 1.13; 1.13 date 2011.09.14.17.21.08; author hans; state Exp; branches 1.13.2.1; next 1.12; 1.12 date 2011.07.19.19.53.18; author drochner; state Exp; branches; next 1.11; 1.11 date 2011.01.17.16.51.05; author drochner; state Exp; branches; next 1.10; 1.10 date 2010.05.04.18.33.43; author drochner; state Exp; branches; next 1.9; 1.9 date 2010.04.02.11.19.40; author jmmv; state Exp; branches; next 1.8; 1.8 date 2009.09.07.20.05.30; author ahoka; state Exp; branches; next 1.7; 1.7 date 2009.08.30.11.01.58; author jmmv; state Exp; branches; next 1.6; 1.6 date 2009.06.14.11.27.01; author ahoka; state Exp; branches 1.6.2.1; next 1.5; 1.5 date 2009.06.14.01.04.44; author hasso; state Exp; branches; next 1.4; 1.4 date 2009.06.12.16.25.34; author ahoka; state dead; branches; next 1.3; 1.3 date 2008.09.11.12.08.41; author joerg; state Exp; branches; next 1.2; 1.2 date 2008.09.08.00.16.35; author ahoka; state Exp; branches; next 1.1; 1.1 date 2008.09.07.23.39.38; author ahoka; state Exp; branches; next ; 1.13.2.1 date 2011.11.16.21.07.03; author sbd; state Exp; branches; next ; 1.6.2.1 date 2009.09.28.08.08.31; author spz; state Exp; branches; next ; desc @@ 1.20 log @Remove ffplay, ffmpeg; add ffplay1, ffmpeg1 to Makefile. @ text @$NetBSD: patch-configure,v 1.19 2013/08/02 18:24:18 adam Exp $ --- configure.orig 2013-07-27 23:49:20.000000000 +0000 +++ configure @@@@ -3225,6 +3225,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 @@@@ -3555,10 +3560,13 @@@@ check_cc < $TMPV if test_ldflags -Wl,--version-script,$TMPV; then append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver' @@@@ -4104,6 +4113,7 @@@@ __asm__(".symver ff_foo,av_foo@@VERSION") void ff_foo(void) {} EOF fi +fi if [ -z "$optflags" ]; then if enabled small; then @@@@ -4560,7 +4570,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 @ 1.19 log @1.2.2 was released on 2013-07-28. It is the latest stable FFmpeg release from the 1.2 release branch, which was cut from master on 2013-03-07. Amongst lots of other changes, it includes all changes from ffmpeg-mt, libav master of 2013-03-07, libav 9 as of 2013-03-07. @ text @d1 1 a1 1 $NetBSD$ @ 1.18 log @Changes 1.1: - stream disposition information printing in ffprobe - filter for loudness analysis following EBU R128 - Opus encoder using libopus - ffprobe -select_streams option - Pinnacle TARGA CineWave YUV16 decoder - TAK demuxer, decoder and parser - DTS-HD demuxer - remove -same_quant, it hasn't worked for years - FFM2 support - X-Face image encoder and decoder - 24-bit FLAC encoding - multi-channel ALAC encoding up to 7.1 - metadata (INFO tag) support in WAV muxer - subtitles raw text decoder - support for building DLLs using MSVC - LVF demuxer - ffescape tool - metadata (info chunk) support in CAF muxer - field filter ported from libmpcodecs - AVR demuxer - geq filter ported from libmpcodecs - remove ffserver daemon mode - AST muxer/demuxer - new expansion syntax for drawtext - BRender PIX image decoder - ffprobe -show_entries option - ffprobe -sections option - ADPCM IMA Dialogic decoder - BRSTM demuxer - animated GIF decoder and demuxer - PVF demuxer - subtitles filter - IRCAM muxer/demuxer - Paris Audio File demuxer - Virtual concatenation demuxer - VobSub demuxer - JSON captions for TED talks decoding support - SOX Resampler support in libswresample - aselect filter - SGI RLE 8-bit decoder - Silicon Graphics Motion Video Compressor 1 & 2 decoder - Silicon Graphics Movie demuxer - apad filter - Resolution & pixel format change support with multithreading for H.264 - documentation split into per-component manuals - pp (postproc) filter ported from MPlayer - NIST Sphere demuxer - MPL2, VPlayer, MPlayer, AQTitle, PJS and SubViewer v1 subtitles demuxers and decoders - Sony Wave64 muxer - adobe and limelight publisher authentication in RTMP - data: URI scheme - support building on the Plan 9 operating system - kerndeint filter ported from MPlayer - histeq filter ported from VirtualDub - Megalux Frame demuxer - 012v decoder - Improved AVC Intra decoding support @ text @d3 1 a3 1 --- configure.orig 2013-01-06 21:53:29.000000000 +0000 d5 1 a5 1 @@@@ -3134,6 +3134,11 @@@@ case $target_os in d17 1 a17 1 @@@@ -3469,10 +3474,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 d42 1 a42 1 @@@@ -3303,6 +3312,7 @@@@ __asm__(".symver ff_foo,av_foo@@VERSION") d50 1 a50 1 @@@@ -3726,7 +3736,7 @@@@ Version: $version @ 1.15 log @Unbreak ffmpeg on NetBSD/macppc... again -- and a big fat comment warning about this next to the relevant piece of code. Looking at the CVS logs, it's the 3rd time I fix this. This, in turn, fixes the build of libdlna. To fix the package, use the "proper" syntax to enable PIC within the configure script, instead of applying what seems to be a hack. As before, i386 is left PIC-less or otherwise ffmpeg breaks. Tested on macppc and amd64. @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.14 2011/11/07 10:43:35 drochner Exp $ d3 1 a3 1 --- configure.orig 2011-11-21 19:49:30.000000000 +0000 d5 1 a5 1 @@@@ -2412,6 +2412,11 @@@@ case $target_os in d17 1 a17 1 @@@@ -2637,10 +2642,13 @@@@ check_cc <= 65" || die "ERROR: libx264 version must be >= 0.65."; } enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore @ 1.9 log @Fix ffmpeg on powerpc again, but without breaking i386. OKed by wiz@@. @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.8 2009/09/07 20:05:30 ahoka Exp $ d3 1 a3 1 --- configure.orig 2009-06-10 22:50:53.000000000 +0200 d42 9 @ 1.8 log @Dont use PIC on i386 as it breaks inline asm. Closes PR pkg/41964. @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.7 2009/08/30 11:01:58 jmmv Exp $ d9 1 a9 1 + if test $subarch != "x86_32"; then @ 1.7 log @Fix linkage in NetBSD so that object files for shared libraries get the -fPIC -DPIC flags. Fixes execution in, at least, NetBSD/macppc. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.6 2009/06/14 11:27:01 ahoka Exp $ d3 1 a3 1 --- configure.orig 2009-06-10 21:50:53.000000000 +0100 d5 1 a5 1 @@@@ -1619,6 +1619,8 @@@@ case $target_os in d9 4 a12 2 + LIBOBJFLAGS='$(PIC)' + SHFLAGS='-shared' d16 1 a16 1 @@@@ -1632,6 +1634,8 @@@@ case $target_os in d25 1 a25 1 @@@@ -1996,10 +2000,13 @@@@ enabled vis && add_cflags -mcpu=ultraspa @ 1.6 log @Switch to a more portable endiannes check in the configure script. Fixes build on NetBSD 4.0 and possibly many more platforms. @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.5 2009/06/14 01:04:44 hasso Exp $ d3 1 a3 1 --- configure.orig 2009-06-10 22:50:53.000000000 +0200 d5 10 a14 1 @@@@ -1632,6 +1632,8 @@@@ case $target_os in d23 1 a23 1 @@@@ -1996,10 +1998,13 @@@@ enabled vis && add_cflags -mcpu=ultraspa @ 1.6.2.1 log @Pullup ticket 2902 - requested by tron security patch Revisions pulled up: - pkgsrc/multimedia/ffmpeg/Makefile by patch - pkgsrc/multimedia/ffmpeg/distinfo by patch - pkgsrc/multimedia/ffmpeg/options.mk by patch - pkgsrc/multimedia/ffmpeg/patches/patch-bktr by patch - pkgsrc/multimedia/ffmpeg/patches/patch-configure by patch Files added: pkgsrc/multimedia/ffmpeg/patches/patch-aa 1.9 pkgsrc/multimedia/ffmpeg/patches/patch-ab 1.6 pkgsrc/multimedia/ffmpeg/patches/patch-powerpc 1.6 ------------------------------------------------------------------------- Module Name: pkgsrc Committed By: tron Date: Fri Sep 25 11:10:21 UTC 2009 Modified Files: pkgsrc/multimedia/ffmpeg: Makefile distinfo Added Files: pkgsrc/multimedia/ffmpeg/patches: patch-ab Log Message: Add patch from ffmpeg GIT repository to fix the vulnerability reported in SA36760. To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 pkgsrc/multimedia/ffmpeg/Makefile cvs rdiff -u -r1.30 -r1.31 pkgsrc/multimedia/ffmpeg/distinfo cvs rdiff -u -r0 -r1.6 pkgsrc/multimedia/ffmpeg/patches/patch-ab @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.6 2009/06/14 11:27:01 ahoka Exp $ d5 1 a5 12 @@@@ -1619,6 +1619,10 @@@@ case $target_os in add_cflags -D__EXTENSIONS__ ;; netbsd) + if test $subarch != "x86_32"; then + LIBOBJFLAGS='$(PIC)' + SHFLAGS='-shared' + fi oss_demuxer_extralibs="-lossaudio" oss_muxer_extralibs="-lossaudio" ;; @@@@ -1632,6 +1636,8 @@@@ case $target_os in d14 1 a14 1 @@@@ -1996,10 +2002,13 @@@@ enabled vis && add_cflags -mcpu=ultraspa @ 1.5 log @Make it build on DragonFly. Fix distinfo - there is no patch-aa. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- configure.orig 2009-06-14 03:13:44 +0300 +++ configure 2009-06-14 03:20:42 +0300 d14 17 @ 1.4 log @Update to nightly the snapshot as of 2009-06-11. Also modularize a bit, so we can have a separate ffplay package. Too many changes to list them. @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.3 2008/09/11 12:08:41 joerg Exp $ d3 11 a13 62 --- configure.orig 2008-07-24 12:53:32.000000000 +0200 +++ configure @@@@ -763,6 +763,7 @@@@ HAVE_LIST=" memalign mkstemp pld + posix_memalign ppc64 round roundf @@@@ -891,7 +892,7 @@@@ rtp_muxer_deps="network rtp_protocol" rtsp_demuxer_deps="sdp_demuxer" sdp_demuxer_deps="rtp_protocol mpegts_demuxer" v4l_demuxer_deps="linux_videodev_h" -v4l2_demuxer_deps="linux_videodev2_h" +v4l2_demuxer_deps_any="linux_videodev2_h sys_videoio_h" vfwcap_demuxer_deps="capCreateCaptureWindow" vfwcap_demuxer_extralibs="-lvfw32" x11_grab_device_demuxer_deps="x11grab XShmCreateImage" @@@@ -1586,10 +1587,14 @@@@ enabled vis && add_cflags "-mcpu=ultrasp # --- # big/little-endian test -check_cc <