head 1.7; access; symbols pkgsrc-2015Q3:1.6.0.24 pkgsrc-2015Q3-base:1.6 pkgsrc-2015Q2:1.6.0.22 pkgsrc-2015Q2-base:1.6 pkgsrc-2015Q1:1.6.0.20 pkgsrc-2015Q1-base:1.6 pkgsrc-2014Q4:1.6.0.18 pkgsrc-2014Q4-base:1.6 pkgsrc-2014Q3:1.6.0.16 pkgsrc-2014Q3-base:1.6 pkgsrc-2014Q2:1.6.0.14 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.6.0.12 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.6.0.10 pkgsrc-2013Q4-base:1.6 pkgsrc-2013Q3:1.6.0.8 pkgsrc-2013Q3-base:1.6 pkgsrc-2013Q2:1.6.0.6 pkgsrc-2013Q2-base:1.6 pkgsrc-2013Q1:1.6.0.4 pkgsrc-2013Q1-base:1.6 pkgsrc-2012Q4:1.6.0.2 pkgsrc-2012Q4-base:1.6 pkgsrc-2012Q3:1.5.0.26 pkgsrc-2012Q3-base:1.5 pkgsrc-2012Q2:1.5.0.24 pkgsrc-2012Q2-base:1.5 pkgsrc-2012Q1:1.5.0.22 pkgsrc-2012Q1-base:1.5 pkgsrc-2011Q4:1.5.0.20 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.5.0.18 pkgsrc-2011Q3-base:1.5 pkgsrc-2011Q2:1.5.0.16 pkgsrc-2011Q2-base:1.5 pkgsrc-2011Q1:1.5.0.14 pkgsrc-2011Q1-base:1.5 pkgsrc-2010Q4:1.5.0.12 pkgsrc-2010Q4-base:1.5 pkgsrc-2010Q3:1.5.0.10 pkgsrc-2010Q3-base:1.5 pkgsrc-2010Q2:1.5.0.8 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.5.0.6 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.5.0.4 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.5.0.2 pkgsrc-2009Q3-base:1.5 pkgsrc-2009Q2:1.4.0.6 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.4 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.2 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.3.0.2 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.2.0.2 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.1.0.22 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.20 pkgsrc-2008Q1:1.1.0.18 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.16 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.14 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.12 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.10 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.8 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.6 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.4 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.2 pkgsrc-2006Q1-base:1.1; locks; strict; comment @# @; 1.7 date 2015.11.21.17.14.26; author adam; state dead; branches; next 1.6; commitid dRBHdal2DQuRZYJy; 1.6 date 2012.10.10.13.37.25; author drochner; state Exp; branches; next 1.5; 1.5 date 2009.07.07.16.38.29; author drochner; state Exp; branches; next 1.4; 1.4 date 2008.11.21.17.35.12; author adam; state Exp; branches; next 1.3; 1.3 date 2008.09.15.12.46.44; author abs; state Exp; branches; next 1.2; 1.2 date 2008.08.07.18.43.42; author drochner; state Exp; branches; next 1.1; 1.1 date 2006.03.13.21.21.39; author joerg; state Exp; branches; next ; desc @@ 1.7 log @Switch to FFMPEG v2 @ text @$NetBSD: patch-ac,v 1.6 2012/10/10 13:37:25 drochner Exp $ --- configure.orig 2011-11-19 16:50:37.000000000 +0000 +++ configure @@@@ -5096,7 +5096,7 @@@@ case "${target_os}" in $as_echo "#define OS_LINUX 1" >>confdefs.h ;; - freebsd*|openbsd*|netbsd*|bsdi*|darwin*|rhapsody*) + freebsd*|openbsd*|netbsd*|bsdi*|darwin*|rhapsody*|dragonfly*) is_bsd=yes $as_echo "#define OS_BSD 1" >>confdefs.h @@@@ -19431,7 +19431,7 @@@@ case "$host" in esac # let user override if test -n "$PTHREAD_LIBS" ; then - pthread_libs="$PTHREAD_LIBS" + pthread_libs="$PTHREAD_LIBS $PTHREAD_LDFLAGS" fi if test -n "$PTHREAD_CFLAGS" ; then pthread_cflags="$PTHREAD_CFLAGS" @@@@ -29507,7 +29507,7 @@@@ if test "${enable_nuv+set}" = set; then yes) if test yes != "$have_lzo"; then as_fn_error $? "liblzo2 is required for NuppelVideo support, try --enable-lzo" "$LINENO" 5 fi - if test true == "$have_x86_64cpu"; then + if test true = "$have_x86_64cpu"; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: NuppelVideo support on x86_64 platform is ***EXPERIMENTAL***" >&5 $as_echo "$as_me: WARNING: NuppelVideo support on x86_64 platform is ***EXPERIMENTAL***" >&2;} elif test true != "$have_x86cpu"; then @ 1.6 log @update to 1.1.7 changes: -bugfixes -speed improve,memt -new ffmpeg compatibility @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @update to 1.1.2 This is a major update, too much to list here. @ text @d3 1 a3 1 --- configure.orig 2009-03-28 10:13:11.000000000 +0100 d5 2 a6 2 @@@@ -4864,7 +4864,7 @@@@ cat >>confdefs.h <<\_ACEOF _ACEOF d13 2 a14 2 cat >>confdefs.h <<\_ACEOF @@@@ -21959,7 +21959,7 @@@@ case "$host" in d23 3 a25 3 @@@@ -42108,7 +42108,7 @@@@ if test "${enable_nuv+set}" = set; then echo "$as_me: error: liblzo2 is required for NuppelVideo support, try --enable-lzo" >&2;} { (exit 1); exit 1; }; } d29 2 a30 2 { echo "$as_me:$LINENO: WARNING: NuppelVideo support on x86_64 platform is ***EXPERIMENTAL***" >&5 echo "$as_me: WARNING: NuppelVideo support on x86_64 platform is ***EXPERIMENTAL***" >&2;} @ 1.4 log @Changes 1.0.7: * bump FFmpeg libraries requisite to SVN >= 20080705. Drop old header layout support. Drop static linking support (unsupported from ages). Update user documentation accordingly. * make AVIStreamHeader structure (more) 64 bit safe. * keep up with lastest ffmpeg API changes. PkgSrc: * Fix buildling with newer ImageMagick @ text @d3 1 a3 1 --- configure.orig 2008-11-15 10:57:26.000000000 +0100 d5 2 a6 2 @@@@ -9832,7 +9832,7 @@@@ fi d8 1 a8 1 case "$host_os" in d11 1 d14 1 a14 2 #define SYS_BSD 1 @@@@ -9864,7 +9864,7 @@@@ case "$host" in d23 9 a31 35 @@@@ -41961,7 +41961,7 @@@@ echo "${ECHO_T}default" >&6; } for l in $imagemagick_ll ; do case $l in -L*) lpaths="$lpaths $l" ;; - -l*) test x"$l" != x"-lMagick" && xlibs="$xlibs $l" ;; + -l*) test x"$l" != x"-lMagickCore" && xlibs="$xlibs $l" ;; *) xlf="$xlf $l" ;; esac done @@@@ -41977,13 +41977,13 @@@@ echo "${ECHO_T}default" >&6; } if test x"Magick" != x"none" ; then save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $imagemagick_ll" - { echo "$as_me:$LINENO: checking for InitializeMagick in -lMagick" >&5 -echo $ECHO_N "checking for InitializeMagick in -lMagick... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: checking for InitializeMagick in -lMagickCore" >&5 +echo $ECHO_N "checking for InitializeMagick in -lMagickCore... $ECHO_C" >&6; } if test "${ac_cv_lib_Magick_InitializeMagick+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lMagick $IMAGEMAGICK_EXTRA_LIBS $LIBS" +LIBS="-lMagickCore $IMAGEMAGICK_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@@@ -42039,7 +42039,7 @@@@ fi { echo "$as_me:$LINENO: result: $ac_cv_lib_Magick_InitializeMagick" >&5 echo "${ECHO_T}$ac_cv_lib_Magick_InitializeMagick" >&6; } if test $ac_cv_lib_Magick_InitializeMagick = yes; then - IMAGEMAGICK_LIBS="$imagemagick_ll -lMagick $IMAGEMAGICK_EXTRA_LIBS" + IMAGEMAGICK_LIBS="$imagemagick_ll -lMagickCore $IMAGEMAGICK_EXTRA_LIBS" else tc_pkg_err="yes" @ 1.3 log @Remove patch which changed configure test for #include to #include As is no longer needed (and breaks configure) with latest ffmpeg, and instead patch filter_pp.c to include "libpostproc/postprocess.h" instead of "postprocess.h" Bump PKGREVISION @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.2 2008/08/07 18:43:42 drochner Exp $ d3 1 a3 1 --- configure.orig 2008-07-26 10:06:43.000000000 +0200 d5 1 a5 1 @@@@ -9833,7 +9833,7 @@@@ fi d14 1 a14 1 @@@@ -9865,7 +9865,7 @@@@ case "$host" in d23 35 @ 1.2 log @update to 1.0.6 changes: does not longer require LZOv1 (this was broken in pkgsrc since archivers/lzo is v2) @ text @d1 1 a1 1 $NetBSD$ a22 18 @@@@ -30886,7 +30886,7 @@@@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@@@ -30926,7 +30926,7 @@@@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @ 1.1 log @Add DragonFly support. Fix errno. @ text @d3 1 a3 1 --- configure.orig 2005-11-06 06:04:59.000000000 +0000 d5 1 a5 1 @@@@ -8959,7 +8959,7 @@@@ fi d14 1 a14 1 @@@@ -8991,7 +8991,7 @@@@ case "$host" in d23 18 @