Changeset 223bc6472936d8761b4397a20496e914b5cb5982

Timestamp:

03/07/08 23:43:01 (3 months ago)

Author:

Christophe Mutricy <xtophe@videolan.org>

git-committer:

Christophe Mutricy <xtophe@videolan.org> 1215121381 +0100

git-parent:

[d7f15579247a59841041b92b8c92746357feb47d]

git-author:

Christophe Mutricy <xtophe@videolan.org> 1215111757 +0100

Message:

Allow binary maintainer to pass a custom string

Soo that we avoid plugin cache problem between binary version.

This patch was first thought for Debian but considering it is usefull
for all distros and for VideoLAN own win32 and MacOSX builds, I
think it has its place in the master tree.

Files:

• configure.ac (modified) (1 diff)
• src/modules/cache.c (modified) (2 diffs)

configure.ac

@@ -80 +80 @@
-AC_C_INLINE
-AC_C_RESTRICT
+
+dnl Allow binary package maintainer to pass a custom string to avoid 
+dnl cache problem
+AC_ARG_WITH(binary-version, 
+    AS_HELP_STRING([--with-binary-version=STRING],
+         [To avoid plugins cache problem between binary version]),[],[])
+AS_IF([test -n "${with_binary_version}"],[
+      AC_DEFINE_UNQUOTED([DISTRO_VERSION],["${with_binary_version}"],
+             [Binary specific version])
+      ])
+
-
-dnl

src/modules/cache.c

@@ -179 +179 @@
-    }
-
+#ifdef DISTRO_VERSION
+    /* Check for distribution specific version */
+    char p_distrostring[sizeof( DISTRO_VERSION )];
+    i_size = sizeof( DISTRO_VERSION ) - 1;
+    i_read = fread( p_distrostring, 1, i_size, file );
+    if( i_read != i_size ||
+        memcmp( p_distrostring, DISTRO_VERSION, i_size ) )
+    {
+        msg_Warn( p_this, "This doesn't look like a valid plugins cache" );
+        fclose( file );
+        return;
+    }
+#endif
+
-    /* Check Sub-version number */
-    i_read = fread( &i_marker, 1, sizeof(i_marker), file );
@@ -497 +511 @@
-    if (fputs ("cache "COPYRIGHT_MESSAGE, file) == EOF)
-        goto error;
-
+
+
+
+
+
-    /* Sub-version number (to avoid breakage in the dev version when cache
-     * structure changes) */