OSEC

Neohapsis is currently accepting applications for employment. For more information, please visit our website www.neohapsis.com or email hr@neohapsis.com
UPDATE: FFmpeg 2.3

From: Brad Smith (bradcomstyle.com)
Date: Thu Jul 17 2014 - 02:01:17 CDT


Here is an update to FFmpeg 2.3.

Looking for any testing.

OK?

Index: graphics/ffmpeg/Makefile
===================================================================
RCS file: /home/cvs/ports/graphics/ffmpeg/Makefile,v
retrieving revision 1.103
diff -u -p -u -p -r1.103 Makefile
--- graphics/ffmpeg/Makefile 16 May 2014 01:34:50 -0000 1.103
+++ graphics/ffmpeg/Makefile 17 Jul 2014 06:18:22 -0000
-2,22 +2,22
 
 COMMENT= audio/video converter and streamer
 
-V= 20140412
+V= 20140717
 DISTNAME= ffmpeg-git-${V}
 PKGNAME= ffmpeg-${V}
 CATEGORIES= graphics multimedia
 MASTER_SITES= http://comstyle.com/source/
 EXTRACT_SUFX= .tar.xz
 
-SHARED_LIBS= avcodec 20.0 \
- avdevice 8.0 \
- avfilter 6.0 \
- avformat 18.0 \
- avresample 0.1 \
- avutil 11.2 \
+SHARED_LIBS= avcodec 20.1 \
+ avdevice 8.1 \
+ avfilter 6.1 \
+ avformat 18.1 \
+ avresample 0.2 \
+ avutil 11.3 \
                 postproc 15.2 \
- swresample 0.2 \
- swscale 5.2
+ swresample 0.3 \
+ swscale 5.3
 
 HOMEPAGE= http://ffmpeg.org/
 
-132,10 +132,10 CONFIGURE_ENV+= LIBavcodec_EXTRALIBS="${
                 LIBpostproc_LINKFLAGS="" \
                 LIBswresample_LINKFLAGS="" \
                 LIBswscale_LINKFLAGS="" \
- LIBavcodec_REQUIRES="libavutil opus schroedinger-1.0 speex theoraenc vpx x264" \
- LIBavdevice_REQUIRES="libavcodec libavfilter libavformat libavutil" \
+ LIBavcodec_REQUIRES="libavutil libswresample opus schroedinger-1.0 speex theoraenc vpx x264" \
+ LIBavdevice_REQUIRES="libavcodec libavfilter libavformat libavutil libpostproc libswresample libswscale" \
                 LIBavfilter_REQUIRES="libavcodec libavformat libavresample libavutil libpostproc libswresample libswscale" \
- LIBavformat_REQUIRES="libavcodec libavutil" \
+ LIBavformat_REQUIRES="libavcodec libavutil libswresample" \
                 LIBavresample_REQUIRES="libavutil" \
                 LIBavutil_REQUIRES="" \
                 LIBpostproc_REQUIRES="libavutil" \
-156,10 +156,10 VERSION_FLAGS= libavcodec_VERSION=${LIBa
 MAKE_ENV= V=1
 
 MAKE_FLAGS= ${VERSION_FLAGS} \
- LIBavcodec_EXTRALIBS="-lavutil ${LIBavcodec_EXTRALIBS}" \
- LIBavdevice_EXTRALIBS="-lavcodec -lavfilter -lavformat -lavutil ${LIBavdevice_EXTRALIBS}" \
+ LIBavcodec_EXTRALIBS="-lavutil -lswresample ${LIBavcodec_EXTRALIBS}" \
+ LIBavdevice_EXTRALIBS="-lavcodec -lavfilter -lavformat -lavutil -lpostproc -lswresample -lswscale ${LIBavdevice_EXTRALIBS}" \
                 LIBavfilter_EXTRALIBS="-lavcodec -lavformat -lavresample -lavutil -lpostproc -lswresample -lswscale ${LIBavfilter_EXTRALIBS}" \
- LIBavformat_EXTRALIBS="-lavcodec -lavutil ${LIBavformat_EXTRALIBS}" \
+ LIBavformat_EXTRALIBS="-lavcodec -lavutil -lswresample ${LIBavformat_EXTRALIBS}" \
                 LIBavresample_EXTRALIBS="-lavutil ${LIBavresample_EXTRALIBS}" \
                 LIBavutil_EXTRALIBS="${LIBavutil_EXTRALIBS}" \
                 LIBpostproc_EXTRALIBS="-lavutil ${LIBpostproc_EXTRALIBS}" \
-176,9 +176,6 ALL_TARGET= all tools/qt-faststart
 TEST_TARGET= check
 
 HTML_DOCS= developer faq ffmpeg ffplay ffprobe ffserver general libavfilter
-
-post-extract:
- rm ${WRKSRC}/VERSION
 
 pre-configure:
         mkdir -p ${WRKTMP}
Index: graphics/ffmpeg/distinfo
===================================================================
RCS file: /home/cvs/ports/graphics/ffmpeg/distinfo,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 distinfo
--- graphics/ffmpeg/distinfo 16 May 2014 01:34:50 -0000 1.30
+++ graphics/ffmpeg/distinfo 17 Jul 2014 06:18:40 -0000
-1,2 +1,2
-SHA256 (ffmpeg-git-20140412.tar.xz) = yst7treEQowV/1kBZtpjphZ8AEtjUOqLzrTJUPGA2hc=
-SIZE (ffmpeg-git-20140412.tar.xz) = 5792316
+SHA256 (ffmpeg-git-20140717.tar.xz) = 9orM3X5jD7oZQQJ053RESfwgKlt4yHFHLmTyBL6AswY=
+SIZE (ffmpeg-git-20140717.tar.xz) = 6129064
Index: graphics/ffmpeg/patches/patch-configure
===================================================================
RCS file: /home/cvs/ports/graphics/ffmpeg/patches/patch-configure,v
retrieving revision 1.39
diff -u -p -u -p -r1.39 patch-configure
--- graphics/ffmpeg/patches/patch-configure 16 May 2014 01:34:50 -0000 1.39
+++ graphics/ffmpeg/patches/patch-configure 17 Jul 2014 06:19:09 -0000
-1,15 +1,15
 $OpenBSD: patch-configure,v 1.39 2014/05/16 01:34:50 brad Exp $
---- configure.orig Mon Mar 24 23:08:28 2014
-+++ configure Mon Mar 24 23:12:38 2014
- -1606,7 +1606,6 HAVE_LIST="
+--- configure.orig Thu Jul 17 02:15:14 2014
++++ configure Thu Jul 17 02:19:04 2014
+ -1622,7 +1622,6 HEADERS_LIST="
+ mach_mach_time_h
+ machine_ioctl_bt848_h
      machine_ioctl_meteor_h
- machine_rw_barrier
- makeinfo
 - malloc_h
- MapViewOfFile
- memalign
- MemoryBarrier
- -3723,7 +3722,7 case $target_os in
+ openjpeg_1_5_openjpeg_h
+ OpenGL_gl3_h
+ poll_h
+ -3936,7 +3935,7 case $target_os in
      openbsd|bitrig)
          disable symver
          SHFLAGS='-shared'
-18,7 +18,7 $OpenBSD: patch-configure,v 1.39 2014/05
          SLIB_INSTALL_LINKS=
          oss_indev_extralibs="-lossaudio"
          oss_outdev_extralibs="-lossaudio"
- -4054,7 +4053,7 die_license_disabled version3 libvo_amrwbenc
+ -4268,7 +4267,7 die_license_disabled version3 libvo_amrwbenc
  
  enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; }
  
-27,23 +27,26 $OpenBSD: patch-configure,v 1.39 2014/05
  
  enable_weak_pic() {
      disabled pic && return
- -4695,7 +4694,6 check_disable_warning -Wno-pointer-sign
+ -4965,7 +4964,6 check_disable_warning -Wno-pointer-sign
  check_ldflags -Wl,--warn-common
  check_ldflags -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
- enabled rpath && add_ldflags -Wl,-rpath=$libdir
+ enabled rpath && add_ldflags -Wl,-rpath,$libdir
 -test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic
  
  # add some strip flags
  # -wN '..*' is more selective than -x, but not available everywhere.
- -5245,6 +5243,7 pkgconfig_generate(){
+ -5580,8 +5578,8 pkgconfig_generate(){
+ comment=$2
      version=$3
      libs=$4
- requires=$5
+- requires=$(map 'lib_version $v' $(eval echo \$${name#lib}_deps))
+- requires=${requires%, }
++ requires=$5
 + linkflags=$6
      enabled ${name#lib} || return 0
      mkdir -p $name
      cat <<EOF > $name/$name${build_suffix}.pc
- -5259,7 +5258,7 Version: $version
+ -5596,7 +5594,7 Version: $version
  Requires: $(enabled shared || echo $requires)
  Requires.private: $(enabled shared && echo $requires)
  Conflicts:
-52,19 +55,11 $OpenBSD: patch-configure,v 1.39 2014/05
  Libs.private: $(enabled shared && echo $libs)
  Cflags: -I\${includedir}
  EOF
- -5295,12 +5294,12 lavfi_libs=${lavfi_libs%, }
- lavd_libs="libavformat${build_suffix} = $LIBAVFORMAT_VERSION"
- enabled lavfi_indev && prepend lavd_libs "libavfilter${build_suffix} = $LIBAVFILTER_VERSION,"
-
--pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" "$LIBM"
--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" "$lavd_libs"
--pkgconfig_generate libavfilter "FFmpeg audio/video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$lavfi_libs"
--pkgconfig_generate libpostproc "FFmpeg postprocessing library" "$LIBPOSTPROC_VERSION" "" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
--pkgconfig_generate libavresample "Libav audio resampling library" "$LIBAVRESAMPLE_VERSION" "$extralibs" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
--pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
--pkgconfig_generate libswresample "FFmpeg audio resampling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
+ -5629,3 +5627,13 pkgconfig_generate libpostproc "FFmpeg postprocessin
+ pkgconfig_generate libavresample "Libav audio resampling library" "$LIBAVRESAMPLE_VERSION" "$extralibs"
+ pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM"
+ pkgconfig_generate libswresample "FFmpeg audio resampling library" "$LIBSWRESAMPLE_VERSION" "$LIBM"
++
 +pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" "$LIBavutil_EXTRALIBS" "$LIBavutil_REQUIRES" "$LIBavutil_LINKFLAGS"
 +pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$LIBavcodec_EXTRALIBS" "$LIBavcodec_REQUIRES" "$LIBavcodec_LINKFLAGS"
 +pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$LIBavformat_EXTRALIBS" "$LIBavformat_REQUIRES" "$LIBavformat_LINKFLAGS"
Index: graphics/ffmpeg/pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/graphics/ffmpeg/pkg/PLIST,v
retrieving revision 1.28
diff -u -p -u -p -r1.28 PLIST
--- graphics/ffmpeg/pkg/PLIST 16 May 2014 01:34:50 -0000 1.28
+++ graphics/ffmpeg/pkg/PLIST 17 Jul 2014 06:32:47 -0000
-7,6 +7,7
 include/libavcodec/
 include/libavcodec/avcodec.h
 include/libavcodec/avfft.h
+include/libavcodec/dv_profile.h
 include/libavcodec/dxva2.h
 include/libavcodec/old_codec_ids.h
 include/libavcodec/vaapi.h
-52,6 +53,7 include/libavutil/common.h
 include/libavutil/cpu.h
 include/libavutil/crc.h
 include/libavutil/dict.h
+include/libavutil/display.h
 include/libavutil/downmix_info.h
 include/libavutil/error.h
 include/libavutil/eval.h
-59,6 +61,7 include/libavutil/ffversion.h
 include/libavutil/fifo.h
 include/libavutil/file.h
 include/libavutil/frame.h
+include/libavutil/hash.h
 include/libavutil/hmac.h
 include/libavutil/imgutils.h
 include/libavutil/intfloat.h
-79,11 +82,13 include/libavutil/pixdesc.h
 include/libavutil/pixfmt.h
 include/libavutil/random_seed.h
 include/libavutil/rational.h
+include/libavutil/replaygain.h
 include/libavutil/ripemd.h
 include/libavutil/samplefmt.h
 include/libavutil/sha.h
 include/libavutil/sha512.h
 include/libavutil/stereo3d.h
+include/libavutil/threadmessage.h
 include/libavutil/time.h
 include/libavutil/timecode.h
 include/libavutil/timestamp.h
-116,7 +121,6 lib/libswresample.a
 lib lib/libswresample.so.${LIBswresample_VERSION}
 lib/libswscale.a
 lib lib/libswscale.so.${LIBswscale_VERSION}
-lib/pkgconfig/
 lib/pkgconfig/libavcodec.pc
 lib/pkgconfig/libavdevice.pc
 lib/pkgconfig/libavfilter.pc
-189,8 +193,8 share/ffmpeg/
 share/ffmpeg/examples/
 share/ffmpeg/examples/Makefile
 share/ffmpeg/examples/README
-share/ffmpeg/examples/avcodec.c
 share/ffmpeg/examples/avio_reading.c
+share/ffmpeg/examples/decoding_encoding.c
 share/ffmpeg/examples/demuxing_decoding.c
 share/ffmpeg/examples/filter_audio.c
 share/ffmpeg/examples/filtering_audio.c
-201,11 +205,10 share/ffmpeg/examples/remuxing.c
 share/ffmpeg/examples/resampling_audio.c
 share/ffmpeg/examples/scaling_video.c
 share/ffmpeg/examples/transcode_aac.c
+share/ffmpeg/examples/transcoding.c
 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-ipod320.ffpreset
-share/ffmpeg/libx264-ipod640.ffpreset
Index: x11/mplayer/Makefile
===================================================================
RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.238
diff -u -p -u -p -r1.238 Makefile
--- x11/mplayer/Makefile 12 Jul 2014 22:01:53 -0000 1.238
+++ x11/mplayer/Makefile 17 Jul 2014 06:19:37 -0000
-8,14 +8,14 ONLY_FOR_ARCHS = ${GCC4_ARCHS}
 COMMENT = movie player supporting many formats
 
 V = 20140412
-FFMPEG_V = 20140412
+FFMPEG_V = 20140717
 
 SUBST_VARS += PREFIX CONFDIR
 
 # Distfiles must be hand-rolled, see README
 N = mplayer
 DISTNAME = mplayer-${V}
-REVISION = 0
+REVISION = 1
 EXTRACT_SUFX = .tar.xz
 
 CATEGORIES = x11 multimedia

--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.