diff options
author | drochner <drochner@pkgsrc.org> | 2011-07-19 19:53:18 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2011-07-19 19:53:18 +0000 |
commit | 66cfbfa6a053ff0e631e1333d22ff3ddd70c402a (patch) | |
tree | c45828e12fec812646835b1b7344707ca4921b21 | |
parent | 0b2dd51d2c6b618f3b85b53e92d4c9571fea4461 (diff) | |
download | pkgsrc-66cfbfa6a053ff0e631e1333d22ff3ddd70c402a.tar.gz |
update to 0.7.1
changes: many new features and bugfixes (those of the 0.8 branch), but
API/ABI compatible with 0.6
-rw-r--r-- | multimedia/ffmpeg/Makefile | 10 | ||||
-rw-r--r-- | multimedia/ffmpeg/Makefile.common | 4 | ||||
-rw-r--r-- | multimedia/ffmpeg/PLIST | 75 | ||||
-rw-r--r-- | multimedia/ffmpeg/distinfo | 17 | ||||
-rw-r--r-- | multimedia/ffmpeg/options.mk | 6 | ||||
-rw-r--r-- | multimedia/ffmpeg/patches/patch-aa | 22 | ||||
-rw-r--r-- | multimedia/ffmpeg/patches/patch-ac | 19 | ||||
-rw-r--r-- | multimedia/ffmpeg/patches/patch-ae | 22 | ||||
-rw-r--r-- | multimedia/ffmpeg/patches/patch-af | 31 | ||||
-rw-r--r-- | multimedia/ffmpeg/patches/patch-bktr | 18 | ||||
-rw-r--r-- | multimedia/ffmpeg/patches/patch-configure | 37 |
11 files changed, 95 insertions, 166 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 3515f9e746c..6516ba4cbc7 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.68 2011/04/29 07:44:28 obache Exp $ +# $NetBSD: Makefile,v 1.69 2011/07/19 19:53:18 drochner Exp $ -# XXX This is release 0.6.3 but we had date-based pkgnames before. -PKGNAME= ffmpeg-20110426.${DISTVERSION} +# XXX This is release 0.7.1 but we had date-based pkgnames before. +PKGNAME= ffmpeg-20110623.${DISTVERSION} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://ffmpeg.mplayerhq.hu/ @@ -10,7 +10,7 @@ COMMENT= Decoding, encoding and streaming software PKG_DESTDIR_SUPPORT= user-destdir CONFIGURE_ARGS+= --enable-avfilter -CONFIGURE_ARGS+= --enable-avfilter-lavf +#CONFIGURE_ARGS+= --enable-avfilter-lavf CONFIGURE_ARGS+= --enable-postproc CONFIGURE_ARGS+= --enable-libvorbis CONFIGURE_ARGS+= --enable-libmp3lame @@ -30,8 +30,6 @@ CONFIGURE_ARGS+= --disable-asm TEST_TARGET= check post-install: - ${INSTALL_DATA} ${WRKSRC}/libavcodec/api-example.c \ - ${DESTDIR}${PREFIX}/share/doc/ffmpeg ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/doc/TODO \ ${DESTDIR}${PREFIX}/share/doc/ffmpeg ${INSTALL_DATA} ${WRKSRC}/doc/*.txt \ diff --git a/multimedia/ffmpeg/Makefile.common b/multimedia/ffmpeg/Makefile.common index b0d314f11e2..2b869a2491a 100644 --- a/multimedia/ffmpeg/Makefile.common +++ b/multimedia/ffmpeg/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.10 2011/04/29 07:41:01 obache Exp $ +# $NetBSD: Makefile.common,v 1.11 2011/07/19 19:53:18 drochner Exp $ # used by multimedia/ffplay/Makefile # used by multimedia/ffmpeg/Makefile @@ -9,7 +9,7 @@ MASTER_SITES= http://www.ffmpeg.org/releases/ \ http://irkmaffia.com/~ahoka/distfiles/ EXTRACT_SUFX= .tar.bz2 -DISTVERSION= 0.6.3 +DISTVERSION= 0.7.1 PREV_PKGPATH= multimedia/ffmpeg-devel PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg/patches diff --git a/multimedia/ffmpeg/PLIST b/multimedia/ffmpeg/PLIST index e460bc58728..02954510aec 100644 --- a/multimedia/ffmpeg/PLIST +++ b/multimedia/ffmpeg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.14 2011/01/17 16:51:05 drochner Exp $ +@comment $NetBSD: PLIST,v 1.15 2011/07/19 19:53:18 drochner Exp $ bin/ffmpeg bin/ffprobe bin/ffserver @@ -8,53 +8,75 @@ include/libavcodec/dxva2.h include/libavcodec/opt.h include/libavcodec/vaapi.h include/libavcodec/vdpau.h +include/libavcodec/version.h include/libavcodec/xvmc.h include/libavdevice/avdevice.h +include/libavfilter/avcodec.h include/libavfilter/avfilter.h +include/libavfilter/avfiltergraph.h +include/libavfilter/vsink_buffer.h +include/libavfilter/vsrc_buffer.h include/libavformat/avformat.h include/libavformat/avio.h +include/libavformat/version.h include/libavutil/adler32.h +include/libavutil/aes.h include/libavutil/attributes.h +include/libavutil/audioconvert.h +include/libavutil/avassert.h include/libavutil/avconfig.h include/libavutil/avstring.h include/libavutil/avutil.h include/libavutil/base64.h +include/libavutil/bswap.h include/libavutil/common.h +include/libavutil/cpu.h include/libavutil/crc.h +include/libavutil/dict.h include/libavutil/error.h +include/libavutil/eval.h include/libavutil/fifo.h +include/libavutil/file.h +include/libavutil/imgutils.h include/libavutil/intfloat_readwrite.h +include/libavutil/intreadwrite.h +include/libavutil/lfg.h include/libavutil/log.h include/libavutil/lzo.h include/libavutil/mathematics.h include/libavutil/md5.h include/libavutil/mem.h +include/libavutil/opt.h +include/libavutil/parseutils.h include/libavutil/pixdesc.h include/libavutil/pixfmt.h +include/libavutil/random_seed.h include/libavutil/rational.h +include/libavutil/samplefmt.h +include/libavutil/sha.h include/libavutil/sha1.h include/libpostproc/postprocess.h include/libswscale/swscale.h lib/libavcodec.a lib/libavcodec.so lib/libavcodec.so.52 -lib/libavcodec.so.52.72.2 +lib/libavcodec.so.52.122.0 lib/libavdevice.a lib/libavdevice.so lib/libavdevice.so.52 -lib/libavdevice.so.52.2.0 +lib/libavdevice.so.52.5.0 lib/libavfilter.a lib/libavfilter.so lib/libavfilter.so.1 -lib/libavfilter.so.1.19.0 +lib/libavfilter.so.1.80.0 lib/libavformat.a lib/libavformat.so lib/libavformat.so.52 -lib/libavformat.so.52.64.2 +lib/libavformat.so.52.110.0 lib/libavutil.a lib/libavutil.so lib/libavutil.so.50 -lib/libavutil.so.50.15.1 +lib/libavutil.so.50.43.0 lib/libpostproc.a lib/libpostproc.so lib/libpostproc.so.51 @@ -62,7 +84,7 @@ lib/libpostproc.so.51.2.0 lib/libswscale.a lib/libswscale.so lib/libswscale.so.0 -lib/libswscale.so.0.11.0 +lib/libswscale.so.0.14.1 lib/pkgconfig/libavcodec.pc lib/pkgconfig/libavdevice.pc lib/pkgconfig/libavfilter.pc @@ -75,10 +97,13 @@ man/man1/ffprobe.1 man/man1/ffserver.1 share/doc/ffmpeg/README share/doc/ffmpeg/TODO -share/doc/ffmpeg/api-example.c share/doc/ffmpeg/avutil.txt -share/doc/ffmpeg/ffmpeg_powerpc_performance_evaluation_howto.txt +share/doc/ffmpeg/build_system.txt +share/doc/ffmpeg/fate.txt +share/doc/ffmpeg/ffmpeg-mt-authorship.txt +share/doc/ffmpeg/git-howto.txt share/doc/ffmpeg/issue_tracker.txt +share/doc/ffmpeg/multithreading.txt share/doc/ffmpeg/optimization.txt share/doc/ffmpeg/rate_distortion.txt share/doc/ffmpeg/snow.txt @@ -87,14 +112,12 @@ share/doc/ffmpeg/swscale.txt share/doc/ffmpeg/tablegen.txt share/doc/ffmpeg/viterbi.txt share/examples/ffmpeg/ffserver.conf +share/ffmpeg/libvpx-1080p.ffpreset +share/ffmpeg/libvpx-1080p50_60.ffpreset +share/ffmpeg/libvpx-360p.ffpreset +share/ffmpeg/libvpx-720p.ffpreset +share/ffmpeg/libvpx-720p50_60.ffpreset share/ffmpeg/libx264-baseline.ffpreset -share/ffmpeg/libx264-default.ffpreset -share/ffmpeg/libx264-fast.ffpreset -share/ffmpeg/libx264-fast_firstpass.ffpreset -share/ffmpeg/libx264-faster.ffpreset -share/ffmpeg/libx264-faster_firstpass.ffpreset -share/ffmpeg/libx264-fastfirstpass.ffpreset -share/ffmpeg/libx264-hq.ffpreset share/ffmpeg/libx264-ipod320.ffpreset share/ffmpeg/libx264-ipod640.ffpreset share/ffmpeg/libx264-lossless_fast.ffpreset @@ -103,23 +126,3 @@ share/ffmpeg/libx264-lossless_medium.ffpreset share/ffmpeg/libx264-lossless_slow.ffpreset share/ffmpeg/libx264-lossless_slower.ffpreset share/ffmpeg/libx264-lossless_ultrafast.ffpreset -share/ffmpeg/libx264-main.ffpreset -share/ffmpeg/libx264-max.ffpreset -share/ffmpeg/libx264-medium.ffpreset -share/ffmpeg/libx264-medium_firstpass.ffpreset -share/ffmpeg/libx264-normal.ffpreset -share/ffmpeg/libx264-placebo.ffpreset -share/ffmpeg/libx264-placebo_firstpass.ffpreset -share/ffmpeg/libx264-slow.ffpreset -share/ffmpeg/libx264-slow_firstpass.ffpreset -share/ffmpeg/libx264-slower.ffpreset -share/ffmpeg/libx264-slower_firstpass.ffpreset -share/ffmpeg/libx264-slowfirstpass.ffpreset -share/ffmpeg/libx264-superfast.ffpreset -share/ffmpeg/libx264-superfast_firstpass.ffpreset -share/ffmpeg/libx264-ultrafast.ffpreset -share/ffmpeg/libx264-ultrafast_firstpass.ffpreset -share/ffmpeg/libx264-veryfast.ffpreset -share/ffmpeg/libx264-veryfast_firstpass.ffpreset -share/ffmpeg/libx264-veryslow.ffpreset -share/ffmpeg/libx264-veryslow_firstpass.ffpreset diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo index 5c3a8cf98a6..9afc41e2324 100644 --- a/multimedia/ffmpeg/distinfo +++ b/multimedia/ffmpeg/distinfo @@ -1,12 +1,9 @@ -$NetBSD: distinfo,v 1.41 2011/04/29 07:41:01 obache Exp $ +$NetBSD: distinfo,v 1.42 2011/07/19 19:53:18 drochner Exp $ -SHA1 (ffmpeg-0.6.3.tar.bz2) = 25dd82e8a3627a1a9d4464e15685720215fecb3c -RMD160 (ffmpeg-0.6.3.tar.bz2) = 623bf7c60ad7dd4febdac5ae5ef12566fb8dbf38 -Size (ffmpeg-0.6.3.tar.bz2) = 3750617 bytes -SHA1 (patch-aa) = e40f61850fe5c85bdd4b659802601dfacfe73ad1 -SHA1 (patch-ac) = d29395cf05612d6be213a69eafaf549c802b6ce1 +SHA1 (ffmpeg-0.7.1.tar.bz2) = d006cf0fb61d654c0845240da868ecf3a94c043f +RMD160 (ffmpeg-0.7.1.tar.bz2) = 6539f725d869b97a1821636bd1416312970a6457 +Size (ffmpeg-0.7.1.tar.bz2) = 4555714 bytes +SHA1 (patch-aa) = c9540d0ca0a671e9faa8b5b7847c103b515ac382 +SHA1 (patch-ac) = 63e3835a9af2123ab872f6e105bf355bb16cad6c SHA1 (patch-ad) = d3e06c855ab1a5ff3ddb0bee108ea88166c32cb6 -SHA1 (patch-ae) = 7734efe9f6b496ca292d17859cffcc0129aaa90b -SHA1 (patch-af) = d29dd9ae373fd086d3c3b952d8831af1717a8ddf -SHA1 (patch-bktr) = 62c31edc0fa0712d438d0e1ea6539749bfd1df34 -SHA1 (patch-configure) = 3de6a217d60897208e71f201e551095e9d36f8be +SHA1 (patch-configure) = 041d976ee22fab612580c2fb141fb5c829fa68d5 diff --git a/multimedia/ffmpeg/options.mk b/multimedia/ffmpeg/options.mk index f375273b3dc..ccf602fe528 100644 --- a/multimedia/ffmpeg/options.mk +++ b/multimedia/ffmpeg/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.19 2011/01/24 19:07:16 drochner Exp $ +# $NetBSD: options.mk,v 1.20 2011/07/19 19:53:18 drochner Exp $ # Global and legacy options @@ -79,10 +79,12 @@ CONFIGURE_ARGS+= --enable-libxvid ### .if !empty(PKG_OPTIONS:Mx264) # ABI change between 20090326 and 20100201 -BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20101101 +BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20110707 #BUILDLINK_API_DEPENDS.x264-devel+= x264-devel<20110102 CONFIGURE_ARGS+= --enable-libx264 .include "../../multimedia/x264-devel/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-libx264 .endif ### diff --git a/multimedia/ffmpeg/patches/patch-aa b/multimedia/ffmpeg/patches/patch-aa index e523a9bc2ed..86c656e6823 100644 --- a/multimedia/ffmpeg/patches/patch-aa +++ b/multimedia/ffmpeg/patches/patch-aa @@ -1,19 +1,19 @@ -$NetBSD: patch-aa,v 1.9 2009/08/10 20:37:15 drochner Exp $ +$NetBSD: patch-aa,v 1.10 2011/07/19 19:53:18 drochner Exp $ ---- libavcodec/x86/cpuid.c.orig 2009-08-10 22:17:29.000000000 +0200 -+++ libavcodec/x86/cpuid.c -@@ -80,6 +80,7 @@ int mm_support(void) - rval |= FF_MM_MMX2 +--- libavutil/x86/cpu.c.orig 2011-07-07 20:46:02.000000000 +0000 ++++ libavutil/x86/cpu.c +@@ -86,6 +86,7 @@ int ff_get_cpu_flags_x86(void) + rval |= AV_CPU_FLAG_MMX2 #if HAVE_SSE - | FF_MM_SSE; + | AV_CPU_FLAG_SSE; +#if !defined(__GNUC__) || (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) if (std_caps & (1<<26)) - rval |= FF_MM_SSE2; + rval |= AV_CPU_FLAG_SSE2; if (ecx & 1) -@@ -90,6 +91,7 @@ int mm_support(void) - rval |= FF_MM_SSE4; - if (ecx & 0x00100000 ) - rval |= FF_MM_SSE42; +@@ -105,6 +106,7 @@ int ff_get_cpu_flags_x86(void) + rval |= AV_CPU_FLAG_AVX; + } + #endif +#endif /* gcc >= 4.2 */ #endif ; diff --git a/multimedia/ffmpeg/patches/patch-ac b/multimedia/ffmpeg/patches/patch-ac index 5915b46c501..47401a772de 100644 --- a/multimedia/ffmpeg/patches/patch-ac +++ b/multimedia/ffmpeg/patches/patch-ac @@ -1,17 +1,8 @@ -$NetBSD: patch-ac,v 1.9 2011/01/17 16:51:05 drochner Exp $ +$NetBSD: patch-ac,v 1.10 2011/07/19 19:53:18 drochner Exp $ ---- Makefile.orig 2010-04-19 22:05:26.000000000 +0900 -+++ Makefile 2011-01-05 17:04:14.000000000 +0900 -@@ -107,7 +107,7 @@ - - doc/%.html: TAG = HTML - doc/%.html: doc/%.texi -- $(M)cd doc && texi2html -monolithic -number $(<:doc/%=%) -+ $(M)cd doc && texi2html -monolithic -number-sections $(<:doc/%=%) - - doc/%.pod: TAG = POD - doc/%.pod: doc/%-doc.texi -@@ -125,11 +125,11 @@ +--- Makefile.orig 2011-06-21 19:29:25.000000000 +0000 ++++ Makefile +@@ -152,11 +152,11 @@ install-progs: install-progs-yes $(PROGS install-data: $(DATA_FILES) $(Q)mkdir -p "$(DATADIR)" @@ -23,5 +14,5 @@ $NetBSD: patch-ac,v 1.9 2011/01/17 16:51:05 drochner Exp $ - $(INSTALL) -m 644 $(MANPAGES) "$(MANDIR)/man1" + $(INSTALL) -c -m 644 $(MANPAGES) "$(MANDIR)/man1" - uninstall: uninstall-progs uninstall-data uninstall-man + uninstall: uninstall-libs uninstall-headers uninstall-progs uninstall-data uninstall-man diff --git a/multimedia/ffmpeg/patches/patch-ae b/multimedia/ffmpeg/patches/patch-ae deleted file mode 100644 index e33d18d136b..00000000000 --- a/multimedia/ffmpeg/patches/patch-ae +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ae,v 1.12 2011/01/17 16:51:05 drochner Exp $ - ---- libswscale/rgb2rgb.c.orig 2010-06-04 05:16:42.000000000 +0900 -+++ libswscale/rgb2rgb.c 2011-01-05 17:09:12.000000000 +0900 -@@ -98,7 +98,7 @@ - long lumStride, long chromStride, long srcStride); - - --#if ARCH_X86 -+#if ARCH_X86 && !defined(sun) - DECLARE_ASM_CONST(8, uint64_t, mmx_null) = 0x0000000000000000ULL; - DECLARE_ASM_CONST(8, uint64_t, mmx_one) = 0xFFFFFFFFFFFFFFFFULL; - DECLARE_ASM_CONST(8, uint64_t, mask32b) = 0x000000FF000000FFULL; -@@ -159,7 +159,7 @@ - #define RENAME(a) a ## _C - #include "rgb2rgb_template.c" - --#if ARCH_X86 -+#if ARCH_X86 && !defined(sun) && !defined(__APPLE__) - - //MMX versions - #undef RENAME diff --git a/multimedia/ffmpeg/patches/patch-af b/multimedia/ffmpeg/patches/patch-af deleted file mode 100644 index 16704773eca..00000000000 --- a/multimedia/ffmpeg/patches/patch-af +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-af,v 1.8 2011/01/17 16:51:05 drochner Exp $ - ---- libswscale/swscale.c.orig 2010-06-04 05:16:42.000000000 +0900 -+++ libswscale/swscale.c 2011-01-05 17:13:47.000000000 +0900 -@@ -127,7 +127,7 @@ - write special BGR->BGR scaler - */ - --#if ARCH_X86 -+#if ARCH_X86 && !defined(sun) - DECLARE_ASM_CONST(8, uint64_t, bF8)= 0xF8F8F8F8F8F8F8F8LL; - DECLARE_ASM_CONST(8, uint64_t, bFC)= 0xFCFCFCFCFCFCFCFCLL; - DECLARE_ASM_CONST(8, uint64_t, w10)= 0x0010001000100010LL; -@@ -1161,7 +1161,7 @@ - #endif - #endif //ARCH_PPC - --#if ARCH_X86 -+#if ARCH_X86 && !defined(sun) - - #if (HAVE_MMX && !HAVE_AMD3DNOW && !HAVE_MMX2) || CONFIG_RUNTIME_CPUDETECT - #define COMPILE_MMX -@@ -1194,7 +1194,7 @@ - #include "swscale_template.c" - #endif - --#if ARCH_X86 -+#if ARCH_X86 && !defined(sun) - - //MMX versions - #ifdef COMPILE_MMX diff --git a/multimedia/ffmpeg/patches/patch-bktr b/multimedia/ffmpeg/patches/patch-bktr deleted file mode 100644 index 74d3cccbda4..00000000000 --- a/multimedia/ffmpeg/patches/patch-bktr +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-bktr,v 1.5 2011/01/17 16:51:05 drochner Exp $ - ---- libavdevice/bktr.c.orig 2010-03-31 08:30:55.000000000 +0900 -+++ libavdevice/bktr.c 2011-01-05 16:58:47.000000000 +0900 -@@ -24,8 +24,12 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -+/* u_short, u_int */ - #define _BSD_SOURCE 1 --#define _NETBSD_SOURCE -+ #define _BSD_SOURCE 1 -+#ifdef __NetBSD__ -+# define _NETBSD_SOURCE 1 -+#endif - - #include "libavformat/avformat.h" - #if HAVE_DEV_BKTR_IOCTL_METEOR_H && HAVE_DEV_BKTR_IOCTL_BT848_H diff --git a/multimedia/ffmpeg/patches/patch-configure b/multimedia/ffmpeg/patches/patch-configure index 0334a97dc20..db31fbbb52e 100644 --- a/multimedia/ffmpeg/patches/patch-configure +++ b/multimedia/ffmpeg/patches/patch-configure @@ -1,19 +1,19 @@ -$NetBSD: patch-configure,v 1.11 2011/01/17 16:51:05 drochner Exp $ +$NetBSD: patch-configure,v 1.12 2011/07/19 19:53:18 drochner Exp $ ---- configure.orig 2010-06-15 19:44:30.000000000 +0000 +--- configure.orig 2011-06-21 19:29:25.000000000 +0000 +++ configure -@@ -2160,6 +2160,10 @@ case $target_os in - nm_opts='-P -g' +@@ -2404,6 +2404,10 @@ case $target_os in ;; netbsd) -+ if test "${subarch}" != "x86_32"; then -+ LIBOBJFLAGS='$(PIC)' -+ SHFLAGS='-shared' -+ fi + disable symver ++ if test "${subarch}" != "x86_32"; then ++ LIBOBJFLAGS='$(PIC)' ++ SHFLAGS='-shared' ++ fi oss_indev_extralibs="-lossaudio" oss_outdev_extralibs="-lossaudio" - add_cppflags -D_XOPEN_SOURCE=600 -@@ -2387,10 +2391,13 @@ check_cc <<EOF && enable attribute_may_a + ;; +@@ -2627,10 +2631,13 @@ check_cc <<EOF && enable attribute_may_a union { int x; } __attribute__((may_alias)) x; EOF @@ -30,15 +30,15 @@ $NetBSD: patch-configure,v 1.11 2011/01/17 16:51:05 drochner Exp $ if enabled alpha; then -@@ -2738,6 +2745,7 @@ check_ldflags -Wl,--as-needed - check_ldflags '-Wl,-rpath-link,\$(BUILD_ROOT)/libpostproc -Wl,-rpath-link,\$(BUILD_ROOT)/libswscale -Wl,-rpath-link,\$(BUILD_ROOT)/libavfilter -Wl,-rpath-link,\$(BUILD_ROOT)/libavdevice -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil' - check_ldflags -Wl,-Bsymbolic +@@ -3049,6 +3056,7 @@ check_ldflags -Wl,--warn-common + check_ldflags -Wl,-rpath-link,libpostproc -Wl,-rpath-link,libswscale -Wl,-rpath-link,libavfilter -Wl,-rpath-link,libavdevice -Wl,-rpath-link,libavformat -Wl,-rpath-link,libavcodec -Wl,-rpath-link,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' -@@ -2750,6 +2758,7 @@ __asm__(".symver ff_foo,av_foo@VERSION") +@@ -3061,6 +3069,7 @@ __asm__(".symver ff_foo,av_foo@VERSION") void ff_foo(void) {} EOF fi @@ -46,3 +46,12 @@ $NetBSD: patch-configure,v 1.11 2011/01/17 16:51:05 drochner Exp $ if enabled small; then add_cflags $size_cflags +@@ -3148,7 +3157,7 @@ check_deps $CONFIG_LIST \ + + enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; } + +-if test $target_os == "haiku"; then ++if test $target_os = "haiku"; then + disable memalign + disable posix_memalign + fi |