[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/

[Joonas Niilola]

commit: f19a197c2bb10b64ed94a794a6e5c6360c70cf3d
Author: Olivier Laurantin  laposte  net>
AuthorDate: Sat Feb  3 23:34:51 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Feb 29 13:48:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f19a197c

media-video/ffdiaporama: drop 2.2_pre20221007

Signed-off-by: Olivier Laurantin  laposte.net>
Closes: https://github.com/gentoo/gentoo/pull/35175
Signed-off-by: Joonas Niilola  gentoo.org>

 media-video/ffdiaporama/Manifest   |  1 -
 .../ffdiaporama/ffdiaporama-2.2_pre20221007.ebuild | 59 --
 2 files changed, 60 deletions(-)

diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest
index 0e2bbc8e5dd3..b47a6966a178 100644
--- a/media-video/ffdiaporama/Manifest
+++ b/media-video/ffdiaporama/Manifest
@@ -1,3 +1,2 @@
-DIST ffdiaporama-2.2_pre20221007.tar.gz 63271591 BLAKE2B 
0fbd20e571329bc294554c50a04920b837af4b62cf4cc7ef356dd9372a8f1f3f01c7b2736fba71c52d468261ad778107e332929ab90d2cf768698102d269a00c
 SHA512 
a37966bb31853de42e7c03a9a1e913332e417278fe663f088d9d9ee763db163549993fa7271b53ad2d495cef5e05d11e3f13ab3343cace3cb4c202aadb461beb
 DIST ffdiaporama-2.2_pre20230525.tar.gz 63270147 BLAKE2B 
26cc3ecd7966a945808481c18b2f9a239132cae5016f33e83ef5588c55b1f2a0d7609cd1bdfaf51ada75e1df5274733b7985f6eb3b3814260102f6c9e406ed68
 SHA512 
777d110b0948bc3c3bdb14e13b4ce09ec819bfac2759c715a1e247b1d6cf8c8461c1ec28a0315f034e4e5a19b4732ce583d71b2edd9c6375b7dae14868cc8dfe
 DIST ffdiaporama-2.2_pre20240203.tar.gz 63277387 BLAKE2B 
466f8c38b4e308b024f1a8961a0efb0ec5f6c5fe651a8165bd74d8e87823bf3134c5234012f1bd7637d339df92d495f1fc4acaf63670b30ec220e1667963caa0
 SHA512 
e5e46997df7c90016380f15e4b8b5bab4c8df97e536d4f90216e09ab3c09114dba1b034ea8ce23a6b3c04808ba35e92fd850ab1c1bd8fa1db3e7d8ae7cb6d212

diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20221007.ebuild 
b/media-video/ffdiaporama/ffdiaporama-2.2_pre20221007.ebuild
deleted file mode 100644
index 1d33f68b959e..
--- a/media-video/ffdiaporama/ffdiaporama-2.2_pre20221007.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-COMMIT="cb0bb696bea9846fc63a43056c01ddc1efa4a2a8"
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/

[Joonas Niilola]

commit: 18d2642d5bca1a63343017f993f8ef06ebea8638
Author: Olivier Laurantin  laposte  net>
AuthorDate: Sat Feb  3 23:18:45 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Feb 29 13:48:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18d2642d

media-video/ffdiaporama: add 2.2_pre20240203

Signed-off-by: Olivier Laurantin  laposte.net>
Signed-off-by: Joonas Niilola  gentoo.org>

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

diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest
index 93bff6f4e0f3..0e2bbc8e5dd3 100644
--- a/media-video/ffdiaporama/Manifest
+++ b/media-video/ffdiaporama/Manifest
@@ -1,2 +1,3 @@
 DIST ffdiaporama-2.2_pre20221007.tar.gz 63271591 BLAKE2B 
0fbd20e571329bc294554c50a04920b837af4b62cf4cc7ef356dd9372a8f1f3f01c7b2736fba71c52d468261ad778107e332929ab90d2cf768698102d269a00c
 SHA512 
a37966bb31853de42e7c03a9a1e913332e417278fe663f088d9d9ee763db163549993fa7271b53ad2d495cef5e05d11e3f13ab3343cace3cb4c202aadb461beb
 DIST ffdiaporama-2.2_pre20230525.tar.gz 63270147 BLAKE2B 
26cc3ecd7966a945808481c18b2f9a239132cae5016f33e83ef5588c55b1f2a0d7609cd1bdfaf51ada75e1df5274733b7985f6eb3b3814260102f6c9e406ed68
 SHA512 
777d110b0948bc3c3bdb14e13b4ce09ec819bfac2759c715a1e247b1d6cf8c8461c1ec28a0315f034e4e5a19b4732ce583d71b2edd9c6375b7dae14868cc8dfe
+DIST ffdiaporama-2.2_pre20240203.tar.gz 63277387 BLAKE2B 
466f8c38b4e308b024f1a8961a0efb0ec5f6c5fe651a8165bd74d8e87823bf3134c5234012f1bd7637d339df92d495f1fc4acaf63670b30ec220e1667963caa0
 SHA512 
e5e46997df7c90016380f15e4b8b5bab4c8df97e536d4f90216e09ab3c09114dba1b034ea8ce23a6b3c04808ba35e92fd850ab1c1bd8fa1db3e7d8ae7cb6d212

diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20240203.ebuild 
b/media-video/ffdiaporama/ffdiaporama-2.2_pre20240203.ebuild
new file mode 100644
index ..09236af881f4
--- /dev/null
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20240203.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COMMIT="edf0b29d9e14e0b81d54f9b086ff2f0dd2ed85c5"
+
+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-6:=[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
+}

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/

[Arthur Zamarin]

commit: 873a313c03a86ffce5f6fd37ab4337e6bada23a7
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Aug 20 19:35:10 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Aug 20 19:35:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=873a313c

media-video/ffdiaporama: Stabilize 2.2_pre20230525 x86, #912690

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/ffdiaporama/ffdiaporama-2.2_pre20230525.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20230525.ebuild 
b/media-video/ffdiaporama/ffdiaporama-2.2_pre20230525.ebuild
index a6c1ea129a16..624ed4d35a2f 100644
--- a/media-video/ffdiaporama/ffdiaporama-2.2_pre20230525.ebuild
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20230525.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/laurantino/${PN}/archive/${COMMIT}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="openclipart"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/

[Arthur Zamarin]

commit: dc66c6777942a02ae46f3b7701d19f1e596a4b32
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Aug 20 19:34:02 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Aug 20 19:34:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc66c677

media-video/ffdiaporama: Stabilize 2.2_pre20230525 amd64, #912690

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/ffdiaporama/ffdiaporama-2.2_pre20230525.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20230525.ebuild 
b/media-video/ffdiaporama/ffdiaporama-2.2_pre20230525.ebuild
index efbc9b5a2c90..a6c1ea129a16 100644
--- a/media-video/ffdiaporama/ffdiaporama-2.2_pre20230525.ebuild
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20230525.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/laurantino/${PN}/archive/${COMMIT}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="openclipart"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/

[Joonas Niilola]

commit: c7787bece4cc07cf494635d5121da02fb9838d3f
Author: Olivier Laurantin  laposte  net>
AuthorDate: Thu May 25 20:32:13 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun May 28 07:28:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7787bec

media-video/ffdiaporama: add 2.2_pre20230525

Closes: https://bugs.gentoo.org/906496
Signed-off-by: Olivier Laurantin  laposte.net>
Closes: https://github.com/gentoo/gentoo/pull/31162
Signed-off-by: Joonas Niilola  gentoo.org>

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

diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest
index 57455548f43c..93bff6f4e0f3 100644
--- a/media-video/ffdiaporama/Manifest
+++ b/media-video/ffdiaporama/Manifest
@@ -1 +1,2 @@
 DIST ffdiaporama-2.2_pre20221007.tar.gz 63271591 BLAKE2B 
0fbd20e571329bc294554c50a04920b837af4b62cf4cc7ef356dd9372a8f1f3f01c7b2736fba71c52d468261ad778107e332929ab90d2cf768698102d269a00c
 SHA512 
a37966bb31853de42e7c03a9a1e913332e417278fe663f088d9d9ee763db163549993fa7271b53ad2d495cef5e05d11e3f13ab3343cace3cb4c202aadb461beb
+DIST ffdiaporama-2.2_pre20230525.tar.gz 63270147 BLAKE2B 
26cc3ecd7966a945808481c18b2f9a239132cae5016f33e83ef5588c55b1f2a0d7609cd1bdfaf51ada75e1df5274733b7985f6eb3b3814260102f6c9e406ed68
 SHA512 
777d110b0948bc3c3bdb14e13b4ce09ec819bfac2759c715a1e247b1d6cf8c8461c1ec28a0315f034e4e5a19b4732ce583d71b2edd9c6375b7dae14868cc8dfe

diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20230525.ebuild 
b/media-video/ffdiaporama/ffdiaporama-2.2_pre20230525.ebuild
new file mode 100644
index ..efbc9b5a2c90
--- /dev/null
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20230525.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COMMIT="6b2587064d705de42a3e88468d4922bc27b97e2a"
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/

[Andreas Sturmlechner]

commit: 54fe85168d131c0dda9e19e45c767b7a2088b4e3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue May 16 08:54:48 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue May 16 08:54:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54fe8516

media-video/ffdiaporama: Cleanup metadata

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/ffdiaporama/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-video/ffdiaporama/metadata.xml 
b/media-video/ffdiaporama/metadata.xml
index 2dbec0c5037f..77033bf869e4 100644
--- a/media-video/ffdiaporama/metadata.xml
+++ b/media-video/ffdiaporama/metadata.xml
@@ -39,6 +39,5 @@


Support openclipart database
-   Install extra backgrounds

 

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/

[Andreas Sturmlechner]

commit: b3a71531ddaf4eff1b40fed19e1e1e4f564d1783
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue May 16 07:00:31 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue May 16 08:36:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3a71531

media-video/ffdiaporama: drop 2.2_pre20140701-r2, 2.2_pre20220403

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/ffdiaporama/Manifest   |  8 ---
 .../ffdiaporama-2.2_pre20140701-r2.ebuild  | 77 --
 .../ffdiaporama/ffdiaporama-2.2_pre20220403.ebuild | 59 -
 3 files changed, 144 deletions(-)

diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest
index 95deb3493d2b..57455548f43c 100644
--- a/media-video/ffdiaporama/Manifest
+++ b/media-video/ffdiaporama/Manifest
@@ -1,9 +1 @@
-DIST ffdiaporama-2.2-ffmpeg-3.0.patch 19635 BLAKE2B 
000816945e74033b2620f635f59e762e82988ef60740ac14bfee02850cc6299ec0934a7f48afe03009a94bbb531e9668c9d16fe230db34d03ba54b0c42249348
 SHA512 
958025fee8df94a600fa4919fe9aa5574556c163a771b36213e90f116c13d0448a86e99a49b2ac4631c1b845ffb8c87789ac00cb8462fed1abbe9233e49a47fc
-DIST ffdiaporama-2.2-ffmpeg-4.0.patch 6648 BLAKE2B 
1efaecf9dc6180539bc01a6e4f1403864ea2f9318cc1528aac0bb339d840e3eec40ddc60a531d8af52aae5592c38bbcad9d8dd260cedbe01ab655e2135766e6b
 SHA512 
9588352af7b048ade3b681364a4edc29526241b0631e39314b9466f490d66a4e3b795f4c32afd0aadc2a3d63a9ce4e99a6bb77e4c3f79d959e68e82856882d32
-DIST ffdiaporama-2.2-ffmpeg-4.4.patch 1034 BLAKE2B 
f6105f5fc9d928c43fc33d2eb154d97843516f42754154690ca1651c90f9cce21ce03a80ca2fd0440611f30463077a679d2103d6ffecde80f7ca5ba48142
 SHA512 
14c2c8361836a0f95224577710b72d48fe9aa5c9a330777b8cb709a1ad02f95d9b8ba0f22ff9250e0a6898cfd8f6839658a94f59082d2da767299a81a38e9f8a
-DIST ffdiaporama-2.2-libav11.patch 18781 BLAKE2B 
95da6d11fa31f18106184c0c14a524c42f03a169503ad58d72e871edc60ef52b5ee6ac6d757e8ddcaa66ba58a1b78bc1ca1a9b116d69a3526fd6bc3e5817a9d9
 SHA512 
f24f3f6b624763dcc3ea5bc0c52480d986fbec9b123ad5645c11a525c0eefb7b8708f90df4fb728dfab1d640c6dfab9a550874f59d333cff979e3ef56639416e
-DIST ffdiaporama-2.2_pre20220403.tar.gz 63270245 BLAKE2B 
86e5926285b5c38146065cbbc53182eba77c25fa7eddd79e61276b949f5ad4f217f3e2562bed938f06c191493929afa7f24820ef957243f176b3f8e09d4284a9
 SHA512 
75076eadf1cbef38590ef250746228598ddb00bec2328589a6fb913ee3ae376a6587e6e90494986c5cbeda7aba6c342992cb5e71e5c8ce26e4fda12238ce72e4
 DIST ffdiaporama-2.2_pre20221007.tar.gz 63271591 BLAKE2B 
0fbd20e571329bc294554c50a04920b837af4b62cf4cc7ef356dd9372a8f1f3f01c7b2736fba71c52d468261ad778107e332929ab90d2cf768698102d269a00c
 SHA512 
a37966bb31853de42e7c03a9a1e913332e417278fe663f088d9d9ee763db163549993fa7271b53ad2d495cef5e05d11e3f13ab3343cace3cb4c202aadb461beb
-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-r2.ebuild 
b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
deleted file mode 100644
index f32094e39d46..
--- a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV=${PV%_pre20140701}
-BIN_PV=${MY_PV}.devel.2014.0701
-RSC_PV=${MY_PV}.devel.2014.0503
-TMT_PV=1.0.2014.0125
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="Movie creator from photos and video clips"
-HOMEPAGE="https://ffdiaporama.tuxfamily.org;
-SRC_URI="https://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_bin_${BIN_PV}.tar.gz
-   
https://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_rsc_${RSC_PV}.tar.gz
-   
https://raw.githubusercontent.com/laurantino/gentoo-dist/master/ffdiaporama-2.2-libav11.patch
-   
https://raw.githubusercontent.com/laurantino/gentoo-dist/master/ffdiaporama-2.2-ffmpeg-3.0.patch
-   
https://raw.githubusercontent.com/laurantino/gentoo-dist/master/ffdiaporama-2.2-ffmpeg-4.0.patch
-   

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/

[Sam James]

commit: 9a1983030b4ef73bebdee35fbe5118e5c84e752e
Author: Sam James  gentoo  org>
AuthorDate: Tue May 16 03:40:24 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 16 03:40:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a198303

media-video/ffdiaporama: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 media-video/ffdiaporama/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-video/ffdiaporama/metadata.xml 
b/media-video/ffdiaporama/metadata.xml
index dc6829f4891b..2dbec0c5037f 100644
--- a/media-video/ffdiaporama/metadata.xml
+++ b/media-video/ffdiaporama/metadata.xml
@@ -13,6 +13,7 @@

http://ffdiaporama.tuxfamily.org/?page_id=7266lang=en
http://ffdiaporama.tuxfamily.org/?page_id=6268

http://ffdiaporama.tuxfamily.org/Forum/viewforum.php?id=4
+   laurantino/ffdiaporama


ffDiaporama is an application for creating video sequences 
consisting of

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/

[Sam James]

commit: c18361ca64f48b78f462094bc2f82374c34bd727
Author: Sam James  gentoo  org>
AuthorDate: Tue May 16 03:39:03 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 16 03:39:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c18361ca

media-video/ffdiaporama: Stabilize 2.2_pre20221007 amd64, #906504

Signed-off-by: Sam James  gentoo.org>

 media-video/ffdiaporama/ffdiaporama-2.2_pre20221007.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20221007.ebuild 
b/media-video/ffdiaporama/ffdiaporama-2.2_pre20221007.ebuild
index c9ce0306f4d0..1d33f68b959e 100644
--- a/media-video/ffdiaporama/ffdiaporama-2.2_pre20221007.ebuild
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20221007.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/laurantino/${PN}/archive/${COMMIT}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="openclipart"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/

[Sam James]

commit: 6153b87fc66cd7b41d5b437f9dc9cb55443f13de
Author: Sam James  gentoo  org>
AuthorDate: Tue May 16 03:39:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 16 03:39:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6153b87f

media-video/ffdiaporama: Stabilize 2.2_pre20221007 x86, #906504

Signed-off-by: Sam James  gentoo.org>

 media-video/ffdiaporama/ffdiaporama-2.2_pre20221007.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20221007.ebuild 
b/media-video/ffdiaporama/ffdiaporama-2.2_pre20221007.ebuild
index acb80e067b23..c9ce0306f4d0 100644
--- a/media-video/ffdiaporama/ffdiaporama-2.2_pre20221007.ebuild
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20221007.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/laurantino/${PN}/archive/${COMMIT}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="openclipart"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/

[Joonas Niilola]

commit: 67859d5b840c03331d595035990eae168a3c008d
Author: Olivier Laurantin  laposte  net>
AuthorDate: Fri Oct  7 21:27:48 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Oct 27 12:55:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67859d5b

media-video/ffdiaporama: version bump to 2.2_pre20221007

Closes: https://bugs.gentoo.org/870610
Signed-off-by: Olivier Laurantin  laposte.net>
Closes: https://github.com/gentoo/gentoo/pull/27691
Signed-off-by: Joonas Niilola  gentoo.org>

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

diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest
index 1f9d1bb7e54e..95deb3493d2b 100644
--- a/media-video/ffdiaporama/Manifest
+++ b/media-video/ffdiaporama/Manifest
@@ -3,6 +3,7 @@ DIST ffdiaporama-2.2-ffmpeg-4.0.patch 6648 BLAKE2B 
1efaecf9dc6180539bc01a6e4f140
 DIST ffdiaporama-2.2-ffmpeg-4.4.patch 1034 BLAKE2B 
f6105f5fc9d928c43fc33d2eb154d97843516f42754154690ca1651c90f9cce21ce03a80ca2fd0440611f30463077a679d2103d6ffecde80f7ca5ba48142
 SHA512 
14c2c8361836a0f95224577710b72d48fe9aa5c9a330777b8cb709a1ad02f95d9b8ba0f22ff9250e0a6898cfd8f6839658a94f59082d2da767299a81a38e9f8a
 DIST ffdiaporama-2.2-libav11.patch 18781 BLAKE2B 
95da6d11fa31f18106184c0c14a524c42f03a169503ad58d72e871edc60ef52b5ee6ac6d757e8ddcaa66ba58a1b78bc1ca1a9b116d69a3526fd6bc3e5817a9d9
 SHA512 
f24f3f6b624763dcc3ea5bc0c52480d986fbec9b123ad5645c11a525c0eefb7b8708f90df4fb728dfab1d640c6dfab9a550874f59d333cff979e3ef56639416e
 DIST ffdiaporama-2.2_pre20220403.tar.gz 63270245 BLAKE2B 
86e5926285b5c38146065cbbc53182eba77c25fa7eddd79e61276b949f5ad4f217f3e2562bed938f06c191493929afa7f24820ef957243f176b3f8e09d4284a9
 SHA512 
75076eadf1cbef38590ef250746228598ddb00bec2328589a6fb913ee3ae376a6587e6e90494986c5cbeda7aba6c342992cb5e71e5c8ce26e4fda12238ce72e4
+DIST ffdiaporama-2.2_pre20221007.tar.gz 63271591 BLAKE2B 
0fbd20e571329bc294554c50a04920b837af4b62cf4cc7ef356dd9372a8f1f3f01c7b2736fba71c52d468261ad778107e332929ab90d2cf768698102d269a00c
 SHA512 
a37966bb31853de42e7c03a9a1e913332e417278fe663f088d9d9ee763db163549993fa7271b53ad2d495cef5e05d11e3f13ab3343cace3cb4c202aadb461beb
 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_pre20221007.ebuild 
b/media-video/ffdiaporama/ffdiaporama-2.2_pre20221007.ebuild
new file mode 100644
index ..acb80e067b23
--- /dev/null
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20221007.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COMMIT="cb0bb696bea9846fc63a43056c01ddc1efa4a2a8"
+
+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
+   

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/

[Sam James]

commit: 1db76f98616d992b4a9121e5d80efc8c0cb3f09a
Author: Olivier Laurantin  laposte  net>
AuthorDate: Sat May 14 13:09:18 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 19 02:13:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1db76f98

media-video/ffdiaporama: fix parallel build

Closes: https://bugs.gentoo.org/844133
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Olivier Laurantin  laposte.net>
Closes: https://github.com/gentoo/gentoo/pull/25482
Signed-off-by: Sam James  gentoo.org>

 media-video/ffdiaporama/Manifest| 2 +-
 ...ama-2.2_pre20140701-r3.ebuild => ffdiaporama-2.2_pre20220403.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest
index b3dc98cc13f5..1f9d1bb7e54e 100644
--- a/media-video/ffdiaporama/Manifest
+++ b/media-video/ffdiaporama/Manifest
@@ -2,7 +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 
f6105f5fc9d928c43fc33d2eb154d97843516f42754154690ca1651c90f9cce21ce03a80ca2fd0440611f30463077a679d2103d6ffecde80f7ca5ba48142
 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-2.2_pre20220403.tar.gz 63270245 BLAKE2B 
86e5926285b5c38146065cbbc53182eba77c25fa7eddd79e61276b949f5ad4f217f3e2562bed938f06c191493929afa7f24820ef957243f176b3f8e09d4284a9
 SHA512 
75076eadf1cbef38590ef250746228598ddb00bec2328589a6fb913ee3ae376a6587e6e90494986c5cbeda7aba6c342992cb5e71e5c8ce26e4fda12238ce72e4
 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_pre20220403.ebuild
similarity index 95%
rename from media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r3.ebuild
rename to media-video/ffdiaporama/ffdiaporama-2.2_pre20220403.ebuild
index da0e2817003c..f13a63fc974d 100644
--- a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r3.ebuild
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20220403.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-COMMIT="3c25c893a94dd3f88a7515437c42cd5628220625"
+COMMIT="0557dc2d2489b88c813c695b0d75107be82292f8"
 
 inherit qmake-utils xdg-utils
 

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/

[Sam James]

commit: 97e71000c7110fb7d5827963a20f8f77c36074ee
Author: Olivier Laurantin  laposte  net>
AuthorDate: Sat Apr  9 09:05:54 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 13 20:03:54 2022 +
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  laposte.net>
Signed-off-by: Sam James  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 
f6105f5fc9d928c43fc33d2eb154d97843516f42754154690ca1651c90f9cce21ce03a80ca2fd0440611f30463077a679d2103d6ffecde80f7ca5ba48142
 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 ..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() {
+   

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/

[Joonas Niilola]

commit: 76c303fed8e00caf287d4dcb86ca53be19f7a24f
Author: Olivier Laurantin  laposte  net>
AuthorDate: Fri Apr 16 13:22:56 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Apr 28 06:42:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76c303fe

media-video/ffdiaporama: ffmpeg-4.4 compatibility

Add a patch for ffmpeg-4.4 compatibility
Move patches to proxy maintainer github

Closes: https://bugs.gentoo.org/782412
Signed-off-by: Olivier Laurantin  laposte.net>
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Closes: https://github.com/gentoo/gentoo/pull/20408
Signed-off-by: Joonas Niilola  gentoo.org>

 media-video/ffdiaporama/Manifest  |  1 +
 media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild | 11 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest
index 4e5d8a14378..5a325da1439 100644
--- a/media-video/ffdiaporama/Manifest
+++ b/media-video/ffdiaporama/Manifest
@@ -1,5 +1,6 @@
 DIST ffdiaporama-2.2-ffmpeg-3.0.patch 19635 BLAKE2B 
000816945e74033b2620f635f59e762e82988ef60740ac14bfee02850cc6299ec0934a7f48afe03009a94bbb531e9668c9d16fe230db34d03ba54b0c42249348
 SHA512 
958025fee8df94a600fa4919fe9aa5574556c163a771b36213e90f116c13d0448a86e99a49b2ac4631c1b845ffb8c87789ac00cb8462fed1abbe9233e49a47fc
 DIST ffdiaporama-2.2-ffmpeg-4.0.patch 6648 BLAKE2B 
1efaecf9dc6180539bc01a6e4f1403864ea2f9318cc1528aac0bb339d840e3eec40ddc60a531d8af52aae5592c38bbcad9d8dd260cedbe01ab655e2135766e6b
 SHA512 
9588352af7b048ade3b681364a4edc29526241b0631e39314b9466f490d66a4e3b795f4c32afd0aadc2a3d63a9ce4e99a6bb77e4c3f79d959e68e82856882d32
+DIST ffdiaporama-2.2-ffmpeg-4.4.patch 1034 BLAKE2B 
f6105f5fc9d928c43fc33d2eb154d97843516f42754154690ca1651c90f9cce21ce03a80ca2fd0440611f30463077a679d2103d6ffecde80f7ca5ba48142
 SHA512 
14c2c8361836a0f95224577710b72d48fe9aa5c9a330777b8cb709a1ad02f95d9b8ba0f22ff9250e0a6898cfd8f6839658a94f59082d2da767299a81a38e9f8a
 DIST ffdiaporama-2.2-libav11.patch 18781 BLAKE2B 
95da6d11fa31f18106184c0c14a524c42f03a169503ad58d72e871edc60ef52b5ee6ac6d757e8ddcaa66ba58a1b78bc1ca1a9b116d69a3526fd6bc3e5817a9d9
 SHA512 
f24f3f6b624763dcc3ea5bc0c52480d986fbec9b123ad5645c11a525c0eefb7b8708f90df4fb728dfab1d640c6dfab9a550874f59d333cff979e3ef56639416e
 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

diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild 
b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
index 18f8f973731..f32094e39d4 100644
--- a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,9 +13,10 @@ DESCRIPTION="Movie creator from photos and video clips"
 HOMEPAGE="https://ffdiaporama.tuxfamily.org;
 
SRC_URI="https://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_bin_${BIN_PV}.tar.gz

https://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_rsc_${RSC_PV}.tar.gz
-   https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-libav11.patch
-   https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-ffmpeg-3.0.patch
-   https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-ffmpeg-4.0.patch
+   
https://raw.githubusercontent.com/laurantino/gentoo-dist/master/ffdiaporama-2.2-libav11.patch
+   
https://raw.githubusercontent.com/laurantino/gentoo-dist/master/ffdiaporama-2.2-ffmpeg-3.0.patch
+   
https://raw.githubusercontent.com/laurantino/gentoo-dist/master/ffdiaporama-2.2-ffmpeg-4.0.patch
+   
https://raw.githubusercontent.com/laurantino/gentoo-dist/master/ffdiaporama-2.2-ffmpeg-4.4.patch
texturemate? ( 
https://download.tuxfamily.org/${PN}/Packages/Stable/${PN}_texturemate_${TMT_PV}.tar.gz
 )"
 
 LICENSE="GPL-2 texturemate? ( CC-BY-3.0 )"
@@ -40,7 +41,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 DOCS=( authors.txt )
-PATCHES=( "${DISTDIR}"/${PN}-${MY_PV}-{ffmpeg-3.0,libav11,ffmpeg-4.0}.patch )
+PATCHES=( 
"${DISTDIR}"/${PN}-${MY_PV}-{ffmpeg-3.0,libav11,ffmpeg-4.0,ffmpeg-4.4}.patch )
 
 S="${WORKDIR}/ffDiaporama"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/

[Andreas Sturmlechner]

commit: bd9e2c050a41d1bf2547242bd9501d8cf0413291
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jul 15 10:47:16 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jul 28 14:29:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd9e2c05

media-video/ffdiaporama: EAPI-7 bump, drop gnome2-utils

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild   | 13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild 
b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
index 78ec3bfd11d..18f8f973731 100644
--- a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit gnome2-utils qmake-utils xdg-utils
+EAPI=7
 
 MY_PV=${PV%_pre20140701}
 BIN_PV=${MY_PV}.devel.2014.0701
 RSC_PV=${MY_PV}.devel.2014.0503
 TMT_PV=1.0.2014.0125
+inherit qmake-utils xdg-utils
+
 DESCRIPTION="Movie creator from photos and video clips"
 HOMEPAGE="https://ffdiaporama.tuxfamily.org;
 
SRC_URI="https://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_bin_${BIN_PV}.tar.gz
@@ -18,8 +18,7 @@ 
SRC_URI="https://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_bin_${BIN_PV}
https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-ffmpeg-4.0.patch
texturemate? ( 
https://download.tuxfamily.org/${PN}/Packages/Stable/${PN}_texturemate_${TMT_PV}.tar.gz
 )"
 
-LICENSE="GPL-2
-   texturemate? ( CC-BY-3.0 )"
+LICENSE="GPL-2 texturemate? ( CC-BY-3.0 )"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="openclipart texturemate"
@@ -67,11 +66,11 @@ src_install() {
 pkg_postinst() {
xdg_desktop_database_update
xdg_mimeinfo_database_update
-   gnome2_icon_cache_update
+   xdg_icon_cache_update
 }
 
 pkg_postrm() {
xdg_desktop_database_update
xdg_mimeinfo_database_update
-   gnome2_icon_cache_update
+   xdg_icon_cache_update
 }

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/

[Mikle Kolyada]

commit: f81486b71eb460d77d2706126e912e744a26763b
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Apr 26 10:15:56 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Apr 26 10:15:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f81486b7

media-video/ffdiaporama: migrate from libav

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada  gentoo.org>

 media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild 
b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
index b67615051ed..78ec3bfd11d 100644
--- a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ LICENSE="GPL-2
texturemate? ( CC-BY-3.0 )"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="libav openclipart texturemate"
+IUSE="openclipart texturemate"
 
 RDEPEND="
dev-qt/qtconcurrent:5
@@ -36,8 +36,7 @@ RDEPEND="
dev-qt/qtwidgets:5
dev-qt/qtxml:5
media-gfx/exiv2:=
-   libav? ( >=media-video/libav-11:0=[encode] )
-   !libav? ( >=media-video/ffmpeg-3:0=[encode] )
+   >=media-video/ffmpeg-3:0=[encode]
openclipart? ( media-gfx/openclipart[svg,-gzip] )"
 DEPEND="${RDEPEND}"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/

[Andreas Sturmlechner]

commit: a58f6e39aec913556246dbb222a9e19a9c21cae9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jun  4 21:51:57 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jun  4 21:51:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a58f6e39

media-video/ffdiaporama: Drop 2.2_pre20140701-r1

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../ffdiaporama-2.2_pre20140701-r1.ebuild  | 80 --
 1 file changed, 80 deletions(-)

diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r1.ebuild 
b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r1.ebuild
deleted file mode 100644
index 0a8509a3a0b..000
--- a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit xdg-utils gnome2-utils qmake-utils
-
-MY_PV=${PV%_pre20140701}
-BIN_PV=${MY_PV}.devel.2014.0701
-RSC_PV=${MY_PV}.devel.2014.0503
-TMT_PV=1.0.2014.0125
-DESCRIPTION="Movie creator from photos and video clips"
-HOMEPAGE="http://ffdiaporama.tuxfamily.org;
-SRC_URI="http://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_bin_${BIN_PV}.tar.gz
-   
http://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_rsc_${RSC_PV}.tar.gz
-   https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-libav11.patch
-   https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-ffmpeg-3.0.patch
-   texturemate? ( 
http://download.tuxfamily.org/${PN}/Packages/Stable/${PN}_texturemate_${TMT_PV}.tar.gz
 )"
-
-LICENSE="GPL-2
-   texturemate? ( CC-BY-3.0 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libav openclipart texturemate"
-
-RDEPEND="
-   media-gfx/exiv2
-   media-libs/taglib
-   openclipart? ( media-gfx/openclipart[svg,-gzip] )
-   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/qtxml:5
-   libav? ( >=media-video/libav-11:0=[encode] )
-   !libav? ( >=media-video/ffmpeg-2.8:0=[encode] )"
-DEPEND="${RDEPEND}"
-
-DOCS=( authors.txt )
-PATCHES=( "${DISTDIR}"/${PN}-${MY_PV}-{ffmpeg-3.0,libav11}.patch )
-
-S="${WORKDIR}/ffDiaporama"
-
-src_prepare() {
-   echo "SUBDIRS += ../ffDiaporama_rsc" >> ffDiaporama.pro || die
-   if use texturemate; then
-   echo "SUBDIRS += ../ffDiaporama_texturemate" >> ffDiaporama.pro 
|| die
-   fi
-   default_src_prepare
-}
-
-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_preinst() {
-   gnome2_icon_savelist
-}
-
-pkg_postinst() {
-   xdg_desktop_database_update
-   xdg_mimeinfo_database_update
-   gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-   xdg_desktop_database_update
-   xdg_mimeinfo_database_update
-   gnome2_icon_cache_update
-}

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/

[Thomas Deutschmann]

commit: 703e5e8246a2b20896d6d2f4a1b359c45106883e
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Jun  4 20:33:08 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Jun  4 20:58:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=703e5e82

media-video/ffdiaporama: x86 stable (bug #686452)

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild 
b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
index f9cdfff4684..b67615051ed 100644
--- a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ 
SRC_URI="https://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_bin_${BIN_PV}
 LICENSE="GPL-2
texturemate? ( CC-BY-3.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libav openclipart texturemate"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/

[Aaron Bauman]

commit: 650aef9f52a2bc3117e471ff9afd93eb531acf5c
Author: Aaron Bauman  gentoo  org>
AuthorDate: Wed May 29 01:15:02 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Wed May 29 01:15:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=650aef9f

media-video/ffdiaporama: amd64 stable

Signed-off-by: Aaron Bauman  gentoo.org>

 media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild 
b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
index edceb82c0e4..f9cdfff4684 100644
--- a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
@@ -21,7 +21,7 @@ 
SRC_URI="https://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_bin_${BIN_PV}
 LICENSE="GPL-2
texturemate? ( CC-BY-3.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="libav openclipart texturemate"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/

[Andreas Sturmlechner]

commit: e0bcfaee56771a1f772ac6fc483344af84d2086c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Dec 22 11:26:52 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Dec 22 11:43:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0bcfaee

media-video/ffdiaporama: Add missing Qt RDEPENDs

See also: https://github.com/gentoo/gentoo/pull/10649
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild 
b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
index 44e008840ec..edceb82c0e4 100644
--- a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
@@ -30,8 +30,10 @@ RDEPEND="
dev-qt/qtgui:5
dev-qt/qthelp:5
dev-qt/qtmultimedia:5
+   dev-qt/qtnetwork:5
dev-qt/qtsql:5[sqlite]
dev-qt/qtsvg:5
+   dev-qt/qtwidgets:5
dev-qt/qtxml:5
media-gfx/exiv2:=
libav? ( >=media-video/libav-11:0=[encode] )

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/

[Andreas Sturmlechner]

commit: 07cb964db8609416a6604a929d3217444a3b6113
Author: Olivier Laurantin  laposte  net>
AuthorDate: Sun Dec 16 13:11:09 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Dec 22 11:43:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07cb964d

media-video/ffdiaporama: ffmpeg 4.0 compatibility

Add a patch for ffmpeg 4.0 compatibility.
Closes: https://bugs.gentoo.org/671214
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Olivier Laurantin  laposte.net>
Closes: https://github.com/gentoo/gentoo/pull/10649
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/ffdiaporama/Manifest   |  1 +
 .../ffdiaporama-2.2_pre20140701-r2.ebuild  | 76 ++
 2 files changed, 77 insertions(+)

diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest
index 7fa86918d6e..4e5d8a14378 100644
--- a/media-video/ffdiaporama/Manifest
+++ b/media-video/ffdiaporama/Manifest
@@ -1,4 +1,5 @@
 DIST ffdiaporama-2.2-ffmpeg-3.0.patch 19635 BLAKE2B 
000816945e74033b2620f635f59e762e82988ef60740ac14bfee02850cc6299ec0934a7f48afe03009a94bbb531e9668c9d16fe230db34d03ba54b0c42249348
 SHA512 
958025fee8df94a600fa4919fe9aa5574556c163a771b36213e90f116c13d0448a86e99a49b2ac4631c1b845ffb8c87789ac00cb8462fed1abbe9233e49a47fc
+DIST ffdiaporama-2.2-ffmpeg-4.0.patch 6648 BLAKE2B 
1efaecf9dc6180539bc01a6e4f1403864ea2f9318cc1528aac0bb339d840e3eec40ddc60a531d8af52aae5592c38bbcad9d8dd260cedbe01ab655e2135766e6b
 SHA512 
9588352af7b048ade3b681364a4edc29526241b0631e39314b9466f490d66a4e3b795f4c32afd0aadc2a3d63a9ce4e99a6bb77e4c3f79d959e68e82856882d32
 DIST ffdiaporama-2.2-libav11.patch 18781 BLAKE2B 
95da6d11fa31f18106184c0c14a524c42f03a169503ad58d72e871edc60ef52b5ee6ac6d757e8ddcaa66ba58a1b78bc1ca1a9b116d69a3526fd6bc3e5817a9d9
 SHA512 
f24f3f6b624763dcc3ea5bc0c52480d986fbec9b123ad5645c11a525c0eefb7b8708f90df4fb728dfab1d640c6dfab9a550874f59d333cff979e3ef56639416e
 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

diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild 
b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
new file mode 100644
index 000..44e008840ec
--- /dev/null
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils qmake-utils xdg-utils
+
+MY_PV=${PV%_pre20140701}
+BIN_PV=${MY_PV}.devel.2014.0701
+RSC_PV=${MY_PV}.devel.2014.0503
+TMT_PV=1.0.2014.0125
+DESCRIPTION="Movie creator from photos and video clips"
+HOMEPAGE="https://ffdiaporama.tuxfamily.org;
+SRC_URI="https://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_bin_${BIN_PV}.tar.gz
+   
https://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_rsc_${RSC_PV}.tar.gz
+   https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-libav11.patch
+   https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-ffmpeg-3.0.patch
+   https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-ffmpeg-4.0.patch
+   texturemate? ( 
https://download.tuxfamily.org/${PN}/Packages/Stable/${PN}_texturemate_${TMT_PV}.tar.gz
 )"
+
+LICENSE="GPL-2
+   texturemate? ( CC-BY-3.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libav openclipart texturemate"
+
+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/qtxml:5
+   media-gfx/exiv2:=
+   libav? ( >=media-video/libav-11:0=[encode] )
+   !libav? ( >=media-video/ffmpeg-3:0=[encode] )
+   openclipart? ( media-gfx/openclipart[svg,-gzip] )"
+DEPEND="${RDEPEND}"
+
+DOCS=( authors.txt )
+PATCHES=( "${DISTDIR}"/${PN}-${MY_PV}-{ffmpeg-3.0,libav11,ffmpeg-4.0}.patch )
+
+S="${WORKDIR}/ffDiaporama"
+
+src_prepare() {
+   default
+   echo "SUBDIRS += ../ffDiaporama_rsc" >> ffDiaporama.pro || die
+   if use texturemate; then
+   echo "SUBDIRS += ../ffDiaporama_texturemate" >> ffDiaporama.pro 
|| die
+   fi
+}
+
+src_configure() {
+   eqmake5 QMAKE_CFLAGS_ISYSTEM=
+}
+
+src_install() {
+   emake INSTALL_ROOT="${D}" install
+   if use openclipart; then
+   dosym ../../clipart/openclipart 

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/

[Michał Górny]

commit: 88579414b7e9a011aa7dc5cd9694dbf37af5b20b
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Feb 11 11:01:10 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Feb 11 11:01:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88579414

media-video/ffdiaporama: Remove useless maintainer 

Remove useless/redundant maintainer . It does not benefit
bug wrangling, and only wastes developer's time on reading it. Few tips:

- assignee/CC is implied by ordering, there is no reason to repeat it,
- we know that maintainer is maintainer (la la la la la),
- most of adjectives for maintainer are of no value and/or are obvious.

 media-video/ffdiaporama/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-video/ffdiaporama/metadata.xml 
b/media-video/ffdiaporama/metadata.xml
index 60cbff526e1..84064cda742 100644
--- a/media-video/ffdiaporama/metadata.xml
+++ b/media-video/ffdiaporama/metadata.xml
@@ -4,7 +4,6 @@

olivier.lauran...@laposte.net
Olivier Laurantin
-   Proxy maintainer. CC him on bugs


proxy-ma...@gentoo.org

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/, media-video/ffdiaporama/files/

[Andreas Sturmlechner]

commit: 3e526b7fb02314645f124185db693e00089d49f0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan 21 21:29:43 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan 21 22:57:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e526b7f

media-video/ffdiaporama: Drop old

Closes: https://bugs.gentoo.org/640448
Package-Manager: Portage-2.3.20, Repoman-2.3.6

 media-video/ffdiaporama/Manifest   |   4 -
 media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild  |  78 
 media-video/ffdiaporama/ffdiaporama-2.1.ebuild |  77 
 .../ffdiaporama/ffdiaporama-2.2_pre20140701.ebuild |  91 --
 .../files/ffdiaporama-2.1-ffmpeg-2.4.patch |  16 --
 .../files/ffdiaporama-2.1-ffmpeg-3.0.patch | 196 -
 .../files/ffdiaporama-2.2-qt4multimedia.patch  |  25 ---
 7 files changed, 487 deletions(-)

diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest
index d6d3a6eda98..7fa86918d6e 100644
--- a/media-video/ffdiaporama/Manifest
+++ b/media-video/ffdiaporama/Manifest
@@ -1,9 +1,5 @@
-DIST ffdiaporama-2.1-libav10.patch 24734 BLAKE2B 
bc12266f69f10990b4a74b8fd93da31fd55530e1ff3a41a030e865da5154452f58f5aca03c6bc2ebff8200ded02c115f1bda0ffc9d0412010b8a3eed181e1e54
 SHA512 
635dd967792159bfb5986eb97715aa46222029cbf3bcd5b58779b8894272728f2a422b4e73645ddc80f5d4cb1bc9a12ceccc06e160c72140571d2233e029b38b
 DIST ffdiaporama-2.2-ffmpeg-3.0.patch 19635 BLAKE2B 
000816945e74033b2620f635f59e762e82988ef60740ac14bfee02850cc6299ec0934a7f48afe03009a94bbb531e9668c9d16fe230db34d03ba54b0c42249348
 SHA512 
958025fee8df94a600fa4919fe9aa5574556c163a771b36213e90f116c13d0448a86e99a49b2ac4631c1b845ffb8c87789ac00cb8462fed1abbe9233e49a47fc
 DIST ffdiaporama-2.2-libav11.patch 18781 BLAKE2B 
95da6d11fa31f18106184c0c14a524c42f03a169503ad58d72e871edc60ef52b5ee6ac6d757e8ddcaa66ba58a1b78bc1ca1a9b116d69a3526fd6bc3e5817a9d9
 SHA512 
f24f3f6b624763dcc3ea5bc0c52480d986fbec9b123ad5645c11a525c0eefb7b8708f90df4fb728dfab1d640c6dfab9a550874f59d333cff979e3ef56639416e
-DIST ffdiaporama_bin_2.1.2014.0209.tar.gz 16063604 BLAKE2B 
e0915c578f48e23d42e50db77af8a4d8733f6e8914d49e2d0da57f5c1fff84aea584a8f3df94fe9a66acbb1c1bf69efcf3a6140089ab15f59753e7920ab342b6
 SHA512 
40fc40ae8f09d311dc615051bd0bc4573f1f9ab5abe06032e161b759194c772b43c337902baf9c5a1eb027796fcdecc2fc20dce5d998091e6ccf8f696149223d
 DIST ffdiaporama_bin_2.2.devel.2014.0701.tar.gz 18377677 BLAKE2B 
74337dcb935eedfccb769562c9b763f642058d2fc8bf4a3c4a81b1ce857398ee759ce2cf269c31527cece2c18a48505ad46b197e10da8444cbf2131ffb3e1130
 SHA512 
6531381137c47d3fd2954d09fe922086de1b69638ed4b092faeb9e2982b463c6614314bda56512f6a315bd02b8600d815efb19dca3dae89947df9a48a2ae7b86
-DIST ffdiaporama_rsc_2.1.2014.0209.tar.gz 17669845 BLAKE2B 
7155ec3b6b0a6ded2dc5ac079fe65f6d562942fb10c00d85bf109757b4bf7f8c334b51e2e19cb80aa57426ffddc28592d207cc60dad0726675862caac5c7d85f
 SHA512 
910b2139eb1b97a86c8d795b65255f723e346b3b4ce805878835813f9b21c7b606f811488f9099003a0e0951006df6d32663f1d8be2ffe1c355cf9311ac4be19
 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
-DIST openclipart-0.18-svgonly.tar.bz2 82108957 BLAKE2B 
25c13f7fc05898daef78fbc09e8d1506331677bac2a0fb1b9646fe7d8dff92927325faf2e2fd9e9d91d7f1136de91159124152d5e8dd55b63e3184998180fe0a
 SHA512 
71ad11fd2e94f4c3d560ff0fa6e0cee70ec2c8506fd4c4d7a4b7a0db25480aaca9b36d0e91862cf05347be5caa614bfb528bdfdb151342e28efba31d9a8b0473

diff --git a/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild 
b/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild
deleted file mode 100644
index da652736f01..000
--- a/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils fdo-mime gnome2-utils qt4-r2
-
-BIN_PV=${PV}.2014.0209
-RSC_PV=${PV}.2014.0209
-TMT_PV=1.0.2014.0125
-OPENCLI_PV=0.18
-OPENCLI_P=openclipart-${OPENCLI_PV}
-DESCRIPTION="Movie creator from photos and video clips"
-HOMEPAGE="http://ffdiaporama.tuxfamily.org;
-SRC_URI="http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_bin_${BIN_PV}.tar.gz
 -> ${PN}_bin_${BIN_PV}.tar.gz
-   
http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_rsc_${RSC_PV}.tar.gz
 -> ${PN}_rsc_${RSC_PV}.tar.gz
-   

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/

[Tobias Klausmann]

commit: fd600f6a04d86d0e811f3f50d0b44b4a95f8a94b
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Mon Jan 15 19:02:40 2018 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Mon Jan 15 19:02:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd600f6a

media-video/ffdiaporama-2.2_pre20140701-r1: amd64 stable

Gentoo-Bug: http://bugs.gentoo.org/644418

 media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r1.ebuild 
b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r1.ebuild
index 9cf6638df7a..0ec5707e0aa 100644
--- a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r1.ebuild
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r1.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="http://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_bin_${BIN_PV}.
 LICENSE="GPL-2
texturemate? ( CC-BY-3.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="libav openclipart texturemate"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/

[Andreas Sturmlechner]

commit: 172d618e17f20f7cddc633caeb8986acea7e8ad8
Author: Olivier Laurantin  laposte  net>
AuthorDate: Sat Jan 13 21:22:15 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jan 13 23:28:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=172d618e

media-video/ffdiaporama: Drop qt4 support

Drop qt4 support and build unconditionally with qt5

Bug: https://bugs.gentoo.org/644418
Closes: https://github.com/gentoo/gentoo/pull/6854

 .../ffdiaporama-2.2_pre20140701-r1.ebuild  | 80 ++
 1 file changed, 80 insertions(+)

diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r1.ebuild 
b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r1.ebuild
new file mode 100644
index 000..9cf6638df7a
--- /dev/null
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit xdg-utils gnome2-utils qmake-utils
+
+MY_PV=${PV%_pre20140701}
+BIN_PV=${MY_PV}.devel.2014.0701
+RSC_PV=${MY_PV}.devel.2014.0503
+TMT_PV=1.0.2014.0125
+DESCRIPTION="Movie creator from photos and video clips"
+HOMEPAGE="http://ffdiaporama.tuxfamily.org;
+SRC_URI="http://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_bin_${BIN_PV}.tar.gz
+   
http://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_rsc_${RSC_PV}.tar.gz
+   https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-libav11.patch
+   https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-ffmpeg-3.0.patch
+   texturemate? ( 
http://download.tuxfamily.org/${PN}/Packages/Stable/${PN}_texturemate_${TMT_PV}.tar.gz
 )"
+
+LICENSE="GPL-2
+   texturemate? ( CC-BY-3.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libav openclipart texturemate"
+
+RDEPEND="
+   media-gfx/exiv2
+   media-libs/taglib
+   openclipart? ( media-gfx/openclipart[svg,-gzip] )
+   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/qtxml:5
+   libav? ( >=media-video/libav-11:0=[encode] )
+   !libav? ( >=media-video/ffmpeg-2.8:0=[encode] )"
+DEPEND="${RDEPEND}"
+
+DOCS=( authors.txt )
+PATCHES=( "${DISTDIR}"/${PN}-${MY_PV}-{ffmpeg-3.0,libav11}.patch )
+
+S="${WORKDIR}/ffDiaporama"
+
+src_prepare() {
+   echo "SUBDIRS += ../ffDiaporama_rsc" >> ffDiaporama.pro || die
+   if use texturemate; then
+   echo "SUBDIRS += ../ffDiaporama_texturemate" >> ffDiaporama.pro 
|| die
+   fi
+   default_src_prepare
+}
+
+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_preinst() {
+   gnome2_icon_savelist
+}
+
+pkg_postinst() {
+   xdg_desktop_database_update
+   xdg_mimeinfo_database_update
+   gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+   xdg_desktop_database_update
+   xdg_mimeinfo_database_update
+   gnome2_icon_cache_update
+}

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/

[Patrice Clement]

commit: c0ff1e0adaa6d1f87b99b5891f7af5cc26c03e5f
Author: Olivier Laurantin  laposte  net>
AuthorDate: Mon Dec 11 20:59:44 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Dec 21 20:27:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0ff1e0a

media-video/ffdiaporama: fix patch location.

Fix the location of the patch recently moved to devspace.
Patch is now located in DISTDIR.

Closes: https://bugs.gentoo.org/640632
Closes: https://github.com/gentoo/gentoo/pull/6523

 media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild 
b/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild
index ea066ecd17b..da652736f01 100644
--- a/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild
+++ b/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 DOCS=( authors.txt )
-PATCHES=( "${FILESDIR}"/${P}-{ffmpeg-2.4,libav10,ffmpeg-3.0}.patch )
+PATCHES=( "${DISTDIR}"/${P}-libav10.patch 
"${FILESDIR}"/${P}-{ffmpeg-2.4,ffmpeg-3.0}.patch )
 
 S="${WORKDIR}/ffDiaporama"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/files/, media-video/ffdiaporama/

[Patrice Clement]

commit: 9e9f5d53c03d49c5d53d7cf61c4f7a647779241d
Author: Olivier Laurantin  laposte  net>
AuthorDate: Mon Dec 11 22:15:54 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Dec 21 20:26:24 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e9f5d53

media-video/ffdiaporama: version bump to 2.2_pre20140701.

The ebuild now depends on media-gfx/openclipart instead of downloading a
specific version. This also adds the qt5 USE flag.

Closes: https://bugs.gentoo.org/613230
Closes: https://github.com/gentoo/gentoo/pull/6526

 media-video/ffdiaporama/Manifest   |  4 +
 .../ffdiaporama/ffdiaporama-2.2_pre20140701.ebuild | 91 ++
 .../files/ffdiaporama-2.2-qt4multimedia.patch  | 25 ++
 3 files changed, 120 insertions(+)

diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest
index d3b814d3735..d6d3a6eda98 100644
--- a/media-video/ffdiaporama/Manifest
+++ b/media-video/ffdiaporama/Manifest
@@ -1,5 +1,9 @@
 DIST ffdiaporama-2.1-libav10.patch 24734 BLAKE2B 
bc12266f69f10990b4a74b8fd93da31fd55530e1ff3a41a030e865da5154452f58f5aca03c6bc2ebff8200ded02c115f1bda0ffc9d0412010b8a3eed181e1e54
 SHA512 
635dd967792159bfb5986eb97715aa46222029cbf3bcd5b58779b8894272728f2a422b4e73645ddc80f5d4cb1bc9a12ceccc06e160c72140571d2233e029b38b
+DIST ffdiaporama-2.2-ffmpeg-3.0.patch 19635 BLAKE2B 
000816945e74033b2620f635f59e762e82988ef60740ac14bfee02850cc6299ec0934a7f48afe03009a94bbb531e9668c9d16fe230db34d03ba54b0c42249348
 SHA512 
958025fee8df94a600fa4919fe9aa5574556c163a771b36213e90f116c13d0448a86e99a49b2ac4631c1b845ffb8c87789ac00cb8462fed1abbe9233e49a47fc
+DIST ffdiaporama-2.2-libav11.patch 18781 BLAKE2B 
95da6d11fa31f18106184c0c14a524c42f03a169503ad58d72e871edc60ef52b5ee6ac6d757e8ddcaa66ba58a1b78bc1ca1a9b116d69a3526fd6bc3e5817a9d9
 SHA512 
f24f3f6b624763dcc3ea5bc0c52480d986fbec9b123ad5645c11a525c0eefb7b8708f90df4fb728dfab1d640c6dfab9a550874f59d333cff979e3ef56639416e
 DIST ffdiaporama_bin_2.1.2014.0209.tar.gz 16063604 BLAKE2B 
e0915c578f48e23d42e50db77af8a4d8733f6e8914d49e2d0da57f5c1fff84aea584a8f3df94fe9a66acbb1c1bf69efcf3a6140089ab15f59753e7920ab342b6
 SHA512 
40fc40ae8f09d311dc615051bd0bc4573f1f9ab5abe06032e161b759194c772b43c337902baf9c5a1eb027796fcdecc2fc20dce5d998091e6ccf8f696149223d
+DIST ffdiaporama_bin_2.2.devel.2014.0701.tar.gz 18377677 BLAKE2B 
74337dcb935eedfccb769562c9b763f642058d2fc8bf4a3c4a81b1ce857398ee759ce2cf269c31527cece2c18a48505ad46b197e10da8444cbf2131ffb3e1130
 SHA512 
6531381137c47d3fd2954d09fe922086de1b69638ed4b092faeb9e2982b463c6614314bda56512f6a315bd02b8600d815efb19dca3dae89947df9a48a2ae7b86
 DIST ffdiaporama_rsc_2.1.2014.0209.tar.gz 17669845 BLAKE2B 
7155ec3b6b0a6ded2dc5ac079fe65f6d562942fb10c00d85bf109757b4bf7f8c334b51e2e19cb80aa57426ffddc28592d207cc60dad0726675862caac5c7d85f
 SHA512 
910b2139eb1b97a86c8d795b65255f723e346b3b4ce805878835813f9b21c7b606f811488f9099003a0e0951006df6d32663f1d8be2ffe1c355cf9311ac4be19
+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
 DIST openclipart-0.18-svgonly.tar.bz2 82108957 BLAKE2B 
25c13f7fc05898daef78fbc09e8d1506331677bac2a0fb1b9646fe7d8dff92927325faf2e2fd9e9d91d7f1136de91159124152d5e8dd55b63e3184998180fe0a
 SHA512 
71ad11fd2e94f4c3d560ff0fa6e0cee70ec2c8506fd4c4d7a4b7a0db25480aaca9b36d0e91862cf05347be5caa614bfb528bdfdb151342e28efba31d9a8b0473

diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701.ebuild 
b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701.ebuild
new file mode 100644
index 000..1d9d671b540
--- /dev/null
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit xdg-utils gnome2-utils qmake-utils
+
+MY_PV=${PV%_pre20140701}
+BIN_PV=${MY_PV}.devel.2014.0701
+RSC_PV=${MY_PV}.devel.2014.0503
+TMT_PV=1.0.2014.0125
+DESCRIPTION="Movie creator from photos and video clips"
+HOMEPAGE="http://ffdiaporama.tuxfamily.org;
+SRC_URI="http://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_bin_${BIN_PV}.tar.gz
+   
http://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_rsc_${RSC_PV}.tar.gz
+   https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-libav11.patch
+   https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-ffmpeg-3.0.patch
+   texturemate? ( 

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/files/, media-video/ffdiaporama/

[Jonas Stein]

commit: 7de4187729ad1f566dcc75a4e6e483a7aed67d3a
Author: Jonas Stein  gentoo  org>
AuthorDate: Sun Dec 10 14:46:51 2017 +
Commit: Jonas Stein  gentoo  org>
CommitDate: Sun Dec 10 14:47:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7de41877

media-video/ffdiaporama: Moved patch to devspace

Package-Manager: Portage-2.3.17, Repoman-2.3.6

 media-video/ffdiaporama/Manifest   |   1 +
 media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild  |   3 +-
 .../files/ffdiaporama-2.1-libav10.patch| 427 -
 3 files changed, 3 insertions(+), 428 deletions(-)

diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest
index e7efb4c00b5..d3b814d3735 100644
--- a/media-video/ffdiaporama/Manifest
+++ b/media-video/ffdiaporama/Manifest
@@ -1,3 +1,4 @@
+DIST ffdiaporama-2.1-libav10.patch 24734 BLAKE2B 
bc12266f69f10990b4a74b8fd93da31fd55530e1ff3a41a030e865da5154452f58f5aca03c6bc2ebff8200ded02c115f1bda0ffc9d0412010b8a3eed181e1e54
 SHA512 
635dd967792159bfb5986eb97715aa46222029cbf3bcd5b58779b8894272728f2a422b4e73645ddc80f5d4cb1bc9a12ceccc06e160c72140571d2233e029b38b
 DIST ffdiaporama_bin_2.1.2014.0209.tar.gz 16063604 BLAKE2B 
e0915c578f48e23d42e50db77af8a4d8733f6e8914d49e2d0da57f5c1fff84aea584a8f3df94fe9a66acbb1c1bf69efcf3a6140089ab15f59753e7920ab342b6
 SHA512 
40fc40ae8f09d311dc615051bd0bc4573f1f9ab5abe06032e161b759194c772b43c337902baf9c5a1eb027796fcdecc2fc20dce5d998091e6ccf8f696149223d
 DIST ffdiaporama_rsc_2.1.2014.0209.tar.gz 17669845 BLAKE2B 
7155ec3b6b0a6ded2dc5ac079fe65f6d562942fb10c00d85bf109757b4bf7f8c334b51e2e19cb80aa57426ffddc28592d207cc60dad0726675862caac5c7d85f
 SHA512 
910b2139eb1b97a86c8d795b65255f723e346b3b4ce805878835813f9b21c7b606f811488f9099003a0e0951006df6d32663f1d8be2ffe1c355cf9311ac4be19
 DIST ffdiaporama_texturemate_1.0.2014.0125.tar.gz 30352923 BLAKE2B 
af558994a811508ff6b0f1dc34f33c60fca0a4f40c1cf675e08925b40c8312444a20ea95b0a0c9316225806096e9bbb209faf3e48b74041604c6d81be0175aba
 SHA512 
e9aa9607d670a620b2e3c27d6ec5bf983eb31ab3d3139edf32ebb84d9ffa58b11c822f7db4b3f3c4a430b256719803df4a3a385bd467bdda09f8710d010eb2f5

diff --git a/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild 
b/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild
index 3c8b95d50b7..ea066ecd17b 100644
--- a/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild
+++ b/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,6 +14,7 @@ DESCRIPTION="Movie creator from photos and video clips"
 HOMEPAGE="http://ffdiaporama.tuxfamily.org;
 
SRC_URI="http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_bin_${BIN_PV}.tar.gz
 -> ${PN}_bin_${BIN_PV}.tar.gz

http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_rsc_${RSC_PV}.tar.gz
 -> ${PN}_rsc_${RSC_PV}.tar.gz
+   https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.1-libav10.patch
openclipart? ( 
http://openclipart.org/downloads/${OPENCLI_PV}/${OPENCLI_P}-svgonly.tar.bz2 )
texturemate? ( 
http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_texturemate_${TMT_PV}.tar.gz
 -> ${PN}_texturemate_${TMT_PV}.tar.gz )"
 

diff --git a/media-video/ffdiaporama/files/ffdiaporama-2.1-libav10.patch 
b/media-video/ffdiaporama/files/ffdiaporama-2.1-libav10.patch
deleted file mode 100644
index 1b607ba6c66..000
--- a/media-video/ffdiaporama/files/ffdiaporama-2.1-libav10.patch
+++ /dev/null
@@ -1,427 +0,0 @@
 src/ffDiaporama/engine/cBaseMediaFile.cpp  2014-02-09 10:48:04.0 
+0100
-+++ src/ffDiaporama/engine/cBaseMediaFile.cpp  2015-03-29 00:20:56.672641700 
+0100
-@@ -1861,12 +1861,12 @@
- }
- 
- cImageInCache::~cImageInCache() {
--#if defined(LIBAV) || (defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
-+#if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) || 
defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
- if (FrameBufferYUV->opaque) {
- avfilter_unref_buffer((AVFilterBufferRef *)FrameBufferYUV->opaque);
- FrameBufferYUV->opaque=NULL;
- }
--#elif defined(FFMPEG) && (FFMPEGVERSIONINT>=201)
-+#else
- if (FiltFrame) {
- av_frame_unref(FiltFrame);
- av_frame_free();
-@@ -2239,7 +2239,7 @@
- 
LibavFile->streams[VideoStreamNumber]->discard=AVDISCARD_DEFAULT;  // Setup 
STREAM options
- 
- // Setup decoder options
--LibavFile->streams[VideoStreamNumber]->codec->debug_mv
 =0;// Debug level (0=nothing)
-+//LibavFile->streams[VideoStreamNumber]->codec->debug_mv  
   =0;// Debug level (0=nothing)
- LibavFile->streams[VideoStreamNumber]->codec->debug   
 =0;// Debug level (0=nothing)
- 

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/

[Jonas Stein]

commit: 41ccf958a8fd6df1f13df748ab5a47e16abe9077
Author: Olivier Laurantin  laposte  net>
AuthorDate: Sun Dec 10 14:13:55 2017 +
Commit: Jonas Stein  gentoo  org>
CommitDate: Sun Dec 10 14:20:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41ccf958

media-video/ffdiaporama: Fix typo in metadata

Fix typo in metadata: openslipart -> openclipart
Bug: https://bugs.gentoo.org/613230
Package-Manager: Portage-2.3.17, Repoman-2.3.6

 media-video/ffdiaporama/metadata.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/ffdiaporama/metadata.xml 
b/media-video/ffdiaporama/metadata.xml
index cfafbcc57a8..60cbff526e1 100644
--- a/media-video/ffdiaporama/metadata.xml
+++ b/media-video/ffdiaporama/metadata.xml
@@ -33,12 +33,12 @@
- Transitions between sequences with definition of the 
transition type, sequence by sequence.
- Addition of a background sound (wav, mp3 or ogg) with 
customizable effects for volume, fade in/out and passage in pause, sequence by 
sequence.
- Generation of videos usable on most current video equipment 
(DVD player/smartphone, multimedia box, hard drive, etc.) but also publishable 
on the main video-sharing Websites (YouTube, Dailymotion, etc.)
-   - Video formats from QVGA (320×240) to Full HD (1920×1080) by 
way of the DVD and HD 720 formats.
+   - Video formats from QVGA (320x240) to Full HD (1920x1080) by 
way of the DVD and HD 720 formats.
- Image geometry (aspect ratio) : 4:3, 16:9 or 2.35:1 (cinema)
- Possible formats for rendering : avi, mpg, mp4, mkv


-   Support openslipart database
+   Support openclipart database
Install extra backgrounds

 

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/

[David Seifert]

commit: 62f2c9eb48a83da65ea8e3c83712bc1760312ce3
Author: David Seifert  gentoo  org>
AuthorDate: Sun Nov 26 12:23:01 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Nov 26 23:09:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62f2c9eb

media-video/ffdiaporama: [QA] Consistent whitespace in metadata.xml

 media-video/ffdiaporama/metadata.xml | 47 +---
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/media-video/ffdiaporama/metadata.xml 
b/media-video/ffdiaporama/metadata.xml
index 6b20ac540fe..cfafbcc57a8 100644
--- a/media-video/ffdiaporama/metadata.xml
+++ b/media-video/ffdiaporama/metadata.xml
@@ -11,34 +11,31 @@
Proxy Maintainers


-
http://ffdiaporama.tuxfamily.org/?page_id=7266lang=en
-http://ffdiaporama.tuxfamily.org/?page_id=6268
-
http://ffdiaporama.tuxfamily.org/Forum/viewforum.php?id=4
+   
http://ffdiaporama.tuxfamily.org/?page_id=7266lang=en
+   http://ffdiaporama.tuxfamily.org/?page_id=6268
+   
http://ffdiaporama.tuxfamily.org/Forum/viewforum.php?id=4


-ffDiaporama is an application for creating video sequences consisting of
+   ffDiaporama is an application for creating video sequences 
consisting of
+   - titles, fixed or animated.
+   - images or photos, fixed or animated.
+   - movie clips
+   - music
 
-- titles, fixed or animated.
-- images or photos, fixed or animated.
-- movie clips
-- music
-
-These sequences are assembled into a slide show by means of transitions to 
produce complete videos
-The following options are available:
-
-
-- Reframing of images and photos
-- Cutting of video clips
-- Adding text, notes to images, photos, sequences and animations
-- Graphical filters on the images and the videos (conversion into black 
and white, dust removal, equalization of colors, etc.)
-- Creation of animation by zoom, rotation or Ken Burns Effect on images or 
photos
-- Correction of the images and the videos during animations (luminosity, 
contrast, gamma, colors, etc.)
-- Transitions between sequences with definition of the transition type, 
sequence by sequence.
-- Addition of a background sound (wav, mp3 or ogg) with customizable 
effects for volume, fade in/out and passage in pause, sequence by sequence.
-- Generation of videos usable on most current video equipment (DVD 
player/smartphone, multimedia box, hard drive, etc.) but also publishable on 
the main video-sharing Websites (YouTube, Dailymotion, etc.)
-- Video formats from QVGA (320×240) to Full HD (1920×1080) by way of the 
DVD and HD 720 formats.
-- Image geometry (aspect ratio) : 4:3, 16:9 or 2.35:1 (cinema)
-- Possible formats for rendering : avi, mpg, mp4, mkv
+   These sequences are assembled into a slide show by means of 
transitions to produce complete videos
+   The following options are available:
+   - Reframing of images and photos
+   - Cutting of video clips
+   - Adding text, notes to images, photos, sequences and animations
+   - Graphical filters on the images and the videos (conversion 
into black and white, dust removal, equalization of colors, etc.)
+   - Creation of animation by zoom, rotation or Ken Burns Effect 
on images or photos
+   - Correction of the images and the videos during animations 
(luminosity, contrast, gamma, colors, etc.)
+   - Transitions between sequences with definition of the 
transition type, sequence by sequence.
+   - Addition of a background sound (wav, mp3 or ogg) with 
customizable effects for volume, fade in/out and passage in pause, sequence by 
sequence.
+   - Generation of videos usable on most current video equipment 
(DVD player/smartphone, multimedia box, hard drive, etc.) but also publishable 
on the main video-sharing Websites (YouTube, Dailymotion, etc.)
+   - Video formats from QVGA (320×240) to Full HD (1920×1080) by 
way of the DVD and HD 720 formats.
+   - Image geometry (aspect ratio) : 4:3, 16:9 or 2.35:1 (cinema)
+   - Possible formats for rendering : avi, mpg, mp4, mkv


Support openslipart database

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/

[Amy Liffey]

commit: 8aec79d1636046f97722a76301b560a3789cda7b
Author: Amy Liffey  gentoo  org>
AuthorDate: Sun Mar 19 17:58:03 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Sun Mar 19 17:58:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aec79d1

media-video/ffdiaporama: reorder maintainers. By Coacher

Package-Manager: portage-2.3.0

 media-video/ffdiaporama/metadata.xml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-video/ffdiaporama/metadata.xml 
b/media-video/ffdiaporama/metadata.xml
index c0df23bfe75..6b20ac540fe 100644
--- a/media-video/ffdiaporama/metadata.xml
+++ b/media-video/ffdiaporama/metadata.xml
@@ -1,15 +1,15 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-proxy-ma...@gentoo.org
-Proxy Maintainers
-   

olivier.lauran...@laposte.net
Olivier Laurantin
Proxy maintainer. CC him on bugs

+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   

 
http://ffdiaporama.tuxfamily.org/?page_id=7266lang=en
 http://ffdiaporama.tuxfamily.org/?page_id=6268

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/, media-video/ffdiaporama/files/

[Alexis Ballier]

commit: 9aaa1586a3b67e7211e2c54424f9fec0ebb22b3a
Author: Alexis Ballier  gentoo  org>
AuthorDate: Mon Dec  5 10:19:40 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Mon Dec  5 10:19:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9aaa1586

media-video/ffdiaporama: fix build with ffmpeg-3. Patch by charlot in bug 
#575058.

Package-Manager: portage-2.3.2

 media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild  |   4 +-
 .../files/ffdiaporama-2.1-ffmpeg-3.0.patch | 196 +
 2 files changed, 198 insertions(+), 2 deletions(-)

diff --git a/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild 
b/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild
index e935fdc..cb539a9 100644
--- a/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild
+++ b/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -39,7 +39,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 DOCS=( authors.txt )
-PATCHES=( "${FILESDIR}"/${P}-{ffmpeg-2.4,libav10}.patch )
+PATCHES=( "${FILESDIR}"/${P}-{ffmpeg-2.4,libav10,ffmpeg-3.0}.patch )
 
 S="${WORKDIR}/ffDiaporama"
 

diff --git a/media-video/ffdiaporama/files/ffdiaporama-2.1-ffmpeg-3.0.patch 
b/media-video/ffdiaporama/files/ffdiaporama-2.1-ffmpeg-3.0.patch
new file mode 100644
index ..4eb8c97
--- /dev/null
+++ b/media-video/ffdiaporama/files/ffdiaporama-2.1-ffmpeg-3.0.patch
@@ -0,0 +1,196 @@
+--- src/ffDiaporama/engine/cBaseMediaFile.cpp  2014-02-09 10:48:04.0 
+0100
 src/ffDiaporama/engine/cBaseMediaFile.cpp  2016-02-21 19:00:43.129114600 
+0100
+@@ -113,10 +113,23 @@
+ #define VC_USERDATA 0x0008
+ #define VC_FLUSHED  0x0010
+ 
+-#define PIXFMT  PIX_FMT_RGB24
++#if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
++  #define PIXELFORMAT AVPixelFormat
++  #define PIXFMT AV_PIX_FMT_RGB24
++#else
++  #define PIXELFORMAT PixelFormat
++  #define PIXFMT PIX_FMT_RGB24
++#endif
+ #define QTPIXFMTQImage::Format_RGB888
+ 
+-AVFrame *ALLOCFRAME()   { return avcodec_alloc_frame(); }
++AVFrame *ALLOCFRAME()   { return 
++  #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
++av_frame_alloc();
++  #else
++avcodec_alloc_frame();
++  #endif
++}
++
+ voidFREEFRAME(AVFrame **Buf){ avcodec_free_frame(Buf); *Buf=NULL; }
+ 
+ 
//
+@@ -2402,7 +2415,7 @@
+ AVFrame *FrameRGB=ALLOCFRAME();
+ if ((FrameRGB)&&(!Thumbnail.isNull())) {
+ avpicture_fill((AVPicture 
*)FrameRGB,Thumbnail.bits(),PIXFMT,RealW,RealH);
+-struct SwsContext 
*img_convert_ctx=sws_getContext(FrameYUV->width,FrameYUV->height,(PixelFormat)FrameYUV->format,RealW,RealH,PIXFMT,SWS_FAST_BILINEAR,NULL,NULL,NULL);
++struct SwsContext 
*img_convert_ctx=sws_getContext(FrameYUV->width,FrameYUV->height,(PIXELFORMAT)FrameYUV->format,RealW,RealH,PIXFMT,SWS_FAST_BILINEAR,NULL,NULL,NULL);
+ if (img_convert_ctx!=NULL) {
+ int ret = 
sws_scale(img_convert_ctx,FrameYUV->data,FrameYUV->linesize,0,FrameYUV->height,FrameRGB->data,FrameRGB->linesize);
+ if (ret>0) {
+@@ -3482,7 +3495,7 @@
+ struct SwsContext *img_convert_ctx=sws_getContext(
+ Frame->width, 
// Src width
+ Frame->height,
// Src height
+-(PixelFormat)Frame->format,   
// Src Format
++(PIXELFORMAT)Frame->format,   
// Src Format
+ W,
// Destination width
+ H,
// Destination height
+ PIXFMT,   
// Destination Format
+--- src/ffDiaporama/engine/cDeviceModelDef.h   2016-02-21 19:53:00.487286000 
+0100
 src/ffDiaporama/engine/cDeviceModelDef.h   2016-02-21 19:52:47.623287800 
+0100
+@@ -53,7 +53,9 @@
+ 
+ #include 
+ #include 
+-#include 
++#if (LIBAVUTIL_VERSION_INT

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/files/, media-video/ffdiaporama/

[Julian Ospald]

commit: 124c96e38457e662f2201c1703b7def2456dd030
Author: Julian Ospald hasufell AT gentoo DOT org
AuthorDate: Fri Aug 14 22:53:30 2015 +
Commit: Julian Ospald hasufell AT gentoo DOT org
CommitDate: Fri Aug 14 22:53:30 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=124c96e3

media-video/ffdiaporama: rm old

 media-video/ffdiaporama/Manifest   |  4 --
 media-video/ffdiaporama/ffdiaporama-1.5.ebuild | 56 
 media-video/ffdiaporama/ffdiaporama-1.6.ebuild | 65 ---
 media-video/ffdiaporama/ffdiaporama-2.0.1.ebuild   | 75 --
 .../files/ffdiaporama-1.6-ffmpeg-2.0.patch | 32 -
 .../ffdiaporama-2.0-libav9-deinterlacing.patch | 26 
 6 files changed, 258 deletions(-)

diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest
index 553fda7..d47d732 100644
--- a/media-video/ffdiaporama/Manifest
+++ b/media-video/ffdiaporama/Manifest
@@ -1,7 +1,3 @@
-DIST ffDiaporama-texturemate_1.0.tar.gz 60772371 SHA256 
673db4e8603551970892e9b9eae28de12d190285cd7d2ba49c3b9a6c0d9df0fb SHA512 
bd93c153d6f5740540b822fe73f765c3ce6e7a886894d70dd5f9c7d23a59b3f0bd2ccb1109fc2af0529fe37aaca1c8f2e0bb2807b40c2ee8dfd213d0221d2536
 WHIRLPOOL 
661a6085ab6d888945a631ef805dbede65f1ea2e05037d368c3070a16dd15ae62e4b22ba4416c00284686aa9dbd2e72bf9c88d27296737920a84cd85bc44d7d9
-DIST ffdiaporama_1.5.tar.gz 14576632 SHA256 
9a7090d57da3383b47d44347f519092cbd3a5a62ba84f7493b2fdeb551c951bd SHA512 
59967f0a43d70e963eb104514fadd34e166e16519dcb7f58056ee8be10f4d08065fab30a94cbe75c39e796e39b387e9522d9616d3b317363e6ab332f2e3512ae
 WHIRLPOOL 
e08fdc5413d8fd23a7734056f9f338818f8263271404546613502043f85439155f73204fe8a1328dc256edd821ac057c5d57077291b7044d4a289340776b261e
-DIST ffdiaporama_1.6.tar.gz 15708389 SHA256 
b82c125b22f15c343cf87e5ad83e86e5278e25dc74385a9a39a5fe896d411d66 SHA512 
5fa05afdb317531b13a8788e7b37816c780de0bc56b6c25a5d9d0ef4b5c6c8126b3af23d37d41d970c97c0ffe9a21d5ae87cfb99a414abc8d65be87262f8c436
 WHIRLPOOL 
3da97f9fa7fc4b1a483813e89f783d6490722900f104f817ad62aad5717f3ce16b5b0732bc990fbd2371b301433dfd00eea3ec374587a1687f2d7fca1516709f
-DIST ffdiaporama_2.0.1.tar.gz 36140512 SHA256 
a3447a3e48b3988b4addf42938ba9d09b9c8be940ac969659637d8fb3af82729 SHA512 
72152a1e6b2f770e8dcb9f893a19cb4521056e195deb805df96aebe9344f32e74a8fae17426e2896b8dae5b1263526ffd3bdc17269103bb8efdff9fb59164e1b
 WHIRLPOOL 
121151b36ef615116c7e147e9c24fa268cb9aa196457bfbf13af37279ed0dd27da936c5d980dbd0d40c1440753c8daf774e12bcb1def267d075709cbf2dd
 DIST ffdiaporama_bin_2.1.2014.0209.tar.gz 16063604 SHA256 
a1f55367a3d915045a5f4ce5db20419c2e8ea26a8cd4d56bef2e3d525e55acaa SHA512 
40fc40ae8f09d311dc615051bd0bc4573f1f9ab5abe06032e161b759194c772b43c337902baf9c5a1eb027796fcdecc2fc20dce5d998091e6ccf8f696149223d
 WHIRLPOOL 
0cc1b7343bef904e6b89bda4d9fc17066ca1e9aff4beccf0a8b615c7e42a7a84d9cb7f582c6799bfc2e4a1398ad71f8398920ff1f57c2f60cf03ac12a66ce241
 DIST ffdiaporama_rsc_2.1.2014.0209.tar.gz 17669845 SHA256 
965bb1506531f7b5214d9003019aff410107908f4837fe7f2a1fcbd2e55c4447 SHA512 
910b2139eb1b97a86c8d795b65255f723e346b3b4ce805878835813f9b21c7b606f811488f9099003a0e0951006df6d32663f1d8be2ffe1c355cf9311ac4be19
 WHIRLPOOL 
1d9ecdb96df47785b146156c54ba1a9a80e3e5ec03b9ad9c4ca08bab17fd5738d20cf7a75247840c2c08af6feca75a14974f4602b8f73736080634644be15e9e
 DIST ffdiaporama_texturemate_1.0.2014.0125.tar.gz 30352923 SHA256 
47ef9a0391baa4dd145a4c9c39590afb3c7a2857da4a8fa7c74bd081f52a0417 SHA512 
e9aa9607d670a620b2e3c27d6ec5bf983eb31ab3d3139edf32ebb84d9ffa58b11c822f7db4b3f3c4a430b256719803df4a3a385bd467bdda09f8710d010eb2f5
 WHIRLPOOL 
00b22bfcaf6d5a698fe2d0f38d6578d027ca8451707bf49edecfca0ea6b181202e05cc5d13b32d9090825b4bde5eba509f1fd4e7a68d19dab7d2440b2eaa420e

diff --git a/media-video/ffdiaporama/ffdiaporama-1.5.ebuild 
b/media-video/ffdiaporama/ffdiaporama-1.5.ebuild
deleted file mode 100644
index 7737de3..000
--- a/media-video/ffdiaporama/ffdiaporama-1.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils fdo-mime gnome2-utils qt4-r2
-
-DESCRIPTION=Movie creator from photos and video clips
-HOMEPAGE=http://ffdiaporama.tuxfamily.org;
-SRC_URI=http://download.tuxfamily.org/${PN}/Archives/${PN}_${PV}.tar.gz;
-
-LICENSE=GPL-2
-SLOT=0
-KEYWORDS=amd64 x86
-IUSE=
-
-RDEPEND=media-gfx/exiv2
-   media-libs/libsdl[sound]
-   media-libs/qimageblitz
-   media-libs/taglib
-   virtual/ffmpeg[encode]
-   =dev-qt/qtcore-4.8:4
-   =dev-qt/qtgui-4.8:4
-DEPEND=${RDEPEND}
-
-DOCS=( authors.txt )
-
-src_unpack() {
-   # S=${WORKDIR} would result in unremoved files in
-   # ${WORKDIR}/../build
-   mkdir ${P} || die
-   cd ${P} || die
-   unpack ${A}
-}
-
-src_install() {
-   qt4-r2_src_install
-   doicon -s 32 ffdiaporama.png
-}
-
-pkg_preinst() {
-   

[gentoo-commits] repo/gentoo:master commit in: media-video/ffdiaporama/, media-video/ffdiaporama/files/

[Julian Ospald]

commit: 8a9e0d101236da1e1f3ae74df35976c7e03f2b3f
Author: Julian Ospald hasufell AT gentoo DOT org
AuthorDate: Sun Aug  9 15:24:33 2015 +
Commit: Julian Ospald hasufell AT gentoo DOT org
CommitDate: Sun Aug  9 15:25:17 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a9e0d10

media-video/ffdiaporama: fix compilation with libav-10

Suggested-by: Olivier Laurantin
X-Gentoo-Bug: 526434
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=526434

 media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild  |  78 
 .../files/ffdiaporama-2.1-libav10.patch| 427 +
 2 files changed, 505 insertions(+)

diff --git a/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild 
b/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild
new file mode 100644
index 000..9adc79f
--- /dev/null
+++ b/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils fdo-mime gnome2-utils qt4-r2
+
+BIN_PV=${PV}.2014.0209
+RSC_PV=${PV}.2014.0209
+TMT_PV=1.0.2014.0125
+OPENCLI_PV=0.18
+OPENCLI_P=openclipart-${OPENCLI_PV}
+DESCRIPTION=Movie creator from photos and video clips
+HOMEPAGE=http://ffdiaporama.tuxfamily.org;
+SRC_URI=http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_bin_${BIN_PV}.tar.gz
 - ${PN}_bin_${BIN_PV}.tar.gz
+   
http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_rsc_${RSC_PV}.tar.gz
 - ${PN}_rsc_${RSC_PV}.tar.gz
+   openclipart? ( 
http://openclipart.org/downloads/${OPENCLI_PV}/${OPENCLI_P}-svgonly.tar.bz2 )
+   texturemate? ( 
http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_texturemate_${TMT_PV}.tar.gz
 - ${PN}_texturemate_${TMT_PV}.tar.gz )
+
+LICENSE=GPL-2
+   openclipart? ( CC0-1.0 )
+   texturemate? ( CC-BY-3.0 )
+SLOT=0
+KEYWORDS=~amd64 x86
+IUSE=libav openclipart texturemate
+
+RDEPEND=
+   dev-qt/qtcore:4
+   dev-qt/qtgui:4
+   dev-qt/qthelp:4
+   dev-qt/qtsql:4[sqlite]
+   dev-qt/qtsvg:4
+   media-gfx/exiv2
+   media-libs/libsdl[sound]
+   media-libs/taglib
+   !libav? ( media-video/ffmpeg-1.2:0=[encode] )
+   libav? ( =media-video/libav-9:0=[encode] )
+DEPEND=${RDEPEND}
+
+DOCS=( authors.txt )
+PATCHES=( ${FILESDIR}/${P}-{ffmpeg-2.4,libav10}.patch )
+
+S=${WORKDIR}/ffDiaporama
+
+src_prepare() {
+   echo SUBDIRS += ../ffDiaporama_rsc  ffDiaporama.pro || die
+   if use texturemate; then
+   echo SUBDIRS += ../ffDiaporama_texturemate  ffDiaporama.pro 
|| die
+   fi
+   qt4-r2_src_prepare
+}
+
+src_install() {
+   qt4-r2_src_install
+   doicon -s 32 ffdiaporama.png
+   if use openclipart; then
+   dodir /usr/share/ffDiaporama/clipart/openclipart
+   cd ${WORKDIR}/${OPENCLI_P}-svgonly/clipart || die
+   find . -type d -maxdepth 1 -not -name . -exec cp -R '{}' 
${D}/usr/share/ffDiaporama/clipart/openclipart \; || die
+   fi
+}
+
+pkg_preinst() {
+   gnome2_icon_savelist
+}
+
+pkg_postinst() {
+   fdo-mime_desktop_database_update
+   fdo-mime_mime_database_update
+   gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+   fdo-mime_desktop_database_update
+   fdo-mime_mime_database_update
+   gnome2_icon_cache_update
+}

diff --git a/media-video/ffdiaporama/files/ffdiaporama-2.1-libav10.patch 
b/media-video/ffdiaporama/files/ffdiaporama-2.1-libav10.patch
new file mode 100644
index 000..1b607ba
--- /dev/null
+++ b/media-video/ffdiaporama/files/ffdiaporama-2.1-libav10.patch
@@ -0,0 +1,427 @@
+--- src/ffDiaporama/engine/cBaseMediaFile.cpp  2014-02-09 10:48:04.0 
+0100
 src/ffDiaporama/engine/cBaseMediaFile.cpp  2015-03-29 00:20:56.672641700 
+0100
+@@ -1861,12 +1861,12 @@
+ }
+ 
+ cImageInCache::~cImageInCache() {
+-#if defined(LIBAV) || (defined(FFMPEG)(FFMPEGVERSIONINT201))
++#if (defined(LIBAV)(LIBAVVERSIONINT=9) || 
defined(FFMPEG)(FFMPEGVERSIONINT201))
+ if (FrameBufferYUV-opaque) {
+ avfilter_unref_buffer((AVFilterBufferRef *)FrameBufferYUV-opaque);
+ FrameBufferYUV-opaque=NULL;
+ }
+-#elif defined(FFMPEG)  (FFMPEGVERSIONINT=201)
++#else
+ if (FiltFrame) {
+ av_frame_unref(FiltFrame);
+ av_frame_free(FiltFrame);
+@@ -2239,7 +2239,7 @@
+ 
LibavFile-streams[VideoStreamNumber]-discard=AVDISCARD_DEFAULT;  // Setup 
STREAM options
+ 
+ // Setup decoder options
+-LibavFile-streams[VideoStreamNumber]-codec-debug_mv
 =0;// Debug level (0=nothing)
++//LibavFile-streams[VideoStreamNumber]-codec-debug_mv  
   =0;// Debug level (0=nothing)
+ LibavFile-streams[VideoStreamNumber]-codec-debug   
 =0;// Debug level (0=nothing)
+