From 645b993e25951604536092a10be85d1d10dee14d Mon Sep 17 00:00:00 2001 From: Ark74 Date: Sun, 19 Jul 2020 19:50:45 -0500 Subject: [PATCH 1/6] Fix arch libraries to build for i386 --- helpers/make-alembic | 29 ----------------------------- helpers/make-blender | 6 +++++- helpers/make-openimagedenoise | 30 ------------------------------ 3 files changed, 5 insertions(+), 60 deletions(-) delete mode 100644 helpers/make-alembic delete mode 100644 helpers/make-openimagedenoise diff --git a/helpers/make-alembic b/helpers/make-alembic deleted file mode 100644 index 288d6a3..0000000 --- a/helpers/make-alembic +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2020 Luis Guzman -# -# 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 Free Software Foundation; either version 2 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 General Public License for more details. -# -# You should have received a copy of the GNU 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 -# - -VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/thomas-schiex/blender/ubuntu bionic main' -REPOKEY=7281E3E842A98114 -BACKPORTS=true - -. ./config - -changelog "Backported from ppa" - -compile diff --git a/helpers/make-blender b/helpers/make-blender index 330627b..797e7f1 100644 --- a/helpers/make-blender +++ b/helpers/make-blender @@ -22,11 +22,15 @@ VERSION=2 EXTERNAL='deb-src http://ppa.launchpad.net/thomas-schiex/blender/ubuntu bionic main ' REPOKEY=7281E3E842A98114 BACKPORTS=true -DEPENDS=alembic,openimageio,openshadinglanguage,openjpeg,opencollada,openimagedenoise,opensubdiv +DEPENDS=openimageio,openshadinglanguage,openjpeg,opencollada,opensubdiv . ./config sed -i "s|debhelper (>= 7.0.50\~)|debhelper (<< 12\~)|" debian/control +#By removing these libraries/features is possible to build other arch rather amd64-only +sed -i "s|openimagedenoise,||" debian/control +sed -i "s|libalembic-dev,||" debian/control + changelog "Backported from ppa" compile diff --git a/helpers/make-openimagedenoise b/helpers/make-openimagedenoise deleted file mode 100644 index 62d91d8..0000000 --- a/helpers/make-openimagedenoise +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2020 Luis Guzman -# -# 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 Free Software Foundation; either version 2 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 General Public License for more details. -# -# You should have received a copy of the GNU 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 -# - -VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/thomas-schiex/blender/ubuntu bionic main' -REPOKEY=7281E3E842A98114 -BACKPORTS=true -DEPENDS=openimageio - -. ./config - -changelog "Backported from ppa" - -compile From 25db8808562eec41f47a49e3637102f314d2fbb8 Mon Sep 17 00:00:00 2001 From: Ark74 Date: Sun, 19 Jul 2020 19:58:26 -0500 Subject: [PATCH 2/6] Update changelog --- helpers/make-blender | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/make-blender b/helpers/make-blender index 797e7f1..54bb7f0 100644 --- a/helpers/make-blender +++ b/helpers/make-blender @@ -31,6 +31,6 @@ sed -i "s|debhelper (>= 7.0.50\~)|debhelper (<< 12\~)|" debian/control sed -i "s|openimagedenoise,||" debian/control sed -i "s|libalembic-dev,||" debian/control -changelog "Backported from ppa" +changelog "Backported from ppa and remove 64bits-only dependencies" compile From 13ce291b77535f1dab4fe3b5faadb09fb55c79a5 Mon Sep 17 00:00:00 2001 From: Ark74 Date: Tue, 21 Jul 2020 03:24:35 -0500 Subject: [PATCH 3/6] Bump version on changes --- helpers/make-blender | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/make-blender b/helpers/make-blender index 54bb7f0..7cbb74a 100644 --- a/helpers/make-blender +++ b/helpers/make-blender @@ -18,7 +18,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=2 +VERSION=3 EXTERNAL='deb-src http://ppa.launchpad.net/thomas-schiex/blender/ubuntu bionic main ' REPOKEY=7281E3E842A98114 BACKPORTS=true From 0677fc667ee965442f81afc40c27107ead35df70 Mon Sep 17 00:00:00 2001 From: Ark74 Date: Fri, 24 Jul 2020 11:41:07 -0500 Subject: [PATCH 4/6] Adjust libraries arch build --- helpers/make-alembic | 29 +++++++++++++++++++++++++++++ helpers/make-blender | 10 +++++----- helpers/make-openimagedenoise | 30 ++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 5 deletions(-) create mode 100644 helpers/make-alembic create mode 100644 helpers/make-openimagedenoise diff --git a/helpers/make-alembic b/helpers/make-alembic new file mode 100644 index 0000000..288d6a3 --- /dev/null +++ b/helpers/make-alembic @@ -0,0 +1,29 @@ +#!/bin/sh +# +# Copyright (C) 2020 Luis Guzman +# +# 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 Free Software Foundation; either version 2 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 General Public License for more details. +# +# You should have received a copy of the GNU 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 +# + +VERSION=1 +EXTERNAL='deb-src http://ppa.launchpad.net/thomas-schiex/blender/ubuntu bionic main' +REPOKEY=7281E3E842A98114 +BACKPORTS=true + +. ./config + +changelog "Backported from ppa" + +compile diff --git a/helpers/make-blender b/helpers/make-blender index 7cbb74a..d29889d 100644 --- a/helpers/make-blender +++ b/helpers/make-blender @@ -22,15 +22,15 @@ VERSION=3 EXTERNAL='deb-src http://ppa.launchpad.net/thomas-schiex/blender/ubuntu bionic main ' REPOKEY=7281E3E842A98114 BACKPORTS=true -DEPENDS=openimageio,openshadinglanguage,openjpeg,opencollada,opensubdiv +DEPENDS=alembic,openimageio,openshadinglanguage,openjpeg,opencollada,openimagedenoise,opensubdiv . ./config sed -i "s|debhelper (>= 7.0.50\~)|debhelper (<< 12\~)|" debian/control -#By removing these libraries/features is possible to build other arch rather amd64-only -sed -i "s|openimagedenoise,||" debian/control -sed -i "s|libalembic-dev,||" debian/control +#By adjusting these libraries/features is possible to build other archs +sed -i "s|openimagedenoise,|openimagedenoise [amd64],|" debian/control +sed -i "s|libalembic-dev,|libalembic-dev [amd64],|" debian/control -changelog "Backported from ppa and remove 64bits-only dependencies" +changelog "Backported from ppa and adjust 64bits-only dependencies" compile diff --git a/helpers/make-openimagedenoise b/helpers/make-openimagedenoise new file mode 100644 index 0000000..62d91d8 --- /dev/null +++ b/helpers/make-openimagedenoise @@ -0,0 +1,30 @@ +#!/bin/sh +# +# Copyright (C) 2020 Luis Guzman +# +# 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 Free Software Foundation; either version 2 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 General Public License for more details. +# +# You should have received a copy of the GNU 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 +# + +VERSION=1 +EXTERNAL='deb-src http://ppa.launchpad.net/thomas-schiex/blender/ubuntu bionic main' +REPOKEY=7281E3E842A98114 +BACKPORTS=true +DEPENDS=openimageio + +. ./config + +changelog "Backported from ppa" + +compile From 090ec765d82ab58d4ba1ebf7a46ae5f6e311cb94 Mon Sep 17 00:00:00 2001 From: Ark74 Date: Fri, 24 Jul 2020 11:56:02 -0500 Subject: [PATCH 5/6] Dropping openimagedenoise dependency --- helpers/make-blender | 2 +- helpers/make-openimagedenoise | 30 ------------------------------ 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 helpers/make-openimagedenoise diff --git a/helpers/make-blender b/helpers/make-blender index d29889d..eed4a89 100644 --- a/helpers/make-blender +++ b/helpers/make-blender @@ -28,7 +28,7 @@ DEPENDS=alembic,openimageio,openshadinglanguage,openjpeg,opencollada,openimagede sed -i "s|debhelper (>= 7.0.50\~)|debhelper (<< 12\~)|" debian/control #By adjusting these libraries/features is possible to build other archs -sed -i "s|openimagedenoise,|openimagedenoise [amd64],|" debian/control +sed -i "s|openimagedenoise,||" debian/control sed -i "s|libalembic-dev,|libalembic-dev [amd64],|" debian/control changelog "Backported from ppa and adjust 64bits-only dependencies" diff --git a/helpers/make-openimagedenoise b/helpers/make-openimagedenoise deleted file mode 100644 index 62d91d8..0000000 --- a/helpers/make-openimagedenoise +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2020 Luis Guzman -# -# 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 Free Software Foundation; either version 2 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 General Public License for more details. -# -# You should have received a copy of the GNU 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 -# - -VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/thomas-schiex/blender/ubuntu bionic main' -REPOKEY=7281E3E842A98114 -BACKPORTS=true -DEPENDS=openimageio - -. ./config - -changelog "Backported from ppa" - -compile From 113fedad54fcb8ad11163629385020da51483c30 Mon Sep 17 00:00:00 2001 From: Ark74 Date: Fri, 24 Jul 2020 12:05:25 -0500 Subject: [PATCH 6/6] Fix unused variable :P --- helpers/make-blender | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/make-blender b/helpers/make-blender index eed4a89..c632551 100644 --- a/helpers/make-blender +++ b/helpers/make-blender @@ -22,7 +22,7 @@ VERSION=3 EXTERNAL='deb-src http://ppa.launchpad.net/thomas-schiex/blender/ubuntu bionic main ' REPOKEY=7281E3E842A98114 BACKPORTS=true -DEPENDS=alembic,openimageio,openshadinglanguage,openjpeg,opencollada,openimagedenoise,opensubdiv +DEPENDS=alembic,openimageio,openshadinglanguage,openjpeg,opencollada,opensubdiv . ./config sed -i "s|debhelper (>= 7.0.50\~)|debhelper (<< 12\~)|" debian/control