Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ~arm64 to media-gfx/freecad #28351

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
4 changes: 3 additions & 1 deletion dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild
Expand Up @@ -14,7 +14,7 @@ inherit ${SCM} toolchain-funcs java-pkg-opt-2
if [ "${PV#9999}" != "${PV}" ] ; then
SRC_URI=""
else
KEYWORDS="amd64 ~arm"
KEYWORDS="amd64 ~arm ~arm64"
SRC_URI="https://github.com/occipital/OpenNI2/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${P/_/-}"
fi
Expand Down Expand Up @@ -42,6 +42,8 @@ PATCHES=(
"${FILESDIR}/soname.patch"
"${FILESDIR}/pthread.patch"
"${FILESDIR}/c++14.patch"
"${FILESDIR}/build_on_arm64_and_ppc.patch"
"${FILESDIR}/build_on_arm64_and_ppc_PS1200Device.cpp.patch"
)

src_prepare() {
Expand Down
393 changes: 393 additions & 0 deletions dev-libs/OpenNI2/files/build_on_arm64_and_ppc.patch

Large diffs are not rendered by default.

@@ -0,0 +1,11 @@
--- a/Source/Drivers/PSLink/PS1200Device.cpp_org 2022-11-19 18:40:24.772505998 -0000
+++ b/Source/Drivers/PSLink/PS1200Device.cpp 2022-11-19 18:41:46.388543221 -0000
@@ -43,7 +43,7 @@
// On all platforms other than Windows, prefer BULK
nRetVal = SetUsbAltInterface(0);
XN_IS_STATUS_OK_LOG_ERROR("Switch to ISO", nRetVal);
-#elif (XN_PLATFORM == XN_PLATFORM_LINUX_X86 || XN_PLATFORM == XN_PLATFORM_LINUX_ARM || XN_PLATFORM == XN_PLATFORM_MACOSX || XN_PLATFORM == XN_PLATFORM_ANDROID_ARM)
+#elif (XN_PLATFORM == XN_PLATFORM_LINUX_X86 || XN_PLATFORM == XN_PLATFORM_LINUX_ARM || XN_PLATFORM == XN_PLATFORM_LINUX_AARCH64 || XN_PLATFORM == XN_PLATFORM_LINUX_PPC || XN_PLATFORM == XN_PLATFORM_MACOSX || XN_PLATFORM == XN_PLATFORM_ANDROID_ARM)
// On all platforms other than Windows, prefer BULK
nRetVal = SetUsbAltInterface(1);
XN_IS_STATUS_OK_LOG_ERROR("Switch to BULK", nRetVal);
2 changes: 1 addition & 1 deletion dev-python/pivy/pivy-0.6.8.ebuild
Expand Up @@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
PIVY_REPO_URI="https://github.com/coin3d/pivy.git"
else
SRC_URI="https://github.com/coin3d/pivy/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
KEYWORDS="~amd64 ~arm64 ~x86"
fi

LICENSE="ISC"
Expand Down
2 changes: 1 addition & 1 deletion media-gfx/freecad/freecad-0.20.1.ebuild
Expand Up @@ -18,7 +18,7 @@ if [[ ${PV} = *9999 ]]; then
S="${WORKDIR}/freecad-${PV}"
else
SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="amd64"
KEYWORDS="amd64 ~arm64"
S="${WORKDIR}/FreeCAD-${PV}"
fi

Expand Down
4 changes: 2 additions & 2 deletions media-libs/SoQt/SoQt-1.6.0.ebuild
@@ -1,4 +1,4 @@
# Copyright 1999-2021 Gentoo Authors
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7
Expand All @@ -12,7 +12,7 @@ DESCRIPTION="GUI binding for using Coin/Open Inventor with Qt"
SRC_URI="https://github.com/coin3d/soqt/releases/download/${MY_P}/${P}-src.tar.gz"

LICENSE="GPL-2"
KEYWORDS="amd64 x86"
KEYWORDS="amd64 ~arm64 x86"
SLOT="0"
IUSE="debug doc"

Expand Down
2 changes: 1 addition & 1 deletion media-libs/quarter/quarter-1.1.0-r1.ebuild
Expand Up @@ -14,7 +14,7 @@ S="${WORKDIR}/quarter"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
KEYWORDS="amd64 ~arm64 x86"
IUSE="debug designer doc man qthelp"

REQUIRED_USE="
Expand Down
6 changes: 5 additions & 1 deletion profiles/default/linux/arm64/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2019 Gentoo Authors
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# Roy Bamford <neddyseagoon@gentoo.org> (2022-11-20)
# openni broken on arm64 but openni2 can be made to work
sci-libs/pcl openni

# Mike Frysinger <vapier@gentoo.org> (2016-05-08)
# This target supports VTV #547040.
>=sys-devel/gcc-6 -vtv
Expand Down
2 changes: 1 addition & 1 deletion sci-libs/med/med-4.1.1.ebuild
Expand Up @@ -16,7 +16,7 @@ LICENSE="LGPL-3"
S="${WORKDIR}/${P}_SRC"

SLOT="0"
KEYWORDS="amd64 ~x86"
KEYWORDS="amd64 ~arm64 ~x86"
IUSE="doc fortran mpi python test"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RESTRICT="!test? ( test ) python? ( test )"
Expand Down
2 changes: 1 addition & 1 deletion sci-libs/orocos_kdl/orocos_kdl-1.5.1.ebuild
Expand Up @@ -14,7 +14,7 @@ if [[ ${PV} = *9999 ]]; then
S="${WORKDIR}/${P}/${PN}"
else
SRC_URI="https://github.com/orocos/orocos_kinematics_dynamics/archive/v${PV}.tar.gz -> orocos_kinematics_dynamics-${PV}.tar.gz"
KEYWORDS="amd64 ~arm ~x86"
KEYWORDS="amd64 ~arm ~arm64 ~x86"
S="${WORKDIR}/orocos_kinematics_dynamics-${PV}/${PN}"
fi

Expand Down
2 changes: 1 addition & 1 deletion sci-libs/pcl/pcl-1.12.1-r2.ebuild
Expand Up @@ -14,7 +14,7 @@ inherit ${SCM} cmake cuda
if [ "${PV#9999}" != "${PV}" ] ; then
SRC_URI=""
else
KEYWORDS="~amd64 ~arm"
KEYWORDS="~amd64 ~arm ~arm64"
SRC_URI="https://github.com/PointCloudLibrary/pcl/archive/${P}.tar.gz"
S="${WORKDIR}/${PN}-${P}"
fi
Expand Down
4 changes: 3 additions & 1 deletion sci-mathematics/cgal/cgal-5.5.ebuild
Expand Up @@ -17,7 +17,9 @@ S="${WORKDIR}/${MY_P}"

LICENSE="LGPL-3 GPL-3 Boost-1.0"
SLOT="0/14"
KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"

# broken on arm64. Bug #881995
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc examples"

RDEPEND="
Expand Down