[hand] optional video thumbnail support #384

IgnorantGuru · Mar 9, 2015 · b180d4c · b180d4c
1 parent 87937af
commit b180d4c
Show file tree

Hide file tree

Showing 14 changed files with 294 additions and 99 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -250,6 +250,8 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FAM_CFLAGS = @FAM_CFLAGS@
 FAM_LIBS = @FAM_LIBS@
+FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
+FFMPEG_LIBS = @FFMPEG_LIBS@
 FGREP = @FGREP@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@

diff --git a/README b/README
@@ -1,4 +1,4 @@
-README for SpaceFM v0.9.4+
+README for SpaceFM v0.9.9+
 
 Homepage:
     http://ignorantguru.github.io/spacefm/
@@ -81,16 +81,20 @@ BUILD GTK2
     packages names on your distro may vary but should be similar):
 
         autotools-dev bash build-essential desktop-file-utils libc6 libcairo2
-        libglib2.0-0 libglib2.0-dev libgtk2.0-0 (>=2.18) libgtk2.0-dev
-        libgtk2.0-bin libpango1.0-0 libx11-6 shared-mime-info intltool
-        pkg-config fakeroot libudev0 (>=143) libudev-dev
+        libffmpegthumbnailer-dev libglib2.0-0 libglib2.0-dev
+        libgtk2.0-0 (>=2.18) libgtk2.0-dev libgtk2.0-bin libpango1.0-0
+        libx11-6 shared-mime-info intltool pkg-config fakeroot libudev0 (>=143)
+        libudev-dev
 
     Also Recommended: udevil|pmount|udisks eject lsof wget ktsuss|gksu|kdesu
                       libstartup-notification0 libstartup-notification0-dev
-                      dbus libdbus-1-3 libdbus-1-dev
+                      dbus libdbus-1-3 libdbus-1-dev jmtpfs fuseiso
 
     configure will report anything missing when you run it as shown below.
 
+    Note: If you don't want video thumbnail support, add configure option
+    --disable-video-thumbnails and libffmpegthumbnailer is not required.
+
 2)  Use these commands to download the SpaceFM tarball and build:
 
         # Download & Extract
@@ -139,16 +143,19 @@ spacefm-gtk3 packages for your users.
     packages names on your distro may vary but should be similar):
 
         autotools-dev bash build-essential desktop-file-utils libc6 libcairo2
-        libglib2.0-0 libglib2.0-dev libgtk-3-0 libgtk-3-dev libgtk-3-bin
-        libpango1.0-0 libx11-6 shared-mime-info intltool pkg-config fakeroot
-        libudev0 (>=143) libudev-dev
+        libffmpegthumbnailer-dev libglib2.0-0 libglib2.0-dev libgtk-3-0
+        libgtk-3-dev libgtk-3-bin libpango1.0-0 libx11-6 shared-mime-info
+        intltool pkg-config fakeroot libudev0 (>=143) libudev-dev
 
     Also Recommended: udevil|pmount|udisks eject lsof wget ktsuss|gksu|kdesu
                       libstartup-notification0 libstartup-notification0-dev
-                      dbus libdbus-1-3 libdbus-1-dev
+                      dbus libdbus-1-3 libdbus-1-dev jmtpfs fuseiso
 
     configure will report anything missing when you run it as shown below.
 
+    Note: If you don't want video thumbnail support, add configure option
+    --disable-video-thumbnails and libffmpegthumbnailer is not required.
+
 2)  Use these commands to download the SpaceFM tarball and build:
 
         # Download & Extract
@@ -192,9 +199,9 @@ actively developed, yet please report any build problems.
     packages names on your distro may vary but should be similar):
 
         autotools-dev bash build-essential desktop-file-utils libc6 libcairo2
-        libglib2.0-0 libglib2.0-dev libgtk2.0-0 (>=2.18) libgtk2.0-dev
-        libgtk2.0-bin libpango1.0-0 libx11-6 shared-mime-info intltool
-        pkg-config fakeroot
+        libffmpegthumbnailer-dev libglib2.0-0 libglib2.0-dev
+        libgtk2.0-0 (>=2.18) libgtk2.0-dev libgtk2.0-bin libpango1.0-0 libx11-6
+        shared-mime-info intltool pkg-config fakeroot
         hal libhal-dev libhal-storage-dev libhal-storage1 libhal1
         dbus libdbus-1-3 libdbus-1-dev libdbus-glib-1-2 libdbus-glib-1-dev
 
@@ -456,7 +463,7 @@ TRANSLATE
 
 LICENSE
 
-    SpaceFM - Copyright (C) 2014  GPL3+
+    SpaceFM - Copyright (C) 2015  GPL3+
 
     This program is free software; you can redistribute it and/or modify it
     under the terms of the GNU General Public License as published by the

diff --git a/aclocal.m4 b/aclocal.m4
@@ -1977,7 +1977,7 @@ ia64-*-hpux*)
   rm -rf conftest*
   ;;
 
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
@@ -1989,9 +1989,19 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
+	    ;;
+	  powerpc64le-*)
+	    LD="${LD-ld} -m elf32lppclinux"
 	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
+	  powerpc64-*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
 	  s390x-*linux*)
@@ -2010,7 +2020,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_x86_64"
 	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
+	  powerpcle-*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*)
 	    LD="${LD-ld} -m elf64ppc"
 	    ;;
 	  s390*-*linux*|s390*-*tpf*)
@@ -2353,7 +2366,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     ;;
   *)
     lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+	test undefined != "$lt_cv_sys_max_cmd_len"; then
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
     else
@@ -3177,17 +3191,6 @@ freebsd* | dragonfly*)
   esac
   ;;
 
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
 haiku*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
@@ -3304,7 +3307,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
@@ -3349,6 +3352,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -3908,10 +3923,6 @@ freebsd* | dragonfly*)
   fi
   ;;
 
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -3950,11 +3961,11 @@ irix5* | irix6* | nonstopux*)
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd*)
+netbsd* | netbsdelf*-gnu)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   else
@@ -4702,7 +4713,7 @@ m4_if([$1], [CXX], [
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -4766,7 +4777,7 @@ m4_if([$1], [CXX], [
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | netbsdelf*-gnu)
 	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -5001,7 +5012,7 @@ m4_if([$1], [CXX], [
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -5243,6 +5254,9 @@ m4_if([$1], [CXX], [
       ;;
     esac
     ;;
+  linux* | k*bsd*-gnu | gnu*)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+    ;;
   *)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
     ;;
@@ -5305,6 +5319,9 @@ dnl Note also adjust exclude_expsyms for C++ above.
   openbsd*)
     with_gnu_ld=no
     ;;
+  linux* | k*bsd*-gnu | gnu*)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+    ;;
   esac
 
   _LT_TAGVAR(ld_shlibs, $1)=yes
@@ -5526,7 +5543,7 @@ _LT_EOF
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -5703,6 +5720,7 @@ _LT_EOF
 	if test "$aix_use_runtimelinking" = yes; then
 	  shared_flag="$shared_flag "'${wl}-G'
 	fi
+	_LT_TAGVAR(link_all_deplibs, $1)=no
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -6007,7 +6025,7 @@ _LT_EOF
       _LT_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -6883,9 +6901,6 @@ if test "$_lt_caught_CXX_error" != yes; then
         _LT_TAGVAR(ld_shlibs, $1)=yes
         ;;
 
-      gnu*)
-        ;;
-
       haiku*)
         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
         _LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -7047,7 +7062,7 @@ if test "$_lt_caught_CXX_error" != yes; then
         _LT_TAGVAR(inherit_rpath, $1)=yes
         ;;
 
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
         case $cc_basename in
           KCC*)
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -10059,7 +10074,8 @@ to "yes", and re-run configure.
 END
     AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
   fi
-fi])
+fi
+])
 
 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further