[MPlayer-dev-eng] [PATCH] 2 build system patches

Torinthiel torinthiel at megapolis.pl
Fri Jun 11 16:27:40 CEST 2004


First one is for ./configure pointing to translated docs if --language was specified, instead of
always english. I've left out english in messages about wrong gcc,
because these are handled before --language is. Tested w/o --language,
with --language=pl, --language=all and --language='pl en'.

Second is for developer builds - I've noticed that several libs (namely
libavformat, libfaad2, libosdep and libmenu) are not mentioned in
main/etc/.libdeps, this fixes it. Names are not in alphabetical order,
added at the end, just before the only conditional there.
I've posted this one before, but as I haven't labeled it [patch] no
wonder nobody noticed.
Torinthiel

-- 
 Waclaw "Torinthiel" Schiller       GG#: 542916, 3073512
   torinthiel(at)megapolis(dot)pl
   gpg: B06901F1 fpr: FAA3 559F CAE9 34DE CDC8  7346 2B6E 39F2 B069 01F1
 "No classmates may be used during this examination"
-------------- next part --------------
Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.867
diff -u -r1.867 configure
--- configure	11 Jun 2004 09:58:27 -0000	1.867
+++ configure	11 Jun 2004 14:26:10 -0000
@@ -2189,7 +2189,7 @@
   if test "$_inttypes" = yes ; then
     die "You don't have inttypes.h, but sys/bitypes.h is present. Please copy etc/inttypes.h into the include path, and re-run configure."
   else
-    die "Cannot find header either inttypes.h or bitypes.h (see DOCS/HTML/en/faq.html)."
+    die "Cannot find header either inttypes.h or bitypes.h (see DOCS/HTML/$_language/faq.html)."
   fi
 fi
 echores "$_inttypes"
@@ -4919,7 +4919,7 @@
     if test "$_xanim" = yes ; then
       echores "yes (using $_xanimlibdir)"
     else
-      echores "no (no suitable directory found - see DOCS/HTML/en/codecs.html)"
+      echores "no (no suitable directory found - see DOCS/HTML/$_language/codecs.html)"
     fi
   else
     echores "no (dynamic loader support needed)"
@@ -4963,7 +4963,7 @@
       if test "$_real" = yes ; then
         echores "yes (using $_reallibdir)"
       else
-        echores "no (no suitable directory found - see DOCS/HTML/en/codecs.html)"
+        echores "no (no suitable directory found - see DOCS/HTML/$_language/codecs.html)"
       fi
     fi
   else
@@ -5082,7 +5082,7 @@
       echores "no (old ffmpeg version, use CVS !)"
     fi
   else
-    echores "no (see DOCS/HTML/en/codecs.html)"
+    echores "no (see DOCS/HTML/$_language/codecs.html)"
   fi
 else
   echores "$_libavcodec"
@@ -6763,7 +6763,7 @@
 
 
 if test "$_mtrr" = yes ; then
-  echo "Please check mtrr settings at /proc/mtrr (see DOCS/HTML/en/devices.html#mtrr)"
+  echo "Please check mtrr settings at /proc/mtrr (see DOCS/HTML/$_language/devices.html#mtrr)"
   echo
 fi
 
@@ -6811,7 +6811,7 @@
 Check $TMPLOG if you wonder why an autodetection failed (check whether
 the development headers/packages are installed).
 
-If you suspect a bug, please read DOCS/HTML/en/bugreports.html.
+If you suspect a bug, please read DOCS/HTML/$_language/bugreports.html.
 
 EOF
 
-------------- next part --------------
Index: etc/.libdeps
===================================================================
RCS file: /cvsroot/mplayer/main/etc/.libdeps,v
retrieving revision 1.3
diff -u -r1.3 .libdeps
--- etc/.libdeps	4 Oct 2003 22:00:22 -0000	1.3
+++ etc/.libdeps	3 Jun 2004 06:32:44 -0000
@@ -24,6 +24,10 @@
 linux/libosdep.a: $(wildcard linux/*.[ch])
 postproc/libpostproc.a: $(wildcard postproc/*.[ch])
 input/libinput.a: $(wildcard input/*.[ch])
+libfaad2/libfaad2.a: $(wildcard libfaad2/*.[ch])
+libavformat/libavformat.a: $(wildcard libavformat/*.[ch])
+osdep/libosdep.a: $(wildcard libosdep/*.[ch])
+libmenu/libmenu.a: $(wildcard libmenu/*.[ch])
 ifneq ($(MPFLAC),none)
 libmpflac/libmpflac.a: $(wildcard libmpflac/*.[ch])
 endif
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20040611/28fcc2b0/attachment.pgp>


More information about the MPlayer-dev-eng mailing list