head 1.24; access; symbols pkgsrc-2016Q3:1.22.0.6 pkgsrc-2016Q3-base:1.22 pkgsrc-2016Q2:1.22.0.4 pkgsrc-2016Q2-base:1.22 pkgsrc-2016Q1:1.22.0.2 pkgsrc-2016Q1-base:1.22 pkgsrc-2015Q4:1.20.0.8 pkgsrc-2015Q4-base:1.20 pkgsrc-2015Q3:1.20.0.6 pkgsrc-2015Q3-base:1.20 pkgsrc-2015Q2:1.20.0.4 pkgsrc-2015Q2-base:1.20 pkgsrc-2015Q1:1.20.0.2 pkgsrc-2015Q1-base:1.20 pkgsrc-2014Q4:1.19.0.2 pkgsrc-2014Q4-base:1.19 pkgsrc-2014Q3:1.18.0.2 pkgsrc-2014Q3-base:1.18 pkgsrc-2014Q2:1.17.0.4 pkgsrc-2014Q2-base:1.17 pkgsrc-2014Q1:1.17.0.2 pkgsrc-2014Q1-base:1.17 pkgsrc-2013Q4:1.16.0.10 pkgsrc-2013Q4-base:1.16 pkgsrc-2013Q3:1.16.0.8 pkgsrc-2013Q3-base:1.16 pkgsrc-2013Q2:1.16.0.6 pkgsrc-2013Q2-base:1.16 pkgsrc-2013Q1:1.16.0.4 pkgsrc-2013Q1-base:1.16 pkgsrc-2012Q4:1.16.0.2 pkgsrc-2012Q4-base:1.16 pkgsrc-2012Q3:1.14.0.6 pkgsrc-2012Q3-base:1.14 pkgsrc-2012Q2:1.14.0.4 pkgsrc-2012Q2-base:1.14 pkgsrc-2012Q1:1.14.0.2 pkgsrc-2012Q1-base:1.14 pkgsrc-2011Q4:1.12.0.4 pkgsrc-2011Q4-base:1.12 pkgsrc-2011Q3:1.12.0.2 pkgsrc-2011Q3-base:1.12 pkgsrc-2011Q2:1.11.0.4 pkgsrc-2011Q2-base:1.11 pkgsrc-2011Q1:1.11.0.2 pkgsrc-2011Q1-base:1.11 pkgsrc-2010Q4:1.10.0.6 pkgsrc-2010Q4-base:1.10 pkgsrc-2010Q3:1.10.0.4 pkgsrc-2010Q3-base:1.10 pkgsrc-2010Q2:1.10.0.2 pkgsrc-2010Q2-base:1.10 pkgsrc-2010Q1:1.7.0.8 pkgsrc-2010Q1-base:1.7 pkgsrc-2009Q4:1.7.0.6 pkgsrc-2009Q4-base:1.7 pkgsrc-2009Q3:1.7.0.4 pkgsrc-2009Q3-base:1.7 pkgsrc-2009Q2:1.7.0.2 pkgsrc-2009Q2-base:1.7 pkgsrc-2009Q1:1.6.0.4 pkgsrc-2009Q1-base:1.6 pkgsrc-2008Q4:1.6.0.2 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.5.0.8 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.6 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.4 pkgsrc-2008Q2-base:1.5 cwrapper:1.5.0.2 pkgsrc-2008Q1:1.4.0.2 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.2.0.16 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.14 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.12 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.10 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.8 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.6 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.4 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.2 pkgsrc-2006Q1-base:1.2; locks; strict; comment @# @; 1.24 date 2016.10.24.10.36.12; author maya; state dead; branches; next 1.23; commitid URRsIyH3iWRYUnrz; 1.23 date 2016.10.02.20.34.48; author maya; state Exp; branches; next 1.22; commitid ycczTditgSaiVBoz; 1.22 date 2016.01.24.14.34.11; author ryoon; state Exp; branches; next 1.21; commitid M4miA9Aj6MPk3cSy; 1.21 date 2015.12.28.11.37.03; author adam; state Exp; branches; next 1.20; commitid 0toXJ6kB6X39WHOy; 1.20 date 2015.01.21.18.15.17; author adam; state Exp; branches; next 1.19; commitid VYfK9TsePGEA6V6y; 1.19 date 2014.10.24.10.20.44; author adam; state Exp; branches; next 1.18; commitid Y3dKwVbSMpjRkrVx; 1.18 date 2014.08.10.15.39.15; author adam; state Exp; branches; next 1.17; commitid fB3GByIIxgPOvPLx; 1.17 date 2014.03.04.13.59.11; author adam; state Exp; branches; next 1.16; commitid RdfuaAEcTd4l4orx; 1.16 date 2012.11.28.16.29.53; author adam; state Exp; branches; next 1.15; 1.15 date 2012.11.08.19.55.56; author adam; state Exp; branches; next 1.14; 1.14 date 2012.01.16.11.06.06; author drochner; state Exp; branches; next 1.13; 1.13 date 2012.01.09.17.04.03; author drochner; state Exp; branches; next 1.12; 1.12 date 2011.07.18.21.00.11; author drochner; state Exp; branches; next 1.11; 1.11 date 2011.01.17.16.46.42; author drochner; state Exp; branches; next 1.10; 1.10 date 2010.05.07.09.34.43; author drochner; state Exp; branches; next 1.9; 1.9 date 2010.05.06.17.02.12; author drochner; state Exp; branches; next 1.8; 1.8 date 2010.05.04.18.18.57; author drochner; state Exp; branches; next 1.7; 1.7 date 2009.05.25.20.56.38; author drochner; state Exp; branches; next 1.6; 1.6 date 2008.12.18.16.19.07; author bjs; state Exp; branches; next 1.5; 1.5 date 2008.04.09.18.33.37; author tron; state Exp; branches; next 1.4; 1.4 date 2008.01.07.13.33.28; author joerg; state Exp; branches 1.4.2.1; next 1.3; 1.3 date 2008.01.04.18.41.54; author joerg; state Exp; branches; next 1.2; 1.2 date 2006.02.23.18.11.27; author joerg; state Exp; branches; next 1.1; 1.1 date 2006.02.18.16.50.39; author joerg; state Exp; branches; next ; 1.4.2.1 date 2008.04.20.04.08.03; author rtr; state Exp; branches; next ; desc @@ 1.24 log @x264-devel: update to 20161023 Approximate changelog: Remove misaligned SSE support; could cause problems if exception masks were messed with by libraries and is obsoleted by AVX. Fix AVX2 detection if "limit CPUID" is enabled in the BIOS. Fix cases where intra refresh could predict from disallowed pixels. x86inc: support "x64"-marked Windows 64-bit machines. Improvements: Support cygwin 64-bit. x86: faster SAD_X3/SAD_X4 Transparent hugepage support and optimization on Linux. AVC-Intra encoding support. Windows Unicode (UTF-16) support. Fix compilation with OpenCL on OS X. Fix a crash in the case of an OpenCL error during encoding with OpenCL. Fix building in compilers without inline asm support. Fix crash in high bit depth builds compiled with unaligned stack. Fix potential misalignment crash in AVX2 denoise_dct. Fix some builds with PIC. Fix possible crash when writing very large filler NALUs. Improvements: Add --stitchable option for segmented encoding. Add new color primaries, transfer characteristics, and matrix coefficient options from the latest H.264 spec. x86: optimizations to AVX2 iDCT and AVX deblock Tweak i16x16 delta-quant-avoidance code to fix a rare flickering issue with deblocking in static areas of the frame. Fix an invalid memcpy in sliced-threads that sometimes used src==dst; this probably didn't break anything, but valgrind complains and it's technically wrong. Fix a stack alignment bug in checkasm and use 64-bit cycle counters to avoid overflows that could occur in some tests. x86inc: Remove .rodata kludges; they're no longer necessary and could cause other problems. Improvements: x86: add Jaguar CPU detection. x86inc: utilize the shadow space on win64 to avoid stack pointer manipulation in some functions. x86: 32-byte align the stack if possible, avoiding explicit alignment routines in ALIGNED_ARRAY for AVX2-aligned arrays. x86: Various optimizations and a bunch of new AVX2 functions, especially for high bit depth. OpenCL refactoring: autoload the OpenCL library, clean up the code, and increment X264_BUILD. @ text @$NetBSD: patch-aa,v 1.23 2016/10/02 20:34:48 maya Exp $ Add support for DragonFly. Use 'amd64' as a synonym for 'x86_64'. Avoid endian test failure for -flto. Do not force compiler optimisations. If we fail an assembly test, continue as if --disable-asm was passed. --- configure.orig 2016-01-23 21:45:04.000000000 +0000 +++ configure @@@@ -578,6 +578,10 @@@@ case $host_os in SYS="FREEBSD" libm="-lm" ;; + dragonfly*) + SYS="DRAGONFLY" + LDFLAGS="$LDFLAGS -lm" + ;; kfreebsd*-gnu) SYS="FREEBSD" define HAVE_MALLOC_H @@@@ -678,7 +682,7 @@@@ case $host_cpu in ASFLAGS="$ASFLAGS -f elf32" fi ;; - x86_64) + x86_64|amd64) ARCH="X86_64" AS="${AS-yasm}" AS_EXT=".asm" @@@@ -702,14 +706,15 @@@@ case $host_cpu in fi ;; powerpc*) - ARCH="PPC" if [ $asm = auto ] ; then define HAVE_ALTIVEC AS="${AS-${CC}}" AS_EXT=".c" if [ $SYS = MACOSX ] ; then + ARCH="POWERPC" CFLAGS="$CFLAGS -faltivec -fastf -mcpu=G4" else + ARCH="PPC" CFLAGS="$CFLAGS -maltivec -mabi=altivec" define HAVE_ALTIVEC_H fi @@@@ -844,8 +849,8 @@@@ if [ $asm = auto -a $ARCH = ARM ] ; then ASFLAGS="$ASFLAGS -c" else echo "You specified a pre-ARMv6 or Thumb-1 CPU in your CFLAGS." - echo "If you really want to run on such a CPU, configure with --disable-asm." - exit 1 + echo "Disabling asm" + asm="no" fi fi @@@@ -854,8 +859,8 @@@@ if [ $asm = auto -a $ARCH = AARCH64 ] ; ASFLAGS="$ASFLAGS -c" else echo "no NEON support, try adding -mfpu=neon to CFLAGS" - echo "If you really want to run on such a CPU, configure with --disable-asm." - exit 1 + echo "Disabling asm" + asm="no" fi fi @@@@ -873,8 +878,8 @@@@ if [ $asm = auto -a $ARCH = MIPS ] ; the define HAVE_MSA else echo "You specified a pre-MSA CPU in your CFLAGS." - echo "If you really want to run on such a CPU, configure with --disable-asm." - exit 1 + echo "Disabling asm" + asm="no" fi fi @@@@ -891,7 +896,7 @@@@ ASFLAGS="$ASFLAGS -DSTACK_ALIGNMENT=$sta CPU_ENDIAN="little-endian" if [ $compiler = GNU ]; then echo "int i[2] = {0x42494745,0}; double f[2] = {0x1.0656e6469616ep+102,0};" > conftest.c - $CC $CFLAGS conftest.c -c -o conftest.o 2>/dev/null || die "endian test failed" + $CC $CPPFLAGS conftest.c -c -o conftest.o 2>/dev/null || die "endian test failed" if (${cross_prefix}strings -a conftest.o | grep -q BIGE) && (${cross_prefix}strings -a conftest.o | grep -q FPendian) ; then define WORDS_BIGENDIAN CPU_ENDIAN="big-endian" @@@@ -913,7 +918,7 @@@@ fi # autodetect options that weren't forced nor disabled -libpthread="" +libpthread="$PTHREAD_LDFLAGS $PTHREAD_LIBS" if [ "$SYS" = "WINDOWS" -a "$thread" = "posix" ] ; then if [ "$gpl" = "no" ] ; then echo "Warning: pthread-win32 is LGPL and is therefore not supported with --disable-gpl" @@@@ -1124,10 +1129,10 @@@@ fi cc_check "stdint.h" "" "uint32_t test_vec __attribute__ ((vector_size (16))) = {0,1,2,3};" && define HAVE_VECTOREXT if [ "$pic" = "yes" ] ; then - [ "$SYS" != WINDOWS -a "$SYS" != CYGWIN ] && CFLAGS="$CFLAGS -fPIC" + PICFLAG="-prefer-pic" ASFLAGS="$ASFLAGS -DPIC" # resolve textrels in the x86 asm - cc_check stdio.h "-shared -Wl,-Bsymbolic" && SOFLAGS="$SOFLAGS -Wl,-Bsymbolic" + cc_check stdio.h "-Wl,-Bsymbolic" && LDFLAGS="$LDFLAGS -Wl,-Bsymbolic" [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text" fi @@@@ -1141,8 +1146,6 @@@@ fi if [ "$debug" = "yes" ]; then CFLAGS="-O1 -g $CFLAGS" -else - CFLAGS="-O3 -ffast-math $CFLAGS" fi if cc_check '' -fno-tree-vectorize ; then @@@@ -1271,7 +1274,7 @@@@ else # gcc/icc DEPMM="$DEPMM -g0" AR="$AR rc " LD="$CC -o " - LIBX264=libx264.a + LIBX264=libx264.la [ -n "$RC" ] && RCFLAGS="$RCFLAGS -I. -o " fi [ $compiler != GNU ] && CFLAGS="$(cc_cflags $CFLAGS)" @ 1.23 log @x264-devel: if we don't pass the assembly test, e.g. if we don't pass optimizing flags (like default netbsd setup), just act as if we passed --disable-asm, as opposed to passing it for netbsd/arm. - now other operating systems that don't optimize won't fail here. - if someone does pass optimization, he benefits from it - I don't have to define another case in the Makefile for MIPS @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.22 2016/01/24 14:34:11 ryoon Exp $ @ 1.22 log @Update to 20160123 Changelog: encoder_open: Fix memory leak arm: do not fill mc_weight*_neon tabs for HIGH_BIT_DEPTH arm: Eliminate text relocations in asm arm: Don't assume alignment in mbtree_propagate_list_internal where it isn't provided Fix checkasm register clobber check on iOS @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.21 2015/12/28 11:37:03 adam Exp $ d8 3 d50 33 @ 1.21 log @Changes 20151227: * ppc: Add detection of AltiVec support for FreeBSD * Don't assume 16-byte stack alignment by default on x86-32 * Fix a few static analyzer performance hints * Revise the row VBV algorithm * Fix high bit depth lookahead cost compensation algorithm * Correctly update the intra row predictor in B-frames * Change the predictors update algorithm @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.20 2015/01/21 18:15:17 adam Exp $ d8 1 a8 1 --- configure.orig 2015-10-24 20:45:04.000000000 +0000 d21 1 a21 1 @@@@ -689,7 +693,7 @@@@ case $host_cpu in d30 1 a30 1 @@@@ -713,14 +717,15 @@@@ case $host_cpu in d47 1 a47 1 @@@@ -902,7 +907,7 @@@@ ASFLAGS="$ASFLAGS -DSTACK_ALIGNMENT=$sta d56 3 a58 3 @@@@ -927,7 +932,7 @@@@ fi # pthread-win32 is lgpl, prevent its use if --disable-gpl is specified and targeting windows [ "$SYS" = "WINDOWS" -a "$gpl" = "no" -a "$thread" = "auto" ] && thread="win32" d62 4 a65 4 if [ "$thread" = "auto" ]; then thread="no" case $SYS in @@@@ -1141,10 +1146,10 @@@@ fi d78 1 a78 1 @@@@ -1158,8 +1163,6 @@@@ fi d87 1 a87 1 @@@@ -1288,7 +1291,7 @@@@ else # gcc/icc @ 1.20 log @Fix building with -flto; do not force optimisation compiler flags @ text @d1 1 a1 1 $NetBSD$ d8 1 a8 1 --- configure.orig 2014-11-28 21:45:04.000000000 +0000 d10 1 a10 1 @@@@ -516,6 +516,10 @@@@ case $host_os in d21 2 a22 2 @@@@ -639,7 +643,7 @@@@ case $host_cpu in ASFLAGS="$ASFLAGS -f elf" d28 1 a28 1 AS="yasm" d30 1 a30 1 @@@@ -662,14 +666,15 @@@@ case $host_cpu in d33 1 a33 1 powerpc|powerpc64) d47 2 a48 2 @@@@ -817,7 +822,7 @@@@ ASFLAGS="$ASFLAGS -DSTACK_ALIGNMENT=$sta # skip endianness check for Intel Compiler and MSVS, as all supported platforms are little. each have flags that will cause the check to fail as well d55 2 a56 2 elif !(${cross_prefix}strings -a conftest.o | grep -q EGIB && ${cross_prefix}strings -a conftest.o | grep -q naidnePF) ; then @@@@ -830,7 +835,7 @@@@ fi d65 1 a65 1 @@@@ -1044,10 +1049,11 @@@@ fi d69 1 a69 2 - CFLAGS="$CFLAGS -fPIC" + CFLAGS="$CFLAGS" d78 1 a78 1 @@@@ -1061,8 +1067,6 @@@@ fi d87 1 a87 1 @@@@ -1154,7 +1158,7 @@@@ else # gcc/icc @ 1.19 log @Changes 20141023: * Update to the current lavf API and fix memory leak when using --seek * x86inc: Make INIT_CPUFLAGS support an arbitrary number of cpuflags * x86: Minor pixel_ssim_end4 improvements * x86: Faster quant_4x4x4 * configure: improve cc_check for clang and ICL to not ignore unknown options * checkasm: Only call x264_cpu_detect() once @ text @d3 6 a8 1 --- configure.orig 2014-10-23 20:45:04.000000000 +0000 d47 9 d79 18 @ 1.18 log @Changes 20140809: Bug fixes and improvements. @ text @d3 1 a3 1 --- configure.orig 2014-08-09 20:45:04.000000000 +0000 d5 1 a5 1 @@@@ -501,6 +501,10 @@@@ case $host_os in d16 1 a16 1 @@@@ -623,7 +627,7 @@@@ case $host_cpu in d24 2 a25 2 ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/" @@@@ -645,13 +649,14 @@@@ case $host_cpu in d32 2 a33 1 AS="${AS-${cross_prefix}gcc}" d35 1 a35 1 + ARCH="POWERPC" d38 1 a38 1 + ARCH="PPC" d42 1 a42 1 @@@@ -785,7 +790,7 @@@@ fi d51 1 a51 1 @@@@ -999,10 +1004,11 @@@@ fi @ 1.17 log @Changes 20140303: Bug fixes. Enabled OpenCL for Darwin. Fix building with Clang. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.16 2012/11/28 16:29:53 adam Exp $ d3 1 a3 3 Clang does not support -falign-loops option. --- configure.orig 2014-03-03 21:45:04.000000000 +0000 d5 1 a5 10 @@@@ -467,7 +467,7 @@@@ case $host_os in ;; darwin*) SYS="MACOSX" - CFLAGS="$CFLAGS -falign-loops=16" + CFLAGS="$CFLAGS" libm="-lm" if [ "$pic" = "no" ]; then cc_check "" -mdynamic-no-pic && CFLAGS="$CFLAGS -mdynamic-no-pic" @@@@ -477,6 +477,10 @@@@ case $host_os in d16 1 a16 1 @@@@ -599,7 +603,7 @@@@ case $host_cpu in d24 2 a25 2 [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS" @@@@ -620,13 +624,14 @@@@ case $host_cpu in d41 1 a41 1 @@@@ -777,7 +782,7 @@@@ fi d50 1 a50 1 @@@@ -986,10 +991,11 @@@@ fi @ 1.16 log @Updated to snapshot 20121127 @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 1 --- configure.orig 2012-11-27 21:45:03.000000000 +0000 d7 10 a16 1 @@@@ -466,6 +466,10 @@@@ case $host_os in d27 1 a27 1 @@@@ -567,7 +571,7 @@@@ case $host_cpu in d36 1 a36 1 @@@@ -587,13 +591,14 @@@@ case $host_cpu in d52 1 a52 1 @@@@ -739,7 +744,7 @@@@ fi d61 1 a61 1 @@@@ -922,10 +927,11 @@@@ fi @ 1.15 log @Changes 20121107: This is another snapshot. @ text @d3 1 a3 1 --- configure.orig 2012-11-07 21:45:03.000000000 +0000 d5 1 a5 1 @@@@ -465,6 +465,10 @@@@ case $host_os in d7 1 a7 1 LDFLAGS="$LDFLAGS -lm" d16 1 a16 1 @@@@ -564,7 +568,7 @@@@ case $host_cpu in d25 1 a25 1 @@@@ -584,13 +588,14 @@@@ case $host_cpu in d41 1 a41 1 @@@@ -736,7 +741,7 @@@@ fi d50 1 a50 1 @@@@ -919,10 +924,11 @@@@ fi @ 1.14 log @revert an upstream change in the "configure" script which might be the reason for build problems on NetBSD/amd64, as reported by Aran Clauson per PR pkg/45839 @ text @d3 1 a3 1 --- configure.orig 2011-12-07 21:45:03.000000000 +0000 d5 1 a5 1 @@@@ -428,6 +428,10 @@@@ case $host_os in d16 1 a16 1 @@@@ -522,7 +526,7 @@@@ case $host_cpu in d24 2 a25 2 if [ "$SYS" = MACOSX ]; then @@@@ -540,13 +544,14 @@@@ case $host_cpu in d41 1 a41 1 @@@@ -686,7 +691,7 @@@@ fi d50 1 a50 1 @@@@ -872,10 +877,11 @@@@ fi @ 1.13 log @update to the 20111207 snapshot (this date is the beginning of a period of stability in the development tree) changelog is unknown @ text @d50 1 a50 1 @@@@ -872,7 +877,8 @@@@ fi d59 5 a63 1 cc_check stdio.h "-shared -Wl,-Bsymbolic" && SOFLAGS="$SOFLAGS -Wl,-Bsymbolic" @ 1.12 log @update to 20110707 a newer snapshot is needed for newer versions of ffmpeg @ text @d3 1 a3 1 --- configure.orig 2011-07-07 20:45:05.000000000 +0000 d5 1 a5 1 @@@@ -403,6 +403,10 @@@@ case $host_os in d16 1 a16 1 @@@@ -487,7 +491,7 @@@@ case $host_cpu in d25 1 a25 1 @@@@ -505,13 +509,14 @@@@ case $host_cpu in d41 1 a41 1 @@@@ -648,7 +653,7 @@@@ fi d50 1 a50 1 @@@@ -835,7 +840,8 @@@@ fi d59 1 a59 1 cc_check stdio.h -Wl,-Bsymbolic && LDFLAGS="$LDFLAGS -Wl,-Bsymbolic" @ 1.11 log @update to 20110101, from Makoto Fujiwara per pkgsrc-wip (I've just put back libtool support.) needed for update of ffmpeg which in turn is needed for updates of eg vlc and gst-plugin-ffmpeg @ text @d3 3 a5 3 --- configure.orig 2011-01-02 06:45:05.000000000 +0900 +++ configure 2011-01-09 21:33:08.000000000 +0900 @@@@ -306,6 +306,10 @@@@ d16 1 a16 1 @@@@ -369,7 +373,7 @@@@ d25 1 a25 1 @@@@ -386,13 +390,14 @@@@ d41 1 a41 1 @@@@ -522,7 +527,7 @@@@ d43 1 a43 1 [ "$SYS" = "MINGW" -a "$gpl" = "no" -a "$thread" = "auto" ] && thread="win32" d50 2 a51 2 @@@@ -712,7 +717,8 @@@@ fi @ 1.10 log @as suggested by OBATA Akio, give up on replacing bashisms and just use bash to run the configure script @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.9 2010/05/06 17:02:12 drochner Exp $ d3 41 a43 57 --- configure.orig 2009-09-20 20:45:09.000000000 +0000 +++ configure @@@@ -117,7 +117,7 @@@@ for opt do LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}" ;; --enable-pthread) - pthread="auto" # can't skip detection, since it differs by OS + pthread="yes" ;; --disable-pthread) pthread="no" @@@@ -137,7 +137,7 @@@@ for opt do shared="yes" ;; --enable-visualize) - LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11" + LDFLAGS="$LDFLAGS -lX11" CFLAGS="$CFLAGS -DVISUALIZE=1" vis="yes" ;; @@@@ -187,6 +187,10 @@@@ case $host_os in SYS="FREEBSD" LDFLAGS="$LDFLAGS -lm" ;; + dragonfly*) + SYS="DRAGONFLY" + LDFLAGS="$LDFLAGS -lm" + ;; kfreebsd*-gnu) SYS="FREEBSD" CFLAGS="$CFLAGS -DHAVE_MALLOC_H" @@@@ -250,7 +254,7 @@@@ case $host_cpu in ASFLAGS="$ASFLAGS -f elf" fi ;; - x86_64) + x86_64|amd64) ARCH="X86_64" AS="yasm" if [ "$SYS" = MACOSX ];then @@@@ -264,11 +268,11 @@@@ case $host_cpu in fi ;; powerpc|powerpc64) - ARCH="PPC" if [ $SYS = MACOSX ] then - ALTIVECFLAGS="$ALTIVECFLAGS -faltivec -fastf -mcpu=G4" + ARCH="POWERPC" else + ARCH="PPC" ALTIVECFLAGS="$ALTIVECFLAGS -maltivec -mabi=altivec -DHAVE_ALTIVEC_H" fi ;; @@@@ -354,7 +358,7 @@@@ grep -q BIGE conftest.o && CFLAGS="$CFLA # autodetect options that weren't forced nor disabled d47 2 a48 2 if test "$pthread" = "auto" ; then pthread="no" d50 1 a50 10 @@@@ -387,7 +391,7 @@@@ if test "$pthread" = "auto" ; then esac fi if test "$pthread" = "yes" ; then - CFLAGS="$CFLAGS -DHAVE_PTHREAD" + CFLAGS="$CFLAGS -DHAVE_PTHREAD $PTHREAD_CFLAGS" LDFLAGS="$LDFLAGS $libpthread" fi @@@@ -424,7 +428,8 @@@@ if [ "$avis_input" = "yes" ] ; then @ 1.9 log @-don't use assembler code on NetBSD/i386