commit:     97e71000c7110fb7d5827963a20f8f77c36074ee
Author:     Olivier Laurantin <olivier.laurantin <AT> laposte <DOT> net>
AuthorDate: Sat Apr  9 09:05:54 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 13 20:03:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e71000

media-video/ffdiaporama: code clean up (fix build w/ newer ffmpeg, musl)

Change sources location
The code now includes all previous patches
The code should compile fine with ffmpeg-5 and musl

Closes: https://bugs.gentoo.org/834402
Closes: https://bugs.gentoo.org/832358
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Olivier Laurantin <olivier.laurantin <AT> laposte.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-video/ffdiaporama/Manifest                   |  1 +
 .../ffdiaporama-2.2_pre20140701-r3.ebuild          | 59 ++++++++++++++++++++++
 2 files changed, 60 insertions(+)

diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest
index 5a325da14399..b3dc98cc13f5 100644
--- a/media-video/ffdiaporama/Manifest
+++ b/media-video/ffdiaporama/Manifest
@@ -2,6 +2,7 @@ DIST ffdiaporama-2.2-ffmpeg-3.0.patch 19635 BLAKE2B 
000816945e74033b2620f635f59e
 DIST ffdiaporama-2.2-ffmpeg-4.0.patch 6648 BLAKE2B 
1efaecf9dc6180539bc01a6e4f1403864ea2f9318cc1528aac0bb339d840e3eec40ddc60a531d8af52aae5592c38bbcad9d8dd260cedbe01ab655e2135766e6b
 SHA512 
9588352af7b048ade3b681364a4edc29526241b0631e39314b9466f490d66a4e3b795f4c32afd0aadc2a3d63a9ce4e99a6bb77e4c3f79d959e68e82856882d32
 DIST ffdiaporama-2.2-ffmpeg-4.4.patch 1034 BLAKE2B 
f6105f5fc9d928c43fc33d2eb154d97843516f42754154690ca1651c90f9cce21ce03a80ca2fd0440611f30463077a67cccc9d2103d6ffecde80f7ca5ba48142
 SHA512 
14c2c8361836a0f95224577710b72d48fe9aa5c9a330777b8cb709a1ad02f95d9b8ba0f22ff9250e0a6898cfd8f6839658a94f59082d2da767299a81a38e9f8a
 DIST ffdiaporama-2.2-libav11.patch 18781 BLAKE2B 
95da6d11fa31f18106184c0c14a524c42f03a169503ad58d72e871edc60ef52b5ee6ac6d757e8ddcaa66ba58a1b78bc1ca1a9b116d69a3526fd6bc3e5817a9d9
 SHA512 
f24f3f6b624763dcc3ea5bc0c52480d986fbec9b123ad5645c11a525c0eefb7b8708f90df4fb728dfab1d640c6dfab9a550874f59d333cff979e3ef56639416e
+DIST ffdiaporama-2.2_pre20140701.tar.gz 63271629 BLAKE2B 
d04aa9900428373e1718b2d0542929df31d7cc53067d833b15be9b2976b7e3b23e0c1cc81353e971e04784198df19179e8fbc71c5d96c1f13eb4010a6ef2635c
 SHA512 
19a17a5d0843368da2814c6dd6bcbc0fb72dc97ab1389df1c43b4db80a50f662db62f75afd864231c0ac4729f2b579f82d4909bc523bee570c543fa3cef65282
 DIST ffdiaporama_bin_2.2.devel.2014.0701.tar.gz 18377677 BLAKE2B 
74337dcb935eedfccb769562c9b763f642058d2fc8bf4a3c4a81b1ce857398ee759ce2cf269c31527cece2c18a48505ad46b197e10da8444cbf2131ffb3e1130
 SHA512 
6531381137c47d3fd2954d09fe922086de1b69638ed4b092faeb9e2982b463c6614314bda56512f6a315bd02b8600d815efb19dca3dae89947df9a48a2ae7b86
 DIST ffdiaporama_rsc_2.2.devel.2014.0503.tar.gz 18390602 BLAKE2B 
58c38d1f62ec04b217add232873556cf57d13cd17ef672f2087b44c0aac9ee7bc890de3bb812cb1c57093565b06de51ed0ddb0465d9b7fce21311fedf51042a3
 SHA512 
73faafe54d7d9a3d8d91719ac56cec7323e0a497f77e0c9f243d84782aa6040677236d9e41d3b539c45d6aca2448d737912ec59bd2a7e417749ee548cd68652d
 DIST ffdiaporama_texturemate_1.0.2014.0125.tar.gz 30352923 BLAKE2B 
af558994a811508ff6b0f1dc34f33c60fca0a4f40c1cf675e08925b40c8312444a20ea95b0a0c9316225806096e9bbb209faf3e48b74041604c6d81be0175aba
 SHA512 
e9aa9607d670a620b2e3c27d6ec5bf983eb31ab3d3139edf32ebb84d9ffa58b11c822f7db4b3f3c4a430b256719803df4a3a385bd467bdda09f8710d010eb2f5

diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r3.ebuild 
b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r3.ebuild
new file mode 100644
index 000000000000..da0e2817003c
--- /dev/null
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT="3c25c893a94dd3f88a7515437c42cd5628220625"
+
+inherit qmake-utils xdg-utils
+
+DESCRIPTION="Movie creator from photos and video clips"
+HOMEPAGE="https://ffdiaporama.tuxfamily.org";
+SRC_URI="https://github.com/laurantino/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="openclipart"
+
+RDEPEND="
+       dev-qt/qtconcurrent:5
+       dev-qt/qtcore:5
+       dev-qt/qtgui:5
+       dev-qt/qthelp:5
+       dev-qt/qtmultimedia:5
+       dev-qt/qtsql:5[sqlite]
+       dev-qt/qtsvg:5
+       dev-qt/qtwidgets:5
+       dev-qt/qtxml:5
+       media-gfx/exiv2:=
+       >=media-video/ffmpeg-4:0=[encode]
+       openclipart? ( media-gfx/openclipart[svg,-gzip] )"
+DEPEND="${RDEPEND}"
+
+DOCS=( authors.txt )
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_configure() {
+       eqmake5 QMAKE_CFLAGS_ISYSTEM=
+}
+
+src_install() {
+       emake INSTALL_ROOT="${D}" install
+       if use openclipart; then
+               dosym ../../clipart/openclipart 
/usr/share/ffDiaporama/clipart/openclipart
+       fi
+}
+
+pkg_postinst() {
+       xdg_desktop_database_update
+       xdg_mimeinfo_database_update
+       xdg_icon_cache_update
+}
+
+pkg_postrm() {
+       xdg_desktop_database_update
+       xdg_mimeinfo_database_update
+       xdg_icon_cache_update
+}

Reply via email to