Re: [MPlayer-dev-eng] [PATCH] GGI driver update
On Tue, May 10, 2005 at 07:38:29PM +0200, Christoph Egger wrote:
On Sat, May 07, 2005 at 06:38:00PM +0200, Christoph Egger wrote:
+ --enable-ggiwmh build with GGI libggiwmh extension
(implies --enable-ggi) [autodetect]
This line in the output is far too long, please don't exceed 80 characters. Just remove the (...), we never mention implicit dependencies in the --help output anyway.
done.
OK
+echocheck "GGI extension: libggiwmh" +_ggiwmh=no +_def_ggiwmh='#undef HAVE_GGIWMH' +if test "$_ggi" = yes ; then
You're not implementing correct semantics there. You are unconditionally doing autodetection and overriding the --(dis|en)able-ggiwmh options you introduced above. Check for the state of _ggiwmh.
done.
Let me elaborate..
+if test "$_ggiwmh" = auto -o "$_ggiwmh" = yes ; then + echocheck "GGI extension: libggiwmh"
Swap these two lines, the text should always get printed.
+ _ggiwmh=no + _def_ggiwmh='#undef HAVE_GGIWMH' + if test "$_ggi" = yes ; then + cat > $TMPC << EOF
The test for $_ggi should go along with the test for the extension, something like this:
echocheck "GGI extension: libggiwmh" if test "$_ggi" = yes && test "$_ggiwmh" = auto ; then _ggiwmh=no cat > $TMPC << EOF #include <ggi/ggi.h> #include <ggi/wmh.h> int main(void) { return 0; } EOF cc_check -lggi -lggiwmh && _ggiwmh=yes
if test "$_ggiwmh" = yes ; then _def_ggiwmh='#define HAVE_GGIWMH 1' _ld_ggi="$_ld_ggi -lggiwmh" else _def_ggiwmh='#undef HAVE_GGIWMH' fi fi echores "$_ggiwmh"
Thank you for this guidance. I'm only familiar with autoconf generated configure scripts... I think you will like this patch better.
+#ifdef HAVE_GGIWMH + if (ggiWmhInit() < 0) { + mp_msg(MSGT_VO, MSGL_FATAL, "[ggi] unable to initialize libggiwmh\n"); + return(-1);
You're messing up the indentation here by mixing spaces and tabs, please don't.
fixed.
Not in the version you sent. Maybe you mixed up patches?
umm... yes, sorry. -- Greetings, Christoph +++ Neu: Echte DSL-Flatrates von GMX - Surfen ohne Limits +++ Always online ab 4,99 Euro/Monat: http://www.gmx.net/de/go/dsl
On Wed, May 11, 2005 at 07:23:41AM +0200, Christoph Egger wrote:
The test for $_ggi should go along with the test for the extension, something like this:
echocheck "GGI extension: libggiwmh" if test "$_ggi" = yes && test "$_ggiwmh" = auto ; then
Lol, but in my template, the test should only be run in the auto case of course... [...]
echores "$_ggiwmh"
Thank you for this guidance. I'm only familiar with autoconf generated configure scripts...
You're welcome.
I think you will like this patch better.
Yes.
+#ifdef HAVE_GGIWMH + if (ggiWmhInit() < 0) { + mp_msg(MSGT_VO, MSGL_FATAL, "[ggi] unable to initialize libggiwmh\n"); + return(-1);
You're messing up the indentation here by mixing spaces and tabs, please don't.
fixed.
Not in the version you sent. Maybe you mixed up patches?
umm... yes, sorry.
I was referring to the tabs in front of the mp_msg and return calls. They're still there, but never mind, looking at the file again I see it is a mix of tabs and spaces all over, especially in that function, so at least it is consistently mixed up now. I'll trust you on the vo_ggi part of the patch, after all you are the maintainer of that file ;-) Patch applied. Diego P.S.: Please don't CC me, I follow dev-eng.
You're messing up the indentation here by mixing spaces and tabs, please don't.
fixed.
Not in the version you sent. Maybe you mixed up patches?
umm... yes, sorry.
I was referring to the tabs in front of the mp_msg and return calls. They're still there, but never mind, looking at the file again I see it is a mix of tabs and spaces all over, especially in that function, so at least it is consistently mixed up now.
I'll trust you on the vo_ggi part of the patch, after all you are the maintainer of that file ;-)
I can send you a patch that converts it into K&R style. Do you like K&R ?
Patch applied.
Thank you very much.
Diego
P.S.: Please don't CC me, I follow dev-eng.
ok. -- Greetings, Christoph +++ Neu: Echte DSL-Flatrates von GMX - Surfen ohne Limits +++ Always online ab 4,99 Euro/Monat: http://www.gmx.net/de/go/dsl
On Wed, May 11, 2005 at 11:30:07AM +0200, Christoph Egger wrote:
I was referring to the tabs in front of the mp_msg and return calls. They're still there, but never mind, looking at the file again I see it is a mix of tabs and spaces all over, especially in that function, so at least it is consistently mixed up now.
I'll trust you on the vo_ggi part of the patch, after all you are the maintainer of that file ;-)
I can send you a patch that converts it into K&R style. Do you like K&R ?
I don't care at all. You're the maintainer. If you wish to change the indentation to suit your taste, that's fine by me. Diego
participants (2)
-
Christoph Egger -
Diego Biurrun