From 0adf231d662816ab8444ac2d19668de24c97f811 Mon Sep 17 00:00:00 2001 From: Lynnesbian Date: Thu, 9 Apr 2020 02:36:34 +1000 Subject: [PATCH] updated readme and enabled flatpak builds --- .gitignore | 1 + README.md | 4 +++- docker/Dockerfile-armv7l | 2 +- docker/Dockerfile-i686 | 5 +---- docker/Dockerfile-x86_64 | 2 +- docker/build.sh | 3 --- 6 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index a56e9c0..8ba6101 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ appimage/squashfs-root/ flatpak/repo/ flatpak/files/ flatpak/export/ +flatpak/*.flatpak /game.love /game.desktop.in /game.svg diff --git a/README.md b/README.md index 26a8f34..77c5727 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ love-linux-git ---- +=== ## This is a fork! This project was forked from [the original BitBucket repo](https://bitbucket.org/bartbes/love-linux-builder/), which hasn't been updated in some time. Currently, the Docker image provided by that repo fails to build, as the Mercurial version that it tries to use dies when connecting to bitbucket.org because it can't complete the SSLv3 handshake (which is a good thing). I've fixed this by updating the Dockerfile to use [Debian OldStable](https://wiki.debian.org/DebianOldStable) instead of [Debian Jessie](https://wiki.debian.org/LTS/Jessie). As of the time of writing, Debian OldStable is [Debian Stretch](https://wiki.debian.org/DebianStretch). Debian Stretch was originally released 3 years ago, and uses Linux kernel version 4.9, meaning that any Löve binaries created should be compatible with any Linux system that was updated within the last 3 or so years. @@ -15,6 +15,8 @@ LOVE_VERSION=11.3 # the löve version you want to use docker run --rm -v $REPO_PATH:/build/love-linux-builder lynnesbian/love-linux-builder:$TARGET_ARCH $LOVE_VERSION ``` +If you want to build your game's `.love` file in the resulting builds, include `game.love` in the root of the repo. There's also some other files you should include (`game.desktop.in`, `game.svg`...) - you can learn about those files the [Getting Started][] document. + A list of available löve versions can be found [on the love2d wiki](https://love2d.org/wiki/Version_History). ## License diff --git a/docker/Dockerfile-armv7l b/docker/Dockerfile-armv7l index 1661c0a..6714490 100644 --- a/docker/Dockerfile-armv7l +++ b/docker/Dockerfile-armv7l @@ -1,7 +1,7 @@ FROM arm32v7/debian:jessie # Install all sdl, love (build) deps and love-linux-builder deps -RUN apt-get update && apt-get install -y build-essential cmake libibus-1.0-dev libasound2-dev libpulse-dev libfreetype6-dev libopenal-dev libmodplug-dev libvorbis-dev libtheora-dev libphysfs-dev libmpg123-dev squashfs-tools curl mercurial libfuse2 autotools-dev automake libtool pkg-config libdevil-dev +RUN apt-get update && apt-get install -y build-essential cmake libibus-1.0-dev libasound2-dev libpulse-dev libfreetype6-dev libopenal-dev libmodplug-dev libvorbis-dev libtheora-dev libphysfs-dev libmpg123-dev squashfs-tools curl mercurial libfuse2 autotools-dev automake libtool pkg-config libdevil-dev luajit libsdl2-dev libopenal1 libluajit-5.1-dev flatpak # install the new stuff RUN apt-get install -y luajit libsdl2-dev libopenal1 libluajit-5.1-dev diff --git a/docker/Dockerfile-i686 b/docker/Dockerfile-i686 index 0e0b694..19613b1 100644 --- a/docker/Dockerfile-i686 +++ b/docker/Dockerfile-i686 @@ -1,10 +1,7 @@ FROM i386/debian:jessie # Install all sdl, love (build) deps and love-linux-builder deps -RUN apt-get update && apt-get install -y build-essential cmake libibus-1.0-dev libasound2-dev libpulse-dev libfreetype6-dev libopenal-dev libmodplug-dev libvorbis-dev libtheora-dev libphysfs-dev libmpg123-dev squashfs-tools curl mercurial libfuse2 autotools-dev automake libtool pkg-config libdevil-dev - -# install the new stuff -RUN apt-get install -y luajit libsdl2-dev libopenal1 libluajit-5.1-dev +RUN apt-get update && apt-get install -y build-essential cmake libibus-1.0-dev libasound2-dev libpulse-dev libfreetype6-dev libopenal-dev libmodplug-dev libvorbis-dev libtheora-dev libphysfs-dev libmpg123-dev squashfs-tools curl mercurial libfuse2 autotools-dev automake libtool pkg-config libdevil-dev luajit libsdl2-dev libopenal1 libluajit-5.1-dev flatpak # Add the build script ADD build.sh /build/ diff --git a/docker/Dockerfile-x86_64 b/docker/Dockerfile-x86_64 index 8a3c06e..a13ef0e 100644 --- a/docker/Dockerfile-x86_64 +++ b/docker/Dockerfile-x86_64 @@ -1,7 +1,7 @@ FROM amd64/debian:oldstable # Install all sdl, love (build) deps and love-linux-builder deps -RUN apt-get update && apt-get install -y build-essential cmake libibus-1.0-dev libasound2-dev libpulse-dev libfreetype6-dev libopenal-dev libmodplug-dev libvorbis-dev libtheora-dev libphysfs-dev libmpg123-dev squashfs-tools curl mercurial libfuse2 autotools-dev automake libtool pkg-config libdevil-dev +RUN apt-get update && apt-get install -y build-essential cmake libibus-1.0-dev libasound2-dev libpulse-dev libfreetype6-dev libopenal-dev libmodplug-dev libvorbis-dev libtheora-dev libphysfs-dev libmpg123-dev squashfs-tools curl mercurial libfuse2 autotools-dev automake libtool pkg-config libdevil-dev luajit libsdl2-dev libopenal1 libluajit-5.1-dev flatpak # install the new stuff RUN apt-get install -y luajit libsdl2-dev libopenal1 libluajit-5.1-dev diff --git a/docker/build.sh b/docker/build.sh index 6b6047a..8529c4a 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -69,9 +69,6 @@ buildflatpak() { ./build.sh "${VERSION}" - msg "Flatpak is not supported at the moment (oops)" - msg " It does not build on this old version of debian" - popd }