01/01: gnu: avidemux: Install libraries to lib.

[Andreas Enge]

andreas pushed a commit to branch master
in repository guix.

commit a060ca32011d6224bbc2ce70f73314a9ab51c188
Author: Andreas Enge <address@hidden>
Date:   Sun Jul 26 15:24:20 2015 +0200

    gnu: avidemux: Install libraries to lib.
    
    * gnu/packages/video.scm (avidemux)[source]: Add patch to install to lib
      directory instead of lib64 or lib32 depending on the architecture.
      [arguments]: Use the lib instead of the lib64 directory for flags in the
      build phase, so that these flags should now also work on i686.
    * gnu/packages/patches/avidemux-install-to-lib.patch: New file.
    * gnu-system.am (dist_patch_DATA): Register it.
---
 gnu-system.am                                      |    1 +
 gnu/packages/patches/avidemux-install-to-lib.patch |   24 ++++++++++++++++++++
 gnu/packages/video.scm                             |    5 ++-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/gnu-system.am b/gnu-system.am
index d6635fe..ae0ad37 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -390,6 +390,7 @@ dist_patch_DATA =                                           
\
   gnu/packages/patches/audacity-fix-ffmpeg-binding.patch       \
   gnu/packages/patches/automake-skip-amhello-tests.patch       \
   gnu/packages/patches/avahi-localstatedir.patch               \
+  gnu/packages/patches/avidemux-install-to-lib.patch           \
   gnu/packages/patches/avrdude-fix-libusb.patch                        \
   gnu/packages/patches/bash-completion-directories.patch       \
   gnu/packages/patches/bedtools-32bit-compilation.patch         \
diff --git a/gnu/packages/patches/avidemux-install-to-lib.patch 
b/gnu/packages/patches/avidemux-install-to-lib.patch
new file mode 100644
index 0000000..64c9213
--- /dev/null
+++ b/gnu/packages/patches/avidemux-install-to-lib.patch
@@ -0,0 +1,24 @@
+Patch by Andreas Enge to force installation of libraries into lib
+independently of the architecture, instead of lib32 or lib64.
+On x86_64, the C library path coded in CMAKE_C_IMPLICIT_LINK_DIRECTORIES 
+contains a library (jack) installed into lib64, which forces lib64
+for avidemux with the original code.
+
+diff -u -r avidemux_2.6.8.orig/cmake/admInstallDir.cmake 
avidemux_2.6.8/cmake/admInstallDir.cmake
+--- avidemux_2.6.8.orig/cmake/admInstallDir.cmake      2014-03-12 
07:15:23.000000000 +0100
++++ avidemux_2.6.8/cmake/admInstallDir.cmake   2015-07-26 14:31:10.418459984 
+0200
+@@ -16,13 +16,7 @@
+                 MESSAGE(STATUS "No install dir provided, using /usr/local")
+         ENDIF(NOT AVIDEMUX_INSTALL_DIR )
+         SET(AVIDEMUX_BIN_DIR ${AVIDEMUX_INSTALL_DIR}/bin)
+-        IF(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/lib64([; ]|$)")
+-                SET(AVIDEMUX_RELATIVE_LIB_DIR lib64)
+-        ELSEIF(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/lib32([; ]|$)")
+-                SET(AVIDEMUX_RELATIVE_LIB_DIR lib32)
+-        ELSE(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/lib64([; ]|$)")
+-                SET(AVIDEMUX_RELATIVE_LIB_DIR lib)
+-        ENDIF(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/lib64([; ]|$)")
++        SET(AVIDEMUX_RELATIVE_LIB_DIR lib)
+         SET(AVIDEMUX_LIB_DIR 
${AVIDEMUX_INSTALL_DIR}/${AVIDEMUX_RELATIVE_LIB_DIR})
+ ENDIF(WIN32)
+ SET(AVIDEMUX_INCLUDE_DIR ${AVIDEMUX_INSTALL_DIR}/include)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 6ebd778..c57c6c6 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1090,7 +1090,8 @@ for use with HTML5 video.")
                    version ".tar.gz"))
              (sha256
               (base32
-               "10p60wjkzf1bxqcb6i7bx4hbqy3vqg598p3l9lc4v2c9b8iqr682"))))
+               "10p60wjkzf1bxqcb6i7bx4hbqy3vqg598p3l9lc4v2c9b8iqr682"))
+             (patches (map search-patch '("avidemux-install-to-lib.patch")))))
     (build-system cmake-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)))
@@ -1145,7 +1146,7 @@ for use with HTML5 video.")
             (lambda* (#:key inputs outputs #:allow-other-keys)
               (let*
                 ((out (assoc-ref outputs "out"))
-                 (lib (string-append out "/lib64"))
+                 (lib (string-append out "/lib"))
                  (top (getcwd))
                  (sdl (assoc-ref inputs "sdl"))
                  (build_component