September 2010 - MPlayer-cvslog - lists.mplayerhq.hu

r32378 - trunk/configure
by diego 26 Sep '10

26 Sep '10

Author: diego Date: Mon Sep 27 00:17:42 2010 New Revision: 32378 Log: Remove unnecessary sys/types.h #include from shm check. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Mon Sep 27 00:06:33 2010 (r32377) +++ trunk/configure Mon Sep 27 00:17:42 2010 (r32378) @@ -3786,7 +3786,6 @@ echores "$_termios" echocheck "shm" if test "$_shm" = auto ; then cat > $TMPC << EOF -#include <sys/types.h> #include <sys/shm.h> int main(void) { shmget(0, 0, 0); shmat(0, 0, 0); shmctl(0, 0, 0); return 0; } EOF

1 0

r32377 - trunk/configure
by diego 26 Sep '10

26 Sep '10

Author: diego Date: Mon Sep 27 00:06:33 2010 New Revision: 32377 Log: Add proper autodetection for FTP support; should fix Bugzilla #1804. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Sep 26 23:51:39 2010 (r32376) +++ trunk/configure Mon Sep 27 00:06:33 2010 (r32377) @@ -781,7 +781,7 @@ _fribidi=auto _enca=auto _inet6=auto _gethostbyname2=auto -_ftp=yes +_ftp=auto _musepack=auto _vstream=auto _pthreads=auto @@ -7617,7 +7617,10 @@ echores "$_pvr" echocheck "ftp" -if ! beos && test "$networking" = yes && test "$_ftp" = yes ; then +if test "$_ftp" = "auto" ; then +test "$networking" = "yes" && ! beos && _ftp=yes +fi +if test "$_ftp" = yes ; then def_ftp='#define CONFIG_FTP 1' inputmodules="ftp $inputmodules" else

1 0

[propchange]: r32353 - svn:log
by diego 26 Sep '10

26 Sep '10

Author: diego Revision: 32353 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1,2 @@ Add CFLAGS/LDFLAGS for all FFmpeg libraries when using pkg-config in configure. +Fixes Bugzilla #1799.

1 0

r32376 - trunk/configure
by diego 26 Sep '10

26 Sep '10

Author: diego Date: Sun Sep 26 23:51:39 2010 New Revision: 32376 Log: Simplify inet_pton/inet_aton checks with function_check(). Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Sep 26 23:48:28 2010 (r32375) +++ trunk/configure Sun Sep 26 23:51:39 2010 (r32376) @@ -3254,14 +3254,8 @@ echores "$arpa_inet_h" echocheck "inet_pton()" def_inet_pton='#define HAVE_INET_PTON 0' inet_pton=no -cat > $TMPC << EOF -#include <sys/types.h> -#include <sys/socket.h> -#include <arpa/inet.h> -int main(void) { inet_pton(0, 0, 0); return 0; } -EOF for _ld_tmp in "$_ld_sock" "$_ld_sock -lresolv" ; do - cc_check $_ld_tmp && inet_pton=yes && break + function_check arpa/inet.h 'inet_pton(0, 0, 0)' $_ld_tmp && inet_pton=yes && break done if test $inet_pton = yes ; then test "$_ld_tmp" && res_comment="using $_ld_tmp" @@ -3273,14 +3267,8 @@ echores "$inet_pton" echocheck "inet_aton()" def_inet_aton='#define HAVE_INET_ATON 0' inet_aton=no -cat > $TMPC << EOF -#include <sys/types.h> -#include <sys/socket.h> -#include <arpa/inet.h> -int main(void) { inet_aton(0, 0); return 0; } -EOF for _ld_tmp in "$_ld_sock" "$_ld_sock -lresolv" ; do - cc_check $_ld_tmp && inet_aton=yes && break + function_check arpa/inet.h 'inet_aton(0, 0)' $_ld_tmp && inet_aton=yes && break done if test $inet_aton = yes ; then test "$_ld_tmp" && res_comment="using $_ld_tmp"

1 0

r32375 - trunk/configure
by diego 26 Sep '10

26 Sep '10

Author: diego Date: Sun Sep 26 23:48:28 2010 New Revision: 32375 Log: Simplify jpeglib check with header_check_broken(). Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Sep 26 23:32:54 2010 (r32374) +++ trunk/configure Sun Sep 26 23:48:28 2010 (r32375) @@ -4935,15 +4935,7 @@ fi echocheck "JPEG support" if test "$_jpeg" = auto ; then _jpeg=no -cat > $TMPC << EOF -#include <stdio.h> -#include <stdlib.h> -#include <setjmp.h> -#include <string.h> -#include <jpeglib.h> -int main(void) { return 0; } -EOF - cc_check -ljpeg $_ld_lm && _jpeg=yes + header_check_broken stdio.h jpeglib.h -ljpeg $_ld_lm && _jpeg=yes fi echores "$_jpeg"

1 0

r32374 - trunk/configure
by diego 26 Sep '10

26 Sep '10

Author: diego Date: Sun Sep 26 23:32:54 2010 New Revision: 32374 Log: Switch back to using '-MD -MP' as gcc .d file creation flags. This should avoid trouble when header files get renamed. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Sep 26 22:53:09 2010 (r32373) +++ trunk/configure Sun Sep 26 23:32:54 2010 (r32374) @@ -2556,7 +2556,7 @@ else fi cflag_check -mno-omit-leaf-frame-pointer && cflags_no_omit_leaf_frame_pointer="-mno-omit-leaf-frame-pointer" -cflag_check -MMD -MF "$mplayer_tmpdir/test.d" -MT test.o && DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' +cflag_check -MD -MP && DEPFLAGS="-MD -MP $CFLAGS" if test -n "$LDFLAGS" ; then

1 0

r32373 - trunk/configure
by diego 26 Sep '10

26 Sep '10

Author: diego Date: Sun Sep 26 22:53:09 2010 New Revision: 32373 Log: Remove unnecessary linux/types.h #include from Apple IR check. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Sep 26 22:51:30 2010 (r32372) +++ trunk/configure Sun Sep 26 22:53:09 2010 (r32373) @@ -4040,7 +4040,6 @@ echocheck "Apple IR" if test "$_apple_ir" = auto ; then _apple_ir=no cat > $TMPC <<EOF -#include <linux/types.h> #include <linux/input.h> int main(void) { struct input_event ev; struct input_id id; return 0; } EOF

1 0

r32372 - trunk/configure
by diego 26 Sep '10

26 Sep '10

Author: diego Date: Sun Sep 26 22:51:30 2010 New Revision: 32372 Log: Move xmga check after X11, which xmga requires. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Sep 26 22:48:15 2010 (r32371) +++ trunk/configure Sun Sep 26 22:51:30 2010 (r32372) @@ -4108,20 +4108,6 @@ else fi echores "$_mga" -echocheck "xmga" -if test "$_xmga" = auto ; then - _xmga=no - test "$_x11" = yes && test "$_mga" = yes && _xmga=yes -fi -if test "$_xmga" = yes ; then - def_xmga='#define CONFIG_XMGA 1' - vomodules="xmga $vomodules" -else - def_xmga='#undef CONFIG_XMGA' - novomodules="xmga $novomodules" -fi -echores "$_xmga" - echocheck "tdfxfb" if test "$_tdfxfb" = yes ; then @@ -4555,6 +4541,21 @@ fi echores "$_dga" +echocheck "xmga" +if test "$_xmga" = auto ; then + _xmga=no + test "$_x11" = yes && test "$_mga" = yes && _xmga=yes +fi +if test "$_xmga" = yes ; then + def_xmga='#define CONFIG_XMGA 1' + vomodules="xmga $vomodules" +else + def_xmga='#undef CONFIG_XMGA' + novomodules="xmga $novomodules" +fi +echores "$_xmga" + + echocheck "3dfx" if test "$_3dfx" = yes && test "$_dga" = yes ; then def_3dfx='#define CONFIG_3DFX 1'

1 0

r32371 - trunk/configure
by diego 26 Sep '10

26 Sep '10

Author: diego Date: Sun Sep 26 22:48:15 2010 New Revision: 32371 Log: Simplify ENCA check. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Sep 26 22:31:04 2010 (r32370) +++ trunk/configure Sun Sep 26 22:48:15 2010 (r32371) @@ -6244,18 +6244,8 @@ echores "$_fribidi" echocheck "ENCA" if test "$_enca" = auto ; then - cat > $TMPC << EOF -#include <sys/types.h> -#include <enca.h> -int main(void) { - const char **langs; - size_t langcnt; - langs = enca_get_languages(&langcnt); - return 0; -} -EOF _enca=no - cc_check -lenca $_ld_lm && _enca=yes + function_check enca.h 'enca_get_languages(NULL)' -lenca $_ld_lm && _enca=yes fi if test "$_enca" = yes ; then def_enca='#define CONFIG_ENCA 1'

1 0

r32367 - trunk/configure
by diego 26 Sep '10

26 Sep '10

Author: diego Date: Sun Sep 26 21:33:48 2010 New Revision: 32367 Log: Update documentation on how to add checks; mention helper functions. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Sep 26 21:01:37 2010 (r32366) +++ trunk/configure Sun Sep 26 21:33:48 2010 (r32367) @@ -19,23 +19,8 @@ # - config.h contains #defines that are used in the C code. # - config.mak is included from the Makefiles. # -# If you want to add a new check for $feature, here is a simple skeleton: -# -# echocheck "$feature" -# if test "$_feature" = auto; then -# cat > $TMPC << EOF -# #include <feature.h> -# int main(void) { return 0; } -# EOF -# _feature=no -# cc_check && _feature=yes -# fi -# if test "$_feature" = yes ; then -# def_feature='#define CONFIG_FEATURE 1' -# else -# def_feature='#undef CONFIG_FEATURE' -# fi -# echores "$_feature" +# If you want to add a new check for $feature, look at the existing checks +# and try to use helper functions where you can. # # Furthermore you need to add the variable _feature to the list of default # settings and set it to one of yes/no/auto. Also add appropriate

1 0