diff options
6 files changed, 23 insertions, 97 deletions
diff --git a/media-video/qtlmovie/Manifest b/media-video/qtlmovie/Manifest new file mode 100644 index 00000000..7c604314 --- /dev/null +++ b/media-video/qtlmovie/Manifest @@ -0,0 +1 @@ +DIST qtlmovie-1.12.tar.gz 3580460 SHA256 bcbe4952ba086112446f39de2c3716209bd6a76e9a03575f50f326033195281b SHA512 775bf6470213ac8b5dbeb9dcbe7701c9313b2f1aba9e8c6c34c1e7a99e1252676ee771d41ab261077de8eb24ffe3e1d13d6d614cdbbd424cc40ee43198dc6949 WHIRLPOOL 78653fba9e570c7db3664aba7598987a3881f53c564e3bb2a05ecd7ce6c70ac98bbb2fbee9ef6dc20d0dd914a68d8025448f369bb45e4f29620e84fa539340a3 diff --git a/media-video/qtlmovie/qtlmovie-1.12.ebuild b/media-video/qtlmovie/qtlmovie-1.12.ebuild index 76b23705..1775bc15 100644 --- a/media-video/qtlmovie/qtlmovie-1.12.ebuild +++ b/media-video/qtlmovie/qtlmovie-1.12.ebuild @@ -6,7 +6,7 @@ inherit eutils qmake-utils DESCRIPTION="A specialized Qt frontend for FFmpeg and other free media tools" HOMEPAGE="http://qtlmovie.sourceforge.net/doc/qtlmovie-intro.html" -SRC_URI="https://github.com/redcorelinux/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 x86" @@ -22,10 +22,27 @@ RDEPEND=" " DEPEND="${RDEPEND}" -src_configure() { - eqmake5 PREFIX="${EPREFIX}/usr" ${PN}.pro +src_configure() { + eqmake5 PREFIX="${EPREFIX}/usr" "src/QtlMovie.pro" } -src_install() { - make INSTALL_ROOT=${D} install || die +src_install() { + # FIXME + # This project has a very weird source code + # make does work, but make install doesn't + # so we must do everything by hand, for now + dodir usr/bin + exeinto usr/bin + doexe QtlMovie/QtlMovie + dodir usr/share/applications + insinto usr/share/applications + doins build/QtlMovie.desktop + dodir usr/share/qt5/translations + insinto usr/share/qt5/translations + for localesrc in QtlMovie libQtl libQts; do + doins "${localesrc}"/locale/*qm + done + dodir usr/share/pixmaps + insinto usr/share/pixmaps + newins src/QtlMovie/images/qtlmovie-48.png qtlmovie.png } diff --git a/sys-kernel/nvidia-drivers-dkms/Manifest b/sys-kernel/nvidia-drivers-dkms/Manifest index c6bac581..858e871a 100644 --- a/sys-kernel/nvidia-drivers-dkms/Manifest +++ b/sys-kernel/nvidia-drivers-dkms/Manifest @@ -1,2 +1 @@ -DIST NVIDIA-Linux-x86_64-304.137.run 70087133 SHA256 eb1f56db3a2bea13e3ccde7b5ae14abe8cd6c6dbe69af4c71c68a623cc96e3e2 SHA512 d7fae1e486005ffa2f2bf7f14f901bf5156fc784407a9acfea584f49bdab92ff5f4d0fb66c4c5b2800a461fc06aebb7d760bcb59f69ce4f2cb4e03e11816b3e9 WHIRLPOOL d6dee3634b0d6052c8fbaedc6e24c893af9c9d4f0f0a7836827bfaf26313f3877f398e6cfd22c27527c30dd37347206375d9c7e642cdc9a43a682bc787b1122b DIST NVIDIA-Linux-x86_64-384.98.run 80981256 SHA256 fb10b66d9a835c8a5fca9bf2aeb2a240732108b1d6fd11dea19c326463c6b6bb SHA512 cd337d538d5a35f52b90a4437f44146f4982484c68171ee3570c2ff44b4bd96e0a65223a141770fbe3a7794e68832386a1d2bbaf66cff7f4cafba8462ef402b5 WHIRLPOOL 638700b0c209b27e99267b90c5e6e674946c1fef3dc65233195a3cca580a1bcc6684dd6a8c42f1a0ca1641784c4edf0db941e9c9b1cbcff57c01b116911660ff diff --git a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-304.137-conf.patch b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-304.137-conf.patch deleted file mode 100644 index ddac89d1..00000000 --- a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-304.137-conf.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf ---- a/kernel/dkms.conf 2017-09-14 21:51:09.000000000 +0100 -+++ b/kernel/dkms.conf 2017-12-22 15:26:51.868319934 +0000 -@@ -1,7 +1,9 @@ --PACKAGE_NAME="nvidia" -+PACKAGE_NAME="nvidia-drivers-dkms" - PACKAGE_VERSION="304.137" --BUILT_MODULE_NAME[0]="$PACKAGE_NAME" --DEST_MODULE_LOCATION[0]="/kernel/drivers/video" -+AUTOINSTALL="yes" -+ - MAKE[0]="make module SYSSRC=${kernel_source_dir}" - CLEAN="make clean" --AUTOINSTALL="yes" -+ -+BUILT_MODULE_NAME[0]="nvidia" -+DEST_MODULE_LOCATION[0]="/extra/dkms" diff --git a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-304.137-kernel-4.14.patch b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-304.137-kernel-4.14.patch deleted file mode 100644 index 74523080..00000000 --- a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-304.137-kernel-4.14.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Nur a/kernel/nv-drm.c b/kernel/nv-drm.c ---- a/kernel/nv-drm.c 2017-09-14 21:51:09.000000000 +0100 -+++ b/kernel/nv-drm.c 2017-12-22 15:29:01.080842070 +0000 -@@ -121,8 +121,12 @@ - { - int ret = 0; - #if defined(NV_DRM_AVAILABLE) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) -+ ret = drm_legacy_pci_init(&nv_drm_driver, pci_driver); -+#else - ret = drm_pci_init(&nv_drm_driver, pci_driver); - #endif -+#endif - return ret; - } - -@@ -131,6 +135,10 @@ - ) - { - #if defined(NV_DRM_AVAILABLE) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) -+ drm_legacy_pci_exit(&nv_drm_driver, pci_driver); -+#else - drm_pci_exit(&nv_drm_driver, pci_driver); - #endif -+#endif - } diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-304.137.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-304.137.ebuild deleted file mode 100644 index 798696a1..00000000 --- a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-304.137.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils - -NV_URI="http://us.download.nvidia.com/XFree86/" -AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}" - -DESCRIPTION="NVIDIA driver sources for linux" -HOMEPAGE="http://www.nvidia.com/" -SRC_URI="amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )" - -LICENSE="GPL-2 NVIDIA-r2" -SLOT="0/${PV}" -KEYWORDS="amd64" -IUSE="" - -DEPEND="sys-kernel/dkms" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${AMD64_NV_PACKAGE}" - -src_unpack() { - sh ${DISTDIR}/${AMD64_NV_PACKAGE}.run --extract-only -} - -src_prepare() { - epatch ${FILESDIR}/${P}-conf.patch - epatch ${FILESDIR}/${P}-kernel-4.14.patch -} - -src_install() { - dodir /usr/src/${P} - insinto /usr/src/${P} - doins -r "${S}"/kernel/* -} - -pkg_postinst() { - dkms add ${PN}/${PV} -} - -pkg_prerm() { - dkms remove ${PN}/${PV} --all -} |