sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update to 2010-11-30 snapshot

Browse source 
- Add optional support for frei0r and OpenCV
This commit is contained in:
Martin Matuska 2010-11-30 14:33:15 +00:00
parent 7dd9fbf04b
commit 0a001e1a93
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=265451
5 changed files with 56 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
multimedia/ffmpeg-devel/Makefile
View file

@ -6,8 +6,7 @@
#
PORTNAME= ffmpeg
DISTVERSION= 2010-07-25
PORTREVISION= 5
DISTVERSION= 2010-11-30
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= mm
@ -24,7 +23,7 @@ LATEST_LINK= ffmpeg-devel
WRKSRC= ${WRKDIR}/ffmpeg-export-${DISTVERSION}
HAS_CONFIGURE= yes
CONFIGURE_LOG= config.err
USE_BZIP2= yes
USE_XZ= yes
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
WANT_SDL= yes
@ -35,18 +34,20 @@ OPTIONS= ALSA "Enable alsa input/output device" off \
DIRAC "Dirac codec via libdirac" off \
FAAC "FAAC mp4/aac audio encoder" off \
FFSERVER "Build and install ffserver" on \
FREI0R "Frei0r wrapper filter" off \
GSM "GSM audio codec" off \
LAME "LAME MP3 encoder" off \
OPENCV "OpenCV video filtering support" off \
OPENJPEG "JPEG 2000 decoder" off \
OPTIMIZED_CFLAGS "Additional optimizations" off \
SCHROEDINGER "Dirac codec via libschroedinger" on \
SDL "SDL support (build ffplay)" off \
SPEEX "Speex audio decoder" off \
SSSE3 "Enable ssse3 support" on \
SSSE3 "SSSE3 support" on \
THEORA "Theora encoder (implies OGG)" on \
VORBIS "Vorbis encoder via libvorbis (implies OGG)" on \
VP8 "VP8 codec via libvpx" on \
X264 "H.264 encoder" off \
X264 "H.264 encoder" on \
XVID "Xvid encoder via xvidcore" on
COMPAT_HEADERS=libavcodec/avcodec.h \
@ -88,7 +89,6 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \
--enable-gpl \
--enable-postproc \
--enable-avfilter \
--enable-avfilter-lavf \
--enable-pthreads \
--enable-x11grab \
--enable-memalign-hack \
@ -202,6 +202,14 @@ PLIST_SUB+= FFSERVER="@comment "
CONFIGURE_ARGS+= --disable-ffserver
.endif
# frei0r
.ifdef(WITH_FREI0R)
BUILD_DEPENDS+= ${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r
CONFIGURE_ARGS+= --enable-frei0r
.else
CONFIGURE_ARGS+= --disable-frei0r
.endif
# gsm
.ifdef(WITH_GSM)
LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm
@ -218,6 +226,14 @@ CONFIGURE_ARGS+= --enable-libmp3lame
CONFIGURE_ARGS+= --disable-libmp3lame
.endif
# opencv
.ifdef(WITH_OPENCV)
LIB_DEPENDS+= cv.2:${PORTSDIR}/graphics/opencv
CONFIGURE_ARGS+= --enable-libopencv
.else
CONFIGURE_ARGS+= --disable-libopencv
.endif
# openjpeg
.ifdef(WITH_OPENJPEG)
LIB_DEPENDS+= openjpeg.2:${PORTSDIR}/graphics/openjpeg

5
multimedia/ffmpeg-devel/distinfo
View file

@ -1,3 +1,2 @@
MD5 (ffmpeg-2010-07-25.tar.bz2) = ccd60e8c8869a32bc91bb54f71862e56
SHA256 (ffmpeg-2010-07-25.tar.bz2) = 2af1dbde675cd08af5f9e885eccf07e17f56f811c612a9b7f0558ed8bbe4e15d
SIZE (ffmpeg-2010-07-25.tar.bz2) = 3846115
SHA256 (ffmpeg-2010-11-30.tar.xz) = 05450cb6653c5fb28422512b913cdcad976e6c48edee6c3eed2d0c4042928379
SIZE (ffmpeg-2010-11-30.tar.xz) = 3404296

12
multimedia/ffmpeg-devel/files/patch-configure
View file

@ -1,6 +1,6 @@
--- configure.orig 2010-07-21 20:28:42.000000000 +0200
+++ configure 2010-08-01 21:21:24.326222886 +0200
@@ -1517,7 +1517,7 @@
--- configure.orig 2010-11-04 11:38:39.000000000 +0100
+++ configure 2010-11-30 13:49:43.509425851 +0100
@@ -1556,7 +1556,7 @@
nm_opts='-g'
# machine
@ -9,7 +9,7 @@
cpu="generic"
# OS
@@ -2717,8 +2717,8 @@
@@ -2824,8 +2824,8 @@
fi
fi
@ -20,10 +20,10 @@
check_header sys/videoio.h
check_func_headers "windows.h vfw.h" capCreateCaptureWindow "$vfwcap_indev_extralibs"
@@ -3020,7 +3020,7 @@
SRC_PATH="$source_path"
@@ -3144,7 +3144,7 @@
SRC_PATH_BARE=$source_path
BUILD_ROOT="$PWD"
CC_IDENT=$cc_ident
-ARCH=$arch
+FFMPEG_ARCH=$arch
CC=$cc

11
multimedia/ffmpeg-devel/files/patch-libavfilter-Makefile Normal file
View file

@ -0,0 +1,11 @@
--- libavfilter/Makefile.orig 2010-11-30 14:35:44.372975001 +0100
+++ libavfilter/Makefile 2010-11-30 14:35:50.292359891 +0100
@@ -50,7 +50,7 @@
OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o
--include $(SUBDIR)$(ARCH)/Makefile
+-include $(SUBDIR)$(FFMPEG_ARCH)/Makefile
DIRS = x86

28
multimedia/ffmpeg-devel/pkg-plist
View file

@ -37,19 +37,26 @@ include/libavcodec/opt.h
include/libavcodec/vaapi.h
include/libavcodec/vdpau.h
include/libavcodec/xvmc.h
include/libavcore/audioconvert.h
include/libavcore/avcore.h
include/libavcore/imgutils.h
include/libavcore/parseutils.h
include/libavcore/samplefmt.h
include/libavdevice/avdevice.h
include/libavfilter/avfilter.h
include/libavfilter/avfiltergraph.h
include/libavformat/avformat.h
include/libavformat/avio.h
include/libavutil/adler32.h
include/libavutil/attributes.h
include/libavutil/avassert.h
include/libavutil/avconfig.h
include/libavutil/avstring.h
include/libavutil/avutil.h
include/libavutil/base64.h
include/libavutil/bswap.h
include/libavutil/common.h
include/libavutil/cpu.h
include/libavutil/crc.h
include/libavutil/error.h
include/libavutil/eval.h
@ -62,6 +69,7 @@ include/libavutil/lzo.h
include/libavutil/mathematics.h
include/libavutil/md5.h
include/libavutil/mem.h
include/libavutil/opt.h
include/libavutil/pixdesc.h
include/libavutil/pixfmt.h
include/libavutil/random_seed.h
@ -73,34 +81,34 @@ include/libswscale/swscale.h
lib/libavcodec.a
lib/libavcodec.so
lib/libavcodec.so.1
lib/libavcodec.so.52.84.0
lib/libavcodec.so.52.97.2
lib/libavcore.a
lib/libavcore.so
lib/libavcore.so.0.0.0
lib/libavcore.so.0.14.0
lib/libavcore.so.1
lib/libavdevice.a
lib/libavdevice.so
lib/libavdevice.so.1
lib/libavdevice.so.52.2.0
lib/libavdevice.so.52.2.2
lib/libavfilter.a
lib/libavfilter.so
lib/libavfilter.so.1.26.1
lib/libavfilter.so.1.65.0
lib/libavfilter.so.1
lib/libavformat.a
lib/libavformat.so
lib/libavformat.so.1
lib/libavformat.so.52.77.0
lib/libavformat.so.52.87.1
lib/libavutil.a
lib/libavutil.so
lib/libavutil.so.1
lib/libavutil.so.50.23.0
lib/libavutil.so.50.33.0
lib/libpostproc.a
lib/libpostproc.so
lib/libpostproc.so.1
lib/libpostproc.so.51.2.0
lib/libswscale.a
lib/libswscale.so
lib/libswscale.so.0.11.0
lib/libswscale.so.0.12.0
lib/libswscale.so.1
libdata/pkgconfig/libavcodec.pc
libdata/pkgconfig/libavcore.pc
@ -111,13 +119,10 @@ libdata/pkgconfig/libavutil.pc
libdata/pkgconfig/libpostproc.pc
libdata/pkgconfig/libswscale.pc
%%DATADIR%%/libx264-baseline.ffpreset
%%DATADIR%%/libx264-default.ffpreset
%%DATADIR%%/libx264-fast.ffpreset
%%DATADIR%%/libx264-fast_firstpass.ffpreset
%%DATADIR%%/libx264-faster.ffpreset
%%DATADIR%%/libx264-faster_firstpass.ffpreset
%%DATADIR%%/libx264-fastfirstpass.ffpreset
%%DATADIR%%/libx264-hq.ffpreset
%%DATADIR%%/libx264-ipod320.ffpreset
%%DATADIR%%/libx264-ipod640.ffpreset
%%DATADIR%%/libx264-lossless_fast.ffpreset
@ -127,17 +132,14 @@ libdata/pkgconfig/libswscale.pc
%%DATADIR%%/libx264-lossless_slower.ffpreset
%%DATADIR%%/libx264-lossless_ultrafast.ffpreset
%%DATADIR%%/libx264-main.ffpreset
%%DATADIR%%/libx264-max.ffpreset
%%DATADIR%%/libx264-medium.ffpreset
%%DATADIR%%/libx264-medium_firstpass.ffpreset
%%DATADIR%%/libx264-normal.ffpreset
%%DATADIR%%/libx264-placebo.ffpreset
%%DATADIR%%/libx264-placebo_firstpass.ffpreset
%%DATADIR%%/libx264-slow.ffpreset
%%DATADIR%%/libx264-slow_firstpass.ffpreset
%%DATADIR%%/libx264-slower.ffpreset
%%DATADIR%%/libx264-slower_firstpass.ffpreset
%%DATADIR%%/libx264-slowfirstpass.ffpreset
%%DATADIR%%/libx264-superfast.ffpreset
%%DATADIR%%/libx264-superfast_firstpass.ffpreset
%%DATADIR%%/libx264-ultrafast.ffpreset