[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg copy ffmpeg10 to ffmpeg, making it t...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg copy ffmpeg10 to ffmpeg, making it t...
From: drochner <drochner%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 13:03:51 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/8c2bf6f79029
branches:  trunk
changeset: 609802:8c2bf6f79029
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Wed Oct 10 13:33:44 2012 +0000

description:
copy ffmpeg10 to ffmpeg, making it the default version

diffstat:

 multimedia/ffmpeg/Makefile                |  11 ++---
 multimedia/ffmpeg/Makefile.common         |   4 +-
 multimedia/ffmpeg/PLIST                   |  56 ++++++++++++++++--------------
 multimedia/ffmpeg/buildlink3.mk           |   6 +-
 multimedia/ffmpeg/distinfo                |  13 +++---
 multimedia/ffmpeg/options.mk              |   2 +-
 multimedia/ffmpeg/patches/patch-aa        |   2 +-
 multimedia/ffmpeg/patches/patch-ac        |  24 ++----------
 multimedia/ffmpeg/patches/patch-ad        |  33 ------------------
 multimedia/ffmpeg/patches/patch-ap        |   2 +-
 multimedia/ffmpeg/patches/patch-configure |  31 +++++++++++------
 11 files changed, 73 insertions(+), 111 deletions(-)

diffs (truncated from 389 to 300 lines):

diff -r 510c877665d8 -r 8c2bf6f79029 multimedia/ffmpeg/Makefile
--- a/multimedia/ffmpeg/Makefile        Wed Oct 10 13:32:09 2012 +0000
+++ b/multimedia/ffmpeg/Makefile        Wed Oct 10 13:33:44 2012 +0000
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.89 2012/10/08 09:21:00 asau Exp $
+# $NetBSD: Makefile,v 1.90 2012/10/10 13:33:44 drochner Exp $
 
-# XXX This is release 0.7.13 but we had date-based pkgnames before.
-PKGNAME=       ffmpeg-20120609.${DISTVERSION}
-PKGREVISION=   1
+PKGNAME=       ffmpeg-20120919.${DISTVERSION}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://ffmpeg.mplayerhq.hu/
@@ -23,11 +21,12 @@
 CONFIGURE_ARGS+=       --disable-asm
 .endif
 
+# "error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'"
+CFLAGS.SunOS+= -DBROKEN_RELOCATIONS=1
+
 TEST_TARGET=   check
 
 post-install:
-       ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/doc/TODO \
-               ${DESTDIR}${PREFIX}/share/doc/ffmpeg
        ${INSTALL_DATA} ${WRKSRC}/doc/*.txt \
                ${DESTDIR}${PREFIX}/share/doc/ffmpeg
        ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \
diff -r 510c877665d8 -r 8c2bf6f79029 multimedia/ffmpeg/Makefile.common
--- a/multimedia/ffmpeg/Makefile.common Wed Oct 10 13:32:09 2012 +0000
+++ b/multimedia/ffmpeg/Makefile.common Wed Oct 10 13:33:44 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2012/07/02 18:44:31 drochner Exp $
+# $NetBSD: Makefile.common,v 1.22 2012/10/10 13:33:44 drochner Exp $
 # used by multimedia/ffplay/Makefile
 # used by multimedia/ffmpeg/Makefile
 
@@ -7,7 +7,7 @@
 MASTER_SITES=  http://www.ffmpeg.org/releases/
 EXTRACT_SUFX=  .tar.bz2
 
-DISTVERSION=   0.7.13
+DISTVERSION=   0.10.5
 PREV_PKGPATH=  multimedia/ffmpeg-devel
 PATCHDIR=      ${.CURDIR}/../../multimedia/ffmpeg/patches
 
diff -r 510c877665d8 -r 8c2bf6f79029 multimedia/ffmpeg/PLIST
--- a/multimedia/ffmpeg/PLIST   Wed Oct 10 13:32:09 2012 +0000
+++ b/multimedia/ffmpeg/PLIST   Wed Oct 10 13:33:44 2012 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2011/11/28 11:00:28 drochner Exp $
+@comment $NetBSD: PLIST,v 1.18 2012/10/10 13:33:44 drochner Exp $
 bin/ffmpeg
 bin/ffprobe
 bin/ffserver
@@ -7,6 +7,7 @@
 include/libavcodec/dxva2.h
 include/libavcodec/opt.h
 include/libavcodec/vaapi.h
+include/libavcodec/vda.h
 include/libavcodec/vdpau.h
 include/libavcodec/version.h
 include/libavcodec/xvmc.h
@@ -14,7 +15,8 @@
 include/libavfilter/avcodec.h
 include/libavfilter/avfilter.h
 include/libavfilter/avfiltergraph.h
-include/libavfilter/vsink_buffer.h
+include/libavfilter/buffersink.h
+include/libavfilter/version.h
 include/libavfilter/vsrc_buffer.h
 include/libavformat/avformat.h
 include/libavformat/avio.h
@@ -38,6 +40,7 @@
 include/libavutil/fifo.h
 include/libavutil/file.h
 include/libavutil/imgutils.h
+include/libavutil/intfloat.h
 include/libavutil/intfloat_readwrite.h
 include/libavutil/intreadwrite.h
 include/libavutil/lfg.h
@@ -54,52 +57,56 @@
 include/libavutil/rational.h
 include/libavutil/samplefmt.h
 include/libavutil/sha.h
-include/libavutil/sha1.h
 include/libpostproc/postprocess.h
+include/libswresample/swresample.h
 include/libswscale/swscale.h
 lib/libavcodec.a
 lib/libavcodec.so
-lib/libavcodec.so.52
-lib/libavcodec.so.52.123.0
+lib/libavcodec.so.53
+lib/libavcodec.so.53.61.100
 lib/libavdevice.a
 lib/libavdevice.so
-lib/libavdevice.so.52
-lib/libavdevice.so.52.5.0
+lib/libavdevice.so.53
+lib/libavdevice.so.53.4.100
 lib/libavfilter.a
 lib/libavfilter.so
-lib/libavfilter.so.1
-lib/libavfilter.so.1.80.0
+lib/libavfilter.so.2
+lib/libavfilter.so.2.61.100
 lib/libavformat.a
 lib/libavformat.so
-lib/libavformat.so.52
-lib/libavformat.so.52.111.0
+lib/libavformat.so.53
+lib/libavformat.so.53.32.100
 lib/libavutil.a
 lib/libavutil.so
-lib/libavutil.so.50
-lib/libavutil.so.50.43.0
+lib/libavutil.so.51
+lib/libavutil.so.51.35.100
 lib/libpostproc.a
 lib/libpostproc.so
-lib/libpostproc.so.51
-lib/libpostproc.so.51.2.0
+lib/libpostproc.so.52
+lib/libpostproc.so.52.0.100
+lib/libswresample.a
+lib/libswresample.so
+lib/libswresample.so.0
+lib/libswresample.so.0.6.100
 lib/libswscale.a
 lib/libswscale.so
-lib/libswscale.so.0
-lib/libswscale.so.0.14.1
+lib/libswscale.so.2
+lib/libswscale.so.2.1.100
 lib/pkgconfig/libavcodec.pc
 lib/pkgconfig/libavdevice.pc
 lib/pkgconfig/libavfilter.pc
 lib/pkgconfig/libavformat.pc
 lib/pkgconfig/libavutil.pc
 lib/pkgconfig/libpostproc.pc
+lib/pkgconfig/libswresample.pc
 lib/pkgconfig/libswscale.pc
 man/man1/ffmpeg.1
 man/man1/ffprobe.1
 man/man1/ffserver.1
-share/doc/ffmpeg/README
-share/doc/ffmpeg/TODO
 share/doc/ffmpeg/avutil.txt
 share/doc/ffmpeg/build_system.txt
-share/doc/ffmpeg/fate.txt
+share/doc/ffmpeg/errno.txt
+share/doc/ffmpeg/ffmpeg.txt
 share/doc/ffmpeg/git-howto.txt
 share/doc/ffmpeg/issue_tracker.txt
 share/doc/ffmpeg/multithreading.txt
@@ -107,21 +114,16 @@
 share/doc/ffmpeg/rate_distortion.txt
 share/doc/ffmpeg/snow.txt
 share/doc/ffmpeg/soc.txt
+share/doc/ffmpeg/swresample.txt
 share/doc/ffmpeg/swscale.txt
 share/doc/ffmpeg/tablegen.txt
 share/doc/ffmpeg/viterbi.txt
 share/examples/ffmpeg/ffserver.conf
+share/ffmpeg/ffprobe.xsd
 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-ipod320.ffpreset
 share/ffmpeg/libx264-ipod640.ffpreset
-share/ffmpeg/libx264-lossless_fast.ffpreset
-share/ffmpeg/libx264-lossless_max.ffpreset
-share/ffmpeg/libx264-lossless_medium.ffpreset
-share/ffmpeg/libx264-lossless_slow.ffpreset
-share/ffmpeg/libx264-lossless_slower.ffpreset
-share/ffmpeg/libx264-lossless_ultrafast.ffpreset
diff -r 510c877665d8 -r 8c2bf6f79029 multimedia/ffmpeg/buildlink3.mk
--- a/multimedia/ffmpeg/buildlink3.mk   Wed Oct 10 13:32:09 2012 +0000
+++ b/multimedia/ffmpeg/buildlink3.mk   Wed Oct 10 13:33:44 2012 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.21 2012/09/27 21:37:55 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2012/10/10 13:33:44 drochner Exp $
 
 BUILDLINK_TREE+=       ffmpeg
 
 .if !defined(FFMPEG_BUILDLINK3_MK)
 FFMPEG_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ffmpeg+= ffmpeg>=20120609.0.6.1<20120609.0.10
-BUILDLINK_ABI_DEPENDS.ffmpeg+= ffmpeg>=20120609.0.7.13nb1
+BUILDLINK_API_DEPENDS.ffmpeg+= ffmpeg>=20120919.0.10.5
+BUILDLINK_ABI_DEPENDS.ffmpeg+= ffmpeg>=20120919.0.10.5
 BUILDLINK_PKGSRCDIR.ffmpeg?=   ../../multimedia/ffmpeg
 
 pkgbase := ffmpeg
diff -r 510c877665d8 -r 8c2bf6f79029 multimedia/ffmpeg/distinfo
--- a/multimedia/ffmpeg/distinfo        Wed Oct 10 13:32:09 2012 +0000
+++ b/multimedia/ffmpeg/distinfo        Wed Oct 10 13:33:44 2012 +0000
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.56 2012/07/02 18:44:31 drochner Exp $
+$NetBSD: distinfo,v 1.57 2012/10/10 13:33:44 drochner Exp $
 
-SHA1 (ffmpeg-0.7.13.tar.bz2) = f55f553520373e2de644fd05a7feb7a9ce25f797
-RMD160 (ffmpeg-0.7.13.tar.bz2) = 507acb8467784d045e0ba3720822243826d054c1
-Size (ffmpeg-0.7.13.tar.bz2) = 4525507 bytes
+SHA1 (ffmpeg-0.10.5.tar.bz2) = 0afe23de31e68495ceb80344459056059f44c7d9
+RMD160 (ffmpeg-0.10.5.tar.bz2) = acaf5fdcd15eae027bcf156ff897fb9699d12185
+Size (ffmpeg-0.10.5.tar.bz2) = 5774951 bytes
 SHA1 (patch-aa) = c9540d0ca0a671e9faa8b5b7847c103b515ac382
-SHA1 (patch-ac) = 4eba6e68d3fab082a957fa08f5618561f3b4aecb
-SHA1 (patch-ad) = d3e06c855ab1a5ff3ddb0bee108ea88166c32cb6
+SHA1 (patch-ac) = 14b39a2663be41395be0faae8270e18e2ba0891f
 SHA1 (patch-ap) = 0ea32afb145b55f0186fb14b1b07568d7442ddf3
-SHA1 (patch-configure) = 242f16e06a30b8e55193ee647ab78e9fb2645231
+SHA1 (patch-configure) = edc359ba50cdc90ad3ce7529f72e07970b679303
diff -r 510c877665d8 -r 8c2bf6f79029 multimedia/ffmpeg/options.mk
--- a/multimedia/ffmpeg/options.mk      Wed Oct 10 13:32:09 2012 +0000
+++ b/multimedia/ffmpeg/options.mk      Wed Oct 10 13:33:44 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.24 2012/02/01 17:56:07 drochner Exp $
+# $NetBSD: options.mk,v 1.25 2012/10/10 13:33:44 drochner Exp $
 
 # Global and legacy options
 
diff -r 510c877665d8 -r 8c2bf6f79029 multimedia/ffmpeg/patches/patch-aa
--- a/multimedia/ffmpeg/patches/patch-aa        Wed Oct 10 13:32:09 2012 +0000
+++ b/multimedia/ffmpeg/patches/patch-aa        Wed Oct 10 13:33:44 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.10 2011/07/19 19:53:18 drochner Exp $
+$NetBSD: patch-aa,v 1.11 2012/10/10 13:33:44 drochner Exp $
 
 --- libavutil/x86/cpu.c.orig   2011-07-07 20:46:02.000000000 +0000
 +++ libavutil/x86/cpu.c
diff -r 510c877665d8 -r 8c2bf6f79029 multimedia/ffmpeg/patches/patch-ac
--- a/multimedia/ffmpeg/patches/patch-ac        Wed Oct 10 13:32:09 2012 +0000
+++ b/multimedia/ffmpeg/patches/patch-ac        Wed Oct 10 13:33:44 2012 +0000
@@ -1,27 +1,13 @@
-$NetBSD: patch-ac,v 1.11 2011/09/14 17:21:08 hans Exp $
+$NetBSD: patch-ac,v 1.12 2012/10/10 13:33:44 drochner Exp $
 
---- Makefile.orig      2011-06-21 21:29:25.000000000 +0200
-+++ Makefile   2011-09-12 17:54:06.075569882 +0200
-@@ -112,7 +112,7 @@ version.h .version:
- # force version.sh to run whenever version might have changed
- -include .version
- 
--DOCS = $(addprefix doc/, developer.html faq.html general.html libavfilter.html) $(HTMLPAGES) $(MANPAGES) $(PODPAGES)
-+DOCS = $(MANPAGES) $(PODPAGES)
- 
- documentation: $(DOCS)
- 
-@@ -152,11 +152,11 @@ install-progs: install-progs-yes $(PROGS
+--- Makefile.orig      2012-06-09 20:09:44.000000000 +0000
++++ Makefile
+@@ -124,7 +124,7 @@ install-progs: install-progs-yes $(PROGS
  
  install-data: $(DATA_FILES)
        $(Q)mkdir -p "$(DATADIR)"
 -      $(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)"
 +      $(INSTALL) -c -m 644 $(DATA_FILES) "$(DATADIR)"
  
- install-man: $(MANPAGES)
-       $(Q)mkdir -p "$(MANDIR)/man1"
--      $(INSTALL) -m 644 $(MANPAGES) "$(MANDIR)/man1"
-+      $(INSTALL) -c -m 644 $(MANPAGES) "$(MANDIR)/man1"
+ uninstall: uninstall-libs uninstall-headers uninstall-progs uninstall-data
  
- uninstall: uninstall-libs uninstall-headers uninstall-progs uninstall-data uninstall-man
- 
diff -r 510c877665d8 -r 8c2bf6f79029 multimedia/ffmpeg/patches/patch-ad
--- a/multimedia/ffmpeg/patches/patch-ad        Wed Oct 10 13:32:09 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-$NetBSD: patch-ad,v 1.9 2011/01/17 16:51:05 drochner Exp $
-
---- subdir.mak.orig    2010-03-17 23:43:05.000000000 +0900
-+++ subdir.mak 2011-01-05 17:06:02.000000000 +0900
-@@ -59,7 +59,7 @@
- 
- install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
-       $(Q)mkdir -p "$(SHLIBDIR)"
--      $$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
-+      $$(INSTALL) -c -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
-       $$(STRIP) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
-       $(Q)cd "$(SHLIBDIR)" && \
-               $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
-@@ -69,16 +69,16 @@
- 
- install-lib$(NAME)-static: $(SUBDIR)$(LIBNAME)
-       $(Q)mkdir -p "$(LIBDIR)"
--      $$(INSTALL) -m 644 $$< "$(LIBDIR)"
-+      $$(INSTALL) -c -m 644 $$< "$(LIBDIR)"
-       $(LIB_INSTALL_EXTRA_CMD)
- 
- install-lib$(NAME)-headers: $(addprefix $(SUBDIR),$(HEADERS) $(BUILT_HEADERS))
Prev by Date: [pkgsrc/trunk]: pkgsrc/x11/gtk3 Update gtk3 to 3.6.1
Next by Date: [pkgsrc/trunk]: pkgsrc/textproc/groonga Update groonga to 4.1.1.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/x11/gtk3 Update gtk3 to 3.6.1
Next by Thread: [pkgsrc/trunk]: pkgsrc/textproc/groonga Update groonga to 4.1.1.
Indexes:
Home | Main Index | Thread Index | Old Index