Date: Mon, 1 Apr 2013 18:19:55 GMT From: Douglas Carmichael <dcarmich@dcarmichael.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/177549: I have updated multimedia/ffmpeg1 to 1.2 Message-ID: <201304011819.r31IJtTu010349@red.freebsd.org> Resent-Message-ID: <201304011830.r31IU0Ea024885@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 177549 >Category: ports >Synopsis: I have updated multimedia/ffmpeg1 to 1.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Apr 01 18:30:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Douglas Carmichael >Release: 9.1-RELEASE >Organization: n/a >Environment: n/a >Description: I have updated multimedia/ffmpeg1 to 1.2. A patch is attached. >How-To-Repeat: n/a >Fix: n/a Patch attached with submission follows: diff -ruN ffmpeg1.orig/Makefile ffmpeg1/Makefile --- ffmpeg1.orig/Makefile 2013-04-01 11:48:48.000000000 -0500 +++ ffmpeg1/Makefile 2013-04-01 11:49:03.000000000 -0500 @@ -6,7 +6,7 @@ # PORTNAME= ffmpeg -PORTVERSION= 1.0.5 +PORTVERSION= 1.2 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ PKGNAMESUFFIX= 1 diff -ruN ffmpeg1.orig/distinfo ffmpeg1/distinfo --- ffmpeg1.orig/distinfo 2013-04-01 11:48:48.000000000 -0500 +++ ffmpeg1/distinfo 2013-04-01 11:49:25.000000000 -0500 @@ -1,2 +1,2 @@ -SHA256 (ffmpeg-1.0.5.tar.bz2) = 1f1af23112e2da8403abce605749db9111d45d2e4e28910831e778c6e2cbdcce -SIZE (ffmpeg-1.0.5.tar.bz2) = 6449133 +SHA256 (ffmpeg-1.2.tar.bz2) = 9a39fbc07dae0c893059e07491bcfb1e2409cc220f72b41eed23a04becea5aaf +SIZE (ffmpeg-1.2.tar.bz2) = 5969590 diff -ruN ffmpeg1.orig/files/patch-Makefile ffmpeg1/files/patch-Makefile --- ffmpeg1.orig/files/patch-Makefile 2013-04-01 11:48:48.000000000 -0500 +++ ffmpeg1/files/patch-Makefile 1969-12-31 18:00:00.000000000 -0600 @@ -1,11 +0,0 @@ ---- Makefile.orig 2012-05-04 12:24:34.447846798 +0200 -+++ Makefile 2012-05-04 12:24:42.471850113 +0200 -@@ -79,7 +79,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)/$(FFMPEG_ARCH)/Makefile - include $(SRC_PATH)/library.mak - endef - diff -ruN ffmpeg1.orig/files/patch-configure ffmpeg1/files/patch-configure --- ffmpeg1.orig/files/patch-configure 2013-04-01 11:48:48.000000000 -0500 +++ ffmpeg1/files/patch-configure 1969-12-31 18:00:00.000000000 -0600 @@ -1,102 +0,0 @@ ---- configure.orig 2013-02-07 01:29:22.000000000 +0100 -+++ configure 2013-02-23 22:38:06.946960545 +0100 -@@ -2030,7 +2030,7 @@ - nogas=":" - - # machine --arch_default=$(uname -m) -+arch_default=$(uname -p) - cpu="generic" - - # OS -@@ -3729,10 +3729,10 @@ - perl --version > /dev/null 2>&1 && enable perl || disable perl - pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man - --check_header linux/fb.h --check_header linux/videodev.h --check_header linux/videodev2.h --check_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_safe struct_v4l2_frmivalenum_discrete -+#check_header linux/fb.h -+#check_header linux/videodev.h -+#check_header linux/videodev2.h -+#check_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_safe struct_v4l2_frmivalenum_discrete - - check_header sys/videoio.h - -@@ -4122,7 +4122,7 @@ - SRC_PATH:=\$(SRC_PATH:.%=..%) - endif - CC_IDENT=$cc_ident --ARCH=$arch -+FFMPEG_ARCH=$arch - CC=$cc - CXX=$cxx - AS=$as -@@ -4325,13 +4325,13 @@ - requires=$5 - enabled ${name#lib} || return 0 - mkdir -p $name -- cat <<EOF > $name/$name.pc -+ cat <<EOF > $name/${name}${build_suffix}.pc - prefix=$prefix - exec_prefix=\${prefix} - libdir=$libdir - includedir=$incdir - --Name: $name -+Name: ${name}${build_suffix} - Description: $comment - Version: $version - Requires: $(enabled shared || echo $requires) -@@ -4345,10 +4345,10 @@ - mkdir -p doc/examples/pc-uninstalled - includedir=${source_path} - [ "$includedir" = . ] && includedir="\${pcfiledir}/../../.." -- cat <<EOF > doc/examples/pc-uninstalled/$name.pc -+ cat <<EOF > doc/examples/pc-uninstalled/${name}${build_suffix}.pc - prefix= - exec_prefix= --libdir=\${pcfiledir}/../../../$name -+libdir=\${pcfiledir}/../../../${name}${build_suffix} - includedir=${includedir} - - Name: $name -@@ -4362,25 +4362,25 @@ - } - - libavfilter_pc_deps="" --enabled libavfilter_deps_avcodec && prepend libavfilter_pc_deps "libavcodec = $LIBAVCODEC_VERSION," --enabled libavfilter_deps_avformat && prepend libavfilter_pc_deps "libavformat = $LIBAVFORMAT_VERSION," --enabled libavfilter_deps_swscale && prepend libavfilter_pc_deps "libswscale = $LIBSWSCALE_VERSION," --enabled libavfilter_deps_swresample && prepend libavfilter_pc_deps "libswresample = $LIBSWRESAMPLE_VERSION," --enabled libavfilter_deps_postproc && prepend libavfilter_pc_deps "libpostproc = $LIBPOSTPROC_VERSION," -+enabled libavfilter_deps_avcodec && prepend libavfilter_pc_deps "libavcodec${build_suffix} = $LIBAVCODEC_VERSION," -+enabled libavfilter_deps_avformat && prepend libavfilter_pc_deps "libavformat${build_suffix} = $LIBAVFORMAT_VERSION," -+enabled libavfilter_deps_swscale && prepend libavfilter_pc_deps "libswscale${build_suffix} = $LIBSWSCALE_VERSION," -+enabled libavfilter_deps_swresample && prepend libavfilter_pc_deps "libswresample${build_suffix} = $LIBSWRESAMPLE_VERSION," -+enabled libavfilter_deps_postproc && prepend libavfilter_pc_deps "libpostproc${build_suffix} = $LIBPOSTPROC_VERSION," - libavfilter_pc_deps=${libavfilter_pc_deps%, } - --libavdevice_pc_deps="libavformat = $LIBAVFORMAT_VERSION" --enabled lavfi_indev && prepend libavdevice_pc_deps "libavfilter = $LIBAVFILTER_VERSION," -+libavdevice_pc_deps="libavformat${build_suffix} = $LIBAVFORMAT_VERSION" -+enabled lavfi_indev && prepend libavdevice_pc_deps "libavfilter${build_suffix} = $LIBAVFILTER_VERSION," - - pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" "$LIBM" --pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION" --pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec = $LIBAVCODEC_VERSION" -+pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil${build_suffix} = $LIBAVUTIL_VERSION" -+pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec${build_suffix} = $LIBAVCODEC_VERSION" - pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "$libavdevice_pc_deps" - pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$libavfilter_pc_deps" --pkgconfig_generate libpostproc "FFmpeg postprocessing library" "$LIBPOSTPROC_VERSION" "" "libavutil = $LIBAVUTIL_VERSION" -+pkgconfig_generate libpostproc "FFmpeg postprocessing library" "$LIBPOSTPROC_VERSION" "" "libavutil${build_suffix} = $LIBAVUTIL_VERSION" - pkgconfig_generate libavresample "Libav audio resampling library" "$LIBAVRESAMPLE_VERSION" "$extralibs" --pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION" --pkgconfig_generate libswresample "FFmpeg audio rescaling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION" -+pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION" -+pkgconfig_generate libswresample "FFmpeg audio rescaling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION" - - fix_ffmpeg_remote(){ - git_remote_from=$1 diff -ruN ffmpeg1.orig/files/patch-doc-Makefile ffmpeg1/files/patch-doc-Makefile --- ffmpeg1.orig/files/patch-doc-Makefile 2013-04-01 11:48:48.000000000 -0500 +++ ffmpeg1/files/patch-doc-Makefile 1969-12-31 18:00:00.000000000 -0600 @@ -1,11 +0,0 @@ ---- doc/Makefile.orig 2012-09-28 03:37:35.000000000 +0200 -+++ doc/Makefile 2012-10-12 21:36:56.461440175 +0200 -@@ -57,7 +57,7 @@ - install-man: - - ifdef CONFIG_MANPAGES --install-progs-$(CONFIG_DOC): install-man -+#install-progs-$(CONFIG_DOC): install-man - - install-man: $(MANPAGES) - $(Q)mkdir -p "$(MANDIR)/man1" diff -ruN ffmpeg1.orig/files/patch-libavcodec-Makefile ffmpeg1/files/patch-libavcodec-Makefile --- ffmpeg1.orig/files/patch-libavcodec-Makefile 2013-04-01 11:48:48.000000000 -0500 +++ ffmpeg1/files/patch-libavcodec-Makefile 1969-12-31 18:00:00.000000000 -0600 @@ -1,11 +0,0 @@ ---- libavcodec/Makefile.orig 2012-08-06 10:06:26.000000000 +0200 -+++ libavcodec/Makefile 2012-08-06 10:36:33.478505808 +0200 -@@ -793,7 +793,7 @@ - codec_names.h \ - fft-internal.h \ - tableprint.h \ -- $(ARCH)/vp56_arith.h \ -+ $(FFMPEG_ARCH)/vp56_arith.h \ - - SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h - SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h diff -ruN ffmpeg1.orig/files/patch-libavcodec-libgsm.c ffmpeg1/files/patch-libavcodec-libgsm.c --- ffmpeg1.orig/files/patch-libavcodec-libgsm.c 2013-04-01 11:48:48.000000000 -0500 +++ ffmpeg1/files/patch-libavcodec-libgsm.c 1969-12-31 18:00:00.000000000 -0600 @@ -1,11 +0,0 @@ ---- libavcodec/libgsm.c.orig 2012-01-22 14:41:15.000000000 +0100 -+++ libavcodec/libgsm.c 2012-01-22 16:06:24.357156664 +0100 -@@ -27,7 +27,7 @@ - - // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html - --#include <gsm/gsm.h> -+#include <gsm.h> - - #include "avcodec.h" - #include "gsm.h" diff -ruN ffmpeg1.orig/files/patch-library.mak ffmpeg1/files/patch-library.mak --- ffmpeg1.orig/files/patch-library.mak 2013-04-01 11:48:48.000000000 -0500 +++ ffmpeg1/files/patch-library.mak 1969-12-31 18:00:00.000000000 -0600 @@ -1,24 +0,0 @@ ---- library.mak.orig 2012-09-28 03:37:35.000000000 +0200 -+++ library.mak 2012-10-12 21:38:55.732664096 +0200 -@@ -74,9 +74,9 @@ - $(Q)mkdir -p "$(INCINSTDIR)" - $$(INSTALL) -m 644 $$^ "$(INCINSTDIR)" - --install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME).pc -- $(Q)mkdir -p "$(LIBDIR)/pkgconfig" -- $$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig" -+install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME)$(BUILDSUF).pc -+ $(Q)mkdir -p "$(prefix)/libdata/pkgconfig" -+ $$(INSTALL) -m 644 $$^ "$(prefix)/libdata/pkgconfig" - - uninstall-libs:: - -$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \ -@@ -88,7 +88,7 @@ - - uninstall-headers:: - $(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS) $(BUILT_HEADERS)) -- $(RM) "$(LIBDIR)/pkgconfig/lib$(NAME).pc" -+ $(RM) "$(prefix)/libdata/pkgconfig/lib$(NAME).pc" - -rmdir "$(INCINSTDIR)" - endef - diff -ruN ffmpeg1.orig/pkg-plist ffmpeg1/pkg-plist --- ffmpeg1.orig/pkg-plist 2013-04-01 11:48:48.000000000 -0500 +++ ffmpeg1/pkg-plist 2013-04-01 13:07:33.000000000 -0500 @@ -38,6 +38,7 @@ include/ffmpeg%%SUFF%%/libavutil/blowfish.h include/ffmpeg%%SUFF%%/libavutil/bprint.h include/ffmpeg%%SUFF%%/libavutil/bswap.h +include/ffmpeg%%SUFF%%/libavutil/channel_layout.h include/ffmpeg%%SUFF%%/libavutil/common.h include/ffmpeg%%SUFF%%/libavutil/cpu.h include/ffmpeg%%SUFF%%/libavutil/crc.h @@ -46,6 +47,7 @@ include/ffmpeg%%SUFF%%/libavutil/eval.h include/ffmpeg%%SUFF%%/libavutil/fifo.h include/ffmpeg%%SUFF%%/libavutil/file.h +include/ffmpeg%%SUFF%%/libavutil/hmac.h include/ffmpeg%%SUFF%%/libavutil/imgutils.h include/ffmpeg%%SUFF%%/libavutil/intfloat.h include/ffmpeg%%SUFF%%/libavutil/intfloat_readwrite.h @@ -56,6 +58,7 @@ include/ffmpeg%%SUFF%%/libavutil/mathematics.h include/ffmpeg%%SUFF%%/libavutil/md5.h include/ffmpeg%%SUFF%%/libavutil/mem.h +include/ffmpeg%%SUFF%%/libavutil/old_pix_fmts.h include/ffmpeg%%SUFF%%/libavutil/opt.h include/ffmpeg%%SUFF%%/libavutil/parseutils.h include/ffmpeg%%SUFF%%/libavutil/pixdesc.h @@ -70,41 +73,43 @@ include/ffmpeg%%SUFF%%/libavutil/version.h include/ffmpeg%%SUFF%%/libavutil/xtea.h include/ffmpeg%%SUFF%%/libpostproc/postprocess.h +include/ffmpeg%%SUFF%%/libpostproc/version.h include/ffmpeg%%SUFF%%/libswresample/swresample.h +include/ffmpeg%%SUFF%%/libswresample/version.h include/ffmpeg%%SUFF%%/libswscale/swscale.h include/ffmpeg%%SUFF%%/libswscale/version.h lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.a lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.54 -lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.54.59.100 +lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.54.92.100 lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.a lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.54 -lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.54.2.101 +lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.54.3.103 lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.a lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.3 -lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.3.17.100 +lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.3.42.103 lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.a lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.54 -lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.54.29.104 +lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.54.63.104 lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.a lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so -lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.51 -lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.51.73.101 +lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.52 +lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.52.18.100 lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.a lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.52 -lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.52.0.100 +lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.52.2.100 lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.a lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so.0 -lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so.0.15.100 +lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so.0.17.102 lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.a lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so.2 -lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so.2.1.101 +lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so.2.2.100 libdata/pkgconfig/libavcodec%%SUFF%%.pc libdata/pkgconfig/libavdevice%%SUFF%%.pc libdata/pkgconfig/libavfilter%%SUFF%%.pc @@ -114,9 +119,11 @@ libdata/pkgconfig/libswresample%%SUFF%%.pc libdata/pkgconfig/libswscale%%SUFF%%.pc %%DATADIR%%/examples/Makefile +%%DATADIR%%/examples/README %%DATADIR%%/examples/decoding_encoding.c %%DATADIR%%/examples/demuxing.c %%DATADIR%%/examples/filtering_audio.c +%%DATADIR%%/examples/resampling_audio.c %%DATADIR%%/examples/filtering_video.c %%DATADIR%%/examples/metadata.c %%DATADIR%%/examples/muxing.c >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304011819.r31IJtTu010349>