- Remove the --disable-avx flag as I found out after speaking to Antoine
about Libav that digging into the CPU run-time detection code that the AVX support has an OS level check unlike the SSE code so it is safe. - Revert back to not using the -Bsymbolic linker flag as was done for quite some time to workaround an issue with pthreads but enabling it exposed a bug with the mips64 linker and I'd rather do this consistently across all archs as was done before instead of only for mips64 as has been proposed. - sync the libgsm hacking with my submitted diff from upstream. ok ajacoutot@ sthen@
This commit is contained in:
brad
parent
70e16b9cd5
commit
52770423f7
@ -1,11 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.94 2013/01/20 07:46:16 brad Exp $
|
||||
# $OpenBSD: Makefile,v 1.95 2013/01/25 09:46:22 brad Exp $
|
||||
|
||||
COMMENT= audio/video converter and streamer
|
||||
|
||||
V= 20121026
|
||||
DISTNAME= ffmpeg-git-${V}
|
||||
PKGNAME= ffmpeg-${V}
|
||||
REVISION= 1
|
||||
REVISION= 2
|
||||
CATEGORIES= graphics multimedia
|
||||
MASTER_SITES= http://comstyle.com/source/
|
||||
EXTRACT_SUFX= .tar.xz
|
||||
@ -84,7 +84,6 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
|
||||
--disable-armv6 \
|
||||
--disable-armv6t2 \
|
||||
--disable-armvfp \
|
||||
--disable-avx \
|
||||
--disable-debug \
|
||||
--disable-indev=jack \
|
||||
--disable-indev=oss \
|
||||
|
||||
@ -1,7 +1,15 @@
|
||||
$OpenBSD: patch-configure,v 1.33 2013/01/14 02:14:41 brad Exp $
|
||||
$OpenBSD: patch-configure,v 1.34 2013/01/25 09:46:22 brad Exp $
|
||||
--- configure.orig Tue Sep 18 22:44:40 2012
|
||||
+++ configure Tue Jan 8 06:02:20 2013
|
||||
@@ -1205,7 +1205,6 @@ HAVE_LIST="
|
||||
+++ configure Thu Jan 24 16:11:00 2013
|
||||
@@ -1185,6 +1185,7 @@ HAVE_LIST="
|
||||
GetProcessTimes
|
||||
getrusage
|
||||
gnu_as
|
||||
+ gsm_h
|
||||
ibm_asm
|
||||
inet_aton
|
||||
inline_asm
|
||||
@@ -1205,7 +1206,6 @@ HAVE_LIST="
|
||||
machine_ioctl_bt848_h
|
||||
machine_ioctl_meteor_h
|
||||
makeinfo
|
||||
@ -9,7 +17,7 @@ $OpenBSD: patch-configure,v 1.33 2013/01/14 02:14:41 brad Exp $
|
||||
MapViewOfFile
|
||||
memalign
|
||||
mkstemp
|
||||
@@ -2618,6 +2617,7 @@ case $target_os in
|
||||
@@ -2618,6 +2618,7 @@ case $target_os in
|
||||
enable pic
|
||||
disable symver
|
||||
SHFLAGS='-shared'
|
||||
@ -17,7 +25,7 @@ $OpenBSD: patch-configure,v 1.33 2013/01/14 02:14:41 brad Exp $
|
||||
oss_indev_extralibs="-lossaudio"
|
||||
oss_outdev_extralibs="-lossaudio"
|
||||
;;
|
||||
@@ -2800,7 +2800,7 @@ die_license_disabled version3 libvo_amrwbenc
|
||||
@@ -2800,7 +2801,7 @@ die_license_disabled version3 libvo_amrwbenc
|
||||
|
||||
enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; }
|
||||
|
||||
@ -26,16 +34,26 @@ $OpenBSD: patch-configure,v 1.33 2013/01/14 02:14:41 brad Exp $
|
||||
|
||||
enable_pic() {
|
||||
enable pic
|
||||
@@ -3138,7 +3138,7 @@ enabled libdirac && require_pkg_config dirac
|
||||
@@ -3138,7 +3139,9 @@ enabled libdirac && require_pkg_config dirac
|
||||
"dirac_decoder_init dirac_encoder_init"
|
||||
enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
|
||||
enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType
|
||||
-enabled libgsm && require libgsm gsm/gsm.h gsm_create -lgsm
|
||||
+enabled libgsm && require libgsm gsm.h gsm_create -lgsm
|
||||
+enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
|
||||
+ check_lib "${gsm_hdr}" gsm_create -lgsm && break;
|
||||
+ done || die "ERROR: libgsm not found"; }
|
||||
enabled libmodplug && require libmodplug libmodplug/modplug.h ModPlug_Load -lmodplug
|
||||
enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
|
||||
enabled libnut && require libnut libnut.h nut_demuxer_init -lnut
|
||||
@@ -3714,6 +3714,7 @@ comment=$2
|
||||
@@ -3291,7 +3294,6 @@ enabled extra_warnings && check_cflags -Winline
|
||||
# add some linker flags
|
||||
check_ldflags -Wl,--warn-common
|
||||
check_ldflags -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil
|
||||
-test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic
|
||||
|
||||
echo "X{};" > $TMPV
|
||||
if test_ldflags -Wl,--version-script,$TMPV; then
|
||||
@@ -3714,6 +3716,7 @@ comment=$2
|
||||
version=$3
|
||||
libs=$4
|
||||
requires=$5
|
||||
@ -43,7 +61,7 @@ $OpenBSD: patch-configure,v 1.33 2013/01/14 02:14:41 brad Exp $
|
||||
enabled ${name#lib} || return 0
|
||||
mkdir -p $name
|
||||
cat <<EOF > $name/$name.pc
|
||||
@@ -3728,7 +3729,7 @@ Version: $version
|
||||
@@ -3728,7 +3731,7 @@ Version: $version
|
||||
Requires: $(enabled shared || echo $requires)
|
||||
Requires.private: $(enabled shared && echo $requires)
|
||||
Conflicts:
|
||||
@ -52,7 +70,7 @@ $OpenBSD: patch-configure,v 1.33 2013/01/14 02:14:41 brad Exp $
|
||||
Libs.private: $(enabled shared && echo $libs)
|
||||
Cflags: -I\${includedir}
|
||||
EOF
|
||||
@@ -3748,11 +3749,11 @@ Cflags: -I\${includedir}
|
||||
@@ -3748,11 +3751,11 @@ Cflags: -I\${includedir}
|
||||
EOF
|
||||
}
|
||||
|
||||
|
||||
@ -1,12 +1,16 @@
|
||||
$OpenBSD: patch-libavcodec_libgsm_c,v 1.2 2013/01/14 02:14:41 brad Exp $
|
||||
--- libavcodec/libgsm.c.orig Mon Jun 11 07:25:10 2012
|
||||
+++ libavcodec/libgsm.c Thu Sep 13 23:18:57 2012
|
||||
@@ -27,7 +27,7 @@
|
||||
$OpenBSD: patch-libavcodec_libgsm_c,v 1.3 2013/01/25 09:46:22 brad Exp $
|
||||
--- libavcodec/libgsm.c.orig Tue Sep 18 22:44:41 2012
|
||||
+++ libavcodec/libgsm.c Thu Jan 24 16:11:40 2013
|
||||
@@ -27,7 +27,12 @@
|
||||
|
||||
// The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html
|
||||
|
||||
-#include <gsm/gsm.h>
|
||||
+#include "config.h"
|
||||
+#if HAVE_GSM_H
|
||||
+#include <gsm.h>
|
||||
+#else
|
||||
#include <gsm/gsm.h>
|
||||
+#endif
|
||||
|
||||
#include "avcodec.h"
|
||||
#include "gsm.h"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user