FFmpeg fails to configure with binutils-2.17 (inter-library dependency
issue with libssl/libcrypto). Should we just disable as-needed on it
for now? This allows it to build on i386 though the library setup in
Makefile is rather complicated and I don't know if we need anything
other than the simple diff below.

btw while I was looking at this I also noticed bounds problems being
reported in h264_slice.c and vp3.c which would be worth a look sometime.

Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/ffmpeg/Makefile,v
retrieving revision 1.115
diff -u -p -r1.115 Makefile
--- Makefile    5 May 2015 16:04:18 -0000       1.115
+++ Makefile    16 May 2015 10:56:30 -0000
@@ -5,7 +5,7 @@ COMMENT=        audio/video converter and strea
 V=             20150412
 DISTNAME=      ffmpeg-git-${V}
 PKGNAME=       ffmpeg-${V}
-REVISION=      1
+REVISION=      2
 CATEGORIES=    graphics multimedia
 MASTER_SITES=  http://comstyle.com/source/
 EXTRACT_SUFX=  .tar.xz
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/graphics/ffmpeg/patches/patch-configure,v
retrieving revision 1.44
diff -u -p -r1.44 patch-configure
--- patches/patch-configure     28 Apr 2015 06:32:47 -0000      1.44
+++ patches/patch-configure     16 May 2015 10:56:30 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-configure,v 1.44 2015/04/28 06:32:47 ajacoutot Exp $
---- configure.orig     Wed Mar 25 18:11:38 2015
-+++ configure  Wed Mar 25 18:16:17 2015
+--- configure.orig     Wed Mar 25 22:11:38 2015
++++ configure  Sat May 16 11:53:31 2015
 @@ -4057,7 +4057,7 @@ case $target_os in
      openbsd|bitrig)
          disable symver
@@ -19,7 +19,15 @@ $OpenBSD: patch-configure,v 1.44 2015/04
  
  enable_weak_pic() {
      disabled pic && return
-@@ -5203,7 +5203,6 @@ check_disable_warning -Wno-pointer-sign
+@@ -4706,7 +4706,6 @@ fi
+ 
+ check_code cc arm_neon.h "int16x8_t test = vdupq_n_s16(0)" && enable 
intrinsics_neon
+ 
+-check_ldflags -Wl,--as-needed
+ check_ldflags -Wl,-z,noexecstack
+ 
+ if check_func dlopen; then
+@@ -5203,7 +5202,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_ldexeflags -Wl,-rpath,$libdir
@@ -27,7 +35,7 @@ $OpenBSD: patch-configure,v 1.44 2015/04
  
  # add some strip flags
  # -wN '..@*' is more selective than -x, but not available everywhere.
-@@ -5823,8 +5822,8 @@ pkgconfig_generate(){
+@@ -5823,8 +5821,8 @@ pkgconfig_generate(){
      comment=$2
      version=$3
      libs=$4
@@ -38,7 +46,7 @@ $OpenBSD: patch-configure,v 1.44 2015/04
      enabled ${name#lib} || return 0
      mkdir -p $name
      cat <<EOF > $name/$name${build_suffix}.pc
-@@ -5839,7 +5838,7 @@ Version: $version
+@@ -5839,7 +5837,7 @@ Version: $version
  Requires: $(enabled shared || echo $requires)
  Requires.private: $(enabled shared && echo $requires)
  Conflicts:
@@ -47,7 +55,7 @@ $OpenBSD: patch-configure,v 1.44 2015/04
  Libs.private: $(enabled shared && echo $libs)
  Cflags: -I\${includedir}
  EOF
-@@ -5872,3 +5871,13 @@ pkgconfig_generate libpostproc   "FFmpeg postprocessin
+@@ -5872,3 +5870,13 @@ pkgconfig_generate libpostproc   "FFmpeg postprocessin
  pkgconfig_generate libavresample "Libav audio resampling library"       
"$LIBAVRESAMPLE_VERSION" "$LIBM"
  pkgconfig_generate libswscale    "FFmpeg image rescaling library"       
"$LIBSWSCALE_VERSION"    "$LIBM"
  pkgconfig_generate libswresample "FFmpeg audio resampling library"      
"$LIBSWRESAMPLE_VERSION" "$LIBM"

Reply via email to