media-libs/partio-1.5.4-r1 build with python 3.7

4 years ago · 03309a280b
parent f16df90c01
commit 03309a280b
6 changed files with 114 additions and 140 deletions
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@ -1 +0,0 @@
-DIST libffado-2.4.1.tgz 1229295 BLAKE2B 3b42493b68fc8648e116784e04baee2278c21e01fa92b22d990340ef329f67c898e247891e76d494410a758009fcf186ba556e900598eaca539a9879664cc704 SHA512 0859f17b87c68108bbde726d1cf8ab0b99f6f7f02cbe36acd8b451e112688a4d1edc21134eb4a2edc8c92dcf5f5da52efeabb2ad0dc07804ed1aa664a3b38d74
--- a/media-libs/libffado/files/libffado-2.4.1-python3-scons-fix.patch
+++ b/media-libs/libffado/files/libffado-2.4.1-python3-scons-fix.patch
@ -1,24 +0,0 @@
--- libffado-2.4.1-old/support/mixer-qt4/SConscript	2015-04-12 20:18:15.000000000 +0900
-+++ libffado-2.4.1/support/mixer-qt4/SConscript	2018-06-26 19:59:19.015719710 +0900
-@@ -29,16 +29,12 @@
- if env['BUILD_MIXER'] == 'true':
-     e = env.Clone()
- 
-    def findfiles( arg, dirname, names ):
-        for name in names:
-            if name.startswith("."):
-                names.remove(name)
-        for name in names:
-            if '.pyc' not in name and '.in' not in name:
-                arg.append( os.path.join( dirname, name ) )
-
-     pythonfiles = [ 'ffado/config.py' ]
-    os.path.walk( "ffado", findfiles, pythonfiles )
-+    for root, dirs, files in os.walk( "ffado" ):
-+        for name in files:
-+            if name.endswith( '.pyc' ) or '.in' in name or name.startswith("."):
-+                continue
-+            pythonfiles.append( os.path.join( root, name ) )
- 
-     e.ScanReplace( "ffado/config.py.in" )
-     e.Depends( "ffado/config.py", "#/SConstruct" )
--- a/media-libs/libffado/libffado-2.4.1-r2.ebuild
+++ b/media-libs/libffado/libffado-2.4.1-r2.ebuild
@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit desktop python-single-r1 scons-utils toolchain-funcs udev multilib-minimal
-
-DESCRIPTION="Driver for IEEE1394 (Firewire) audio interfaces"
-HOMEPAGE="http://www.ffado.org"
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit subversion
-	ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}"
-else
-	SRC_URI="http://www.ffado.org/files/${P}.tgz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-fi
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-IUSE="debug qt5 test-programs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-cpp/libxmlpp:2.6[${MULTILIB_USEDEP}]
-	dev-libs/dbus-c++
-	dev-libs/libconfig[cxx,${MULTILIB_USEDEP}]
-	media-libs/alsa-lib
-	media-libs/libiec61883[${MULTILIB_USEDEP}]
-	sys-apps/dbus
-	sys-libs/libavc1394[${MULTILIB_USEDEP}]
-	sys-libs/libraw1394[${MULTILIB_USEDEP}]
-	qt5? (
-		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-			dev-python/PyQt5[dbus,${PYTHON_MULTI_USEDEP}]
-		')
-		x11-misc/xdg-utils
-	)"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	!<media-sound/jack-audio-connection-kit-0.122.0:0
-	!<media-sound/jack-audio-connection-kit-1.9.9:2"
-
-PATCHES=(
-	"${FILESDIR}/${P}-python3-scons-fix.patch"
-)
-
-myescons() {
-	local myesconsargs=(
-		PREFIX="${EPREFIX}/usr"
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-		MANDIR="${EPREFIX}/usr/share/man"
-		UDEVDIR="$(get_udevdir)/rules.d"
-		CUSTOM_ENV=true
-		DETECT_USERSPACE_ENV=false
-		DEBUG=$(usex debug)
-		PYPKGDIR="$(python_get_sitedir)"
-		# ENABLE_OPTIMIZATIONS detects cpu type and sets flags accordingly
-		# -fomit-frame-pointer is added also which can cripple debugging.
-		# we set flags from portage instead
-		ENABLE_OPTIMIZATIONS=false
-		# This only works for JACK1>=0.122.0 or JACK2>=1.9.9, so we block
-		# lower versions.
-		ENABLE_SETBUFFERSIZE_API_VER=force
-	)
-	if multilib_is_native_abi; then
-		myesconsargs+=(
-			BUILD_MIXER=$(usex qt5 true false)
-			BUILD_TESTS=$(usex test-programs)
-		)
-	else
-		myesconsargs+=(
-			BUILD_MIXER=false
-			BUILD_TESTS=false
-		)
-	fi
-	escons "${myesconsargs[@]}" "${@}"
-}
-
-src_prepare() {
-	default
-
-	# Always use Qt5
-	sed -i -e 's/try:/if False:/' -e 's/except.*/else:/' support/mixer-qt4/ffado/import_pyqt.py || die
-
-	# Bugs #658052, #659226
-	sed -i -e 's/^CacheDir/#CacheDir/' SConstruct || die
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export CC CXX
-	myescons
-}
-
-multilib_src_install() {
-	myescons DESTDIR="${D}" WILL_DEAL_WITH_XDG_MYSELF="True" install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	python_fix_shebang "${D}"
-	python_optimize "${D}"
-
-	if use qt5; then
-		newicon "support/xdg/hi64-apps-ffado.png" "ffado.png"
-		newmenu "support/xdg/ffado.org-ffadomixer.desktop" "ffado-mixer.desktop"
-	fi
-}
--- a/media-libs/partio/Manifest
+++ b/media-libs/partio/Manifest
@ -0,0 +1 @@
+DIST partio-1.5.4.tar.gz 291617 BLAKE2B 638fae984d392e1e6c95862ad9a8dd8b8a0d80b2c83dfd03e887af36e420d15fd67f0b2c71e5e8c335668b512660bf14f03a1329ac0d7a48431674a51043585d SHA512 967da5b648b19c45bd0c3c8ff56f891e2d54a07b2cd113f18d5d0b646cbfabd968e31ee48c0e167bf9a911d8d5af42d5291b355da305a2b9134fa78fc23e5636
--- a/media-libs/partio/files/partio-1.1.0-Rename-partconv.patch
+++ b/media-libs/partio/files/partio-1.1.0-Rename-partconv.patch
@ -0,0 +1,65 @@
+From 7042285af5491fd3c2727fa24a7fd44145c066e5 Mon Sep 17 00:00:00 2001
+From: Jonathan Scruggs <j.scruggs@gmail.com>
+Date: Sat, 23 Sep 2017 16:43:37 +0100
+Subject: [PATCH] Rename partconv to partconvert to avoid file collisions
+
+* partconv is the name of a program used by Crystal Space
+
+Closes: https://bugs.gentoo.org/631834
+---
+ README.md                                  | 2 +-
+ src/Makefile                               | 2 +-
+ src/tools/CMakeLists.txt                   | 6 +++---
+ src/tools/{partconv.cpp => partconvert.cpp} | 0
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+ rename src/tools/{partconv.cpp => partconvert.cpp} (100%)
+
+diff --git a/README.md b/README.md
+index 0a3ac19..4cd12c3 100644
+--- a/README.md
+++ b/README.md
+@@ -56,7 +56,7 @@ src/
+    doc/      Doxygen documentation and (the start of) a manual
+    tests/    Start of regression tests (I need more)
+    tools/    Useful tools 
+-             partconv <input format> <output format>
+             partconvert <input format> <output format>
+              partinfo <particle file>
+              partview <particle file>
+ 
+diff --git a/src/Makefile b/src/Makefile
+index 0ced80e..ca4f965 100644
+--- a/src/Makefile
+++ b/src/Makefile
+@@ -25,4 +25,4 @@ reader/BGEO.o: reader/BGEO.cpp Particle.h ParticleSimple.h \
+ reader/PDB.o: reader/PDB.cpp Particle.h ParticleSimple.h \
+   reader/../Particle.h reader/pdb.h
+ partinfo.o: partinfo.cpp Particle.h
+-partconv.o: partconf.cpp Particle.h
+\ No newline at end of file
+partconvert.o: partconf.cpp Particle.h
+diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
+index 7a6d26b..b4ed9ae 100644
+--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
+@@ -47,10 +47,10 @@ ENDIF(GLUT_FOUND AND OPENGL_FOUND)
+ ADD_EXECUTABLE(partinfo partinfo.cpp)
+ target_link_libraries(partinfo ${PARTIO_LIBRARIES})
+ 
+-ADD_EXECUTABLE(partconv partconv.cpp)
+-target_link_libraries(partconv ${PARTIO_LIBRARIES})
+ADD_EXECUTABLE(partconvert partconvert.cpp)
+target_link_libraries(partconvert ${PARTIO_LIBRARIES})
+ 
+ ADD_EXECUTABLE(partattr partattr.cpp)
+ target_link_libraries(partattr ${PARTIO_LIBRARIES})
+ 
+-install(TARGETS partattr partconv partinfo DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(TARGETS partattr partconvert partinfo DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/src/tools/partconv.cpp b/src/tools/partconvert.cpp
+similarity index 100%
+rename from src/tools/partconv.cpp
+rename to src/tools/partconvert.cpp
+-- 
+2.14.1
+
--- a/media-libs/partio/partio-1.5.4-r1.ebuild
+++ b/media-libs/partio/partio-1.5.4-r1.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 )
+inherit cmake python-single-r1
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/wdas/partio.git"
+else
+	SRC_URI="https://github.com/wdas/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 x86"
+fi
+
+DESCRIPTION="Library for particle IO and manipulation"
+HOMEPAGE="https://www.disneyanimation.com/technology/partio.html"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-lang/swig
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
+RDEPEND="${PYTHON_DEPS}
+	media-libs/freeglut
+	sys-libs/zlib
+	virtual/opengl
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package doc Doxygen)
+	)
+	cmake_src_configure
+}
				`@ -1 +0,0 @@`
				`DIST libffado-2.4.1.tgz 1229295 BLAKE2B 3b42493b68fc8648e116784e04baee2278c21e01fa92b22d990340ef329f67c898e247891e76d494410a758009fcf186ba556e900598eaca539a9879664cc704 SHA512 0859f17b87c68108bbde726d1cf8ab0b99f6f7f02cbe36acd8b451e112688a4d1edc21134eb4a2edc8c92dcf5f5da52efeabb2ad0dc07804ed1aa664a3b38d74`
				`@ -0,0 +1 @@`
				`DIST partio-1.5.4.tar.gz 291617 BLAKE2B 638fae984d392e1e6c95862ad9a8dd8b8a0d80b2c83dfd03e887af36e420d15fd67f0b2c71e5e8c335668b512660bf14f03a1329ac0d7a48431674a51043585d SHA512 967da5b648b19c45bd0c3c8ff56f891e2d54a07b2cd113f18d5d0b646cbfabd968e31ee48c0e167bf9a911d8d5af42d5291b355da305a2b9134fa78fc23e5636`