Bug#765578: vlc: FTBFS on Hurd

Samuel Thibault sthibault at debian.org
Sun May 1 09:05:21 UTC 2016


Hello,

The attached commits were applied upstream, could you cherry-pick them?

Thanks,
Samuel
-------------- next part --------------
commit 8d99c0fe7d38297aedd336d8712380e8311ba554
Author: Samuel Thibault <samuel.thibault at ens-lyon.org>
Date:   Tue Apr 26 20:18:37 2016 +0200

    the Hurd also uses the .so extension for libraries
    
    Signed-off-by: R?mi Denis-Courmont <remi at remlab.net>

diff --git a/extras/analyser/zsh_completion.sh b/extras/analyser/zsh_completion.sh
index a380a90..156b4d9 100755
--- a/extras/analyser/zsh_completion.sh
+++ b/extras/analyser/zsh_completion.sh
@@ -11,7 +11,7 @@ case $HOST in
     *cygwin*|*mingw*)
         SUFFIX=dll
     ;;
-    *linux*|*bsd*)
+    *linux*|*bsd*|*gnu*)
         SUFFIX=so
     ;;
     *)
commit daa50fbf8e7d009ff1b224bdc06c7f68dfd61eaf
Author: Samuel Thibault <samuel.thibault at ens-lyon.org>
Date:   Wed Apr 27 13:47:13 2016 +0200

    Fix Hurd build
    
    theme_loader.cpp contains an unconditional use of PATH_MAX,
    which is not defined on GNU/Hurd to avoid imposing build-time
    limits. This change replaces its use with dynamic allocation of the
    required size.
    
    Signed-off-by: R?mi Denis-Courmont <remi at remlab.net>

diff --git a/modules/gui/skins2/src/theme_loader.cpp b/modules/gui/skins2/src/theme_loader.cpp
index 1ec1dfc..b4cf7e8 100644
--- a/modules/gui/skins2/src/theme_loader.cpp
+++ b/modules/gui/skins2/src/theme_loader.cpp
@@ -549,7 +549,9 @@ int tar_extract_all( TAR *t, char *prefix )
     union tar_buffer buffer;
     int   len, err, getheader = 1, remaining = 0;
     FILE  *outfile = NULL;
-    char  fname[BLOCKSIZE + PATH_MAX];
+    long  path_max = pathconf (".", _PC_PATH_MAX);
+    size_t maxsize = (path_max == -1 || path_max > 4096) ? 4096 : path_max;
+    char  fname[BLOCKSIZE + maxsize];
 
     while( 1 )
     {
@@ -583,7 +585,7 @@ int tar_extract_all( TAR *t, char *prefix )
                 break;
             }
 
-            sprintf( fname, "%s/%s", prefix, buffer.header.name );
+            snprintf( fname, sizeof(fname), "%s/%s", prefix, buffer.header.name );
 
             /* Check magic value in header */
             if( strncmp( buffer.header.magic, "GNUtar", 6 ) &&


More information about the pkg-multimedia-maintainers mailing list