From 07c11742a94deb8c2c2493afe3b81870c10f1e93 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 6 Oct 2009 06:43:00 +0000
Subject: Remove many uses of tmp_run. Checking that installed header and
 library match is not really our task, also if desired it would be more
 correct to do it at runtime (e.g. because of distributed binaries, or system
 updates gone wrong, ...). tmp_run also slows down configure on systems with
 slow fork like MinGW.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29753 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 46 ++++++++++++----------------------------------
 1 file changed, 12 insertions(+), 34 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 5aa8a31abe..fac492d6a6 100755
--- a/configure
+++ b/configure
@@ -3942,7 +3942,7 @@ int main(void) {
   return 0;
 }
 EOF
-  cc_check && tmp_run && _apple_ir=yes
+  cc_check && _apple_ir=yes
 fi
 if test "$_apple_ir" = yes ; then
   def_apple_ir='#define CONFIG_APPLE_IR 1'
@@ -4948,13 +4948,7 @@ int main(void) {
   return strcmp(PNG_LIBPNG_VER_STRING, png_libpng_ver);
 }
 EOF
-    if cc_check -lpng -lz $_ld_lm ; then
-      if tmp_run ; then
-        _png=yes
-      else
-        _res_comment="mismatch of library and header versions"
-      fi
-    fi
+    cc_check -lpng -lz $_ld_lm && _png=yes
   fi
 fi
 echores "$_png"
@@ -5000,11 +4994,7 @@ cat > $TMPC << EOF
 #include <jpeglib.h>
 int main(void) { return 0; }
 EOF
-    if cc_check -ljpeg $_ld_lm ; then
-      if tmp_run ; then
-        _jpeg=yes
-      fi
-    fi
+  cc_check -ljpeg $_ld_lm && _jpeg=yes
 fi
 echores "$_jpeg"
 
@@ -5047,7 +5037,7 @@ cat > $TMPC << EOF
 int main(void) { return 0; }
 EOF
   for _ld_gif in "-lungif" "-lgif" ; do
-    cc_check $_ld_gif && tmp_run && _gif=yes && break
+    cc_check $_ld_gif && _gif=yes && break
   done
 fi
 
@@ -5084,7 +5074,7 @@ int main(void) {
   return 0;
 }
 EOF
-  if cc_check "$_ld_gif" && tmp_run ; then
+  if cc_check "$_ld_gif" ; then
     def_gif_4='#define CONFIG_GIF_4 1'
     _res_comment=""
   fi
@@ -5109,7 +5099,7 @@ int main(void) {
   return 0;
 }
 EOF
-  if cc_check "$_ld_gif" && tmp_run ; then
+  if cc_check "$_ld_gif" ; then
     def_gif_tvt_hack='#undef CONFIG_GIF_TVT_HACK'
     echores "disabled"
   else
@@ -5458,7 +5448,7 @@ cat > $TMPC << EOF
 #include <artsc.h>
 int main(void) { return 0; }
 EOF
-cc_check $(artsc-config --libs) $(artsc-config --cflags) && tmp_run && _arts=yes
+cc_check $(artsc-config --libs) $(artsc-config --cflags) && _arts=yes
 
   fi
 fi
@@ -5538,7 +5528,7 @@ cat > $TMPC << EOF
 #include <pulse/pulseaudio.h>
 int main(void) { return 0; }
 EOF
-cc_check $($_pkg_config --libs --cflags libpulse) && tmp_run && _pulse=yes
+cc_check $($_pkg_config --libs --cflags libpulse) && _pulse=yes
 
   fi
 fi
@@ -6073,23 +6063,11 @@ int main(void) {
     FT_Library library;
     FT_Int major=-1,minor=-1,patch=-1;
     int err=FT_Init_FreeType(&library);
-    if (err) {
-	printf("Couldn't initialize freetype2 lib, err code: %d\n",err);
-	exit(err);
-    }
-    FT_Library_Version(library,&major,&minor,&patch); // in v2.1.0+ only :(((
-    printf("freetype2  header version: %d.%d.%d  library version: %d.%d.%d\n",
-	FREETYPE_MAJOR,FREETYPE_MINOR,FREETYPE_PATCH,
-	(int)major,(int)minor,(int)patch );
-    if (major!=FREETYPE_MAJOR || minor!=FREETYPE_MINOR) {
-	printf("Library and header version mismatch! Fix it in your distribution!\n");
-	exit(1);
-    }
     return 0;
 }
 EOF
 	_freetype=no
-	cc_check $($_freetypeconfig --cflags) $($_freetypeconfig --libs) && tmp_run && _freetype=yes
+	cc_check $($_freetypeconfig --cflags) $($_freetypeconfig --libs) && _freetype=yes
     else
 	_freetype=no
     fi
@@ -6159,7 +6137,7 @@ if test "$_ass" = auto ; then
 int main(void) { return 0; }
 EOF
     _ass=no
-    cc_check $($_freetypeconfig --cflags) $($_freetypeconfig --libs) && tmp_run && _ass=yes
+    cc_check $($_freetypeconfig --cflags) $($_freetypeconfig --libs) && _ass=yes
     if test "$_ass" = no ; then
         _res_comment="FreeType >= 2.1.8 needed"
     fi
@@ -6189,7 +6167,7 @@ int main(void) {
 }
 EOF
 	_fribidi=no
-	cc_check $($_fribidiconfig --cflags) $($_fribidiconfig --libs) && tmp_run && _fribidi=yes
+	cc_check $($_fribidiconfig --cflags) $($_fribidiconfig --libs) && _fribidi=yes
     else
 	_fribidi=no
     fi
@@ -7408,7 +7386,7 @@ int main(void) { lame_version_t lv; (void) lame_init();
     get_lame_version_numerical(&lv);  printf("%d%d\n",lv.major,lv.minor);
     return 0; }
 EOF
-  cc_check -lmp3lame $_ld_lm && tmp_run && _mp3lame=yes
+  cc_check -lmp3lame $_ld_lm && _mp3lame=yes
 fi
 if test "$_mp3lame" = yes ; then
   def_mp3lame="#define CONFIG_MP3LAME"
-- 
cgit v1.2.3


From 7210df9cb9c0ec8246643037caf822d2207e6db7 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 19 Oct 2009 09:10:27 +0000
Subject: Add CONFIG_LPC to config.mak (needed by FFmpeg).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29781 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 1 +
 1 file changed, 1 insertion(+)

(limited to 'configure')

diff --git a/configure b/configure
index fac492d6a6..f8d08f7367 100755
--- a/configure
+++ b/configure
@@ -8917,6 +8917,7 @@ $def_yasm
 #define CONFIG_AANDCT 1
 #define CONFIG_FFT 1
 #define CONFIG_GOLOMB 1
+#define CONFIG_LPC 1
 #define CONFIG_MDCT 1
 #define CONFIG_RDFT 1
 
-- 
cgit v1.2.3


From 1d823d4b0fd3709cc02eef539e9f48bb3e798034 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 19 Oct 2009 09:41:30 +0000
Subject: Add CONFIG_LPC to config.h as well (needed by FFmpeg).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29782 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 1 +
 1 file changed, 1 insertion(+)

(limited to 'configure')

diff --git a/configure b/configure
index f8d08f7367..308841068c 100755
--- a/configure
+++ b/configure
@@ -8430,6 +8430,7 @@ CONFIG_AANDCT=yes
 CONFIG_FFT=yes
 CONFIG_FFT_MMX=$fft_mmx
 CONFIG_GOLOMB=yes
+CONFIG_LPC=yes
 CONFIG_MDCT=yes
 CONFIG_RDFT=yes
 
-- 
cgit v1.2.3


From fc1b468117d333ca5630f7842a4c3d412389ec91 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 19 Oct 2009 09:56:18 +0000
Subject: Get rid of COMMON_LDFLAGS variable.  It was a pointless indirection.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29784 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 308841068c..753d291fc9 100755
--- a/configure
+++ b/configure
@@ -8208,8 +8208,7 @@ CFLAGS_SVGALIB_HELPER = $cflags_svgalib_helper
 CFLAGS_TREMOR_LOW = $cflags_tremor_low
 YASMFLAGS = $YASMFLAGS
 
-EXTRALIBS = $extra_libs
-EXTRA_LIB = $extra_ldflags $_ld_static $_ld_lm
+EXTRALIBS = $extra_ldflags $_ld_static $_ld_lm $extra_libs
 EXTRALIBS_MPLAYER = $libs_mplayer
 EXTRALIBS_MENCODER = $libs_mencoder
 
-- 
cgit v1.2.3


From e155d3d9f910508273b15990eb75e9de5fa67671 Mon Sep 17 00:00:00 2001
From: lorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 19 Oct 2009 21:23:08 +0000
Subject: sync to x264-r1296

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29787 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index 753d291fc9..a19980f5db 100755
--- a/configure
+++ b/configure
@@ -7221,7 +7221,7 @@ if test "$_x264" = auto ; then
   cat > $TMPC << EOF
 #include <inttypes.h>
 #include <x264.h>
-#if X264_BUILD < 76
+#if X264_BUILD < 78
 #error We do not support old versions of x264. Get the latest from git.
 #endif
 int main(void) { x264_encoder_open((void*)0); return 0; }
-- 
cgit v1.2.3


From 406c8a2b5bd0a2bda1e8ba2e38b8aa089efdfb27 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 26 Oct 2009 22:15:19 +0000
Subject: Move 64 bit check below compiler detection since it needs the
 compiler and obviously should use the one that will be used for compiling in
 the end.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29797 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index a19980f5db..e6f539c393 100755
--- a/configure
+++ b/configure
@@ -1520,19 +1520,6 @@ echo configuration: $_configuration > "$TMPLOG"
 echo >> "$TMPLOG"
 
 
-if test -z "$_target" && x86 ; then
-  cat > $TMPC << EOF
-int main(void) {
-    int test[sizeof(char *)-7];
-    return 0;
-}
-EOF
-  cc_check && host_arch=x86_64 || host_arch=i386
-fi
-
-echo "Detected operating system: $system_name"
-echo "Detected host architecture: $host_arch"
-
 if test "$_runtime_cpudetection" = yes && ! x86 && ! ppc; then
   die "Runtime CPU detection only works for x86, x86-64 and PPC!"
 fi
@@ -1587,6 +1574,19 @@ else
 fi # icc
 test "$cc_fail" = yes && die "unsupported compiler version"
 
+if test -z "$_target" && x86 ; then
+  cat > $TMPC << EOF
+int main(void) {
+    int test[sizeof(char *)-7];
+    return 0;
+}
+EOF
+  cc_check && host_arch=x86_64 || host_arch=i386
+fi
+
+echo "Detected operating system: $system_name"
+echo "Detected host architecture: $host_arch"
+
 echocheck "host cc"
 test "$_host_cc" || _host_cc=$_cc
 echores $_host_cc
-- 
cgit v1.2.3


From f86cab4ecc5ca22bcfd2fc723e2fbb7b020b0b25 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 28 Oct 2009 13:55:18 +0000
Subject: consistency fix: Give all CONFIG_ definitions the value 1.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29800 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index e6f539c393..fcda8df9b2 100755
--- a/configure
+++ b/configure
@@ -3982,7 +3982,7 @@ EOF
 fi
 
 if test "$_smb" = yes; then
-    def_smb="#define CONFIG_LIBSMBCLIENT"
+    def_smb="#define CONFIG_LIBSMBCLIENT 1"
     _inputmodules="smb $_inputmodules"
 else
     def_smb="#undef CONFIG_LIBSMBCLIENT"
@@ -4075,7 +4075,7 @@ echores "$_tga"
 
 echocheck "md5sum support"
 if test "$_md5sum" = yes; then
-  def_md5sum="#define CONFIG_MD5SUM"
+  def_md5sum="#define CONFIG_MD5SUM 1"
   _vomodules="md5sum $_vomodules"
 else
   def_md5sum="#undef CONFIG_MD5SUM"
@@ -4086,7 +4086,7 @@ echores "$_md5sum"
 
 echocheck "yuv4mpeg support"
 if test "$_yuv4mpeg" = yes; then
-  def_yuv4mpeg="#define CONFIG_YUV4MPEG"
+  def_yuv4mpeg="#define CONFIG_YUV4MPEG 1"
   _vomodules="yuv4mpeg $_vomodules"
 else
   def_yuv4mpeg="#undef CONFIG_YUV4MPEG"
@@ -5490,7 +5490,7 @@ if test "$_esd" = yes ; then
 #include <esd.h>
 int main(void) { return esd_get_latency(0); }
 EOF
-  cc_check $(esd-config --libs) $(esd-config --cflags) && _esd_latency=yes && def_esd_latency='#define CONFIG_ESD_LATENCY'
+  cc_check $(esd-config --libs) $(esd-config --cflags) && _esd_latency=yes && def_esd_latency='#define CONFIG_ESD_LATENCY 1'
   echores "$_esd_latency"
 else
   def_esd='#undef CONFIG_ESD'
@@ -6004,7 +6004,7 @@ EOF
 fi
 if test "$_libcdio" = yes && test "$_cdparanoia" = no ; then
     _cdda='yes'
-    def_libcdio='#define CONFIG_LIBCDIO'
+    def_libcdio='#define CONFIG_LIBCDIO 1'
     def_havelibcdio='yes'
 else
     if test "$_cdparanoia" = yes ; then
@@ -6017,7 +6017,7 @@ echores "$_libcdio"
 
 if test "$_cdda" = yes ; then
     test $_cddb = auto && test $_network = yes && _cddb=yes
-    def_cdparanoia='#define CONFIG_CDDA'
+    def_cdparanoia='#define CONFIG_CDDA 1'
     _inputmodules="cdda $_inputmodules"
 else
     def_cdparanoia='#undef CONFIG_CDDA'
@@ -6025,7 +6025,7 @@ else
 fi
 
 if test "$_cddb" = yes ; then
-    def_cddb='#define CONFIG_CDDB'
+    def_cddb='#define CONFIG_CDDB 1'
     _inputmodules="cddb $_inputmodules"
 else
     _cddb=no
@@ -6073,7 +6073,7 @@ EOF
     fi
 fi
 if test "$_freetype" = yes ; then
-    def_freetype='#define CONFIG_FREETYPE'
+    def_freetype='#define CONFIG_FREETYPE 1'
     extra_cflags="$extra_cflags $($_freetypeconfig --cflags)"
     extra_ldflags="$extra_ldflags $($_freetypeconfig --libs)"
 else
@@ -6113,7 +6113,7 @@ EOF
   fi
 fi
 if test "$_fontconfig" = yes ; then
-    def_fontconfig='#define CONFIG_FONTCONFIG'
+    def_fontconfig='#define CONFIG_FONTCONFIG 1'
 else
     def_fontconfig='#undef CONFIG_FONTCONFIG'
 fi
@@ -6143,7 +6143,7 @@ EOF
     fi
 fi
 if test "$_ass" = yes ; then
-    def_ass='#define CONFIG_ASS'
+    def_ass='#define CONFIG_ASS 1'
 else
     def_ass='#undef CONFIG_ASS'
 fi
@@ -6173,7 +6173,7 @@ EOF
     fi
 fi
 if test "$_fribidi" = yes ; then
-    def_fribidi='#define CONFIG_FRIBIDI'
+    def_fribidi='#define CONFIG_FRIBIDI 1'
     extra_cflags="$extra_cflags $($_fribidiconfig --cflags)"
     extra_ldflags="$extra_ldflags $($_fribidiconfig --libs)"
 else
@@ -6696,7 +6696,7 @@ EOF
   cc_check && _ladspa=yes
 fi
 if test "$_ladspa" = yes; then
-  def_ladspa="#define CONFIG_LADSPA"
+  def_ladspa="#define CONFIG_LADSPA 1"
 else
   def_ladspa="#undef CONFIG_LADSPA"
 fi
@@ -6736,7 +6736,7 @@ EOF
   fi
 fi
 def_libbs2b="#undef CONFIG_LIBBS2B"
-test "$_libbs2b" = yes && def_libbs2b="#define CONFIG_LIBBS2B"
+test "$_libbs2b" = yes && def_libbs2b="#define CONFIG_LIBBS2B 1"
 echores "$_libbs2b"
 
 
@@ -7389,19 +7389,19 @@ EOF
   cc_check -lmp3lame $_ld_lm && _mp3lame=yes
 fi
 if test "$_mp3lame" = yes ; then
-  def_mp3lame="#define CONFIG_MP3LAME"
+  def_mp3lame="#define CONFIG_MP3LAME 1"
   _ld_mp3lame=-lmp3lame
   libs_mencoder="$libs_mencoder $_ld_mp3lame"
   cat > $TMPC << EOF
 #include <lame/lame.h>
 int main(void) { lame_set_preset(NULL, STANDARD_FAST); return 0; }
 EOF
-  cc_check $_ld_mp3lame $_ld_lm && def_mp3lame_preset="#define CONFIG_MP3LAME_PRESET"
+  cc_check $_ld_mp3lame $_ld_lm && def_mp3lame_preset="#define CONFIG_MP3LAME_PRESET 1"
   cat > $TMPC << EOF
 #include <lame/lame.h>
 int main(void) { lame_set_preset(NULL, MEDIUM_FAST); return 0; }
 EOF
-  cc_check $_ld_mp3lame $_ld_lm && def_mp3lame_preset_medium="#define CONFIG_MP3LAME_PRESET_MEDIUM"
+  cc_check $_ld_mp3lame $_ld_lm && def_mp3lame_preset_medium="#define CONFIG_MP3LAME_PRESET_MEDIUM 1"
   test "$_mp3lame_lavc" = auto && _mp3lame_lavc=yes
   if test "$_mp3lame_lavc" = yes ; then
     def_mp3lame_lavc="#define CONFIG_LIBMP3LAME 1"
-- 
cgit v1.2.3


From a10b3f08bffd9d71d34abccbb3966b5113976c8c Mon Sep 17 00:00:00 2001
From: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 4 Nov 2009 15:30:13 +0000
Subject: Add new VDPAU feature high-quality-scaling (and require newer
 library).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29823 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index fcda8df9b2..48840c9e27 100755
--- a/configure
+++ b/configure
@@ -4339,7 +4339,7 @@ if test "$_vdpau" = auto ; then
   if test "$_dl" = yes ; then
     cat > $TMPC <<EOF
 #include <vdpau/vdpau_x11.h>
-int main(void) {return VDP_VIDEO_MIXER_ATTRIBUTE_SKIP_CHROMA_DEINTERLACE;}
+int main(void) {return VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L1;}
 EOF
     cc_check && _vdpau=yes
   fi
-- 
cgit v1.2.3


From 9c0834b0f6c063602285eb6a8343a767955d27e6 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 5 Nov 2009 19:05:42 +0000
Subject: Add cast to signed for 64 bit check, since according to an FFmpeg bug
 report some compilers (llvm?) do not fail when arrays larger than the maximum
 addressable size are declared but instead just silently generate broken code.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29826 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index 48840c9e27..5501ee19d9 100755
--- a/configure
+++ b/configure
@@ -1577,7 +1577,7 @@ test "$cc_fail" = yes && die "unsupported compiler version"
 if test -z "$_target" && x86 ; then
   cat > $TMPC << EOF
 int main(void) {
-    int test[sizeof(char *)-7];
+    int test[(int)sizeof(char *)-7];
     return 0;
 }
 EOF
-- 
cgit v1.2.3


From 87e2b02f7ab91fe5855d5010e5280226f3627bc6 Mon Sep 17 00:00:00 2001
From: attila <attila@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 6 Nov 2009 14:06:58 +0000
Subject: PPC: make inline asm xform address test work with Apple tools
 original from mru, ffmpeg commit r20466 adapted to mplayer by Emanuele
 Giaquinta (exg)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29834 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index 5501ee19d9..9c85f6116d 100755
--- a/configure
+++ b/configure
@@ -2681,7 +2681,7 @@ def_xform_asm='#define HAVE_XFORM_ASM 0'
 xform_asm=no
 echocheck "XFORM ASM support"
   cat > $TMPC << EOF
-int main(void) { __asm__ volatile ("lwzx 0, %y0" :: "Z"(*(int*)0)); return 0; }
+int main(void) { __asm__ volatile ("lwzx %1, %y0" :: "Z"(*(int*)0), "r"(0)); return 0; }
 EOF
 cc_check && xform_asm=yes && def_xform_asm='#define HAVE_XFORM_ASM 1'
 echores "$xform_asm"
-- 
cgit v1.2.3


From 423c415534f7393c07247b87ab4d95f6d0635474 Mon Sep 17 00:00:00 2001
From: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 7 Nov 2009 12:31:05 +0000
Subject: Separate teletext from tv support.

Path by Francesco Lavra, francescolavra interfree it


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29848 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index 9c85f6116d..b85339eaa2 100755
--- a/configure
+++ b/configure
@@ -7620,7 +7620,7 @@ echocheck "TV teletext interface"
 if test "$_tv_teletext" = auto ; then
   _tv_teletext=no
   if test "$_freetype" = yes && test "$_pthreads" = yes; then
-    if test "$_tv_v4l2" = yes || test "$_v4l" = yes || test "$_tv_dshow" = yes; then
+    if test "$_tv_v4l2" = yes || test "$_v4l" = yes || test "$_tv_dshow" = yes || test "$_dvbin" = yes; then
       _tv_teletext=yes
     fi
   fi
-- 
cgit v1.2.3


From 2a5611473cb3696597240be15b0e1e662c1c79b8 Mon Sep 17 00:00:00 2001
From: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 7 Nov 2009 16:40:42 +0000
Subject: Remove CONFIG_TV_TELETEXT. DVB teletext support is nearly finished,
 it will be possible to read teletext from file, it will not be depending on
 reception any more.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29851 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 25 -------------------------
 1 file changed, 25 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index b85339eaa2..166127d934 100755
--- a/configure
+++ b/configure
@@ -248,7 +248,6 @@ Optional features:
   --disable-tv-v4l1      disable Video4Linux TV interface [autodetect]
   --disable-tv-v4l2      disable Video4Linux2 TV interface [autodetect]
   --disable-tv-bsdbt848  disable BSD BT848 interface [autodetect]
-  --disable-tv-teletext  disable TV teletext interface [autodetect]
   --disable-pvr          disable Video4Linux2 MPEG PVR [autodetect]
   --disable-rtc          disable RTC (/dev/rtc) on Linux [autodetect]
   --disable-network      disable networking [enable]
@@ -668,7 +667,6 @@ _tv_v4l1=auto
 _tv_v4l2=auto
 _tv_bsdbt848=auto
 _tv_dshow=auto
-_tv_teletext=auto
 _pvr=auto
 _network=yes
 _winsock2_h=auto
@@ -1092,8 +1090,6 @@ for ac_option do
   --disable-tv-v4l2)	_tv_v4l2=no	;;
   --enable-tv-dshow)	_tv_dshow=yes	;;
   --disable-tv-dshow)	_tv_dshow=no	;;
-  --enable-tv-teletext)    _tv_teletext=yes        ;;
-  --disable-tv-teletext)    _tv_teletext=no        ;;
   --enable-radio)       _radio=yes	;;
   --enable-radio-capture)       _radio_capture=yes	;;
   --disable-radio-capture)       _radio_capture=no	;;
@@ -7616,25 +7612,6 @@ fi
 echores "$_tv_v4l2"
 
 
-echocheck "TV teletext interface"
-if test "$_tv_teletext" = auto ; then
-  _tv_teletext=no
-  if test "$_freetype" = yes && test "$_pthreads" = yes; then
-    if test "$_tv_v4l2" = yes || test "$_v4l" = yes || test "$_tv_dshow" = yes || test "$_dvbin" = yes; then
-      _tv_teletext=yes
-    fi
-  fi
-fi
-if test "$_tv_teletext" = yes ; then
-  def_tv_teletext='#define CONFIG_TV_TELETEXT 1'
-  _inputmodules="tv-teletext $_inputmodules"
-else
-  _noinputmodules="tv-teletext $_noinputmodules"
-  def_tv_teletext='#undef CONFIG_TV_TELETEXT'
-fi
-echores "$_tv_teletext"
-
-
 echocheck "Radio interface"
 if test "$_radio" = yes ; then
   def_radio='#define CONFIG_RADIO 1'
@@ -8352,7 +8329,6 @@ TREMOR_INTERNAL = $_tremor_internal
 TV = $_tv
 TV_BSDBT848 = $_tv_bsdbt848
 TV_DSHOW = $_tv_dshow
-TV_TELETEXT = $_tv_teletext
 TV_V4L  = $_tv_v4l
 TV_V4L1 = $_tv_v4l1
 TV_V4L2 = $_tv_v4l2
@@ -8749,7 +8725,6 @@ $def_radio_v4l2
 $def_tv
 $def_tv_bsdbt848
 $def_tv_dshow
-$def_tv_teletext
 $def_tv_v4l
 $def_tv_v4l1
 $def_tv_v4l2
-- 
cgit v1.2.3


From e1ce8f9c41bd9273a283dd0826ef0898c2a63763 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 8 Nov 2009 15:38:59 +0000
Subject: Add a check if compiler creates PIC code and if so add -DPIC to
 YASMFLAGS. Should make it possible to compile MPlayer as PIE on x86_64 e.g.
 on hardened Gentoo and probably OpenBSD, too.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29853 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'configure')

diff --git a/configure b/configure
index 166127d934..c17ff27d0f 100755
--- a/configure
+++ b/configure
@@ -2576,6 +2576,20 @@ EOF
 cc_check && ebx_available=yes && def_ebx_available='#define HAVE_EBX_AVAILABLE 1'
 echores $ebx_available
 
+echocheck "PIC"
+pic=no
+cat > $TMPC << EOF
+int main(void) {
+// keep in sync with mangle.h and libavutil/internal.h
+#if !(defined(__PIC__) || defined(__pic__) || defined(PIC))
+#error PIC not enabled
+#endif
+    return 0;
+}
+EOF
+cc_check && pic=yes
+echores $pic
+
 echocheck "yasm"
 if test -z "$YASMFLAGS" ; then
   if darwin ; then
@@ -2588,6 +2602,7 @@ if test -z "$YASMFLAGS" ; then
   # currently tested for Linux x86, x86_64
   YASMFLAGS="-f $objformat"
   x86_64 && YASMFLAGS="$YASMFLAGS -DARCH_X86_64 -m amd64"
+  test "$pic" = "yes" && YASMFLAGS="$YASMFLAGS -DPIC"
   case "$objformat" in
     elf) test $_debug && YASMFLAGS="$YASMFLAGS -g dwarf2" ;;
     macho64)             YASMFLAGS="$YASMFLAGS -DPIC -DPREFIX" ;;
-- 
cgit v1.2.3


From 4c3dc1b10ba728b2f5f9cae43ad29c02a91157e6 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 8 Nov 2009 15:41:40 +0000
Subject: Remove a pointless undeclared function reference, #error is assumed
 to be enough to fail cc_check all over the place already.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29855 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 1 -
 1 file changed, 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index c17ff27d0f..cc960c7dd9 100755
--- a/configure
+++ b/configure
@@ -5375,7 +5375,6 @@ if test "$_v4l2" = auto ; then
 int main(void) {
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
 #error kernel headers too old, need 2.6.22
-  bad_kernel_version();
 #endif
   struct v4l2_ext_controls ctrls;
   ctrls.ctrl_class = V4L2_CTRL_CLASS_MPEG;
-- 
cgit v1.2.3


From 3cc24f5bee4366be1d0d98743a07f739739df444 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 8 Nov 2009 19:32:57 +0000
Subject: Remove macho64 special-case for yasm options, -DPIC is already added
 by the PIC-detection code.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29856 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 1 -
 1 file changed, 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index cc960c7dd9..132ec7efea 100755
--- a/configure
+++ b/configure
@@ -2605,7 +2605,6 @@ if test -z "$YASMFLAGS" ; then
   test "$pic" = "yes" && YASMFLAGS="$YASMFLAGS -DPIC"
   case "$objformat" in
     elf) test $_debug && YASMFLAGS="$YASMFLAGS -g dwarf2" ;;
-    macho64)             YASMFLAGS="$YASMFLAGS -DPIC -DPREFIX" ;;
     *)                   YASMFLAGS="$YASMFLAGS -DPREFIX"  ;;
   esac
 else
-- 
cgit v1.2.3


From 42ec82c1e53a7ee17bc4855acf3d83b2cd7b7a00 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 10 Nov 2009 13:08:36 +0000
Subject: Use configure code to define PIC instead of duplicating the check in
 mangle.h. While it is currently not necessary, it might be a good idea to
 move this outside the x86-only block in configure, as well as adding -pie to
 LDFLAGS.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29877 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 132ec7efea..9137544399 100755
--- a/configure
+++ b/configure
@@ -2580,14 +2580,13 @@ echocheck "PIC"
 pic=no
 cat > $TMPC << EOF
 int main(void) {
-// keep in sync with mangle.h and libavutil/internal.h
 #if !(defined(__PIC__) || defined(__pic__) || defined(PIC))
 #error PIC not enabled
 #endif
     return 0;
 }
 EOF
-cc_check && pic=yes
+cc_check && pic=yes && extra_cflags="$extra_cflags -DPIC"
 echores $pic
 
 echocheck "yasm"
-- 
cgit v1.2.3


From 977c12c62886060895cb83ad82ef71b7c302d5f6 Mon Sep 17 00:00:00 2001
From: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 11 Nov 2009 00:30:54 +0000
Subject: 10l: Fix compilation without VDPAU.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29891 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index 9137544399..7b100affd2 100755
--- a/configure
+++ b/configure
@@ -4359,7 +4359,7 @@ if test "$_vdpau" = yes ; then
 else
   def_vdpau='#define CONFIG_VDPAU 0'
   _novomodules="vdpau $_novomodules"
-  _libavdecoders=$(echo $_libavdecoders | sed -e s/MPEG_VDPAU_DECODER// -e s/MPEG1_VDPAU_DECODER// -e s/H264_VDPAU_DECODER// -e s/WMV3_VDPAU_DECODER// -e s/VC1_VDPAU_DECODER//)
+  _libavdecoders=$(echo $_libavdecoders | sed -e s/MPEG_VDPAU_DECODER// -e s/MPEG1_VDPAU_DECODER// -e s/H264_VDPAU_DECODER// -e s/WMV3_VDPAU_DECODER// -e s/VC1_VDPAU_DECODER// -e s/MPEG4_VDPAU_DECODER//)
 fi
 echores "$_vdpau"
 
-- 
cgit v1.2.3


From 153cac185c2d38aef1c322ea3bfa2b97befbb8d9 Mon Sep 17 00:00:00 2001
From: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 11 Nov 2009 22:26:38 +0000
Subject: Do not dynamically load libvdpau.so.1, but link at compile time.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29903 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 7b100affd2..809d3f9250 100755
--- a/configure
+++ b/configure
@@ -4348,13 +4348,16 @@ if test "$_vdpau" = auto ; then
   if test "$_dl" = yes ; then
     cat > $TMPC <<EOF
 #include <vdpau/vdpau_x11.h>
-int main(void) {return VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L1;}
+int main(void) {
+    (void) vdp_device_create_x11(0, 0, 0, 0);
+    return VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L1; }
 EOF
-    cc_check && _vdpau=yes
+    cc_check -lvdpau && _vdpau=yes
   fi
 fi
 if test "$_vdpau" = yes ; then
   def_vdpau='#define CONFIG_VDPAU 1'
+  libs_mplayer="$libs_mplayer -lvdpau"
   _vomodules="vdpau $_vomodules"
 else
   def_vdpau='#define CONFIG_VDPAU 0'
-- 
cgit v1.2.3