cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch FFmpeg back to base clang, now that it has been updated to 5.x.

Browse Source 
This doesn't fix the already-existing problem with AAC on i386. From Brad.
This commit is contained in:
sthen 2017-10-27 03:16:30 +00:00
parent 7b2660eb19
commit 1bf6f6de00
2 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
graphics/ffmpeg/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.165 2017/09/08 19:54:17 sthen Exp $
# $OpenBSD: Makefile,v 1.166 2017/10/27 03:16:30 sthen Exp $
COMMENT= audio/video converter and streamer
V= 20170825
DISTNAME= ffmpeg-git-${V}
PKGNAME= ffmpeg-${V}
REVISION= 1
REVISION= 2
CATEGORIES= graphics multimedia
MASTER_SITES= http://comstyle.com/source/
EXTRACT_SUFX= .tar.xz
@ -33,14 +33,6 @@ WANTLIB= SDL X11 Xext Xv ass bz2 c crypto fontconfig freetype fribidi \
vorbisenc vpx>=5 x264 x265>=2 xcb xcb-shape xcb-shm xcb-xfixes \
xvidcore z
# AAC encoder hangs on at least amd64/i386 when built with base
# clang and at least in some cases ports clang 4.0.0 or 4.0.1.
# It succeeds with ports clang 5.0.0rc4 on amd64, though not i386.
# e.g. "ffmpeg -i somefile.mkv -acodec aac out.mkv"
COMPILER= base-gcc ports-clang base-clang
COMPILER_LANGS= c
MODCLANG_ARCHS= amd64
BUILD_DEPENDS= textproc/texi2html
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
BUILD_DEPENDS+= devel/yasm

20
graphics/ffmpeg/patches/patch-configure
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure,v 1.56 2017/09/08 19:54:17 sthen Exp $
$OpenBSD: patch-configure,v 1.57 2017/10/27 03:16:30 sthen Exp $
- lavu/random_seed: use arc4random() when available
- configure: Also try -mstack-alignment for clang
@ -48,19 +48,7 @@ Index: configure
check_cflags -Qunused-arguments
check_cflags -Werror=implicit-function-declaration
check_cflags -Werror=missing-prototypes
@@ -5788,6 +5791,11 @@ if test $target_os = "haiku"; then
disable posix_memalign
fi
+
+if test $target_os = "openbsd"; then
+ enabled x86_32 && disable ebx_available
+fi
+
enabled_all dxva2 dxva2api_cobj CoTaskMemFree &&
prepend ffmpeg_libs $($ldflags_filter "-lole32" "-luser32") &&
enable dxva2_lib
@@ -6220,8 +6228,8 @@ pkgconfig_generate(){
@@ -6220,8 +6223,8 @@ pkgconfig_generate(){
comment=$2
version=$3
libs=$4
@ -71,7 +59,7 @@ Index: configure
enabled ${name#lib} || return 0
mkdir -p $name
cat <<EOF > $name/$name${build_suffix}.pc
@@ -6236,7 +6244,7 @@ Version: $version
@@ -6236,7 +6239,7 @@ Version: $version
Requires: $(enabled shared || echo $requires)
Requires.private: $(enabled shared && echo $requires)
Conflicts:
@ -80,7 +68,7 @@ Index: configure
Libs.private: $(enabled shared && echo $libs)
Cflags: -I\${includedir}
EOF
@@ -6260,12 +6268,12 @@ Cflags: -I\${includedir}
@@ -6260,12 +6263,12 @@ Cflags: -I\${includedir}
EOF
}