Do not copy all 32 bit dynamic sos as this causes problems with output device enumeration.
This will cause issues with the AppImage, so disable creation of the Appimage.master
parent
6da40d7ad4
commit
411f15635f
|
|
@ -1,54 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
SCRIPT_PATH=`readlink -f $0`
|
||||
SCRIPT_PATH=`dirname $SCRIPT_PATH`
|
||||
|
||||
echo "Trying to build AppImage in directory $1 into file $3"
|
||||
|
||||
# All hope is lost if there is no lsb_release command
|
||||
command -v lsb_release >/dev/null 2>/dev/null || exit 0
|
||||
|
||||
if [ `lsb_release -is` != "Ubuntu" ]
|
||||
then
|
||||
echo "Distribution is not Ubuntu, skipping AppImage creation"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
set -e
|
||||
|
||||
cd $1
|
||||
pushd packaged
|
||||
|
||||
wget -q https://github.com/AppImage/AppImages/raw/master/functions.sh -O ./functions.sh
|
||||
. ./functions.sh
|
||||
rm functions.sh
|
||||
|
||||
cp firestorm AppRun
|
||||
cp ${SCRIPT_PATH}/firestorm.desktop firestorm.desktop
|
||||
|
||||
copy_deps
|
||||
copy_deps
|
||||
copy_deps
|
||||
delete_blacklisted
|
||||
|
||||
# Now copy everything to ./lib. The viewer binaries got build with a rpath pointing to ./lib so all so will be magically found there.
|
||||
#find ./usr/lib/ -type f -print0 | xargs -0 -Ifile cp file ./lib/
|
||||
#find ./lib/x86_64-linux-gnu/ -type f -print0 | xargs -0 -Ifile cp file ./lib/
|
||||
|
||||
#rm -rf ./usr/lib/
|
||||
#rm -rf ./lib/x86_64-linux-gnu/
|
||||
|
||||
find . -empty -type d -delete
|
||||
|
||||
popd
|
||||
|
||||
wget "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage"
|
||||
chmod a+x appimagetool-x86_64.AppImage
|
||||
./appimagetool-x86_64.AppImage --appimage-extract
|
||||
rm appimagetool-x86_64.AppImage
|
||||
ARCH=x86_64 squashfs-root/AppRun packaged
|
||||
|
||||
if [ -f $2 ]
|
||||
then
|
||||
mv $2 $3
|
||||
fi
|
||||
|
|
@ -2049,7 +2049,10 @@ class LinuxManifest(ViewerManifest):
|
|||
self.path("win64")
|
||||
|
||||
with self.prefix(src=os.path.join(pkgdir, 'lib32' ), dst="lib32"):
|
||||
self.path("*")
|
||||
self.path("libvivox*")
|
||||
self.path("libortp*")
|
||||
self.path("libsndfile*")
|
||||
self.path("*.crt")
|
||||
|
||||
def package_finish(self):
|
||||
# a standard map of strings for replacing in the templates
|
||||
|
|
@ -2075,10 +2078,6 @@ class LinuxManifest(ViewerManifest):
|
|||
# name in the tarfile
|
||||
realname = self.get_dst_prefix()
|
||||
tempname = self.build_path_of(installer_name)
|
||||
self.run_command([
|
||||
self.args["source"] + "/installers/linux/appimage.sh", self.args["build"],
|
||||
self.args["build"] + "/Firestorm-x86_64.AppImage", self.args["build"] + "/" + installer_name + ".AppImage"
|
||||
] )
|
||||
self.run_command(["mv", realname, tempname])
|
||||
try:
|
||||
# only create tarball if it's a release build.
|
||||
|
|
|
|||
Loading…
Reference in New Issue