[40890] trunk/dports/multimedia/libtheora

boeyms at macports.org boeyms at macports.org
Fri Oct 17 01:05:40 PDT 2008


Revision: 40890
          http://trac.macports.org/changeset/40890
Author:   boeyms at macports.org
Date:     2008-10-17 01:05:40 -0700 (Fri, 17 Oct 2008)
Log Message:
-----------
libtheora: update to latest version (1.0beta3).

This changeset updates libtheora to version 1.0beta3, and includes revisions
to the patches required to make it compile.  Those patches have been further
split from the previous monolithic patch file into one per changed file, as
per the MacPorts documentation.

Modified Paths:
--------------
    trunk/dports/multimedia/libtheora/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/libtheora/files/patch-configure.ac.diff
    trunk/dports/multimedia/libtheora/files/patch-configure.diff

Removed Paths:
-------------
    trunk/dports/multimedia/libtheora/files/patch-configure

Modified: trunk/dports/multimedia/libtheora/Portfile
===================================================================
--- trunk/dports/multimedia/libtheora/Portfile	2008-10-17 07:51:45 UTC (rev 40889)
+++ trunk/dports/multimedia/libtheora/Portfile	2008-10-17 08:05:40 UTC (rev 40890)
@@ -3,7 +3,7 @@
 PortSystem      1.0
 
 name            libtheora
-version         1.0beta2
+version         1.0beta3
 categories      multimedia
 platforms       darwin
 maintainers     nomaintainer
@@ -21,11 +21,11 @@
 master_sites    http://downloads.xiph.org/releases/theora/
 use_bzip2       yes
 
-checksums       md5 6ed9f998a982e996ad53d3686d655cfe \
-                sha1 d58490cc507e1840fbdb432a1dd12433644cc04b \
-                rmd160 544bdb94e09fdfcfb76b603dd32c40ed5d6103a2
+checksums       md5 04b3e1055da49daba6afce93f3214b1f \
+                sha1 01f0a5adcdde5bdc5b7e700b5975067af60b456c \
+                rmd160 5308039be56064c7a54d464b0dc32f31542a34d8
 
-patchfiles      patch-configure
+patchfiles      patch-configure.ac.diff patch-configure.diff
 
 post-patch {
     if {! [variant_isset doc]} {

Deleted: trunk/dports/multimedia/libtheora/files/patch-configure
===================================================================
--- trunk/dports/multimedia/libtheora/files/patch-configure	2008-10-17 07:51:45 UTC (rev 40889)
+++ trunk/dports/multimedia/libtheora/files/patch-configure	2008-10-17 08:05:40 UTC (rev 40890)
@@ -1,648 +0,0 @@
---- configure.ac.orig	2007-10-03 01:05:18.000000000 +0200
-+++ configure.ac	2007-10-03 01:10:16.000000000 +0200
-@@ -213,34 +213,6 @@
-   XIPH_PATH_VORBIS(HAVE_VORBIS=yes, HAVE_VORBIS=no)
- fi
- 
--dnl check for SDL
--HAVE_SDL=no
--
--AM_PATH_SDL(,[
--  HAVE_SDL=yes
--  SDL_LIBS=`$SDL_CONFIG --libs`
--],AC_MSG_WARN([*** Unable to find SDL -- Not compiling example players ***]))
--
--dnl check for OSS
--HAVE_OSS=no
--
--AC_CHECK_HEADERS([sys/soundcard.h soundcard.h machine/soundcard.h],[
--  HAVE_OSS=yes
--  break
--])
--if test x$HAVE_OSS != xyes; then
--  AC_MSG_WARN([OSS audio support not found -- not compiling player_example])
--fi
--
--dnl check for libpng
--HAVE_PNG=no
--if test "x$HAVE_PKG_CONFIG" = "xyes"
--then
--  PKG_CHECK_MODULES(PNG, libpng, HAVE_PNG=yes, HAVE_PNG=no)
--fi
--AC_SUBST(PNG_CFLAGS)
--AC_SUBST(PNG_LIBS)
--
- dnl --------------------------------------------------
- dnl Overall build configuration options
- dnl --------------------------------------------------
-@@ -307,14 +279,6 @@
-               [GETOPT_OBJS='getopt.$(OBJEXT) getopt1.$(OBJEXT)'])
- AC_SUBST(GETOPT_OBJS)
- 
--if test x$HAVE_SDL = xyes -a x$HAVE_OSS = xyes -a x$HAVE_VORBIS = xyes; then
--  BUILDABLE_EXAMPLES="$BUILDABLE_EXAMPLES player_example"
--fi
--if test x$HAVE_PNG = xyes; then
--  BUILDABLE_EXAMPLES="$BUILDABLE_EXAMPLES png2theora"
--fi
--AC_SUBST(BUILDABLE_EXAMPLES)
--
- dnl --------------------------------------------------
- dnl Do substitutions
- dnl --------------------------------------------------
---- configure.orig	2007-10-03 01:05:25.000000000 +0200
-+++ configure	2007-10-03 01:10:12.000000000 +0200
-@@ -20573,574 +20573,6 @@
- 
- fi
- 
--HAVE_SDL=no
--
--
--# Check whether --with-sdl-prefix was given.
--if test "${with_sdl_prefix+set}" = set; then
--  withval=$with_sdl_prefix; sdl_prefix="$withval"
--else
--  sdl_prefix=""
--fi
--
--
--# Check whether --with-sdl-exec-prefix was given.
--if test "${with_sdl_exec_prefix+set}" = set; then
--  withval=$with_sdl_exec_prefix; sdl_exec_prefix="$withval"
--else
--  sdl_exec_prefix=""
--fi
--
--# Check whether --enable-sdltest was given.
--if test "${enable_sdltest+set}" = set; then
--  enableval=$enable_sdltest;
--else
--  enable_sdltest=yes
--fi
--
--
--  if test x$sdl_exec_prefix != x ; then
--     sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
--     if test x${SDL_CONFIG+set} != xset ; then
--        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
--     fi
--  fi
--  if test x$sdl_prefix != x ; then
--     sdl_args="$sdl_args --prefix=$sdl_prefix"
--     if test x${SDL_CONFIG+set} != xset ; then
--        SDL_CONFIG=$sdl_prefix/bin/sdl-config
--     fi
--  fi
--
--
--  PATH="$prefix/bin:$prefix/usr/bin:$PATH"
--  # Extract the first word of "sdl-config", so it can be a program name with args.
--set dummy sdl-config; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_path_SDL_CONFIG+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  case $SDL_CONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_SDL_CONFIG="$SDL_CONFIG" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--IFS=$as_save_IFS
--
--  test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no"
--  ;;
--esac
--fi
--SDL_CONFIG=$ac_cv_path_SDL_CONFIG
--if test -n "$SDL_CONFIG"; then
--  { echo "$as_me:$LINENO: result: $SDL_CONFIG" >&5
--echo "${ECHO_T}$SDL_CONFIG" >&6; }
--else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--
--
--  min_sdl_version=0.11.0
--  { echo "$as_me:$LINENO: checking for SDL - version >= $min_sdl_version" >&5
--echo $ECHO_N "checking for SDL - version >= $min_sdl_version... $ECHO_C" >&6; }
--  no_sdl=""
--  if test "$SDL_CONFIG" = "no" ; then
--    no_sdl=yes
--  else
--    SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
--    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
--
--    sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
--           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
--    sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
--           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
--    sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
--           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
--    if test "x$enable_sdltest" = "xyes" ; then
--      ac_save_CFLAGS="$CFLAGS"
--      ac_save_CXXFLAGS="$CXXFLAGS"
--      ac_save_LIBS="$LIBS"
--      CFLAGS="$CFLAGS $SDL_CFLAGS"
--      CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
--      LIBS="$LIBS $SDL_LIBS"
--      rm -f conf.sdltest
--      if test "$cross_compiling" = yes; then
--  echo $ac_n "cross compiling; assumed OK... $ac_c"
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--#include <stdio.h>
--#include <stdlib.h>
--#include <string.h>
--#include "SDL.h"
--
--char*
--my_strdup (char *str)
--{
--  char *new_str;
--
--  if (str)
--    {
--      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
--      strcpy (new_str, str);
--    }
--  else
--    new_str = NULL;
--
--  return new_str;
--}
--
--int main (int argc, char *argv[])
--{
--  int major, minor, micro;
--  char *tmp_version;
--
--  /* This hangs on some systems (?)
--  system ("touch conf.sdltest");
--  */
--  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
--
--  /* HP/UX 9 (%@#!) writes to sscanf strings */
--  tmp_version = my_strdup("$min_sdl_version");
--  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
--     printf("%s, bad version string\n", "$min_sdl_version");
--     exit(1);
--   }
--
--   if (($sdl_major_version > major) ||
--      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
--      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
--    {
--      return 0;
--    }
--  else
--    {
--      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
--      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
--      printf("*** best to upgrade to the required version.\n");
--      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
--      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
--      printf("*** config.cache before re-running configure\n");
--      return 1;
--    }
--}
--
--
--_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  :
--else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--no_sdl=yes
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--
--
--       CFLAGS="$ac_save_CFLAGS"
--       CXXFLAGS="$ac_save_CXXFLAGS"
--       LIBS="$ac_save_LIBS"
--     fi
--  fi
--  if test "x$no_sdl" = x ; then
--     { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--
--  HAVE_SDL=yes
--  SDL_LIBS=`$SDL_CONFIG --libs`
--
--  else
--     { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--     if test "$SDL_CONFIG" = "no" ; then
--       echo "*** The sdl-config script installed by SDL could not be found"
--       echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
--       echo "*** your path, or set the SDL_CONFIG environment variable to the"
--       echo "*** full path to sdl-config."
--     else
--       if test -f conf.sdltest ; then
--        :
--       else
--          echo "*** Could not run SDL test program, checking why..."
--          CFLAGS="$CFLAGS $SDL_CFLAGS"
--          CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
--          LIBS="$LIBS $SDL_LIBS"
--          cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--#include <stdio.h>
--#include "SDL.h"
--
--int main(int argc, char *argv[])
--{ return 0; }
--#undef  main
--#define main K_and_R_C_main
--
--int
--main ()
--{
-- return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
--   echo "*** The test program compiled, but did not run. This usually means"
--          echo "*** that the run-time linker is not finding SDL or finding the wrong"
--          echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
--          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
--          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
--          echo "*** is required on your system"
--	  echo "***"
--          echo "*** If you have an old version installed, it is best to remove it, although"
--          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	 echo "*** The test program failed to compile or link. See the file config.log for the"
--          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
--          echo "*** or that you have moved SDL since it was installed. In the latter case, you"
--          echo "*** may want to edit the sdl-config script: $SDL_CONFIG"
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--          CFLAGS="$ac_save_CFLAGS"
--          CXXFLAGS="$ac_save_CXXFLAGS"
--          LIBS="$ac_save_LIBS"
--       fi
--     fi
--     SDL_CFLAGS=""
--     SDL_LIBS=""
--     { echo "$as_me:$LINENO: WARNING: *** Unable to find SDL -- Not compiling example players ***" >&5
--echo "$as_me: WARNING: *** Unable to find SDL -- Not compiling example players ***" >&2;}
--  fi
--
--
--  rm -f conf.sdltest
--
--
--HAVE_OSS=no
--
--
--
--
--for ac_header in sys/soundcard.h soundcard.h machine/soundcard.h
--do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
--else
--  # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--#include <$ac_header>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_header_compiler=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_header_compiler=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
--
--# Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <$ac_header>
--_ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null && {
--	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       }; then
--  ac_header_preproc=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--  ac_header_preproc=no
--fi
--
--rm -f conftest.err conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
--
--# So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--  yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
--    ac_header_preproc=yes
--    ;;
--  no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--
--    ;;
--esac
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  eval "$as_ac_Header=\$ac_header_preproc"
--fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
--
--fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--  HAVE_OSS=yes
--  break
--
--fi
--
--done
--
--if test x$HAVE_OSS != xyes; then
--  { echo "$as_me:$LINENO: WARNING: OSS audio support not found -- not compiling player_example" >&5
--echo "$as_me: WARNING: OSS audio support not found -- not compiling player_example" >&2;}
--fi
--
--HAVE_PNG=no
--if test "x$HAVE_PKG_CONFIG" = "xyes"
--then
--
--  succeeded=no
--
--  if test -z "$PKG_CONFIG"; then
--    # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  case $PKG_CONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--IFS=$as_save_IFS
--
--  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
--  ;;
--esac
--fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
--  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--echo "${ECHO_T}$PKG_CONFIG" >&6; }
--else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--
--
--  fi
--
--  if test "$PKG_CONFIG" = "no" ; then
--     echo "*** The pkg-config script could not be found. Make sure it is"
--     echo "*** in your path, or set the PKG_CONFIG environment variable"
--     echo "*** to the full path to pkg-config."
--     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
--  else
--     PKG_CONFIG_MIN_VERSION=0.9.0
--     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
--        { echo "$as_me:$LINENO: checking for libpng" >&5
--echo $ECHO_N "checking for libpng... $ECHO_C" >&6; }
--
--        if $PKG_CONFIG --exists "libpng" ; then
--            { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--            succeeded=yes
--
--            { echo "$as_me:$LINENO: checking PNG_CFLAGS" >&5
--echo $ECHO_N "checking PNG_CFLAGS... $ECHO_C" >&6; }
--            PNG_CFLAGS=`$PKG_CONFIG --cflags "libpng"`
--            { echo "$as_me:$LINENO: result: $PNG_CFLAGS" >&5
--echo "${ECHO_T}$PNG_CFLAGS" >&6; }
--
--            { echo "$as_me:$LINENO: checking PNG_LIBS" >&5
--echo $ECHO_N "checking PNG_LIBS... $ECHO_C" >&6; }
--            PNG_LIBS=`$PKG_CONFIG --libs "libpng"`
--            { echo "$as_me:$LINENO: result: $PNG_LIBS" >&5
--echo "${ECHO_T}$PNG_LIBS" >&6; }
--        else
--            PNG_CFLAGS=""
--            PNG_LIBS=""
--            ## If we have a custom action on failure, don't print errors, but
--            ## do set a variable so people can do so.
--            PNG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpng"`
--
--        fi
--
--
--
--     else
--        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
--        echo "*** See http://www.freedesktop.org/software/pkgconfig"
--     fi
--  fi
--
--  if test $succeeded = yes; then
--     HAVE_PNG=yes
--  else
--     HAVE_PNG=no
--  fi
--
--fi
--
--
--
- 
- 
- ac_enable_float=yes
-@@ -21313,18 +20745,6 @@
- 
- 
- 
--if test x$HAVE_SDL = xyes -a x$HAVE_OSS = xyes -a x$HAVE_VORBIS = xyes; then
--  BUILDABLE_EXAMPLES="$BUILDABLE_EXAMPLES player_example"
--fi
--if test x$HAVE_PNG = xyes; then
--  BUILDABLE_EXAMPLES="$BUILDABLE_EXAMPLES png2theora"
--fi
--
--
--
--
--
--
- ac_config_files="$ac_config_files Makefile lib/Makefile include/Makefile include/theora/Makefile examples/Makefile doc/Makefile doc/Doxyfile tests/Makefile m4/Makefile libtheora.spec theora.pc theora-uninstalled.pc"
- 
- cat >confcache <<\_ACEOF

Added: trunk/dports/multimedia/libtheora/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/multimedia/libtheora/files/patch-configure.ac.diff	                        (rev 0)
+++ trunk/dports/multimedia/libtheora/files/patch-configure.ac.diff	2008-10-17 08:05:40 UTC (rev 40890)
@@ -0,0 +1,52 @@
+--- configure.ac	2008-04-17 06:25:55.000000000 +1000
++++ configure.ac	2008-10-10 05:11:51.000000000 +1100
+@@ -279,34 +279,6 @@
+   XIPH_PATH_VORBIS(HAVE_VORBIS=yes, HAVE_VORBIS=no)
+ fi
+ 
+-dnl check for SDL
+-HAVE_SDL=no
+-
+-AM_PATH_SDL(,[
+-  HAVE_SDL=yes
+-  SDL_LIBS=`$SDL_CONFIG --libs`
+-],AC_MSG_WARN([*** Unable to find SDL -- Not compiling example players ***]))
+-
+-dnl check for OSS
+-HAVE_OSS=no
+-
+-AC_CHECK_HEADERS([sys/soundcard.h soundcard.h machine/soundcard.h],[
+-  HAVE_OSS=yes
+-  break
+-])
+-if test x$HAVE_OSS != xyes; then
+-  AC_MSG_WARN([OSS audio support not found -- not compiling player_example])
+-fi
+-
+-dnl check for libpng
+-HAVE_PNG=no
+-if test "x$HAVE_PKG_CONFIG" = "xyes"
+-then
+-  PKG_CHECK_MODULES(PNG, libpng, HAVE_PNG=yes, HAVE_PNG=no)
+-fi
+-AC_SUBST(PNG_CFLAGS)
+-AC_SUBST(PNG_LIBS)
+-
+ dnl --------------------------------------------------
+ dnl Overall build configuration options
+ dnl --------------------------------------------------
+@@ -373,14 +345,6 @@
+               [GETOPT_OBJS='getopt.$(OBJEXT) getopt1.$(OBJEXT)'])
+ AC_SUBST(GETOPT_OBJS)
+ 
+-if test x$HAVE_SDL = xyes -a x$HAVE_OSS = xyes -a x$HAVE_VORBIS = xyes; then
+-  BUILDABLE_EXAMPLES="$BUILDABLE_EXAMPLES player_example"
+-fi
+-if test x$HAVE_PNG = xyes; then
+-  BUILDABLE_EXAMPLES="$BUILDABLE_EXAMPLES png2theora"
+-fi
+-AC_SUBST(BUILDABLE_EXAMPLES)
+-
+ dnl --------------------------------------------------
+ dnl Do substitutions
+ dnl --------------------------------------------------


Property changes on: trunk/dports/multimedia/libtheora/files/patch-configure.ac.diff
___________________________________________________________________
Added: svn:eol-style
   + native

Added: trunk/dports/multimedia/libtheora/files/patch-configure.diff
===================================================================
--- trunk/dports/multimedia/libtheora/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/multimedia/libtheora/files/patch-configure.diff	2008-10-17 08:05:40 UTC (rev 40890)
@@ -0,0 +1,596 @@
+--- configure	2008-04-17 06:26:16.000000000 +1000
++++ configure	2008-10-10 05:14:29.000000000 +1100
+@@ -21015,574 +21015,6 @@
+ 
+ fi
+ 
+-HAVE_SDL=no
+-
+-
+-# Check whether --with-sdl-prefix was given.
+-if test "${with_sdl_prefix+set}" = set; then
+-  withval=$with_sdl_prefix; sdl_prefix="$withval"
+-else
+-  sdl_prefix=""
+-fi
+-
+-
+-# Check whether --with-sdl-exec-prefix was given.
+-if test "${with_sdl_exec_prefix+set}" = set; then
+-  withval=$with_sdl_exec_prefix; sdl_exec_prefix="$withval"
+-else
+-  sdl_exec_prefix=""
+-fi
+-
+-# Check whether --enable-sdltest was given.
+-if test "${enable_sdltest+set}" = set; then
+-  enableval=$enable_sdltest;
+-else
+-  enable_sdltest=yes
+-fi
+-
+-
+-  if test x$sdl_exec_prefix != x ; then
+-     sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
+-     if test x${SDL_CONFIG+set} != xset ; then
+-        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
+-     fi
+-  fi
+-  if test x$sdl_prefix != x ; then
+-     sdl_args="$sdl_args --prefix=$sdl_prefix"
+-     if test x${SDL_CONFIG+set} != xset ; then
+-        SDL_CONFIG=$sdl_prefix/bin/sdl-config
+-     fi
+-  fi
+-
+-
+-  PATH="$prefix/bin:$prefix/usr/bin:$PATH"
+-  # Extract the first word of "sdl-config", so it can be a program name with args.
+-set dummy sdl-config; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_SDL_CONFIG+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  case $SDL_CONFIG in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_SDL_CONFIG="$SDL_CONFIG" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+-  test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no"
+-  ;;
+-esac
+-fi
+-SDL_CONFIG=$ac_cv_path_SDL_CONFIG
+-if test -n "$SDL_CONFIG"; then
+-  { echo "$as_me:$LINENO: result: $SDL_CONFIG" >&5
+-echo "${ECHO_T}$SDL_CONFIG" >&6; }
+-else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-
+-
+-  min_sdl_version=0.11.0
+-  { echo "$as_me:$LINENO: checking for SDL - version >= $min_sdl_version" >&5
+-echo $ECHO_N "checking for SDL - version >= $min_sdl_version... $ECHO_C" >&6; }
+-  no_sdl=""
+-  if test "$SDL_CONFIG" = "no" ; then
+-    no_sdl=yes
+-  else
+-    SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
+-    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
+-
+-    sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
+-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+-    sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
+-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+-    sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
+-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+-    if test "x$enable_sdltest" = "xyes" ; then
+-      ac_save_CFLAGS="$CFLAGS"
+-      ac_save_CXXFLAGS="$CXXFLAGS"
+-      ac_save_LIBS="$LIBS"
+-      CFLAGS="$CFLAGS $SDL_CFLAGS"
+-      CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+-      LIBS="$LIBS $SDL_LIBS"
+-      rm -f conf.sdltest
+-      if test "$cross_compiling" = yes; then
+-  echo $ac_n "cross compiling; assumed OK... $ac_c"
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include "SDL.h"
+-
+-char*
+-my_strdup (char *str)
+-{
+-  char *new_str;
+-
+-  if (str)
+-    {
+-      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
+-      strcpy (new_str, str);
+-    }
+-  else
+-    new_str = NULL;
+-
+-  return new_str;
+-}
+-
+-int main (int argc, char *argv[])
+-{
+-  int major, minor, micro;
+-  char *tmp_version;
+-
+-  /* This hangs on some systems (?)
+-  system ("touch conf.sdltest");
+-  */
+-  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
+-
+-  /* HP/UX 9 (%@#!) writes to sscanf strings */
+-  tmp_version = my_strdup("$min_sdl_version");
+-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+-     printf("%s, bad version string\n", "$min_sdl_version");
+-     exit(1);
+-   }
+-
+-   if (($sdl_major_version > major) ||
+-      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
+-      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
+-    {
+-      return 0;
+-    }
+-  else
+-    {
+-      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
+-      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
+-      printf("*** best to upgrade to the required version.\n");
+-      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
+-      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
+-      printf("*** config.cache before re-running configure\n");
+-      return 1;
+-    }
+-}
+-
+-
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  :
+-else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-no_sdl=yes
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+-
+-       CFLAGS="$ac_save_CFLAGS"
+-       CXXFLAGS="$ac_save_CXXFLAGS"
+-       LIBS="$ac_save_LIBS"
+-     fi
+-  fi
+-  if test "x$no_sdl" = x ; then
+-     { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+-
+-  HAVE_SDL=yes
+-  SDL_LIBS=`$SDL_CONFIG --libs`
+-
+-  else
+-     { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-     if test "$SDL_CONFIG" = "no" ; then
+-       echo "*** The sdl-config script installed by SDL could not be found"
+-       echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
+-       echo "*** your path, or set the SDL_CONFIG environment variable to the"
+-       echo "*** full path to sdl-config."
+-     else
+-       if test -f conf.sdltest ; then
+-        :
+-       else
+-          echo "*** Could not run SDL test program, checking why..."
+-          CFLAGS="$CFLAGS $SDL_CFLAGS"
+-          CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+-          LIBS="$LIBS $SDL_LIBS"
+-          cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-#include <stdio.h>
+-#include "SDL.h"
+-
+-int main(int argc, char *argv[])
+-{ return 0; }
+-#undef  main
+-#define main K_and_R_C_main
+-
+-int
+-main ()
+-{
+- return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
+-   echo "*** The test program compiled, but did not run. This usually means"
+-          echo "*** that the run-time linker is not finding SDL or finding the wrong"
+-          echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
+-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+-          echo "*** is required on your system"
+-	  echo "***"
+-          echo "*** If you have an old version installed, it is best to remove it, although"
+-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	 echo "*** The test program failed to compile or link. See the file config.log for the"
+-          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
+-          echo "*** or that you have moved SDL since it was installed. In the latter case, you"
+-          echo "*** may want to edit the sdl-config script: $SDL_CONFIG"
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-          CFLAGS="$ac_save_CFLAGS"
+-          CXXFLAGS="$ac_save_CXXFLAGS"
+-          LIBS="$ac_save_LIBS"
+-       fi
+-     fi
+-     SDL_CFLAGS=""
+-     SDL_LIBS=""
+-     { echo "$as_me:$LINENO: WARNING: *** Unable to find SDL -- Not compiling example players ***" >&5
+-echo "$as_me: WARNING: *** Unable to find SDL -- Not compiling example players ***" >&2;}
+-  fi
+-
+-
+-  rm -f conf.sdltest
+-
+-
+-HAVE_OSS=no
+-
+-
+-
+-
+-for ac_header in sys/soundcard.h soundcard.h machine/soundcard.h
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-ac_res=`eval echo '${'$as_ac_Header'}'`
+-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6; }
+-else
+-  # Is the header compilable?
+-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_header_compiler=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_header_compiler=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6; }
+-
+-# Is the header present?
+-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <$ac_header>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
+-  ac_header_preproc=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
+-fi
+-
+-rm -f conftest.err conftest.$ac_ext
+-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6; }
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-
+-    ;;
+-esac
+-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-ac_res=`eval echo '${'$as_ac_Header'}'`
+-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6; }
+-
+-fi
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-  HAVE_OSS=yes
+-  break
+-
+-fi
+-
+-done
+-
+-if test x$HAVE_OSS != xyes; then
+-  { echo "$as_me:$LINENO: WARNING: OSS audio support not found -- not compiling player_example" >&5
+-echo "$as_me: WARNING: OSS audio support not found -- not compiling player_example" >&2;}
+-fi
+-
+-HAVE_PNG=no
+-if test "x$HAVE_PKG_CONFIG" = "xyes"
+-then
+-
+-  succeeded=no
+-
+-  if test -z "$PKG_CONFIG"; then
+-    # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  case $PKG_CONFIG in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+-  ;;
+-esac
+-fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+-  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-echo "${ECHO_T}$PKG_CONFIG" >&6; }
+-else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-
+-
+-  fi
+-
+-  if test "$PKG_CONFIG" = "no" ; then
+-     echo "*** The pkg-config script could not be found. Make sure it is"
+-     echo "*** in your path, or set the PKG_CONFIG environment variable"
+-     echo "*** to the full path to pkg-config."
+-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+-  else
+-     PKG_CONFIG_MIN_VERSION=0.9.0
+-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+-        { echo "$as_me:$LINENO: checking for libpng" >&5
+-echo $ECHO_N "checking for libpng... $ECHO_C" >&6; }
+-
+-        if $PKG_CONFIG --exists "libpng" ; then
+-            { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+-            succeeded=yes
+-
+-            { echo "$as_me:$LINENO: checking PNG_CFLAGS" >&5
+-echo $ECHO_N "checking PNG_CFLAGS... $ECHO_C" >&6; }
+-            PNG_CFLAGS=`$PKG_CONFIG --cflags "libpng"`
+-            { echo "$as_me:$LINENO: result: $PNG_CFLAGS" >&5
+-echo "${ECHO_T}$PNG_CFLAGS" >&6; }
+-
+-            { echo "$as_me:$LINENO: checking PNG_LIBS" >&5
+-echo $ECHO_N "checking PNG_LIBS... $ECHO_C" >&6; }
+-            PNG_LIBS=`$PKG_CONFIG --libs "libpng"`
+-            { echo "$as_me:$LINENO: result: $PNG_LIBS" >&5
+-echo "${ECHO_T}$PNG_LIBS" >&6; }
+-        else
+-            PNG_CFLAGS=""
+-            PNG_LIBS=""
+-            ## If we have a custom action on failure, don't print errors, but
+-            ## do set a variable so people can do so.
+-            PNG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpng"`
+-
+-        fi
+-
+-
+-
+-     else
+-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+-     fi
+-  fi
+-
+-  if test $succeeded = yes; then
+-     HAVE_PNG=yes
+-  else
+-     HAVE_PNG=no
+-  fi
+-
+-fi
+-
+-
+-
+ 
+ 
+ ac_enable_float=yes
+@@ -21755,18 +21187,6 @@
+ 
+ 
+ 
+-if test x$HAVE_SDL = xyes -a x$HAVE_OSS = xyes -a x$HAVE_VORBIS = xyes; then
+-  BUILDABLE_EXAMPLES="$BUILDABLE_EXAMPLES player_example"
+-fi
+-if test x$HAVE_PNG = xyes; then
+-  BUILDABLE_EXAMPLES="$BUILDABLE_EXAMPLES png2theora"
+-fi
+-
+-
+-
+-
+-
+-
+ ac_config_files="$ac_config_files Makefile lib/Makefile include/Makefile include/theora/Makefile examples/Makefile doc/Makefile doc/Doxyfile doc/spec/Makefile tests/Makefile m4/Makefile libtheora.spec theora.pc theora-uninstalled.pc theoradec.pc theoradec-uninstalled.pc theoraenc.pc theoraenc-uninstalled.pc"
+ 
+ cat >confcache <<\_ACEOF


Property changes on: trunk/dports/multimedia/libtheora/files/patch-configure.diff
___________________________________________________________________
Added: svn:eol-style
   + native
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20081017/9123fa20/attachment-0001.html 


More information about the macports-changes mailing list