From 533947cd110ee335b615a45c5f1182d55e6e2765 Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Sat, 27 Dec 2014 15:28:46 +0000 Subject: [PATCH] Replace multimedia/ffmpeg24 with ffmpeg25 (no ports depend on ffmpeg24 and ffmpeg25 is the more likely candidate for the eventual replacement of multimedia/ffmpeg) --- MOVED | 1 + multimedia/Makefile | 2 +- multimedia/ffmpeg24/distinfo | 2 -- .../ffmpeg24/files/patch-libavdevice-Makefile | 11 ----------- multimedia/{ffmpeg24 => ffmpeg25}/Makefile | 7 +++---- multimedia/ffmpeg25/distinfo | 2 ++ .../files/ffserver25.in} | 12 ++++++------ .../{ffmpeg24 => ffmpeg25}/files/patch-Makefile | 0 .../files/patch-configure | 0 .../files/patch-doc-Makefile | 0 .../files/patch-libavcodec-Makefile | 0 .../files/patch-libavdevice-bktr.c | 0 .../files/patch-libavdevice-oss_audio.c | 0 .../files/patch-libavfilter-vf_libopencv.c | 0 .../files/patch-libavformat-udp.c | 0 .../files/patch-libavutil-common.h | 0 .../files/patch-libavutil-x86-asm.h | 0 multimedia/{ffmpeg24 => ffmpeg25}/pkg-descr | 0 multimedia/{ffmpeg24 => ffmpeg25}/pkg-plist | 17 +++++++++-------- 19 files changed, 22 insertions(+), 32 deletions(-) delete mode 100644 multimedia/ffmpeg24/distinfo delete mode 100644 multimedia/ffmpeg24/files/patch-libavdevice-Makefile rename multimedia/{ffmpeg24 => ffmpeg25}/Makefile (99%) create mode 100644 multimedia/ffmpeg25/distinfo rename multimedia/{ffmpeg24/files/ffserver24.in => ffmpeg25/files/ffserver25.in} (58%) rename multimedia/{ffmpeg24 => ffmpeg25}/files/patch-Makefile (100%) rename multimedia/{ffmpeg24 => ffmpeg25}/files/patch-configure (100%) rename multimedia/{ffmpeg24 => ffmpeg25}/files/patch-doc-Makefile (100%) rename multimedia/{ffmpeg24 => ffmpeg25}/files/patch-libavcodec-Makefile (100%) rename multimedia/{ffmpeg24 => ffmpeg25}/files/patch-libavdevice-bktr.c (100%) rename multimedia/{ffmpeg24 => ffmpeg25}/files/patch-libavdevice-oss_audio.c (100%) rename multimedia/{ffmpeg24 => ffmpeg25}/files/patch-libavfilter-vf_libopencv.c (100%) rename multimedia/{ffmpeg24 => ffmpeg25}/files/patch-libavformat-udp.c (100%) rename multimedia/{ffmpeg24 => ffmpeg25}/files/patch-libavutil-common.h (100%) rename multimedia/{ffmpeg24 => ffmpeg25}/files/patch-libavutil-x86-asm.h (100%) rename multimedia/{ffmpeg24 => ffmpeg25}/pkg-descr (100%) rename multimedia/{ffmpeg24 => ffmpeg25}/pkg-plist (93%) diff --git a/MOVED b/MOVED index 76d3cf2e23ca..c8dca8cac35e 100644 --- a/MOVED +++ b/MOVED @@ -7348,3 +7348,4 @@ games/secretmaryochronicles-music||2014-12-27|Has expired: Depends on expiring g science/mpb||2014-12-27|Has expired: Broken for more than 6 months x11-fm/pbi-thumbnailer||2014-12-27|Has expired: Broken for more than 6 months games/secretmaryochronicles||2014-12-27|Has expired: does not run, cegui 0.8 support still in development +multimedia/ffmpeg24|multimedia/ffmpeg25|2014-12-27|ffmpeg upstream now points to 2.5.x series diff --git a/multimedia/Makefile b/multimedia/Makefile index 5d8efa0e970c..c6abb7e1fc43 100644 --- a/multimedia/Makefile +++ b/multimedia/Makefile @@ -58,7 +58,7 @@ SUBDIR += emovix SUBDIR += ffmpeg SUBDIR += ffmpeg0 - SUBDIR += ffmpeg24 + SUBDIR += ffmpeg25 SUBDIR += ffmpeg2theora SUBDIR += ffmpegthumbnailer SUBDIR += flvmeta diff --git a/multimedia/ffmpeg24/distinfo b/multimedia/ffmpeg24/distinfo deleted file mode 100644 index 519832b5a640..000000000000 --- a/multimedia/ffmpeg24/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (ffmpeg-2.4.3.tar.bz2) = ca5c3e3c0e4f9e43b9dceafceb866acb1ea575cb9f2d94e0d959303e4fc4e602 -SIZE (ffmpeg-2.4.3.tar.bz2) = 7369986 diff --git a/multimedia/ffmpeg24/files/patch-libavdevice-Makefile b/multimedia/ffmpeg24/files/patch-libavdevice-Makefile deleted file mode 100644 index a2f68f3aaaf0..000000000000 --- a/multimedia/ffmpeg24/files/patch-libavdevice-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- libavdevice/Makefile.orig 2014-09-15 12:00:39.254449025 +0200 -+++ libavdevice/Makefile 2014-09-15 12:00:52.715443822 +0200 -@@ -34,7 +34,7 @@ - OBJS-$(CONFIG_OSS_INDEV) += oss_audio.o - OBJS-$(CONFIG_OSS_OUTDEV) += oss_audio.o - OBJS-$(CONFIG_PULSE_INDEV) += pulse_audio_dec.o \ -- pulse_audio_common.o -+ pulse_audio_common.o timefilter.o - OBJS-$(CONFIG_PULSE_OUTDEV) += pulse_audio_enc.o \ - pulse_audio_common.o - OBJS-$(CONFIG_QTKIT_INDEV) += qtkit.o diff --git a/multimedia/ffmpeg24/Makefile b/multimedia/ffmpeg25/Makefile similarity index 99% rename from multimedia/ffmpeg24/Makefile rename to multimedia/ffmpeg25/Makefile index c76e14caf9b8..ad3138b96187 100644 --- a/multimedia/ffmpeg24/Makefile +++ b/multimedia/ffmpeg25/Makefile @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= ffmpeg -PORTVERSION= 2.4.3 -PORTREVISION= 4 +PORTVERSION= 2.5.2 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ -PKGNAMESUFFIX= 24 +PKGNAMESUFFIX= 25 MAINTAINER= riggs@FreeBSD.org COMMENT= Realtime audio/video encoder/converter and streaming server @@ -27,7 +26,7 @@ USE_LDCONFIG= ${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX} USE_PERL5= build WANT_SDL= yes -FFMPEG_SUFFIX= 24 +FFMPEG_SUFFIX= 25 PLIST_SUB+= FFMPEG_SUFFIX="${FFMPEG_SUFFIX}" CONFIGURE_ENV+= EXESUF="${FFMPEG_SUFFIX}" MAKE_ARGS+= EXESUF="${FFMPEG_SUFFIX}" diff --git a/multimedia/ffmpeg25/distinfo b/multimedia/ffmpeg25/distinfo new file mode 100644 index 000000000000..fe11061fad15 --- /dev/null +++ b/multimedia/ffmpeg25/distinfo @@ -0,0 +1,2 @@ +SHA256 (ffmpeg-2.5.2.tar.bz2) = 9edf17e7c280cbcfca4bc4219b1c22f760a61ec6a3f39ef26e3e2ad4cd24465e +SIZE (ffmpeg-2.5.2.tar.bz2) = 7675420 diff --git a/multimedia/ffmpeg24/files/ffserver24.in b/multimedia/ffmpeg25/files/ffserver25.in similarity index 58% rename from multimedia/ffmpeg24/files/ffserver24.in rename to multimedia/ffmpeg25/files/ffserver25.in index ef308f3c158e..2465fca6b38e 100644 --- a/multimedia/ffmpeg24/files/ffserver24.in +++ b/multimedia/ffmpeg25/files/ffserver25.in @@ -3,25 +3,25 @@ # $FreeBSD$ # -# PROVIDE: ffserver24 +# PROVIDE: ffserver25 # REQUIRE: NETWORKING # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to enable ffserver: # -#ffserver24_enable="YES" +#ffserver25_enable="YES" # -ffserver24_enable="${ffserver_enable-NO}" +ffserver25_enable="${ffserver_enable-NO}" . /etc/rc.subr -name=ffserver24 -rcvar=ffserver24_enable +name=ffserver25 +rcvar=ffserver25_enable command="%%PREFIX%%/bin/${name}" command_args="&" -required_files=%%PREFIX%%/etc/ffserver24.conf +required_files=%%PREFIX%%/etc/ffserver25.conf load_rc_config ${name} run_rc_command "$1" diff --git a/multimedia/ffmpeg24/files/patch-Makefile b/multimedia/ffmpeg25/files/patch-Makefile similarity index 100% rename from multimedia/ffmpeg24/files/patch-Makefile rename to multimedia/ffmpeg25/files/patch-Makefile diff --git a/multimedia/ffmpeg24/files/patch-configure b/multimedia/ffmpeg25/files/patch-configure similarity index 100% rename from multimedia/ffmpeg24/files/patch-configure rename to multimedia/ffmpeg25/files/patch-configure diff --git a/multimedia/ffmpeg24/files/patch-doc-Makefile b/multimedia/ffmpeg25/files/patch-doc-Makefile similarity index 100% rename from multimedia/ffmpeg24/files/patch-doc-Makefile rename to multimedia/ffmpeg25/files/patch-doc-Makefile diff --git a/multimedia/ffmpeg24/files/patch-libavcodec-Makefile b/multimedia/ffmpeg25/files/patch-libavcodec-Makefile similarity index 100% rename from multimedia/ffmpeg24/files/patch-libavcodec-Makefile rename to multimedia/ffmpeg25/files/patch-libavcodec-Makefile diff --git a/multimedia/ffmpeg24/files/patch-libavdevice-bktr.c b/multimedia/ffmpeg25/files/patch-libavdevice-bktr.c similarity index 100% rename from multimedia/ffmpeg24/files/patch-libavdevice-bktr.c rename to multimedia/ffmpeg25/files/patch-libavdevice-bktr.c diff --git a/multimedia/ffmpeg24/files/patch-libavdevice-oss_audio.c b/multimedia/ffmpeg25/files/patch-libavdevice-oss_audio.c similarity index 100% rename from multimedia/ffmpeg24/files/patch-libavdevice-oss_audio.c rename to multimedia/ffmpeg25/files/patch-libavdevice-oss_audio.c diff --git a/multimedia/ffmpeg24/files/patch-libavfilter-vf_libopencv.c b/multimedia/ffmpeg25/files/patch-libavfilter-vf_libopencv.c similarity index 100% rename from multimedia/ffmpeg24/files/patch-libavfilter-vf_libopencv.c rename to multimedia/ffmpeg25/files/patch-libavfilter-vf_libopencv.c diff --git a/multimedia/ffmpeg24/files/patch-libavformat-udp.c b/multimedia/ffmpeg25/files/patch-libavformat-udp.c similarity index 100% rename from multimedia/ffmpeg24/files/patch-libavformat-udp.c rename to multimedia/ffmpeg25/files/patch-libavformat-udp.c diff --git a/multimedia/ffmpeg24/files/patch-libavutil-common.h b/multimedia/ffmpeg25/files/patch-libavutil-common.h similarity index 100% rename from multimedia/ffmpeg24/files/patch-libavutil-common.h rename to multimedia/ffmpeg25/files/patch-libavutil-common.h diff --git a/multimedia/ffmpeg24/files/patch-libavutil-x86-asm.h b/multimedia/ffmpeg25/files/patch-libavutil-x86-asm.h similarity index 100% rename from multimedia/ffmpeg24/files/patch-libavutil-x86-asm.h rename to multimedia/ffmpeg25/files/patch-libavutil-x86-asm.h diff --git a/multimedia/ffmpeg24/pkg-descr b/multimedia/ffmpeg25/pkg-descr similarity index 100% rename from multimedia/ffmpeg24/pkg-descr rename to multimedia/ffmpeg25/pkg-descr diff --git a/multimedia/ffmpeg24/pkg-plist b/multimedia/ffmpeg25/pkg-plist similarity index 93% rename from multimedia/ffmpeg24/pkg-plist rename to multimedia/ffmpeg25/pkg-plist index c06fc22acc21..0472076dc3e5 100644 --- a/multimedia/ffmpeg24/pkg-plist +++ b/multimedia/ffmpeg25/pkg-plist @@ -12,6 +12,7 @@ include/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec/vaapi.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec/vda.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec/vdpau.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec/version.h +include/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec/vorbis_parser.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec/xvmc.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavdevice/avdevice.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavdevice/version.h @@ -21,6 +22,7 @@ include/ffmpeg%%FFMPEG_SUFFIX%%/libavfilter/avfilter.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavfilter/avfiltergraph.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavfilter/buffersink.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavfilter/buffersrc.h +include/ffmpeg%%FFMPEG_SUFFIX%%/libavutil/cast5.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavfilter/version.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavformat/avformat.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavformat/avio.h @@ -58,7 +60,6 @@ include/ffmpeg%%FFMPEG_SUFFIX%%/libavutil/hash.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavutil/hmac.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavutil/imgutils.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavutil/intfloat.h -include/ffmpeg%%FFMPEG_SUFFIX%%/libavutil/intfloat_readwrite.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavutil/intreadwrite.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavutil/lfg.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavutil/log.h @@ -98,19 +99,19 @@ include/ffmpeg%%FFMPEG_SUFFIX%%/libswscale/version.h lib/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec%%FFMPEG_SUFFIX%%.a lib/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec%%FFMPEG_SUFFIX%%.so lib/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec%%FFMPEG_SUFFIX%%.so.56 -lib/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec%%FFMPEG_SUFFIX%%.so.56.1.100 +lib/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec%%FFMPEG_SUFFIX%%.so.56.13.100 lib/ffmpeg%%FFMPEG_SUFFIX%%/libavdevice%%FFMPEG_SUFFIX%%.a lib/ffmpeg%%FFMPEG_SUFFIX%%/libavdevice%%FFMPEG_SUFFIX%%.so lib/ffmpeg%%FFMPEG_SUFFIX%%/libavdevice%%FFMPEG_SUFFIX%%.so.56 -lib/ffmpeg%%FFMPEG_SUFFIX%%/libavdevice%%FFMPEG_SUFFIX%%.so.56.0.100 +lib/ffmpeg%%FFMPEG_SUFFIX%%/libavdevice%%FFMPEG_SUFFIX%%.so.56.3.100 lib/ffmpeg%%FFMPEG_SUFFIX%%/libavfilter%%FFMPEG_SUFFIX%%.a lib/ffmpeg%%FFMPEG_SUFFIX%%/libavfilter%%FFMPEG_SUFFIX%%.so lib/ffmpeg%%FFMPEG_SUFFIX%%/libavfilter%%FFMPEG_SUFFIX%%.so.5 -lib/ffmpeg%%FFMPEG_SUFFIX%%/libavfilter%%FFMPEG_SUFFIX%%.so.5.1.100 +lib/ffmpeg%%FFMPEG_SUFFIX%%/libavfilter%%FFMPEG_SUFFIX%%.so.5.2.103 lib/ffmpeg%%FFMPEG_SUFFIX%%/libavformat%%FFMPEG_SUFFIX%%.a lib/ffmpeg%%FFMPEG_SUFFIX%%/libavformat%%FFMPEG_SUFFIX%%.so lib/ffmpeg%%FFMPEG_SUFFIX%%/libavformat%%FFMPEG_SUFFIX%%.so.56 -lib/ffmpeg%%FFMPEG_SUFFIX%%/libavformat%%FFMPEG_SUFFIX%%.so.56.4.101 +lib/ffmpeg%%FFMPEG_SUFFIX%%/libavformat%%FFMPEG_SUFFIX%%.so.56.15.102 lib/ffmpeg%%FFMPEG_SUFFIX%%/libavresample%%FFMPEG_SUFFIX%%.a lib/ffmpeg%%FFMPEG_SUFFIX%%/libavresample%%FFMPEG_SUFFIX%%.so lib/ffmpeg%%FFMPEG_SUFFIX%%/libavresample%%FFMPEG_SUFFIX%%.so.2 @@ -118,11 +119,11 @@ lib/ffmpeg%%FFMPEG_SUFFIX%%/libavresample%%FFMPEG_SUFFIX%%.so.2.1.0 lib/ffmpeg%%FFMPEG_SUFFIX%%/libavutil%%FFMPEG_SUFFIX%%.a lib/ffmpeg%%FFMPEG_SUFFIX%%/libavutil%%FFMPEG_SUFFIX%%.so lib/ffmpeg%%FFMPEG_SUFFIX%%/libavutil%%FFMPEG_SUFFIX%%.so.54 -lib/ffmpeg%%FFMPEG_SUFFIX%%/libavutil%%FFMPEG_SUFFIX%%.so.54.7.100 +lib/ffmpeg%%FFMPEG_SUFFIX%%/libavutil%%FFMPEG_SUFFIX%%.so.54.15.100 lib/ffmpeg%%FFMPEG_SUFFIX%%/libpostproc%%FFMPEG_SUFFIX%%.a lib/ffmpeg%%FFMPEG_SUFFIX%%/libpostproc%%FFMPEG_SUFFIX%%.so lib/ffmpeg%%FFMPEG_SUFFIX%%/libpostproc%%FFMPEG_SUFFIX%%.so.53 -lib/ffmpeg%%FFMPEG_SUFFIX%%/libpostproc%%FFMPEG_SUFFIX%%.so.53.0.100 +lib/ffmpeg%%FFMPEG_SUFFIX%%/libpostproc%%FFMPEG_SUFFIX%%.so.53.3.100 lib/ffmpeg%%FFMPEG_SUFFIX%%/libswresample%%FFMPEG_SUFFIX%%.a lib/ffmpeg%%FFMPEG_SUFFIX%%/libswresample%%FFMPEG_SUFFIX%%.so lib/ffmpeg%%FFMPEG_SUFFIX%%/libswresample%%FFMPEG_SUFFIX%%.so.1 @@ -130,7 +131,7 @@ lib/ffmpeg%%FFMPEG_SUFFIX%%/libswresample%%FFMPEG_SUFFIX%%.so.1.1.100 lib/ffmpeg%%FFMPEG_SUFFIX%%/libswscale%%FFMPEG_SUFFIX%%.a lib/ffmpeg%%FFMPEG_SUFFIX%%/libswscale%%FFMPEG_SUFFIX%%.so lib/ffmpeg%%FFMPEG_SUFFIX%%/libswscale%%FFMPEG_SUFFIX%%.so.3 -lib/ffmpeg%%FFMPEG_SUFFIX%%/libswscale%%FFMPEG_SUFFIX%%.so.3.0.100 +lib/ffmpeg%%FFMPEG_SUFFIX%%/libswscale%%FFMPEG_SUFFIX%%.so.3.1.101 libdata/pkgconfig/libavcodec%%FFMPEG_SUFFIX%%.pc libdata/pkgconfig/libavdevice%%FFMPEG_SUFFIX%%.pc libdata/pkgconfig/libavfilter%%FFMPEG_SUFFIX%%.pc