[vlc-devel] [PATCH] Nightly Branch for windows broken?

[Pierre Ynard]

Hello,

> I noticed that the nightly builds for windows for the branch had not
> been build since 12/07/2009. Any reason for that such as the 1.0.4
> release and switching to working on 1.1.0?

These nighly builds are broken because of a problem after updating the
contribs.

The 1.0 branch still uses caca-config to configure the libcaca video
output, which breaks cross-compiling. Attached patch solves this.


diff --git a/configure.ac b/configure.ac
index 160da61..17df719 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4679,19 +4679,10 @@ AC_ARG_ENABLE(caca,
   [  --enable-caca           libcaca output (default disabled)])
 if test "${enable_caca}" = "yes"
 then
-  CACA_PATH="${PATH}"
-  AC_ARG_WITH(caca-config-path,
-    [    --with-caca-config-path=PATH caca-config path (default search in \$PATH)],
-    [ if test "${with_caca_config_path}" != "no"
-      then
-        CACA_PATH="${with_caca_config_path}:${PATH}"
-      fi ])
-  AC_PATH_PROG(CACA_CONFIG, caca-config, no, ${CACA_PATH})
-  if test "${CACA_CONFIG}" != "no"
-  then
+  PKG_CHECK_MODULES(CACA, caca, [
+    VLC_ADD_LIBS([caca],[$CACA_LIBS])
+    VLC_ADD_CFLAGS([caca],[$CACA_CFLAGS])
     VLC_ADD_PLUGIN([caca])
-    VLC_ADD_CFLAGS([caca],[`${CACA_CONFIG} --cflags`])
-    VLC_ADD_LIBS([caca],[`${CACA_CONFIG} --plugin-libs`])
     AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include <caca.h>
                                         caca_event_t ev;]],
                                         [[ev.type = 0;]]
@@ -4699,7 +4690,7 @@ then
                        [],
       [AC_DEFINE(CACA_EVENT_OPAQUE, [1], ["Define if struct caca_event is opaque and must not be accessed directly"])]
     )
-  fi
+  ], [])
 fi
 
 dnl


Regards,

-- 
Pierre Ynard
"Une âme dans un corps, c'est comme un dessin sur une feuille de papier."