Changeset 74764fb415c49ea93dcb9b02caa6b45247fa2978

Timestamp:

23/08/05 16:24:35 (3 years ago)

Author:

Christophe Massiot <massiot@videolan.org>

git-committer:

Christophe Massiot <massiot@videolan.org> 1124807075 +0000

git-parent:

[f60342e3528964c12c2afeca60e5380768d3e3e1]

git-author:

Christophe Massiot <massiot@videolan.org> 1124807075 +0000

Message:

• toolbox: Removed compilation information from version.c to reduce the
  compilation time.
  
• configure.ac: Compilation information are now determined at
  configure-time. Fixed libSDL_image static linking.
  
• src/libvlc.c: Removed VLC_CompileTime() since this is not possible
  without increasing the compilation time.
  

Files:

• configure.ac (modified) (5 diffs)
• include/vlc_common.h (modified) (1 diff)
• include/vlc_symbols.h (modified) (5 diffs)
• modules/control/http/http.c (modified) (1 diff)
• src/libvlc.c (modified) (2 diffs)
• toolbox (modified) (2 diffs)

configure.ac

@@ -2957 +2957 @@
-  then
-    # SDL on Darwin is heavily patched and can only run SDL_image
-
+ -a "${SYS}" != "mingw32"
-      VLC_ADD_PLUGINS([vout_sdl aout_sdl])
-    fi
@@ -2974 +2974 @@
-      <${SDL_IMAGE}>, Indicate the path of SDL_image.h)
-      VLC_ADD_PLUGINS([sdl_image])
+      AC_CHECK_LIB(png, png_set_rows,
+        [VLC_ADD_LDFLAGS([sdl_image],[-lpng -lz])],[],[-lz])
+      AC_CHECK_LIB(jpeg, jpeg_start_decompress,
+        [VLC_ADD_LDFLAGS([sdl_image],[-ljpeg])])
+      AC_CHECK_LIB(tiff, TIFFClientOpen,
+        [VLC_ADD_LDFLAGS([sdl_image],[-ltiff])])
-      VLC_ADD_LDFLAGS([sdl_image], [-lSDL_image])],
-      [ AC_CHECK_HEADERS(SDL_image.h, AC_DEFINE(SDL_IMAGE_INCLUDE_FILE, <SDL_image.h>,
@@ -2987 +2993 @@
---disable-sdl.])
-    fi
+
-  elif test "${enable_sdl}" =  "yes"
-  then
@@ -4473 +4480 @@
-AC_SUBST(VERSION_MINOR)
-AC_SUBST(VERSION_REVISION)
+AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami`", [user who ran configure]) 
+AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname`", [host which ran configure]) 
+AC_DEFINE_UNQUOTED(VLC_COMPILE_DOMAIN, "`dnsdomainname 2>/dev/null || domainname 2>/dev/null || echo unknown`", [domain of the host which ran configure]) 
+AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1`", [compiler]) 
-
-dnl Old definitions for version-dependant plugins
@@ -4479 +4490 @@
-dnl AC_DEFINE_UNQUOTED(MODULE_SYMBOL, ${VLC_SYMBOL}, [Symbol suffix for module functions])
-
-2
+4
-module_symbol="0_8_4"
-AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${module_symbol}", [String suffix for module functions])

include/vlc_common.h

@@ -1095 +1095 @@
- *****************************************************************************/
-VLC_EXPORT( const char *, VLC_Version, ( void ) );
-VLC_EXPORT( const char *, VLC_CompileTime, ( void ) );
-VLC_EXPORT( const char *, VLC_CompileBy, ( void ) );
-VLC_EXPORT( const char *, VLC_CompileHost, ( void ) );

include/vlc_symbols.h

@@ -371 +371 @@
-playlist_item_t* playlist_ItemNewWithType (vlc_object_t *,const char *,const char *, int);
-void __config_PutPsz (vlc_object_t *, const char *, const char *);
-const char * VLC_CompileTime (void);
-vlm_schedule_t * vlm_ScheduleNew (vlm_t *, char *);
-void net_Close (int fd);
@@ -832 +831 @@
-    const char * (*VLC_CompileHost_inner) (void);
-    const char * (*VLC_Version_inner) (void);
-const char * (*VLC_CompileTime_inner) (void)
+void *VLC_CompileTime_deprecated
-    int (*playlist_PreparseEnqueueItem_inner) (playlist_t *, playlist_item_t *);
-    struct dirent * (*vlc_readdir_wrapper_inner) (void *);
@@ -1234 +1233 @@
-#  define VLC_CompileHost (p_symbols)->VLC_CompileHost_inner
-#  define VLC_Version (p_symbols)->VLC_Version_inner
-#  define VLC_CompileTime (p_symbols)->VLC_CompileTime_inner
-#  define playlist_PreparseEnqueueItem (p_symbols)->playlist_PreparseEnqueueItem_inner
-#  define vlc_readdir_wrapper (p_symbols)->vlc_readdir_wrapper_inner
@@ -1639 +1637 @@
-    ((p_symbols)->VLC_CompileHost_inner) = VLC_CompileHost; \
-    ((p_symbols)->VLC_Version_inner) = VLC_Version; \
-    ((p_symbols)->VLC_CompileTime_inner) = VLC_CompileTime; \
-    ((p_symbols)->playlist_PreparseEnqueueItem_inner) = playlist_PreparseEnqueueItem; \
-    ((p_symbols)->vlc_readdir_wrapper_inner) = vlc_readdir_wrapper; \
@@ -1648 +1645 @@
-    (p_symbols)->__osd_VolumeDown_deprecated = NULL; \
-    (p_symbols)->__osd_VolumeUp_deprecated = NULL; \
+    (p_symbols)->VLC_CompileTime_deprecated = NULL; \
-
-#  endif /* __PLUGIN__ */

modules/control/http/http.c

@@ -480 +480 @@
-        E_(mvar_AppendNewVar)( p_args->vars, "version", VLC_Version() );
-        E_(mvar_AppendNewVar)( p_args->vars, "copyright", COPYRIGHT_MESSAGE );
-        E_(mvar_AppendNewVar)( p_args->vars, "vlc_compile_time",
-                           VLC_CompileTime() );
-        E_(mvar_AppendNewVar)( p_args->vars, "vlc_compile_by", VLC_CompileBy() );
-        E_(mvar_AppendNewVar)( p_args->vars, "vlc_compile_host",

src/libvlc.c

@@ -140 +140 @@
-
-/*****************************************************************************
-Time, VLC_Compile
+
- * VLC_Compiler, VLC_Changeset
- *****************************************************************************/
-#define DECLARE_VLC_VERSION( func, var )                                    \
-extern const char psz_vlc_##var [];                                         \
-char const * VLC_##func ( void )                                            \
-{                                                                           \
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/*****************************************************************************
@@ -2393 +2396 @@
-
-    fprintf( stdout, _("VLC version %s\n"), VLC_Version() );
-on %s by %s@%s.%s\n"), VLC_CompileTime(
+by %s@%s.%s\n"
-             VLC_CompileBy(), VLC_CompileHost(), VLC_CompileDomain() );
-    fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() );
-*VLC_Changeset(
+strcmp( VLC_Changeset(), "exported" 
-        fprintf( stdout, _("Based upon svn changeset [%s]\n"),
-                 VLC_Changeset() );

toolbox

@@ -445 +445 @@
-  fi
-
-
-
-
-
-
+
-  if which svnversion 2>&1 >/dev/null; then
-    VLC_CHANGESET=`svnversion $srcdir`
@@ -456 +452 @@
-  fi
-
-src/misc/version.c
+${file}.tmp
-/* DO NOT EDIT THIS FILE - IT IS REGENERATED AT EVERY COMPILE -
-F
-ETHER THEY ARE BUILD
+
+HETHER THEY ARE BUILT
- * OFFICIAL VLC STABLE RELEASES.
- */
-const char psz_vlc_compile_time[] = "${VLC_COMPILE_TIME}";
-const char psz_vlc_compile_by[] = "${VLC_COMPILE_BY}";
-const char psz_vlc_compile_host[] = "${VLC_COMPILE_HOST}";
-const char psz_vlc_compile_domain[] = "${VLC_COMPILE_DOMAIN}";
-const char psz_vlc_compiler[] = "${VLC_COMPILER}";
-const char psz_vlc_changeset[] = "${VLC_CHANGESET}";
-
-EOF
+  if diff >/dev/null 2>&1 ${file} ${file}.tmp
+  then
+    rm -f ${file}.tmp
+  else
+    echo "creating new ${file}"
+    mv -f ${file}.tmp ${file}
+  fi
+
+  exit 0
-fi
-