* [gentoo-commits] repo/gentoo:master commit in: media-gfx/photoqt/, media-gfx/photoqt/files/
@ 2015-10-12 13:37 Michael Palimaka
0 siblings, 0 replies; 7+ messages in thread
From: Michael Palimaka @ 2015-10-12 13:37 UTC (permalink / raw
To: gentoo-commits
commit: 56dcc48b398d7f47bff44820d217ca26bfd299f5
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 13:35:39 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 13:37:22 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56dcc48b
media-gfx/photoqt: remove old
Package-Manager: portage-2.2.20.1
media-gfx/photoqt/Manifest | 4 ---
.../files/photo-0.7.1.1-install-desktop.patch | 22 ------------
media-gfx/photoqt/photoqt-0.8-r1.ebuild | 27 ---------------
media-gfx/photoqt/photoqt-1.0.ebuild | 37 --------------------
media-gfx/photoqt/photoqt-1.1.0.1.ebuild | 38 --------------------
media-gfx/photoqt/photoqt-1.2.ebuild | 40 ----------------------
6 files changed, 168 deletions(-)
diff --git a/media-gfx/photoqt/Manifest b/media-gfx/photoqt/Manifest
index 2057b17..43dbbb2 100644
--- a/media-gfx/photoqt/Manifest
+++ b/media-gfx/photoqt/Manifest
@@ -1,5 +1 @@
-DIST photo-0.8.tar.gz 241142 SHA256 123f8cfa8e86dd131147b58e1c94a138bb9d3e5873f29b550cc960e83b2c4f5f SHA512 b5b8700a4f15e4ce880c5558247cc0e96e59df21c0674f57e202b5d6474e1ef0a251d5be391e795b230c4959251e194ec4a1c87e75075ee9ae501d3e18c4e32f WHIRLPOOL c6ff5a3a41cdfac0c54593dfbabb35bcb903b592809f698cf7d7c56bce05b1a29c31d8db7031392819481188f563bcf67e997cec24acd0a0842a311efaa76529
-DIST photoqt-1.0.tar.gz 709752 SHA256 e7f866540a03e95463dacdf2769a954f601ac3cd1507655793f9f231ab8689ce SHA512 2badf4e6e6694460fb8d1c8a9f8cb73fdcbcc20868588beec7da01e86ee906f81ed4f5154050960cb5000c40ef1efc03684872c35b352fe4246a880e03ee1bd7 WHIRLPOOL c33eae430c34e0e1c9dbf3d7721fa52af44dbc825060e804b42eeeec64bfc8c59bcf056e3f79227c4cd4a03823efc8716b9f5d172cb6a552165131f2600cdf2a
-DIST photoqt-1.1.0.1.tar.gz 1201723 SHA256 3727ec58a243586d367dc609793ad043cc78d4e67d9e7d3454f7cad782f6a9f8 SHA512 024c4fa1212d773b53b0bd7dd0a15bda961c33bd01ed9b8199f555e94339f97bb2d56a2928f68440f3de7f3ebaf539585be044cd5ba9f6e6b0f284d0c744ff6a WHIRLPOOL be35177b1b8587130f8728be6f44d5dc657b4d188dc947a514bcac344700fcec58db99e36c85163ddb22460331b64b2c1d3f7dab643d1c42beea5e5a58542655
-DIST photoqt-1.2.tar.gz 1452897 SHA256 4a293136c82c075c2f87bb1d8c6be384e8e8ca00f3d32e1783271439a090d6b6 SHA512 13b34a5511bebe9e2845b4fb9949472af2a75e358d836d05521f3efd848c8cc36f0d977a1c1a5ed16df9e0333ce8082f1b4fa4984a3318b4cb1012c44c6237e4 WHIRLPOOL 2fa599a5d1ff550253607a13a05bf67e5c3fc81152238be4a208f1d6bcd3939d1eaf4af398818cea728fb778955e3a6d5a3ef6191b757b5cb0b134b65b7b5220
DIST photoqt-1.3.tar.gz 1382474 SHA256 81baba387538f62a24af1e69ec26b2a62aafd9b4c1841dd952a9ddb25cdf5348 SHA512 6fdc0c00449519304e0e0da09cabee6f096100ce8054213ca48f5093629328b5f2b6d45215edbbf5419e34189b456eac1389b561840077b3b8320461a1591762 WHIRLPOOL 7989d53468e5f94a4ae5d160feb928c11790d381c5395e97eea2e5e715f76a7c95bfff34f3879cfc5bed2a5d29a3140cd8c978c3a08757cd5efd933363fc9489
diff --git a/media-gfx/photoqt/files/photo-0.7.1.1-install-desktop.patch b/media-gfx/photoqt/files/photo-0.7.1.1-install-desktop.patch
deleted file mode 100644
index 4814a41..0000000
--- a/media-gfx/photoqt/files/photo-0.7.1.1-install-desktop.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -burN photo-0.7.1.1-orig/CMakeLists.txt photo-0.7.1.1/CMakeLists.txt
---- photo-0.7.1.1-orig/CMakeLists.txt 2012-04-29 20:38:49.374650243 +0800
-+++ photo-0.7.1.1/CMakeLists.txt 2012-04-29 21:00:03.237838770 +0800
-@@ -28,7 +28,7 @@
- if(UNIX)
-
- # find xdg-desktop-menu and xdg-mime
-- find_program(XDG-DESKTOP-MENU_EXECUTABLE xdg-desktop-menu)
-+ #find_program(XDG-DESKTOP-MENU_EXECUTABLE xdg-desktop-menu)
-
- # Set the install prefix to /usr/
- SET(PRODUCT_INSTALL_PREFIX /usr)
-@@ -41,7 +41,8 @@
-
- # Install desktop file
- INSTALL(
-- CODE "execute_process(COMMAND ${XDG-DESKTOP-MENU_EXECUTABLE} install --novendor ${CMAKE_CURRENT_SOURCE_DIR}/photo.desktop)"
-+ FILES photo.desktop
-+ DESTINATION share/applications/
- )
-
- # And install all the icons
diff --git a/media-gfx/photoqt/photoqt-0.8-r1.ebuild b/media-gfx/photoqt/photoqt-0.8-r1.ebuild
deleted file mode 100644
index 0328224..0000000
--- a/media-gfx/photoqt/photoqt-0.8-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="Simple but powerful Qt-based image viewer"
-HOMEPAGE="http://photoqt.org/"
-SRC_URI="http://photoqt.org/oldRel/photo-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtsql:4
- media-gfx/exiv2:="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/photo-0.7.1.1-install-desktop.patch"
-)
-
-S=${WORKDIR}/photo-${PV}
diff --git a/media-gfx/photoqt/photoqt-1.0.ebuild b/media-gfx/photoqt/photoqt-1.0.ebuild
deleted file mode 100644
index 2f1eb8c..0000000
--- a/media-gfx/photoqt/photoqt-1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="Simple but powerful Qt-based image viewer"
-HOMEPAGE="http://photoqt.org/"
-SRC_URI="http://photoqt.org/oldRel/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="exiv2 graphicsmagick" # phonon"
-
-DEPEND="dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtsql:4
- exiv2? ( media-gfx/exiv2:= )
- graphicsmagick? ( media-gfx/graphicsmagick:= )"
-# phonon? ( || ( media-libs/phonon dev-qt/qtphonon ) )" # fails to compile
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- # make desktop file validate; needs more work
- echo ';' >> "${S}"/${PN}.desktop || die
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use exiv2 EXIV2)
- $(cmake-utils_use graphicsmagick GM)
- -DPHONON=OFF
- )
- cmake-utils_src_configure
-}
diff --git a/media-gfx/photoqt/photoqt-1.1.0.1.ebuild b/media-gfx/photoqt/photoqt-1.1.0.1.ebuild
deleted file mode 100644
index 2b2336e..0000000
--- a/media-gfx/photoqt/photoqt-1.1.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="Simple but powerful Qt-based image viewer"
-HOMEPAGE="http://photoqt.org/"
-SRC_URI="http://photoqt.org/pkgs/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="graphicsmagick exiv2"
-
-RDEPEND="dev-qt/qtgui:5
- dev-qt/qtimageformats:5
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5
- dev-qt/qtsql:5
- dev-qt/qtwidgets:5
- exiv2? ( media-gfx/exiv2:= )
- graphicsmagick? ( media-gfx/graphicsmagick )"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use graphicsmagick GM)
- $(cmake-utils_use exiv2 EXIV2)
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- MAKEOPTS+=" -j1" cmake-utils_src_compile
-}
diff --git a/media-gfx/photoqt/photoqt-1.2.ebuild b/media-gfx/photoqt/photoqt-1.2.ebuild
deleted file mode 100644
index a24f72d..0000000
--- a/media-gfx/photoqt/photoqt-1.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="Simple but powerful Qt-based image viewer"
-HOMEPAGE="http://photoqt.org/"
-SRC_URI="http://photoqt.org/pkgs/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="graphicsmagick exiv2"
-
-RDEPEND="dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtimageformats:5
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5
- dev-qt/qtsql:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- exiv2? ( media-gfx/exiv2:= )
- graphicsmagick? ( media-gfx/graphicsmagick )"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use graphicsmagick GM)
- $(cmake-utils_use exiv2 EXIV2)
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- MAKEOPTS+=" -j1" cmake-utils_src_compile
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/photoqt/, media-gfx/photoqt/files/
@ 2018-12-29 22:02 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2018-12-29 22:02 UTC (permalink / raw
To: gentoo-commits
commit: 2ab36b4e15ab63e64b0a4b20f5117455e84e58af
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 21:40:38 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 22:02:02 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ab36b4e
media-gfx/photoqt: Fix USE exif
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/photoqt/files/photoqt-1.7.1-cmake.patch | 13 +++++++++++++
media-gfx/photoqt/photoqt-1.7.1.ebuild | 2 ++
2 files changed, 15 insertions(+)
diff --git a/media-gfx/photoqt/files/photoqt-1.7.1-cmake.patch b/media-gfx/photoqt/files/photoqt-1.7.1-cmake.patch
new file mode 100644
index 00000000000..5dfacf435a0
--- /dev/null
+++ b/media-gfx/photoqt/files/photoqt-1.7.1-cmake.patch
@@ -0,0 +1,13 @@
+--- a/CMake/FindExiv2.cmake 2018-06-03 05:21:04.143148857 +0200
++++ b/CMake/FindExiv2.cmake 2018-12-29 22:35:40.770393025 +0100
+@@ -13,8 +13,8 @@
+ "${EXIV2_LOCATION}"
+ "${EXIV2_LOCATION}/include"
+ /usr/include
+- /usr/include/Exiv2
+- /opt/local/include/Exiv2
++ /usr/include/exiv2
++ /opt/local/include/exiv2
+ )
+
+ IF(EXIV2_INCLUDE_DIR)
diff --git a/media-gfx/photoqt/photoqt-1.7.1.ebuild b/media-gfx/photoqt/photoqt-1.7.1.ebuild
index b37af5d4f16..a865dab8014 100644
--- a/media-gfx/photoqt/photoqt-1.7.1.ebuild
+++ b/media-gfx/photoqt/photoqt-1.7.1.ebuild
@@ -41,6 +41,8 @@ DEPEND="${RDEPEND}
kde-frameworks/extra-cmake-modules:5
"
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
src_configure() {
local mycmakeargs=(
-DDEVIL=$(usex devil)
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/photoqt/, media-gfx/photoqt/files/
@ 2022-10-25 18:36 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2022-10-25 18:36 UTC (permalink / raw
To: gentoo-commits
commit: 0aaa3d5a49c0ac229510b85c83418fb470a00006
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 25 18:33:48 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 25 18:35:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0aaa3d5a
media-gfx/photoqt: drop 1.7.1-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/photoqt/Manifest | 1 -
media-gfx/photoqt/files/photoqt-1.7.1-cmake.patch | 13 ---
.../photoqt/files/photoqt-1.7.1-exiv2-0.27.patch | 102 ---------------------
media-gfx/photoqt/photoqt-1.7.1-r1.ebuild | 59 ------------
4 files changed, 175 deletions(-)
diff --git a/media-gfx/photoqt/Manifest b/media-gfx/photoqt/Manifest
index 1cf8748b9630..900b20d3660d 100644
--- a/media-gfx/photoqt/Manifest
+++ b/media-gfx/photoqt/Manifest
@@ -1,2 +1 @@
-DIST photoqt-1.7.1.tar.gz 1324774 BLAKE2B b739508511cdc34b6de5736260692c48186a49d0cf62d8283238ee274d2fdf73716589277fa602f86c8c15fff87b49d1700202d260480e002dfa18380b47d328 SHA512 50cee1a77a5e69d05f19a8f1ac8ab18d1ef420962b05f3a76e12ce0f3202db7037c894bbd7631674504f0e51c2be690aff4248ed343d0da2dc8a1ccce2d8e078
DIST photoqt-2.9.1.tar.gz 3708647 BLAKE2B dd8c958709ebd830558f150f59c90c317d3f5edb363f92e9fadcd1506de4c97a41f6766670e202081397081c231604028298771eb52911255dae53bfa92a1a8d SHA512 c2ac3bce2ffa0962b243808cdd2495d45af3bd5703389de5e9626a518a8edf25646a317ff420dc0fdd8dc60a53104b1b5ec7e473087454d5c2f0b967066dc192
diff --git a/media-gfx/photoqt/files/photoqt-1.7.1-cmake.patch b/media-gfx/photoqt/files/photoqt-1.7.1-cmake.patch
deleted file mode 100644
index 5dfacf435a0e..000000000000
--- a/media-gfx/photoqt/files/photoqt-1.7.1-cmake.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/CMake/FindExiv2.cmake 2018-06-03 05:21:04.143148857 +0200
-+++ b/CMake/FindExiv2.cmake 2018-12-29 22:35:40.770393025 +0100
-@@ -13,8 +13,8 @@
- "${EXIV2_LOCATION}"
- "${EXIV2_LOCATION}/include"
- /usr/include
-- /usr/include/Exiv2
-- /opt/local/include/Exiv2
-+ /usr/include/exiv2
-+ /opt/local/include/exiv2
- )
-
- IF(EXIV2_INCLUDE_DIR)
diff --git a/media-gfx/photoqt/files/photoqt-1.7.1-exiv2-0.27.patch b/media-gfx/photoqt/files/photoqt-1.7.1-exiv2-0.27.patch
deleted file mode 100644
index 48734ce70593..000000000000
--- a/media-gfx/photoqt/files/photoqt-1.7.1-exiv2-0.27.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From c6fd41478e818f3a651d40f96cab3d790e1c09a4 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 20 Jan 2019 18:25:45 +0100
-Subject: [PATCH] Fix build with exiv2-0.27
-
-Fixes https://gitlab.com/luspi/photoqt/issues/64
----
- cplusplus/scripts/getanddostuff/manipulation.h | 3 +--
- cplusplus/scripts/getmetadata.cpp | 4 ++--
- cplusplus/scripts/getmetadata.h | 3 +--
- cplusplus/scripts/managepeopletags.cpp | 4 ++--
- cplusplus/scripts/managepeopletags.h | 3 +--
- 5 files changed, 7 insertions(+), 10 deletions(-)
-
-diff --git a/cplusplus/scripts/getanddostuff/manipulation.h b/cplusplus/scripts/getanddostuff/manipulation.h
-index b3fa9b42..465d9372 100644
---- a/cplusplus/scripts/getanddostuff/manipulation.h
-+++ b/cplusplus/scripts/getanddostuff/manipulation.h
-@@ -38,8 +38,7 @@
- #include "../../logger.h"
-
- #ifdef EXIV2
--#include <exiv2/image.hpp>
--#include <exiv2/exif.hpp>
-+#include <exiv2/exiv2.hpp>
- #endif
-
- class GetAndDoStuffManipulation : public QObject {
-diff --git a/cplusplus/scripts/getmetadata.cpp b/cplusplus/scripts/getmetadata.cpp
-index deb89a25..df92de6b 100644
---- a/cplusplus/scripts/getmetadata.cpp
-+++ b/cplusplus/scripts/getmetadata.cpp
-@@ -203,7 +203,7 @@ QVariantMap GetMetaData::getExiv2(QString path) {
- }
-
- } catch(Exiv2::Error &e) {
-- LOG << CURDATE << "GetMetaData::getExiv2() Unable to read Exif metadata: " << e << " (" << Exiv2::errMsg(e.code()) << ")" << NL;
-+ LOG << CURDATE << "GetMetaData::getExiv2() Unable to read Exif metadata: " << e.what() << NL;
- }
-
- // If GPS is set, compose into one string
-@@ -246,7 +246,7 @@ QVariantMap GetMetaData::getExiv2(QString path) {
- }
-
- } catch(Exiv2::Error &e) {
-- LOG << CURDATE << "GetMetaData::getExiv2() ERROR reading IPTC metadata: " << e << " (" << Exiv2::errMsg(e.code()) << ")" << NL;
-+ LOG << CURDATE << "GetMetaData::getExiv2() ERROR reading IPTC metadata: " << e.what() << NL;
- }
-
- QString city = returnMap["Iptc.Application2.City"].toString();
-diff --git a/cplusplus/scripts/getmetadata.h b/cplusplus/scripts/getmetadata.h
-index e427cbc1..c5b99140 100644
---- a/cplusplus/scripts/getmetadata.h
-+++ b/cplusplus/scripts/getmetadata.h
-@@ -34,8 +34,7 @@
- #include "../logger.h"
-
- #ifdef EXIV2
--#include <exiv2/image.hpp>
--#include <exiv2/exif.hpp>
-+#include <exiv2/exiv2.hpp>
- #endif
-
- class GetMetaData : public QObject {
-diff --git a/cplusplus/scripts/managepeopletags.cpp b/cplusplus/scripts/managepeopletags.cpp
-index 9b8c7503..96baeb9e 100644
---- a/cplusplus/scripts/managepeopletags.cpp
-+++ b/cplusplus/scripts/managepeopletags.cpp
-@@ -98,7 +98,7 @@ QVariantList ManagePeopleTags::getFaceTags(QString path) {
-
- } catch(Exiv2::Error& e) {
- LOG << CURDATE << "GetPeopleTag::getPeopleLocations() 2 - ERROR reading exiv data (caught exception): "
-- << e << " (" << Exiv2::errMsg(e.code()) << ")" << NL;
-+ << e.what() << NL;
- return ret;
- }
-
-@@ -201,7 +201,7 @@ void ManagePeopleTags::setFaceTags(QString filename, QVariantList tags) {
-
- } catch(Exiv2::Error& e) {
- LOG << CURDATE << "GetPeopleTag::setFaceTags() - ERROR reading exiv data (caught exception): "
-- << e << " (" << Exiv2::errMsg(e.code()) << ")" << NL;
-+ << e.what() << NL;
- return;
- }
-
-diff --git a/cplusplus/scripts/managepeopletags.h b/cplusplus/scripts/managepeopletags.h
-index 1908ba0a..59686cc1 100644
---- a/cplusplus/scripts/managepeopletags.h
-+++ b/cplusplus/scripts/managepeopletags.h
-@@ -29,8 +29,7 @@
- #include "../logger.h"
-
- #ifdef EXIV2
--#include <exiv2/image.hpp>
--#include <exiv2/exif.hpp>
-+#include <exiv2/exiv2.hpp>
- #endif
-
- class ManagePeopleTags : public QObject {
---
-2.18.1
diff --git a/media-gfx/photoqt/photoqt-1.7.1-r1.ebuild b/media-gfx/photoqt/photoqt-1.7.1-r1.ebuild
deleted file mode 100644
index 53e9fae1e605..000000000000
--- a/media-gfx/photoqt/photoqt-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_KDEINSTALLDIRS=false
-inherit ecm
-
-DESCRIPTION="Simple but powerful Qt-based image viewer"
-HOMEPAGE="https://photoqt.org/"
-SRC_URI="https://photoqt.org/pkgs/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="devil exif freeimage graphicsmagick pdf raw"
-
-BDEPEND="
- dev-qt/linguist-tools:5
-"
-RDEPEND="
- dev-qt/qtdeclarative:5
- dev-qt/qtgraphicaleffects:5
- dev-qt/qtgui:5
- dev-qt/qtimageformats:5
- dev-qt/qtmultimedia:5[qml]
- dev-qt/qtnetwork:5
- dev-qt/qtquickcontrols:5
- dev-qt/qtsql:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- app-arch/libarchive:=
- app-arch/unrar
- devil? ( media-libs/devil )
- exif? ( media-gfx/exiv2:= )
- freeimage? ( media-libs/freeimage )
- graphicsmagick? ( >=media-gfx/graphicsmagick-1.3.20:= )
- pdf? ( app-text/poppler[qt5] )
- raw? ( media-libs/libraw:= )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-cmake.patch"
- "${FILESDIR}/${P}-exiv2-0.27.patch" # bugs 675714, 676194
-)
-
-src_configure() {
- local mycmakeargs=(
- -DDEVIL=$(usex devil)
- -DEXIV2=$(usex exif)
- -DFREEIMAGE=$(usex freeimage)
- -DGM=$(usex graphicsmagick)
- -DPOPPLER=$(usex pdf)
- -DRAW=$(usex raw)
- )
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/photoqt/, media-gfx/photoqt/files/
@ 2022-11-07 19:30 Ionen Wolkens
0 siblings, 0 replies; 7+ messages in thread
From: Ionen Wolkens @ 2022-11-07 19:30 UTC (permalink / raw
To: gentoo-commits
commit: a1617dacbcaa34c7f89d56cd8a303ebefd6601c9
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 6 18:50:49 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Nov 7 19:27:57 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1617dac
media-gfx/photoqt: use mpv slot, fix with api 2.0
Very trivial fix that's known to not break anything
with old api, so doing straight-to-strable.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../photoqt/files/photoqt-2.9.1-libmpv-api2.patch | 20 ++++++++++++++++++++
...{photoqt-2.9.1.ebuild => photoqt-2.9.1-r1.ebuild} | 6 +++++-
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/media-gfx/photoqt/files/photoqt-2.9.1-libmpv-api2.patch b/media-gfx/photoqt/files/photoqt-2.9.1-libmpv-api2.patch
new file mode 100644
index 000000000000..006b90a915b6
--- /dev/null
+++ b/media-gfx/photoqt/files/photoqt-2.9.1-libmpv-api2.patch
@@ -0,0 +1,20 @@
+https://gitlab.com/lspies/photoqt/-/merge_requests/10
+From: Ionen Wolkens <ionen@gentoo.org>
+Date: Sun, 6 Nov 2022 13:22:36 -0500
+Subject: [PATCH] [libmpv] drop gl_init_params' deprecated parameter for api
+ 2.0
+
+Fixes build issue with upcoming mpv-0.35.0 (libmpv.so.2),
+and remains compatible with current.
+--- a/cplusplus/libmpv/mpvobject.cpp
++++ b/cplusplus/libmpv/mpvobject.cpp
+@@ -74,7 +74,7 @@ public:
+ QOpenGLFramebufferObject * createFramebufferObject(const QSize &size) {
+ // init mpv_gl:
+ if (!obj->mpv_gl) {
+- mpv_opengl_init_params gl_init_params{get_proc_address_mpv, nullptr, nullptr};
++ mpv_opengl_init_params gl_init_params{get_proc_address_mpv, nullptr};
+ mpv_render_param params[]{
+ {MPV_RENDER_PARAM_API_TYPE, const_cast<char *>(MPV_RENDER_API_TYPE_OPENGL)},
+ {MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &gl_init_params},
+GitLab
diff --git a/media-gfx/photoqt/photoqt-2.9.1.ebuild b/media-gfx/photoqt/photoqt-2.9.1-r1.ebuild
similarity index 95%
rename from media-gfx/photoqt/photoqt-2.9.1.ebuild
rename to media-gfx/photoqt/photoqt-2.9.1-r1.ebuild
index f73af804f930..094f15dc4bbd 100644
--- a/media-gfx/photoqt/photoqt-2.9.1.ebuild
+++ b/media-gfx/photoqt/photoqt-2.9.1-r1.ebuild
@@ -37,7 +37,7 @@ COMMON_DEPEND="
!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
)
- mpv? ( media-video/mpv[libmpv] )
+ mpv? ( media-video/mpv:=[libmpv] )
pdf? ( app-text/poppler[qt5] )
raw? ( media-libs/libraw:= )
"
@@ -51,6 +51,10 @@ RDEPEND="${COMMON_DEPEND}
"
BDEPEND="dev-qt/linguist-tools:5"
+PATCHES=(
+ "${FILESDIR}"/${P}-libmpv-api2.patch
+)
+
src_configure() {
local mycmakeargs=(
-DCHROMECAST=OFF # TODO needs python
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/photoqt/, media-gfx/photoqt/files/
@ 2023-01-18 22:58 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2023-01-18 22:58 UTC (permalink / raw
To: gentoo-commits
commit: c728871c7314838f496f516e46a2d7a528572927
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 18 22:58:06 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 18 22:58:06 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c728871c
media-gfx/photoqt: fix build w/ libraw 0.21
Closes: https://bugs.gentoo.org/891325
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../photoqt/files/photoqt-2.9.1-libraw-0.21.patch | 22 +++++++
media-gfx/photoqt/photoqt-2.9.1-r2.ebuild | 77 ++++++++++++++++++++++
2 files changed, 99 insertions(+)
diff --git a/media-gfx/photoqt/files/photoqt-2.9.1-libraw-0.21.patch b/media-gfx/photoqt/files/photoqt-2.9.1-libraw-0.21.patch
new file mode 100644
index 000000000000..683a72e65d71
--- /dev/null
+++ b/media-gfx/photoqt/files/photoqt-2.9.1-libraw-0.21.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/891325
+https://gitlab.com/lspies/photoqt/-/commit/a8908dbfac01886204a5d911106208bd0f15b467
+
+From a8908dbfac01886204a5d911106208bd0f15b467 Mon Sep 17 00:00:00 2001
+From: Lukas Spies <Lukas@photoqt.org>
+Date: Thu, 22 Dec 2022 03:07:40 -0600
+Subject: [PATCH] [PQLoadImageRAW] make raw loader work when libraw is compiled
+ without rawspeed support. Not aware of macro to chewck at compile time, thsu
+ disabled for now
+
+--- a/cplusplus/imageprovider/loader/loadimage_raw.cpp
++++ b/cplusplus/imageprovider/loader/loadimage_raw.cpp
+@@ -57,7 +57,6 @@ QImage PQLoadImageRAW::load(QString filename, QSize maxSize, QSize &origSize, bo
+ // Since we don't care about manipulating RAW images but only want to display
+ // them, we can optimise for speed
+ raw.imgdata.params.user_qual = 2;
+- raw.imgdata.params.use_rawspeed = 1;
+ raw.imgdata.params.use_camera_wb = 1;
+
+ // Open the RAW image
+--
+GitLab
diff --git a/media-gfx/photoqt/photoqt-2.9.1-r2.ebuild b/media-gfx/photoqt/photoqt-2.9.1-r2.ebuild
new file mode 100644
index 000000000000..cdd579030848
--- /dev/null
+++ b/media-gfx/photoqt/photoqt-2.9.1-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_KDEINSTALLDIRS=false
+inherit ecm optfeature
+
+DESCRIPTION="Simple but powerful Qt-based image viewer"
+HOMEPAGE="https://photoqt.org/"
+SRC_URI="https://photoqt.org/pkgs/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="devil exif freeimage graphicsmagick imagemagick mpv pdf raw"
+
+COMMON_DEPEND="
+ app-arch/libarchive:=
+ app-arch/unrar
+ dev-libs/pugixml
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5[jpeg]
+ dev-qt/qtimageformats:5
+ dev-qt/qtmultimedia:5[qml]
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsql:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ devil? ( media-libs/devil )
+ exif? ( media-gfx/exiv2:= )
+ freeimage? ( media-libs/freeimage )
+ imagemagick? (
+ !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+ graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+ )
+ mpv? ( media-video/mpv:=[libmpv] )
+ pdf? ( app-text/poppler[qt5] )
+ raw? ( media-libs/libraw:= )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-qt/qtconcurrent:5
+"
+RDEPEND="${COMMON_DEPEND}
+ dev-qt/qtgraphicaleffects:5
+ dev-qt/qtquickcontrols:5
+ dev-qt/qtquickcontrols2:5
+"
+BDEPEND="dev-qt/linguist-tools:5"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-libmpv-api2.patch
+ "${FILESDIR}"/${P}-libraw-0.21.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DCHROMECAST=OFF # TODO needs python
+ -DDEVIL=$(usex devil)
+ -DEXIV2=$(usex exif)
+ -DFREEIMAGE=$(usex freeimage)
+ -DGRAPHICSMAGICK=$(usex graphicsmagick $(usex imagemagick))
+ -DIMAGEMAGICK=$(usex imagemagick $(usex !graphicsmagick))
+ -DVIDEO_MPV=$(usex mpv)
+ -DPOPPLER=$(usex pdf)
+ -DRAW=$(usex raw)
+ )
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ optfeature "additional image formats like AVIF, EPS, HEIF/HEIC, PSD, etc." kde-frameworks/kimageformats
+ ecm_pkg_postinst
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/photoqt/, media-gfx/photoqt/files/
@ 2023-05-29 7:37 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2023-05-29 7:37 UTC (permalink / raw
To: gentoo-commits
commit: 803295e8ae3ca539dea6f01ddeecbbd903e38bce
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 29 07:27:37 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 29 07:37:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=803295e8
media-gfx/photoqt: add 3.2, fix build with >=exiv2-0.28
Closes: https://bugs.gentoo.org/896348
Closes: https://bugs.gentoo.org/906491
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/photoqt/Manifest | 1 +
.../photoqt/files/photoqt-3.2-exiv2-0.28.patch | 116 +++++++++++++++++++++
media-gfx/photoqt/photoqt-3.2.ebuild | 75 +++++++++++++
3 files changed, 192 insertions(+)
diff --git a/media-gfx/photoqt/Manifest b/media-gfx/photoqt/Manifest
index 900b20d3660d..e71da2ca3239 100644
--- a/media-gfx/photoqt/Manifest
+++ b/media-gfx/photoqt/Manifest
@@ -1 +1,2 @@
DIST photoqt-2.9.1.tar.gz 3708647 BLAKE2B dd8c958709ebd830558f150f59c90c317d3f5edb363f92e9fadcd1506de4c97a41f6766670e202081397081c231604028298771eb52911255dae53bfa92a1a8d SHA512 c2ac3bce2ffa0962b243808cdd2495d45af3bd5703389de5e9626a518a8edf25646a317ff420dc0fdd8dc60a53104b1b5ec7e473087454d5c2f0b967066dc192
+DIST photoqt-3.2.tar.gz 965895 BLAKE2B ae1e159401b24a1bede344e4d398dbd6c2ae13fd467a4eac9ef15ea2d15933dc1756325a5a4f305a5f447bfd1a9e2d636e0b9367d0201ca356393c033c4f2f0f SHA512 ab7030d0ed6edf79373b1a99b1b8469cd567f04e5c233a87496084424603d8c241f7b473c22d323f4df8480d3f74918a987d2d590ec5026f1b7ca2c92b5c6bba
diff --git a/media-gfx/photoqt/files/photoqt-3.2-exiv2-0.28.patch b/media-gfx/photoqt/files/photoqt-3.2-exiv2-0.28.patch
new file mode 100644
index 000000000000..b1da118c1537
--- /dev/null
+++ b/media-gfx/photoqt/files/photoqt-3.2-exiv2-0.28.patch
@@ -0,0 +1,116 @@
+From 376fe8c3ef6b16d63995f76a194e2c1d788b28b1 Mon Sep 17 00:00:00 2001
+From: Lukas Spies <Lukas@photoqt.org>
+Date: Sun, 28 May 2023 20:23:32 -0500
+Subject: [PATCH 1/2] [exiv2] fix compilation with Exiv2 v0.28.0
+
+---
+ cplusplus/filefoldermodel/filefoldermodel.cpp | 4 ++++
+ cplusplus/scripts/handlingfacetags.cpp | 4 ++++
+ cplusplus/scripts/metadata.cpp | 4 ++++
+ 3 files changed, 12 insertions(+)
+
+diff --git a/cplusplus/filefoldermodel/filefoldermodel.cpp b/cplusplus/filefoldermodel/filefoldermodel.cpp
+index b6258735..56b120b7 100644
+--- a/cplusplus/filefoldermodel/filefoldermodel.cpp
++++ b/cplusplus/filefoldermodel/filefoldermodel.cpp
+@@ -560,7 +560,11 @@ void PQFileFolderModel::advancedSortMainView() {
+ } catch (Exiv2::Error& e) {
+ // An error code of 11 means unknown file type
+ // Since we always try to read any file's meta data, this happens a lot
++#if EXIV2_TEST_VERSION(0, 28, 0)
++ if(e.code() != Exiv2::ErrorCode::kerUnsupportedImageType)
++#else
+ if(e.code() != 11)
++#endif
+ LOG << CURDATE << "PQMetaData::updateMetadaya(): ERROR reading exiv data (caught exception): " << e.what() << NL;
+ else
+ DBG << CURDATE << "PQMetaData::updateMetadaya(): ERROR reading exiv data (caught exception): " << e.what() << NL;
+diff --git a/cplusplus/scripts/handlingfacetags.cpp b/cplusplus/scripts/handlingfacetags.cpp
+index d90ece73..562cf200 100644
+--- a/cplusplus/scripts/handlingfacetags.cpp
++++ b/cplusplus/scripts/handlingfacetags.cpp
+@@ -57,7 +57,11 @@ QVariantList PQHandlingFaceTags::getFaceTags(QString filename) {
+ image->readMetadata();
+ } catch (Exiv2::Error& e) {
+ // An error code of 11 means image not supported. This is much more reliable than, e.g., checking a file ending
++#if EXIV2_TEST_VERSION(0, 28, 0)
++ if(e.code() != Exiv2::ErrorCode::kerUnsupportedImageType)
++#else
+ if(e.code() != 11)
++#endif
+ LOG << CURDATE << "PQHandlingFaceTags::getFaceTags() - ERROR reading metadata (caught exception): " << e << NL;
+ else
+ DBG << CURDATE << "PQHandlingFaceTags::getFaceTags() - ERROR reading metadata (caught exception): " << e << NL;
+diff --git a/cplusplus/scripts/metadata.cpp b/cplusplus/scripts/metadata.cpp
+index 87e23474..a7d3e076 100644
+--- a/cplusplus/scripts/metadata.cpp
++++ b/cplusplus/scripts/metadata.cpp
+@@ -120,7 +120,11 @@ void PQMetaData::updateMetadata(QString path) {
+ } catch (Exiv2::Error& e) {
+ // An error code of 11 means unknown file type
+ // Since we always try to read any file's meta data, this happens a lot
++#if EXIV2_TEST_VERSION(0, 28, 0)
++ if(e.code() != Exiv2::ErrorCode::kerUnsupportedImageType)
++#else
+ if(e.code() != 11)
++#endif
+ LOG << CURDATE << "PQMetaData::updateMetadaya(): ERROR reading exiv data (caught exception): " << e.what() << NL;
+ else
+ DBG << CURDATE << "PQMetaData::updateMetadaya(): ERROR reading exiv data (caught exception): " << e.what() << NL;
+--
+2.40.1
+
+
+From 6190de9e47c358cf54748fa2a3593108831aa768 Mon Sep 17 00:00:00 2001
+From: Lukas Spies <Lukas@photoqt.org>
+Date: Sun, 28 May 2023 20:27:08 -0500
+Subject: [PATCH 2/2] [exiv2] switch to proper exvi2 errorcode
+
+---
+ cplusplus/filefoldermodel/filefoldermodel.cpp | 2 +-
+ cplusplus/scripts/handlingfacetags.cpp | 2 +-
+ cplusplus/scripts/metadata.cpp | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/cplusplus/filefoldermodel/filefoldermodel.cpp b/cplusplus/filefoldermodel/filefoldermodel.cpp
+index 56b120b7..c8cf199a 100644
+--- a/cplusplus/filefoldermodel/filefoldermodel.cpp
++++ b/cplusplus/filefoldermodel/filefoldermodel.cpp
+@@ -561,7 +561,7 @@ void PQFileFolderModel::advancedSortMainView() {
+ // An error code of 11 means unknown file type
+ // Since we always try to read any file's meta data, this happens a lot
+ #if EXIV2_TEST_VERSION(0, 28, 0)
+- if(e.code() != Exiv2::ErrorCode::kerUnsupportedImageType)
++ if(e.code() != Exiv2::ErrorCode::kerFileContainsUnknownImageType)
+ #else
+ if(e.code() != 11)
+ #endif
+diff --git a/cplusplus/scripts/handlingfacetags.cpp b/cplusplus/scripts/handlingfacetags.cpp
+index 562cf200..94a7bca6 100644
+--- a/cplusplus/scripts/handlingfacetags.cpp
++++ b/cplusplus/scripts/handlingfacetags.cpp
+@@ -58,7 +58,7 @@ QVariantList PQHandlingFaceTags::getFaceTags(QString filename) {
+ } catch (Exiv2::Error& e) {
+ // An error code of 11 means image not supported. This is much more reliable than, e.g., checking a file ending
+ #if EXIV2_TEST_VERSION(0, 28, 0)
+- if(e.code() != Exiv2::ErrorCode::kerUnsupportedImageType)
++ if(e.code() != Exiv2::ErrorCode::kerFileContainsUnknownImageType)
+ #else
+ if(e.code() != 11)
+ #endif
+diff --git a/cplusplus/scripts/metadata.cpp b/cplusplus/scripts/metadata.cpp
+index a7d3e076..fabc2d74 100644
+--- a/cplusplus/scripts/metadata.cpp
++++ b/cplusplus/scripts/metadata.cpp
+@@ -121,7 +121,7 @@ void PQMetaData::updateMetadata(QString path) {
+ // An error code of 11 means unknown file type
+ // Since we always try to read any file's meta data, this happens a lot
+ #if EXIV2_TEST_VERSION(0, 28, 0)
+- if(e.code() != Exiv2::ErrorCode::kerUnsupportedImageType)
++ if(e.code() != Exiv2::ErrorCode::kerFileContainsUnknownImageType)
+ #else
+ if(e.code() != 11)
+ #endif
+--
+2.40.1
+
diff --git a/media-gfx/photoqt/photoqt-3.2.ebuild b/media-gfx/photoqt/photoqt-3.2.ebuild
new file mode 100644
index 000000000000..514da69340d7
--- /dev/null
+++ b/media-gfx/photoqt/photoqt-3.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_KDEINSTALLDIRS=false
+inherit ecm optfeature
+
+DESCRIPTION="Simple but powerful Qt-based image viewer"
+HOMEPAGE="https://photoqt.org/"
+SRC_URI="https://photoqt.org/pkgs/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="devil exif freeimage graphicsmagick imagemagick mpv pdf raw"
+
+COMMON_DEPEND="
+ app-arch/libarchive:=
+ app-arch/unrar
+ dev-libs/pugixml
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5[jpeg]
+ dev-qt/qtimageformats:5
+ dev-qt/qtmultimedia:5[qml]
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsql:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ devil? ( media-libs/devil )
+ exif? ( media-gfx/exiv2:=[bmff] )
+ freeimage? ( media-libs/freeimage )
+ imagemagick? (
+ !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+ graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+ )
+ mpv? ( media-video/mpv:=[libmpv] )
+ pdf? ( app-text/poppler[qt5] )
+ raw? ( media-libs/libraw:= )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-qt/qtconcurrent:5
+"
+RDEPEND="${COMMON_DEPEND}
+ dev-qt/qtgraphicaleffects:5
+ dev-qt/qtquickcontrols:5
+ dev-qt/qtquickcontrols2:5
+"
+BDEPEND="dev-qt/linguist-tools:5"
+
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.28.patch" ) # upstream git master, bug #906491
+
+src_configure() {
+ local mycmakeargs=(
+ -DCHROMECAST=OFF # TODO needs python
+ -DDEVIL=$(usex devil)
+ -DEXIV2=$(usex exif)
+ -DEXIV2_ENABLE_BMFF=$(usex exif)
+ -DFREEIMAGE=$(usex freeimage)
+ -DGRAPHICSMAGICK=$(usex graphicsmagick $(usex imagemagick))
+ -DIMAGEMAGICK=$(usex imagemagick $(usex !graphicsmagick))
+ -DVIDEO_MPV=$(usex mpv)
+ -DPOPPLER=$(usex pdf)
+ -DRAW=$(usex raw)
+ )
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ optfeature "additional image formats like AVIF, EPS, HEIF/HEIC, PSD, etc." kde-frameworks/kimageformats
+ ecm_pkg_postinst
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/photoqt/, media-gfx/photoqt/files/
@ 2023-06-17 17:07 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2023-06-17 17:07 UTC (permalink / raw
To: gentoo-commits
commit: 0a44485b22f962f8b7fca0f9438ae6fb38416c86
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 17:04:37 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 17:06:53 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a44485b
media-gfx/photoqt: drop 2.9.1-r2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/photoqt/Manifest | 1 -
.../photoqt/files/photoqt-2.9.1-libmpv-api2.patch | 20 ------
.../photoqt/files/photoqt-2.9.1-libraw-0.21.patch | 22 -------
media-gfx/photoqt/photoqt-2.9.1-r2.ebuild | 77 ----------------------
4 files changed, 120 deletions(-)
diff --git a/media-gfx/photoqt/Manifest b/media-gfx/photoqt/Manifest
index e71da2ca3239..4e6d861d95f5 100644
--- a/media-gfx/photoqt/Manifest
+++ b/media-gfx/photoqt/Manifest
@@ -1,2 +1 @@
-DIST photoqt-2.9.1.tar.gz 3708647 BLAKE2B dd8c958709ebd830558f150f59c90c317d3f5edb363f92e9fadcd1506de4c97a41f6766670e202081397081c231604028298771eb52911255dae53bfa92a1a8d SHA512 c2ac3bce2ffa0962b243808cdd2495d45af3bd5703389de5e9626a518a8edf25646a317ff420dc0fdd8dc60a53104b1b5ec7e473087454d5c2f0b967066dc192
DIST photoqt-3.2.tar.gz 965895 BLAKE2B ae1e159401b24a1bede344e4d398dbd6c2ae13fd467a4eac9ef15ea2d15933dc1756325a5a4f305a5f447bfd1a9e2d636e0b9367d0201ca356393c033c4f2f0f SHA512 ab7030d0ed6edf79373b1a99b1b8469cd567f04e5c233a87496084424603d8c241f7b473c22d323f4df8480d3f74918a987d2d590ec5026f1b7ca2c92b5c6bba
diff --git a/media-gfx/photoqt/files/photoqt-2.9.1-libmpv-api2.patch b/media-gfx/photoqt/files/photoqt-2.9.1-libmpv-api2.patch
deleted file mode 100644
index 006b90a915b6..000000000000
--- a/media-gfx/photoqt/files/photoqt-2.9.1-libmpv-api2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://gitlab.com/lspies/photoqt/-/merge_requests/10
-From: Ionen Wolkens <ionen@gentoo.org>
-Date: Sun, 6 Nov 2022 13:22:36 -0500
-Subject: [PATCH] [libmpv] drop gl_init_params' deprecated parameter for api
- 2.0
-
-Fixes build issue with upcoming mpv-0.35.0 (libmpv.so.2),
-and remains compatible with current.
---- a/cplusplus/libmpv/mpvobject.cpp
-+++ b/cplusplus/libmpv/mpvobject.cpp
-@@ -74,7 +74,7 @@ public:
- QOpenGLFramebufferObject * createFramebufferObject(const QSize &size) {
- // init mpv_gl:
- if (!obj->mpv_gl) {
-- mpv_opengl_init_params gl_init_params{get_proc_address_mpv, nullptr, nullptr};
-+ mpv_opengl_init_params gl_init_params{get_proc_address_mpv, nullptr};
- mpv_render_param params[]{
- {MPV_RENDER_PARAM_API_TYPE, const_cast<char *>(MPV_RENDER_API_TYPE_OPENGL)},
- {MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &gl_init_params},
-GitLab
diff --git a/media-gfx/photoqt/files/photoqt-2.9.1-libraw-0.21.patch b/media-gfx/photoqt/files/photoqt-2.9.1-libraw-0.21.patch
deleted file mode 100644
index 683a72e65d71..000000000000
--- a/media-gfx/photoqt/files/photoqt-2.9.1-libraw-0.21.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/891325
-https://gitlab.com/lspies/photoqt/-/commit/a8908dbfac01886204a5d911106208bd0f15b467
-
-From a8908dbfac01886204a5d911106208bd0f15b467 Mon Sep 17 00:00:00 2001
-From: Lukas Spies <Lukas@photoqt.org>
-Date: Thu, 22 Dec 2022 03:07:40 -0600
-Subject: [PATCH] [PQLoadImageRAW] make raw loader work when libraw is compiled
- without rawspeed support. Not aware of macro to chewck at compile time, thsu
- disabled for now
-
---- a/cplusplus/imageprovider/loader/loadimage_raw.cpp
-+++ b/cplusplus/imageprovider/loader/loadimage_raw.cpp
-@@ -57,7 +57,6 @@ QImage PQLoadImageRAW::load(QString filename, QSize maxSize, QSize &origSize, bo
- // Since we don't care about manipulating RAW images but only want to display
- // them, we can optimise for speed
- raw.imgdata.params.user_qual = 2;
-- raw.imgdata.params.use_rawspeed = 1;
- raw.imgdata.params.use_camera_wb = 1;
-
- // Open the RAW image
---
-GitLab
diff --git a/media-gfx/photoqt/photoqt-2.9.1-r2.ebuild b/media-gfx/photoqt/photoqt-2.9.1-r2.ebuild
deleted file mode 100644
index 3d56e5fca782..000000000000
--- a/media-gfx/photoqt/photoqt-2.9.1-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_KDEINSTALLDIRS=false
-inherit ecm optfeature
-
-DESCRIPTION="Simple but powerful Qt-based image viewer"
-HOMEPAGE="https://photoqt.org/"
-SRC_URI="https://photoqt.org/pkgs/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="devil exif freeimage graphicsmagick imagemagick mpv pdf raw"
-
-COMMON_DEPEND="
- app-arch/libarchive:=
- app-arch/unrar
- dev-libs/pugixml
- dev-qt/qtdbus:5
- dev-qt/qtdeclarative:5
- dev-qt/qtgui:5[jpeg]
- dev-qt/qtimageformats:5
- dev-qt/qtmultimedia:5[qml]
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsql:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- devil? ( media-libs/devil )
- exif? ( media-gfx/exiv2:= )
- freeimage? ( media-libs/freeimage )
- imagemagick? (
- !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
- graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
- )
- mpv? ( media-video/mpv:=[libmpv] )
- pdf? ( app-text/poppler[qt5] )
- raw? ( media-libs/libraw:= )
-"
-DEPEND="${COMMON_DEPEND}
- dev-qt/qtconcurrent:5
-"
-RDEPEND="${COMMON_DEPEND}
- dev-qt/qtgraphicaleffects:5
- dev-qt/qtquickcontrols:5
- dev-qt/qtquickcontrols2:5
-"
-BDEPEND="dev-qt/linguist-tools:5"
-
-PATCHES=(
- "${FILESDIR}"/${P}-libmpv-api2.patch
- "${FILESDIR}"/${P}-libraw-0.21.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DCHROMECAST=OFF # TODO needs python
- -DDEVIL=$(usex devil)
- -DEXIV2=$(usex exif)
- -DFREEIMAGE=$(usex freeimage)
- -DGRAPHICSMAGICK=$(usex graphicsmagick $(usex imagemagick))
- -DIMAGEMAGICK=$(usex imagemagick $(usex !graphicsmagick))
- -DVIDEO_MPV=$(usex mpv)
- -DPOPPLER=$(usex pdf)
- -DRAW=$(usex raw)
- )
- ecm_src_configure
-}
-
-pkg_postinst() {
- optfeature "additional image formats like AVIF, EPS, HEIF/HEIC, PSD, etc." kde-frameworks/kimageformats
- ecm_pkg_postinst
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-06-17 17:07 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-07 19:30 [gentoo-commits] repo/gentoo:master commit in: media-gfx/photoqt/, media-gfx/photoqt/files/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2023-06-17 17:07 Andreas Sturmlechner
2023-05-29 7:37 Andreas Sturmlechner
2023-01-18 22:58 Sam James
2022-10-25 18:36 Andreas Sturmlechner
2018-12-29 22:02 Andreas Sturmlechner
2015-10-12 13:37 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox