Mercurial > mplayer.hg
comparison configure @ 34415:55ff5df09657
Port libtheora glue code to Theora 1.0 API.
patch by Giorgio Vazzana, mywing81 gmail com
| author | diego |
|---|---|
| date | Wed, 04 Jan 2012 22:08:36 +0000 |
| parents | bb440bfcade9 |
| children | cbee80faf0aa |
comparison
equal
deleted
inserted
replaced
| 34414:6f48ca5471b6 | 34415:55ff5df09657 |
|---|---|
| 6231 echores "$_libgsm" | 6231 echores "$_libgsm" |
| 6232 | 6232 |
| 6233 echocheck "OggTheora support" | 6233 echocheck "OggTheora support" |
| 6234 if test "$_theora" = auto ; then | 6234 if test "$_theora" = auto ; then |
| 6235 _theora=no | 6235 _theora=no |
| 6236 ld_theora="-ltheora -logg" | 6236 ld_theora="-ltheoradec -logg" |
| 6237 statement_check theora/theora.h 'theora_info_init(NULL)' $ld_theora && | 6237 statement_check theora/theoradec.h 'theora_info_init(NULL)' $ld_theora && |
| 6238 extra_ldflags="$extra_ldflags $ld_theora" && _theora=yes | 6238 extra_ldflags="$extra_ldflags $ld_theora" && _theora=yes |
| 6239 if test _theora = no; then | 6239 if test _theora = no; then |
| 6240 ld_theora=$($_pkg_config --silence-errors --libs theora) | 6240 ld_theora=$($_pkg_config --silence-errors --libs theoradec) |
| 6241 inc_theora=$($_pkg_config --silence-errors --cflags theora) | 6241 inc_theora=$($_pkg_config --silence-errors --cflags theoradec) |
| 6242 statement_check theora/theora.h 'theora_info_init(NULL)' $inc_theora $ld_theora && | 6242 statement_check theora/theoradec.h 'theora_info_init(NULL)' $inc_theora $ld_theora && |
| 6243 extra_ldflags="$extra_ldflags $ld_theora" && | 6243 extra_ldflags="$extra_ldflags $ld_theora" && |
| 6244 extra_cflags="$extra_cflags $inc_theora" && _theora=yes | 6244 extra_cflags="$extra_cflags $inc_theora" && _theora=yes |
| 6245 fi | 6245 fi |
| 6246 fi | 6246 fi |
| 6247 if test "$_theora" = yes ; then | 6247 if test "$_theora" = yes ; then |
| 6248 def_theora='#define CONFIG_OGGTHEORA 1' | 6248 def_theora='#define CONFIG_OGGTHEORA 1' |
| 6249 codecmodules="libtheora $codecmodules" | 6249 codecmodules="libtheora $codecmodules" |
| 6250 # when --enable-theora is forced, we'd better provide a probably sane | 6250 # when --enable-theora is forced, we'd better provide a probably sane |
| 6251 # $ld_theora than nothing | 6251 # $ld_theora than nothing |
| 6252 test -z "$ld_theora" && extra_ldflags="$extra_ldflags -ltheora -logg" | 6252 test -z "$ld_theora" && extra_ldflags="$extra_ldflags -ltheoradec -logg" |
| 6253 else | 6253 else |
| 6254 def_theora='#undef CONFIG_OGGTHEORA' | 6254 def_theora='#undef CONFIG_OGGTHEORA' |
| 6255 nocodecmodules="libtheora $nocodecmodules" | 6255 nocodecmodules="libtheora $nocodecmodules" |
| 6256 fi | 6256 fi |
| 6257 echores "$_theora" | 6257 echores "$_theora" |