From 0aa2accea32371081bb041bc043431b40dca51a4 Mon Sep 17 00:00:00 2001 From: Gambhiro Date: Mon, 7 Mar 2016 15:34:47 +0000 Subject: [PATCH 1/4] deps --- Data/BuildGuideLinux.md | 4 ++-- debian/changelog | 6 ++++++ debian/control | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Data/BuildGuideLinux.md b/Data/BuildGuideLinux.md index f5e19e0..3f85285 100644 --- a/Data/BuildGuideLinux.md +++ b/Data/BuildGuideLinux.md @@ -12,13 +12,13 @@ Install the dependencies. For Ubuntu 15.04 (vivid) and 15.10 (wily): ``` -sudo apt-get install g++ libgl1-mesa-dev libgl-dev libglm-dev libjpeg-dev libpng12-dev libtbb-dev libxml2-dev qt5-default qt5-qmake qtbase5-dev libqt5opengl5-dev ocl-icd-libopencl1 ocl-icd-opencl-dev opencl-headers +sudo apt-get install g++ libgl1-mesa-dev libgl-dev libglm-dev libjpeg-dev libpng12-dev libqt5opengl5-dev libtbb-dev libxml2-dev ocl-icd-libopencl1 ocl-icd-opencl-dev opencl-headers qt5-default qt5-qmake qtbase5-dev ``` Install the OpenCL drivers and opencl support for your hardware. For AMD get their drivers from their site, build and install .deb package. For Nvidia: ``` -sudo apt-get install nvidia-352 nvidia-352-dev nvidia-opencl-icd-352 nvidia-libopencl1-352 nvidia-prime nvidia-modprobe +sudo apt-get install nvidia-352 nvidia-352-dev nvidia-libopencl1-352 nvidia-modprobe nvidia-opencl-dev nvidia-opencl-icd-352 nvidia-prime ``` Note: There may be a more recent release on their site. diff --git a/debian/changelog b/debian/changelog index a076778..7189fa2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +fractorium (0.9.9.5-0ubuntu1) wily; urgency=low + + * release 0.9.9.5 + + -- Gambhiro Bhikkhu Mon, 07 Mar 2016 15:26:36 +0000 + fractorium (0.9.9.4-0ubuntu1) wily; urgency=low * release 0.9.9.4 diff --git a/debian/control b/debian/control index 1ba7ea1..7a37ec0 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: fractorium Section: graphics Priority: optional Maintainer: Gambhiro Bhikkhu -Build-Depends: debhelper (>= 9), g++ (>= 4.9), libdbus-1-dev, libgl1-mesa-dev, libgl-dev, libglm-dev, libjpeg-dev, libpng12-dev, libtbb-dev, libxml2-dev, qt5-default, qt5-qmake, qtbase5-dev, libqt5opengl5-dev, ocl-icd-libopencl1 +Build-Depends: debhelper (>= 9), g++ (>= 4.9), libgl1-mesa-dev, libgl-dev, libglm-dev, libjpeg-dev, libpng12-dev, libqt5opengl5-dev, libtbb-dev, libxml2-dev, ocl-icd-libopencl1, ocl-icd-opencl-dev, opencl-headers qt5-default, qt5-qmake, qtbase5-dev, Standards-Version: 3.9.5 Homepage: http://mfeemster.deviantart.com/ Vcs-Git: https://github.com/mfeemster/fractorium From fe9d5743c0ec41339d6e7642dd53ed905d86cefd Mon Sep 17 00:00:00 2001 From: Gambhiro Date: Mon, 7 Mar 2016 15:38:55 +0000 Subject: [PATCH 2/4] deps fix comma --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 7a37ec0..58faa64 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: fractorium Section: graphics Priority: optional Maintainer: Gambhiro Bhikkhu -Build-Depends: debhelper (>= 9), g++ (>= 4.9), libgl1-mesa-dev, libgl-dev, libglm-dev, libjpeg-dev, libpng12-dev, libqt5opengl5-dev, libtbb-dev, libxml2-dev, ocl-icd-libopencl1, ocl-icd-opencl-dev, opencl-headers qt5-default, qt5-qmake, qtbase5-dev, +Build-Depends: debhelper (>= 9), g++ (>= 4.9), libgl1-mesa-dev, libgl-dev, libglm-dev, libjpeg-dev, libpng12-dev, libqt5opengl5-dev, libtbb-dev, libxml2-dev, ocl-icd-libopencl1, ocl-icd-opencl-dev, opencl-headers, qt5-default, qt5-qmake, qtbase5-dev Standards-Version: 3.9.5 Homepage: http://mfeemster.deviantart.com/ Vcs-Git: https://github.com/mfeemster/fractorium From 95a018acdf0d8c1d7449f1a0263c2575542560de Mon Sep 17 00:00:00 2001 From: Gambhiro Date: Mon, 7 Mar 2016 15:39:07 +0000 Subject: [PATCH 3/4] no symlinks --- package-linux.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/package-linux.sh b/package-linux.sh index b8bf5aa..ff8ec3b 100755 --- a/package-linux.sh +++ b/package-linux.sh @@ -46,9 +46,6 @@ if [ ! -d '.git' -o ! -f 'main.pro' ]; then exit 2 fi -# Make sure create-symlinks.sh will be executable. -chmod +x ./Builds/create-symlinks.sh - # Set defaults. OPT_BUILD_BINARY=0 OPT_BUILD_SOURCE=1 From 5f2f82ac502f48d98e8bcc20b0172d43b56c5eb2 Mon Sep 17 00:00:00 2001 From: Gambhiro Date: Mon, 7 Mar 2016 18:02:38 +0000 Subject: [PATCH 4/4] deb link upd --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 176de25..321c9c9 100644 --- a/README.md +++ b/README.md @@ -31,11 +31,11 @@ sudo apt-get install fractorium ### Install from .deb -Download: [fractorium_0.9.9.4-0ubuntu1_amd64.deb](https://launchpad.net/~fractorium/+archive/ubuntu/ppa/+files/fractorium_0.9.9.4-0ubuntu1_amd64.deb) +Download: [fractorium_0.9.9.5-0ubuntu1_amd64.deb](https://launchpad.net/~fractorium/+archive/ubuntu/ppa/+files/fractorium_0.9.9.5-0ubuntu1_amd64.deb) ``` cd ~/Downloads -sudo dpkg -i fractorium_0.9.9.4-0ubuntu1_amd64.deb +sudo dpkg -i fractorium_0.9.9.5-0ubuntu1_amd64.deb ``` ## Mac OS/X (10.9+)