Date: Thu, 22 Jan 2015 02:18:35 +0000 From: bugzilla-noreply@freebsd.org To: freebsd-ports-bugs@FreeBSD.org Subject: [Bug 196990] [PATCH] multimedia/libav: Update 11.2 Message-ID: <bug-196990-13-pqSeE4baEX@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-196990-13@https.bugs.freebsd.org/bugzilla/> References: <bug-196990-13@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D196990 takefu@airport.fm changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #151997|text/x-c |text/plain mime type| | Attachment #151997|0 |1 is patch| | --- Comment #1 from takefu@airport.fm --- Comment on attachment 151997 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=3D151997 libav-11.2.patch >diff -ruN /usr/ports/multimedia/libav/Makefile ./Makefile >--- /usr/ports/multimedia/libav/Makefile 2015-01-17 07:34:22.000000000 +09= 00 >+++ ./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 sb= runo $ >=20 > PORTNAME=3D libav >-PORTVERSION=3D 10.2 >-PORTREVISION=3D 7 >+PORTVERSION=3D 11.2 > CATEGORIES=3D multimedia audio ipv6 net > MASTER_SITES=3D http://libav.org/releases/ >=20 >@@ -29,8 +28,7 @@ > --enable-shared \ > --enable-runtime-cpudetect \ > --disable-debug \ >- --cc=3D"${CC}" \ >- --disable-avserver >+ --cc=3D"${CC}" >=20 > OPTIONS_DEFINE=3D ALSA AMR_NB AMR_WB BZIP2 CDIO FAAC FDK_AAC DOCS FREETYP= E \ > 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}/libdat= a/pkgconfig|' \ > ${WRKSRC}/library.mak >=20 >@@ -235,4 +233,12 @@ > @${REINPLACE_CMD} -e 's|CONFIG_TEXI2HTML=3Dyes|!CONFIG_TEXI2HTML=3Dyes|'= ${WRKSRC}/config.mak > .endif >=20 >+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 +09= 00 >+++ ./distinfo 2015-01-21 12:33:48.000000000 +0900 >@@ -1,2 +1,2 @@ >-SHA256 (libav-10.2.tar.gz) =3D a65f49e1a831e02eaaf7823c76050b27b14830e8c1= 6e45eed3ccd826c9cef02f >-SIZE (libav-10.2.tar.gz) =3D 6594434 >+SHA256 (libav-11.2.tar.gz) =3D 1f1448e1245444a1fae2f077f6846fedb47dfb294b= ef797e6742c095a6b4d769 >+SIZE (libav-11.2.tar.gz) =3D 6920866 >diff -ruN /usr/ports/multimedia/libav/files/patch-Makefile ./files/patch-M= akefile >--- /usr/ports/multimedia/libav/files/patch-Makefile 2014-04-09 04:45:15.0= 00000000 +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 :=3D $(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 @@ >=20=20 > check_ld(){ > log check_ld "$@" >@@ -11,17 +11,17 @@ > check_cc $($cflags_filter $flags) || return > flags=3D$($ldflags_filter $flags) > libs=3D$($ldflags_filter $libs) >-@@ -4356,7 +4356,7 @@ >+@@ -4606,7 +4606,7 @@ > MANDIR=3D\$(DESTDIR)$mandir > SRC_PATH=3D$source_path > CC_IDENT=3D$cc_ident > -ARCH=3D$arch > +LIBAV_ARCH=3D$arch >+ INTRINSICS=3D$intrinsics > CC=3D$cc > AS=3D$as >- LD=3D$ld >-@@ -4524,7 +4524,7 @@ >- requires=3D$5 >+@@ -4783,7 +4783,7 @@ >+ requires=3D${requires%, } > enabled ${name#lib} || return 0 > mkdir -p $name > - cat <<EOF > $name/$name.pc >@@ -29,28 +29,3 @@ > prefix=3D$prefix > exec_prefix=3D\${prefix} > libdir=3D$libdir >-@@ -4556,15 +4556,15 @@ >- EOF >- } >-=20 >--lavfi_libs=3D"libavutil =3D $LIBAVUTIL_VERSION" >--enabled movie_filter && prepend lavfi_libs "libavformat >=3D $LIBAVFO= RMAT_VERSION, libavcodec >=3D $LIBAVCODEC_VERSION," >--enabled resample_filter && prepend lavfi_libs "libavresample >=3D $LIBAV= RESAMPLE_VERSION," >--enabled scale_filter && prepend lavfi_libs "libswscale >=3D $LIBSWSCA= LE_VERSION," >-+lavfi_libs=3D"libavutil-libav =3D $LIBAVUTIL_VERSION" >-+enabled movie_filter && prepend lavfi_libs "libavformat-libav >=3D $L= IBAVFORMAT_VERSION, libavcodec-libav >=3D $LIBAVCODEC_VERSION," >-+enabled resample_filter && prepend lavfi_libs "libavresample-libav >=3D = $LIBAVRESAMPLE_VERSION," >-+enabled scale_filter && prepend lavfi_libs "libswscale-libav >=3D $LI= BSWSCALE_VERSION," >-=20 >- pkgconfig_generate libavutil "Libav utility library" "$LIBA= VUTIL_VERSION" "$LIBM" >--pkgconfig_generate libavcodec "Libav codec library" "$LIBA= VCODEC_VERSION" "$extralibs" "libavutil =3D $LIBAVUTIL_VERSION" >--pkgconfig_generate libavformat "Libav container format library" "$LIBA= VFORMAT_VERSION" "$extralibs" "libavcodec =3D $LIBAVCODEC_VERSION" >--pkgconfig_generate libavdevice "Libav device handling library" "$LIBA= VDEVICE_VERSION" "$extralibs" "libavformat =3D $LIBAVFORMAT_VERSION" >-+pkgconfig_generate libavcodec "Libav codec library" "$LIBA= VCODEC_VERSION" "$extralibs" "libavutil-libav =3D $LIBAVUTIL_VERSION" >-+pkgconfig_generate libavformat "Libav container format library" "$LIBA= VFORMAT_VERSION" "$extralibs" "libavcodec-libav =3D $LIBAVCODEC_VERSION" >-+pkgconfig_generate libavdevice "Libav device handling library" "$LIBA= VDEVICE_VERSION" "$extralibs" "libavformat-libav =3D $LIBAVFORMAT_VERSION" >- pkgconfig_generate libavfilter "Libav video filtering library" "$LIBA= VFILTER_VERSION" "$extralibs" "$lavfi_libs" >--pkgconfig_generate libavresample "Libav audio resampling library" "$LIBA= VRESAMPLE_VERSION" "$extralibs" "libavutil =3D $LIBAVUTIL_VERSION" >--pkgconfig_generate libswscale "Libav image rescaling library" "$LIBS= WSCALE_VERSION" "$LIBM" "libavutil =3D $LIBAVUTIL_VERSION" >-+pkgconfig_generate libavresample "Libav audio resampling library" "$LIBA= VRESAMPLE_VERSION" "$extralibs" "libavutil-libav =3D $LIBAVUTIL_VERSION" >-+pkgconfig_generate libswscale "Libav image rescaling library" "$LIBS= WSCALE_VERSION" "$LIBM" "libavutil-libav =3D $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 +0= 900 >+++ ./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 --=20 You are receiving this mail because: You are the assignee for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-196990-13-pqSeE4baEX>