Tweak some of the Makefile comments and remove some hacks in the
configure script which are no longer necessary. ok sthen@
This commit is contained in:
brad
parent
8d88a72ff9
commit
24212352d7
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.219 2013/04/17 23:03:23 ratchov Exp $
|
||||
# $OpenBSD: Makefile,v 1.220 2013/04/30 00:46:56 brad Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
@ -9,7 +9,7 @@ COMMENT = movie player supporting many formats
|
||||
|
||||
V = 20130214
|
||||
FFMPEG_V = 20130319
|
||||
REVISION = 2
|
||||
REVISION = 3
|
||||
|
||||
SUBST_VARS += PREFIX CONFDIR
|
||||
|
||||
@ -148,14 +148,14 @@ WANTLIB += vorbisenc vorbis
|
||||
|
||||
CONFIGURE_ENV += LOCALBASE="${LOCALBASE}" TMPDIR="${WRKBUILD}"
|
||||
|
||||
# binutils 2.15 does not do SSSE3 for amd64/i386
|
||||
# binutils 2.15 does not support SSSE3 / SSE4 for amd64 / i386
|
||||
.if ${MACHINE_ARCH:Mamd64} || ${MACHINE_ARCH:Mi386}
|
||||
CONFIGURE_ARGS += --enable-runtime-cpudetection
|
||||
CONFIGURE_ARGS += --disable-ssse3
|
||||
CONFIGURE_ARGS += --disable-sse4
|
||||
.endif
|
||||
|
||||
# again binutils 2.15 limits what we can do here too
|
||||
# binutils 2.15 assembler missing opcode support
|
||||
.if ${MACHINE_ARCH:Mpowerpc}
|
||||
CONFIGURE_ARGS += --disable-altivec
|
||||
CONFIGURE_ARGS += --enable-runtime-cpudetection
|
||||
@ -168,7 +168,7 @@ CONFIGURE_ARGS += --disable-decoder=mp3on4float \
|
||||
--disable-decoder=mp3float \
|
||||
--disable-decoder=mp2float \
|
||||
--disable-decoder=vorbis
|
||||
# again old binutils...
|
||||
# ARM native target code wants eABI ABI
|
||||
CONFIGURE_ARGS += --target=generic-openbsd
|
||||
.endif
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-configure,v 1.68 2013/04/11 17:32:35 brad Exp $
|
||||
$OpenBSD: patch-configure,v 1.69 2013/04/30 00:46:56 brad Exp $
|
||||
--- configure.orig Thu Feb 14 14:46:19 2013
|
||||
+++ configure Mon Apr 8 21:21:03 2013
|
||||
+++ configure Sun Apr 14 17:14:18 2013
|
||||
@@ -35,34 +35,37 @@
|
||||
#
|
||||
#############################################################################
|
||||
@ -118,57 +118,7 @@ $OpenBSD: patch-configure,v 1.68 2013/04/11 17:32:35 brad Exp $
|
||||
extern_prefix=${sym%%ff_extern*}
|
||||
def_extern_asm="#define EXTERN_ASM $extern_prefix"
|
||||
def_extern_prefix="#define EXTERN_PREFIX \"$extern_prefix\""
|
||||
@@ -2659,7 +2666,7 @@ elif test -z "$CFLAGS" ; then
|
||||
elif test "$cc_vendor" != "gnu" ; then
|
||||
CFLAGS="-O2 $_march $_mcpu $_pipe"
|
||||
else
|
||||
- CFLAGS="-O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer"
|
||||
+ CFLAGS="$_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer"
|
||||
WARNFLAGS="-Wall -Wno-switch -Wno-parentheses -Wpointer-arith -Wredundant-decls"
|
||||
WARN_CFLAGS="-Werror-implicit-function-declaration"
|
||||
extra_ldflags="$extra_ldflags -ffast-math"
|
||||
@@ -2962,8 +2969,11 @@ echores "$ibm_asm"
|
||||
def_gnu_as='#define HAVE_GNU_AS 0'
|
||||
gnu_as=no
|
||||
echocheck "GNU assembler"
|
||||
-inline_asm_check '".macro m n\n\\n:.int 0\n.endm\nm x"' &&
|
||||
- gnu_as=yes && def_gnu_as='#define HAVE_GNU_AS 1'
|
||||
+# OpenBSD - some altivec stuff causes build failures, fix from kili
|
||||
+if ! ppc; then
|
||||
+ inline_asm_check '".macro m n\n\\n:.int 0\n.endm\nm x"' &&
|
||||
+ gnu_as=yes && def_gnu_as='#define HAVE_GNU_AS 1'
|
||||
+fi
|
||||
echores "$gnu_as"
|
||||
|
||||
fi
|
||||
@@ -3590,7 +3600,6 @@ echores "$_fast_inttypes"
|
||||
|
||||
echocheck "malloc.h"
|
||||
_malloc=no
|
||||
-header_check malloc.h && _malloc=yes
|
||||
if test "$_malloc" = yes ; then
|
||||
def_malloc_h='#define HAVE_MALLOC_H 1'
|
||||
else
|
||||
@@ -3617,7 +3626,8 @@ if test "$_memalign" = yes ; then
|
||||
else
|
||||
def_memalign='#define HAVE_MEMALIGN 0'
|
||||
def_map_memalign='#define memalign(a, b) malloc(b)'
|
||||
- darwin || def_memalign_hack='#define CONFIG_MEMALIGN_HACK 1'
|
||||
+ # OpenBSD - prevent CONFIG_MEMALIGN_HACK which causes exit crash
|
||||
+ #darwin || def_memalign_hack='#define CONFIG_MEMALIGN_HACK 1'
|
||||
fi
|
||||
echores "$_memalign"
|
||||
|
||||
@@ -4838,6 +4848,8 @@ if test "$_aa" = yes ; then
|
||||
def_aa='#define CONFIG_AA 1'
|
||||
if cygwin ; then
|
||||
libs_mplayer="$libs_mplayer $(aalib-config --libs | cut -d " " -f 2,5,6)"
|
||||
+ else
|
||||
+ libs_mplayer="$libs_mplayer $(aalib-config --libs)"
|
||||
fi
|
||||
vomodules="aa $vomodules"
|
||||
else
|
||||
@@ -5767,6 +5779,26 @@ fi
|
||||
@@ -5767,6 +5774,26 @@ fi
|
||||
echores "$_sunaudio"
|
||||
|
||||
|
||||
@ -195,7 +145,7 @@ $OpenBSD: patch-configure,v 1.68 2013/04/11 17:32:35 brad Exp $
|
||||
def_mlib='#define CONFIG_MLIB 0'
|
||||
if sunos; then
|
||||
echocheck "Sun mediaLib"
|
||||
@@ -5883,7 +5915,15 @@ else
|
||||
@@ -5883,7 +5910,15 @@ else
|
||||
default_dvd_device="/dev/dvd"
|
||||
fi
|
||||
|
||||
@ -211,7 +161,7 @@ $OpenBSD: patch-configure,v 1.68 2013/04/11 17:32:35 brad Exp $
|
||||
echocheck "VCD support"
|
||||
if test "$_vcd" = auto; then
|
||||
_vcd=no
|
||||
@@ -6033,7 +6073,7 @@ echocheck "cdparanoia"
|
||||
@@ -6033,7 +6068,7 @@ echocheck "cdparanoia"
|
||||
if test "$_cdparanoia" = auto ; then
|
||||
_cdparanoia=no
|
||||
for inc_tmp in "" "-I/usr/include/cdda" "-I/usr/local/include/cdda" ; do
|
||||
@ -220,7 +170,7 @@ $OpenBSD: patch-configure,v 1.68 2013/04/11 17:32:35 brad Exp $
|
||||
_cdparanoia=yes && extra_cflags="$extra_cflags $inc_tmp" && break
|
||||
done
|
||||
fi
|
||||
@@ -7978,6 +8018,7 @@ extra_ldflags="$extra_ldflags -lm"
|
||||
@@ -7978,6 +8013,7 @@ extra_ldflags="$extra_ldflags -lm"
|
||||
# XML documentation tests
|
||||
echocheck "XML catalogs"
|
||||
for try_catalog in \
|
||||
@ -228,7 +178,7 @@ $OpenBSD: patch-configure,v 1.68 2013/04/11 17:32:35 brad Exp $
|
||||
/etc/sgml/catalog \
|
||||
/usr/share/xml/docbook/*/catalog.xml \
|
||||
/opt/local/share/xml/docbook-xml/*/catalog.xml \
|
||||
@@ -8005,6 +8046,7 @@ fi
|
||||
@@ -8005,6 +8041,7 @@ fi
|
||||
|
||||
echocheck "XML chunked stylesheet"
|
||||
for try_chunk_xsl in \
|
||||
@ -236,7 +186,7 @@ $OpenBSD: patch-configure,v 1.68 2013/04/11 17:32:35 brad Exp $
|
||||
/usr/share/xml/docbook/*/html/chunk.xsl \
|
||||
/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl \
|
||||
/usr/share/sgml/docbook/yelp/docbook/html/chunk.xsl \
|
||||
@@ -8030,6 +8072,7 @@ fi
|
||||
@@ -8030,6 +8067,7 @@ fi
|
||||
|
||||
echocheck "XML monolithic stylesheet"
|
||||
for try_docbook_xsl in \
|
||||
@ -244,7 +194,7 @@ $OpenBSD: patch-configure,v 1.68 2013/04/11 17:32:35 brad Exp $
|
||||
/usr/share/xml/docbook/*/html/docbook.xsl \
|
||||
/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl \
|
||||
/usr/share/sgml/docbook/yelp/docbook/html/docbook.xsl \
|
||||
@@ -8083,6 +8126,7 @@ EOF
|
||||
@@ -8083,6 +8121,7 @@ EOF
|
||||
echocheck "XML DTD"
|
||||
#FIXME: This should prefer higher version numbers, not the other way around ..
|
||||
for try_dtd in \
|
||||
@ -252,7 +202,7 @@ $OpenBSD: patch-configure,v 1.68 2013/04/11 17:32:35 brad Exp $
|
||||
/usr/share/xml/docbook/*/dtd/4*/docbookx.dtd \
|
||||
/usr/share/xml/docbook/*/docbookx.dtd \
|
||||
/usr/share/sgml/docbook/*/docbookx.dtd \
|
||||
@@ -8354,6 +8398,7 @@ SPEEX = $_speex
|
||||
@@ -8354,6 +8393,7 @@ SPEEX = $_speex
|
||||
STREAM_CACHE = $_stream_cache
|
||||
SGIAUDIO = $_sgiaudio
|
||||
SUNAUDIO = $_sunaudio
|
||||
@ -260,7 +210,7 @@ $OpenBSD: patch-configure,v 1.68 2013/04/11 17:32:35 brad Exp $
|
||||
SVGA = $_svga
|
||||
TDFXFB = $_tdfxfb
|
||||
TDFXVID = $_tdfxvid
|
||||
@@ -8687,6 +8732,7 @@ $(ff_config_enable "$cpuexts_all" "$cpuexts" "#" "HAVE
|
||||
@@ -8687,6 +8727,7 @@ $(ff_config_enable "$cpuexts_all" "$cpuexts" "#" "HAVE
|
||||
/* Blu-ray/DVD/VCD/CD */
|
||||
#define DEFAULT_CDROM_DEVICE "$default_cdrom_device"
|
||||
#define DEFAULT_DVD_DEVICE "$default_dvd_device"
|
||||
@ -268,7 +218,7 @@ $OpenBSD: patch-configure,v 1.68 2013/04/11 17:32:35 brad Exp $
|
||||
$def_bluray
|
||||
$def_bsdi_dvd
|
||||
$def_cddb
|
||||
@@ -8773,6 +8819,7 @@ $def_ossaudio_devmixer
|
||||
@@ -8773,6 +8814,7 @@ $def_ossaudio_devmixer
|
||||
$def_pulse
|
||||
$def_sgiaudio
|
||||
$def_sunaudio
|
||||
|
||||
Loading…
Reference in New Issue
Block a user