updated gstreamer

Core/build.xml

@@ -105,19 +105,6 @@
             <fileset dir="${thirdparty.dir}/DomainCategorization"/>
         </copy>
 
-        <!-- The 'libgstlibav.dll' file is too big to store on GitHub, so we
-        have it stored in a ZIP file. We'll extract it in place and remove
-        the ZIP file afterward. -->
-        <property name="gstreamer-base-path" value="${basedir}/release/gstreamer/1.0/" />
-
-        <unzip src="${gstreamer-base-path}/x86_64/lib/gstreamer-1.0/libgstlibav.zip"
-               dest="${gstreamer-base-path}/x86_64/lib/gstreamer-1.0/"/>
-        <delete file="${gstreamer-base-path}/x86_64/lib/gstreamer-1.0/libgstlibav.zip" />
-
-        <unzip src="${gstreamer-base-path}/x86/lib/gstreamer-1.0/libgstlibav.zip"
-               dest="${gstreamer-base-path}/x86/lib/gstreamer-1.0/"/>
-        <delete file="${gstreamer-base-path}/x86/lib/gstreamer-1.0/libgstlibav.zip" />
-
         <!--Copy other jars-->
         <copy file="${thirdparty.dir}/rejistry/Rejistry-1.1-SNAPSHOT.jar" todir="${ext.dir}" />
         <copy file="${thirdparty.dir}/sevenzip/sevenzipjbinding.jar" todir="${ext.dir}" />

Core/src/org/sleuthkit/autopsy/core/Installer.java

@@ -301,7 +301,7 @@ public class Installer extends ModuleInstall {
             }
 
             Path gstreamerBasePath = Paths.get(gstreamerPath.toString(), "1.0", arch);
-            Path gstreamerBinPath = Paths.get(gstreamerBasePath.toString(), "bin");
+//            Path gstreamerBinPath = Paths.get(gstreamerBasePath.toString(), "bin");
             Path gstreamerLibPath = Paths.get(gstreamerBasePath.toString(), "lib", "gstreamer-1.0");
 
             // Update the PATH environment variable to contain the GStreamer
@@ -316,7 +316,7 @@ public class Installer extends ModuleInstall {
                  * binaries associated with the current release are found rather
                  * than binaries associated with an earlier version of Autopsy.
                  */
-                k32.SetEnvironmentVariable("PATH", gstreamerBinPath.toString() + File.pathSeparator + gstreamerLibPath.toString() + path);
+                k32.SetEnvironmentVariable("PATH", gstreamerLibPath.toString() + path);
             }
         }
     }

thirdparty/gstreamer/1.0/x86/bin/gst-shell

@@ -1,24 +0,0 @@
-#!/bin/bash
-
-export GSTREAMER_ROOT="c:/gstreamer/1.0/x86"
-export CPPFLAGS="-I${GSTREAMER_ROOT}/include ${CPPFLAGS}"
-export GST_REGISTRY_1_0="${HOME}/.cache/gstreamer-1.0/gstreamer-cerbero-registry"
-export XDG_CONFIG_DIRS="${GSTREAMER_ROOT}/etc/xdg${XDG_CONFIG_DIRS:+:$XDG_CONFIG_DIRS}:/etc/xdg"
-export LDFLAGS="-L${GSTREAMER_ROOT}/lib ${LDFLAGS}"
-export XDG_DATA_DIRS="${GSTREAMER_ROOT}/share${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}:/usr/local/share:/usr/share"
-export GST_PLUGIN_SYSTEM_PATH_1_0="${GSTREAMER_ROOT}/lib/gstreamer-1.0"
-export GIO_EXTRA_MODULES="${GSTREAMER_ROOT}/lib/gio/modules"
-export GST_PLUGIN_SYSTEM_PATH="${GSTREAMER_ROOT}/lib/gstreamer-0.10"
-export GST_PLUGIN_SCANNER="${GSTREAMER_ROOT}/libexec/gstreamer-0.10/gst-plugin-scanner"
-export GST_PLUGIN_SCANNER_1_0="${GSTREAMER_ROOT}/libexec/gstreamer-1.0/gst-plugin-scanner"
-export CFLAGS="-I${GSTREAMER_ROOT}/include ${CFLAGS}"
-export PYTHONPATH="${GSTREAMER_ROOT}/lib/python2.7/site-packages${PYTHONPATH:+:$PYTHONPATH}"
-export PKG_CONFIG_PATH="${GSTREAMER_ROOT}/lib/pkgconfig:${GSTREAMER_ROOT}/share/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
-export PATH="${GSTREAMER_ROOT}/bin${PATH:+:$PATH}:/usr/local/bin:/usr/bin:/bin"
-export GST_REGISTRY="${HOME}/.gstreamer-0.10/gstreamer-cerbero-registry"
-export LD_LIBRARY_PATH="${GSTREAMER_ROOT}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
-export CXXFLAGS="-I${GSTREAMER_ROOT}/include ${CXXFLAGS}"
-export GI_TYPELIB_PATH="${GSTREAMER_ROOT}/lib/girepository-1.0"
-
-
-$SHELL "$@"

thirdparty/gstreamer/1.0/x86/bin/gst-validate-launcher

@@ -1,69 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (c) 2014,Thibault Saunier <thibault.saunier@collabora.com>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-
-import os
-import subprocess
-import sys
-
-LIBDIR = r'/c/gstreamer/1.0/x86/lib'
-BUILDDIR = r'@BUILDDIR@'
-SRCDIR = r'@SRCDIR@'
-GIT_FIRST_HASH = 'da962d096af9460502843e41b7d25fdece7ff1c2'
-
-
-def _get_git_first_hash(path):
-    cdir = os.path.abspath(os.curdir)
-    try:
-        os.chdir(path)
-        res = subprocess.check_output(['git', 'rev-list', '--max-parents=0', 'HEAD']).decode().rstrip('\n')
-    except (subprocess.CalledProcessError, OSError):
-        res = ''
-    finally:
-        os.chdir(cdir)
-
-    return res
-
-
-def _in_devel():
-    root_dir = os.path.abspath(os.path.dirname(os.path.join(os.path.dirname(os.path.abspath(__file__)),
-                                                            "..", "..", "..")))
-    return _get_git_first_hash(root_dir) == GIT_FIRST_HASH
-
-
-def _add_gst_launcher_path():
-    f = os.path.abspath(__file__)
-    if _in_devel():
-        print("Running with development path")
-        dir_ = os.path.dirname(os.path.abspath(__file__))
-        root = os.path.split(dir_)[0]
-    elif f.startswith(BUILDDIR):
-        # Make sure to have the configured config.py in the python path
-        sys.path.insert(0, os.path.abspath(os.path.join(BUILDDIR, "..")))
-        root = os.path.abspath(os.path.join(SRCDIR, "../"))
-    else:
-        root = os.path.join(LIBDIR, 'gst-validate-launcher', 'python')
-
-    sys.path.insert(0, root)
-    return os.path.join(root, "launcher")
-
-
-if "__main__" == __name__:
-    libsdir = _add_gst_launcher_path()
-    from launcher.main import main
-    exit(main(libsdir))