Created attachment 151997 [details] libav-11.2.patch Update to 11.2
Comment on attachment 151997 [details] libav-11.2.patch >diff -ruN /usr/ports/multimedia/libav/Makefile ./Makefile >--- /usr/ports/multimedia/libav/Makefile 2015-01-17 07:34:22.000000000 +0900 >+++ ./Makefile 2015-01-22 10:14:44.000000000 +0900 >@@ -1,8 +1,7 @@ > # $FreeBSD: head/multimedia/libav/Makefile 377204 2015-01-16 22:34:22Z sbruno $ > > PORTNAME= libav >-PORTVERSION= 10.2 >-PORTREVISION= 7 >+PORTVERSION= 11.2 > CATEGORIES= multimedia audio ipv6 net > MASTER_SITES= http://libav.org/releases/ > >@@ -29,8 +28,7 @@ > --enable-shared \ > --enable-runtime-cpudetect \ > --disable-debug \ >- --cc="${CC}" \ >- --disable-avserver >+ --cc="${CC}" > > OPTIONS_DEFINE= ALSA AMR_NB AMR_WB BZIP2 CDIO FAAC FDK_AAC DOCS FREETYPE \ > FREI0R GNUTLS GSM ILBC JACK LAME OPENCV OPENJPEG OPENSSL \ >@@ -226,7 +224,7 @@ > ${WRKSRC}/configure > @${REINPLACE_CMD} -e 's|gsm/gsm.h|gsm.h|' \ > ${WRKSRC}/configure \ >- ${WRKSRC}/libavcodec/libgsm.c >+ ${WRKSRC}/libavcodec/libgsmdec.c > @${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${STAGEDIR}${PREFIX}/libdata/pkgconfig|' \ > ${WRKSRC}/library.mak > >@@ -235,4 +233,12 @@ > @${REINPLACE_CMD} -e 's|CONFIG_TEXI2HTML=yes|!CONFIG_TEXI2HTML=yes|' ${WRKSRC}/config.mak > .endif > >+post-stage: >+.for a in bin/avconv bin/avprobe lib/libav/libavdevice.so.55.0.0\ >+ lib/libav/libavfilter.so.5.0.0 lib/libav/libavformat.so.56.1.0\ >+ lib/libav/libavcodec.so.56.1.0 lib/libav/libavresample.so.2.1.0\ >+ lib/libav/libswscale.so.3.0.0 lib/libav/libavutil.so.54.3.0 >+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${a} >+.endfor >+ > .include <bsd.port.post.mk> >diff -ruN /usr/ports/multimedia/libav/distinfo ./distinfo >--- /usr/ports/multimedia/libav/distinfo 2014-07-04 16:55:27.000000000 +0900 >+++ ./distinfo 2015-01-21 12:33:48.000000000 +0900 >@@ -1,2 +1,2 @@ >-SHA256 (libav-10.2.tar.gz) = a65f49e1a831e02eaaf7823c76050b27b14830e8c16e45eed3ccd826c9cef02f >-SIZE (libav-10.2.tar.gz) = 6594434 >+SHA256 (libav-11.2.tar.gz) = 1f1448e1245444a1fae2f077f6846fedb47dfb294bef797e6742c095a6b4d769 >+SIZE (libav-11.2.tar.gz) = 6920866 >diff -ruN /usr/ports/multimedia/libav/files/patch-Makefile ./files/patch-Makefile >--- /usr/ports/multimedia/libav/files/patch-Makefile 2014-04-09 04:45:15.000000000 +0900 >+++ ./files/patch-Makefile 2015-01-21 16:21:29.000000000 +0900 >@@ -1,10 +1,11 @@ >---- Makefile.orig 2014-04-08 18:24:52.000000000 +0200 >-+++ Makefile 2014-04-08 18:25:08.000000000 +0200 >-@@ -128,7 +128,7 @@ >+--- Makefile.orig 2015-01-15 05:50:49.000000000 +0900 >++++ Makefile 2015-01-21 16:21:14.000000000 +0900 >+@@ -129,7 +129,7 @@ > $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V)))) > SUBDIR := $(1)/ > include $(SRC_PATH)/$(1)/Makefile > --include $(SRC_PATH)/$(1)/$(ARCH)/Makefile > +-include $(SRC_PATH)/$(1)/$(LIBAV_ARCH)/Makefile >+ -include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile > include $(SRC_PATH)/library.mak > endef >diff -ruN /usr/ports/multimedia/libav/files/patch-configure ./files/patch-configure >--- /usr/ports/multimedia/libav/files/patch-configure 2014-07-30 01:35:30.000000000 +0900 >+++ ./files/patch-configure 2015-01-21 16:23:20.000000000 +0900 >@@ -1,6 +1,6 @@ >---- configure.orig 2014-03-23 17:47:44.000000000 +0100 >-+++ configure 2014-04-08 18:30:31.000000000 +0200 >-@@ -757,8 +757,8 @@ >+--- configure.orig 2015-01-15 05:50:49.000000000 +0900 >++++ configure 2015-01-21 16:23:01.000000000 +0900 >+@@ -779,8 +779,8 @@ > > check_ld(){ > log check_ld "$@" >@@ -11,17 +11,17 @@ > check_cc $($cflags_filter $flags) || return > flags=$($ldflags_filter $flags) > libs=$($ldflags_filter $libs) >-@@ -4356,7 +4356,7 @@ >+@@ -4606,7 +4606,7 @@ > MANDIR=\$(DESTDIR)$mandir > SRC_PATH=$source_path > CC_IDENT=$cc_ident > -ARCH=$arch > +LIBAV_ARCH=$arch >+ INTRINSICS=$intrinsics > CC=$cc > AS=$as >- LD=$ld >-@@ -4524,7 +4524,7 @@ >- requires=$5 >+@@ -4783,7 +4783,7 @@ >+ requires=${requires%, } > enabled ${name#lib} || return 0 > mkdir -p $name > - cat <<EOF > $name/$name.pc >@@ -29,28 +29,3 @@ > prefix=$prefix > exec_prefix=\${prefix} > libdir=$libdir >-@@ -4556,15 +4556,15 @@ >- EOF >- } >- >--lavfi_libs="libavutil = $LIBAVUTIL_VERSION" >--enabled movie_filter && prepend lavfi_libs "libavformat >= $LIBAVFORMAT_VERSION, libavcodec >= $LIBAVCODEC_VERSION," >--enabled resample_filter && prepend lavfi_libs "libavresample >= $LIBAVRESAMPLE_VERSION," >--enabled scale_filter && prepend lavfi_libs "libswscale >= $LIBSWSCALE_VERSION," >-+lavfi_libs="libavutil-libav = $LIBAVUTIL_VERSION" >-+enabled movie_filter && prepend lavfi_libs "libavformat-libav >= $LIBAVFORMAT_VERSION, libavcodec-libav >= $LIBAVCODEC_VERSION," >-+enabled resample_filter && prepend lavfi_libs "libavresample-libav >= $LIBAVRESAMPLE_VERSION," >-+enabled scale_filter && prepend lavfi_libs "libswscale-libav >= $LIBSWSCALE_VERSION," >- >- pkgconfig_generate libavutil "Libav utility library" "$LIBAVUTIL_VERSION" "$LIBM" >--pkgconfig_generate libavcodec "Libav codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION" >--pkgconfig_generate libavformat "Libav container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec = $LIBAVCODEC_VERSION" >--pkgconfig_generate libavdevice "Libav device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "libavformat = $LIBAVFORMAT_VERSION" >-+pkgconfig_generate libavcodec "Libav codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil-libav = $LIBAVUTIL_VERSION" >-+pkgconfig_generate libavformat "Libav container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec-libav = $LIBAVCODEC_VERSION" >-+pkgconfig_generate libavdevice "Libav device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "libavformat-libav = $LIBAVFORMAT_VERSION" >- pkgconfig_generate libavfilter "Libav video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$lavfi_libs" >--pkgconfig_generate libavresample "Libav audio resampling library" "$LIBAVRESAMPLE_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION" >--pkgconfig_generate libswscale "Libav image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION" >-+pkgconfig_generate libavresample "Libav audio resampling library" "$LIBAVRESAMPLE_VERSION" "$extralibs" "libavutil-libav = $LIBAVUTIL_VERSION" >-+pkgconfig_generate libswscale "Libav image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil-libav = $LIBAVUTIL_VERSION" >diff -ruN /usr/ports/multimedia/libav/pkg-plist ./pkg-plist >--- /usr/ports/multimedia/libav/pkg-plist 2014-12-02 12:23:13.000000000 +0900 >+++ ./pkg-plist 2015-01-21 16:50:19.000000000 +0900 >@@ -3,6 +3,7 @@ > bin/avprobe > include/libav/libavcodec/avcodec.h > include/libav/libavcodec/avfft.h >+include/libav/libavcodec/dv_profile.h > include/libav/libavcodec/dxva2.h > include/libav/libavcodec/vaapi.h > include/libav/libavcodec/vda.h >@@ -39,6 +40,7 @@ > include/libav/libavutil/cpu.h > include/libav/libavutil/crc.h > include/libav/libavutil/dict.h >+include/libav/libavutil/display.h > include/libav/libavutil/downmix_info.h > include/libav/libavutil/error.h > include/libav/libavutil/eval.h >@@ -63,6 +65,7 @@ > include/libav/libavutil/pixfmt.h > include/libav/libavutil/random_seed.h > include/libav/libavutil/rational.h >+include/libav/libavutil/replaygain.h > include/libav/libavutil/samplefmt.h > include/libav/libavutil/sha.h > include/libav/libavutil/stereo3d.h >@@ -73,32 +76,32 @@ > include/libav/libswscale/version.h > lib/libav/libavcodec.a > lib/libav/libavcodec.so >-lib/libav/libavcodec.so.55 >-lib/libav/libavcodec.so.55.34.1 >+lib/libav/libavcodec.so.56 >+lib/libav/libavcodec.so.56.1.0 > lib/libav/libavdevice.a > lib/libav/libavdevice.so >-lib/libav/libavdevice.so.54 >-lib/libav/libavdevice.so.54.0.0 >+lib/libav/libavdevice.so.55 >+lib/libav/libavdevice.so.55.0.0 > lib/libav/libavfilter.a > lib/libav/libavfilter.so >-lib/libav/libavfilter.so.4 >-lib/libav/libavfilter.so.4.2.0 >+lib/libav/libavfilter.so.5 >+lib/libav/libavfilter.so.5.0.0 > lib/libav/libavformat.a > lib/libav/libavformat.so >-lib/libav/libavformat.so.55 >-lib/libav/libavformat.so.55.12.0 >+lib/libav/libavformat.so.56 >+lib/libav/libavformat.so.56.1.0 > lib/libav/libavresample.a > lib/libav/libavresample.so >-lib/libav/libavresample.so.1 >-lib/libav/libavresample.so.1.1.0 >+lib/libav/libavresample.so.2 >+lib/libav/libavresample.so.2.1.0 > lib/libav/libavutil.a > lib/libav/libavutil.so >-lib/libav/libavutil.so.53 >-lib/libav/libavutil.so.53.3.0 >+lib/libav/libavutil.so.54 >+lib/libav/libavutil.so.54.3.0 > lib/libav/libswscale.a > lib/libav/libswscale.so >-lib/libav/libswscale.so.2 >-lib/libav/libswscale.so.2.1.2 >+lib/libav/libswscale.so.3 >+lib/libav/libswscale.so.3.0.0 > libdata/pkgconfig/libavcodec-libav.pc > libdata/pkgconfig/libavdevice-libav.pc > libdata/pkgconfig/libavfilter-libav.pc
A commit references this bug: Author: vanilla Date: Thu Jan 22 03:21:11 UTC 2015 New revision: 377645 URL: https://svnweb.freebsd.org/changeset/ports/377645 Log: Upgrade to 11.2 PR: 196990 Submitted by: takefu at airport.fm Changes: head/multimedia/libav/Makefile head/multimedia/libav/distinfo head/multimedia/libav/files/patch-Makefile head/multimedia/libav/files/patch-configure head/multimedia/libav/pkg-plist