* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gphoto2/, media-gfx/gphoto2/files/
@ 2018-12-08 15:41 Gilles Dartiguelongue
0 siblings, 0 replies; 3+ messages in thread
From: Gilles Dartiguelongue @ 2018-12-08 15:41 UTC (permalink / raw
To: gentoo-commits
commit: a3075ac05a23feb1ef3033246c4aaacf54679c6c
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 8 15:28:44 2018 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Dec 8 15:40:27 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3075ac0
media-gfx/gphoto2: 2.5.15 → 2.5.20
Fix aalib automagic detection. Clean up some old ebuild tweaks.
Closes: https://bugs.gentoo.org/637418
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Gilles Dartiguelongue <eva <AT> gentoo.org>
media-gfx/gphoto2/Manifest | 1 +
...ted-automagic-activation-of-aalib-support.patch | 37 ++++++++++++++
media-gfx/gphoto2/gphoto2-2.5.20.ebuild | 57 ++++++++++++++++++++++
3 files changed, 95 insertions(+)
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 2c319362fd6..5c482014878 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,2 +1,3 @@
DIST gphoto2-2.5.14.tar.bz2 784442 BLAKE2B 185bd0d18e0b8d280c0ec366738850bd1fe2d1405179700fe25678c04a88b2092820aa5f049bcc6f97c964b5875bd32e3f8c7c5240ef3a71f2af04d6bfdaadb9 SHA512 47cb0d212673c9c0dbc996e0a67191a307599c844293a67184bd1529d9e3b417e154c6de64f4563f6f7e599a1bd6b127266f85f5baa97bd7d86922405bf45331
DIST gphoto2-2.5.15.tar.bz2 790513 BLAKE2B e8a22d014ebd33f5e0976d72c5df8373e29106def5da575b69d21f2a58e9408c6ce399476135909e57111196d6e61ead953f66a00c9f440b7cf92e0da0f4a0f6 SHA512 46058a12a81379f3311911e103cf934b6eb616d7f81180615b385d01e855bf6ce998eb12811b9d032328ebed6acfc4456f3a383cfedb93c6967c9699654d4f40
+DIST gphoto2-2.5.20.tar.bz2 790065 BLAKE2B 6e10aa468696bc3eff51aaa3e886ad2373997f91597e42b33777ac56bf668f918c2fa0cb8b70eb8f7cb45507e67c9cfc3a46a7408449ad35cc3b743daf74859d SHA512 0350c38c264e5ba858ee14952fbf6ad271e7fef05e3f5f8eb3d45102099ae435fec63b09881efa99af60d4e086a9c2f69be92a7e49617643ab13146a5e4655f3
diff --git a/media-gfx/gphoto2/files/0001-Fix-unwanted-automagic-activation-of-aalib-support.patch b/media-gfx/gphoto2/files/0001-Fix-unwanted-automagic-activation-of-aalib-support.patch
new file mode 100644
index 00000000000..8e78578d71d
--- /dev/null
+++ b/media-gfx/gphoto2/files/0001-Fix-unwanted-automagic-activation-of-aalib-support.patch
@@ -0,0 +1,37 @@
+From 45fb2a39195b5b31f61f376323ff78ab40940760 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sat, 8 Dec 2018 16:19:35 +0100
+Subject: [PATCH] Fix unwanted automagic activation of aalib support
+
+---
+ configure.ac | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a6068c9..c19fed9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -306,8 +306,9 @@ aa_msg="no (http://www.sourceforge.net/projects/aa-project)"
+ try_aa=:
+ have_aa=false
+ AC_ARG_WITH([aalib],AS_HELP_STRING([--with-aalib],[Do use aalib for preview ASCII rendering]),[
+- if test x$withval = xyes; then
+- try_aa=:
++ if test x$withval = xno; then
++ try_aa=false
++ aa_msg="no (not requested)"
+ fi
+ ])
+ if $try_aa; then
+@@ -323,8 +324,6 @@ if $try_aa; then
+ AA_LIBS="-laa"
+ fi
+ ])
+-else
+- aa_msg="no (not requested)"
+ fi
+ AM_CONDITIONAL([HAVE_AA], [$have_aa])
+ AC_SUBST([AA_LIBS])
+--
+2.19.2
+
diff --git a/media-gfx/gphoto2/gphoto2-2.5.20.ebuild b/media-gfx/gphoto2/gphoto2-2.5.20.ebuild
new file mode 100644
index 00000000000..5470646b4f2
--- /dev/null
+++ b/media-gfx/gphoto2/gphoto2-2.5.20.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="Free, redistributable digital camera software application"
+HOMEPAGE="http://www.gphoto.org/"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="aalib exif ncurses nls readline"
+
+# aalib -> needs libjpeg
+RDEPEND="
+ dev-libs/popt
+ >=media-libs/libgphoto2-2.5.17:=[exif?]
+ aalib? (
+ media-libs/aalib
+ virtual/jpeg:0 )
+ exif? ( media-libs/libexif )
+ ncurses? ( dev-libs/cdk:0= )
+ readline? ( sys-libs/readline:0= )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ nls? ( >=sys-devel/gettext-0.14.1 )
+"
+
+PATCHES=(
+ # https://github.com/gphoto/gphoto2/pull/179
+ "${FILESDIR}"/0001-Fix-unwanted-automagic-activation-of-aalib-support.patch
+)
+
+src_prepare() {
+ default
+ if ! use exif ; then
+ # Remove tests that require EXIF to pass, bug 610024
+ rm "${S}"/tests/data/test0{35,36,37,40}* || die
+ fi
+ # Leave GCC debug builds under user control
+ sed -r '/(C|LD)FLAGS/ s/ -g( |")/\1/' \
+ -i configure{.ac,} || die
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_with aalib) \
+ $(use_with aalib jpeg) \
+ $(use_with exif libexif auto) \
+ $(use_with ncurses cdk) \
+ $(use_enable nls) \
+ $(use_with readline)
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gphoto2/, media-gfx/gphoto2/files/
@ 2020-11-11 17:11 Matt Turner
0 siblings, 0 replies; 3+ messages in thread
From: Matt Turner @ 2020-11-11 17:11 UTC (permalink / raw
To: gentoo-commits
commit: de9268cbfa1289242cc0ec989b1ec0349db63a22
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 11 15:53:19 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Nov 11 17:11:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de9268cb
media-gfx/gphoto2: Version bump to 2.5.26
Closes: https://bugs.gentoo.org/679332
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
media-gfx/gphoto2/Manifest | 1 +
.../files/gphoto2-2.5.26-s-cdk-cdk.h-cdk.h.patch | 29 +++++++++++
media-gfx/gphoto2/gphoto2-2.5.26.ebuild | 57 ++++++++++++++++++++++
3 files changed, 87 insertions(+)
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 72328f0be87..270a115dfb4 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1 +1,2 @@
DIST gphoto2-2.5.20.tar.bz2 790065 BLAKE2B 6e10aa468696bc3eff51aaa3e886ad2373997f91597e42b33777ac56bf668f918c2fa0cb8b70eb8f7cb45507e67c9cfc3a46a7408449ad35cc3b743daf74859d SHA512 0350c38c264e5ba858ee14952fbf6ad271e7fef05e3f5f8eb3d45102099ae435fec63b09881efa99af60d4e086a9c2f69be92a7e49617643ab13146a5e4655f3
+DIST gphoto2-2.5.26.tar.bz2 804521 BLAKE2B 20ddf39ad8668543864119cb1cf8dd5db4be5a773ccdd73efe434fe790ce001842512acf9a9f3ad08bad43460b42e4de257b2ca5561b5d7727f0703dba8f8098 SHA512 fbfc8d860db830be423271a0f569d51a296e9394884fe1a9e22eafd4ba0b7e4e68d86ba0391df81a64d4a4976b2644b2c39339532bd0e8e01f461b9a89cceb47
diff --git a/media-gfx/gphoto2/files/gphoto2-2.5.26-s-cdk-cdk.h-cdk.h.patch b/media-gfx/gphoto2/files/gphoto2-2.5.26-s-cdk-cdk.h-cdk.h.patch
new file mode 100644
index 00000000000..b68e618cc01
--- /dev/null
+++ b/media-gfx/gphoto2/files/gphoto2-2.5.26-s-cdk-cdk.h-cdk.h.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/679332
+
+diff --git a/configure.ac b/configure.ac
+index ed76a66..b0db85c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -141,7 +141,7 @@ AC_ARG_WITH([cdk-prefix],AS_HELP_STRING([--with-cdk-prefix=PREFIX],
+ if $try_cdk; then
+ CPPFLAGS_save="$CPPFLAGS"
+ CPPFLAGS="-I$cdk_prefix/include $CPPFLAGS"
+- AC_CHECK_HEADER([cdk/cdk.h], [
++ AC_CHECK_HEADER([cdk.h], [
+ have_cdk=:
+ AC_PATH_PROG([CDK_CONFIG], [cdk5-config])
+ if test -n "${CDK_CONFIG}"; then
+diff --git a/gphoto2/gphoto2-cmd-config.c b/gphoto2/gphoto2-cmd-config.c
+index 360fd61..c801604 100644
+--- a/gphoto2/gphoto2-cmd-config.c
++++ b/gphoto2/gphoto2-cmd-config.c
+@@ -29,7 +29,7 @@
+
+ #include <gphoto2/gphoto2-widget.h>
+
+-#include <cdk/cdk.h>
++#include <cdk.h>
+
+ #ifndef MAX
+ # define MAX(a, b) ((a) > (b) ? (a) : (b))
+--
diff --git a/media-gfx/gphoto2/gphoto2-2.5.26.ebuild b/media-gfx/gphoto2/gphoto2-2.5.26.ebuild
new file mode 100644
index 00000000000..4e4d4369001
--- /dev/null
+++ b/media-gfx/gphoto2/gphoto2-2.5.26.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Free, redistributable digital camera software application"
+HOMEPAGE="http://www.gphoto.org/"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="aalib exif ncurses nls readline"
+
+# aalib -> needs libjpeg
+RDEPEND="
+ dev-libs/popt
+ >=media-libs/libgphoto2-2.5.17:=[exif?]
+ aalib? (
+ media-libs/aalib
+ virtual/jpeg:0 )
+ exif? ( media-libs/libexif )
+ ncurses? ( dev-libs/cdk:0= )
+ readline? ( sys-libs/readline:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ nls? ( >=sys-devel/gettext-0.14.1 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-s-cdk-cdk.h-cdk.h.patch
+)
+
+src_prepare() {
+ default
+ if ! use exif ; then
+ # Remove tests that require EXIF to pass, bug 610024
+ rm "${S}"/tests/data/test0{35,36,37,40}* || die
+ fi
+ # Leave GCC debug builds under user control
+ sed -r '/(C|LD)FLAGS/ s/ -g( |")/\1/' \
+ -i configure{.ac,} || die
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_with aalib) \
+ $(use_with aalib jpeg) \
+ $(use_with exif libexif auto) \
+ $(use_with ncurses cdk) \
+ $(use_enable nls) \
+ $(use_with readline)
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gphoto2/, media-gfx/gphoto2/files/
@ 2023-03-17 23:56 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-03-17 23:56 UTC (permalink / raw
To: gentoo-commits
commit: 81f044d7b5f70314f72ec500664d240877ea2242
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 17 22:39:16 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 17 23:56:11 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81f044d7
media-gfx/gphoto2: fix build w/ clang 16
Closes: https://bugs.gentoo.org/896212
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../gphoto2/files/gphoto2-2.5.28-clang-16.patch | 77 ++++++++++++++++++++++
media-gfx/gphoto2/gphoto2-2.5.28-r1.ebuild | 54 +++++++++++++++
2 files changed, 131 insertions(+)
diff --git a/media-gfx/gphoto2/files/gphoto2-2.5.28-clang-16.patch b/media-gfx/gphoto2/files/gphoto2-2.5.28-clang-16.patch
new file mode 100644
index 000000000000..e21d38b311e9
--- /dev/null
+++ b/media-gfx/gphoto2/files/gphoto2-2.5.28-clang-16.patch
@@ -0,0 +1,77 @@
+https://bugs.gentoo.org/896212
+https://github.com/gphoto/gphoto2/pull/569
+https://github.com/gphoto/gphoto2/commit/ccc4c1f092bd21ebc713f4d7b9be85be49f92f1e
+https://github.com/gphoto/gphoto2/commit/366930ccc1a261c3eb883da2bf3c655162ccd75f
+
+From ccc4c1f092bd21ebc713f4d7b9be85be49f92f1e Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 2 Sep 2022 12:59:46 -0700
+Subject: [PATCH] gphoto2: Use pthread_t abstract type for thead IDs
+
+This is not a plain old datatype in every libc, e.g. with musl this
+would fail in type conversion
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/gphoto2/main.c
++++ b/gphoto2/main.c
+@@ -1198,7 +1198,7 @@ thread_func (void *data)
+ pthread_cleanup_pop (1);
+ }
+
+-static unsigned int
++static pthread_t
+ start_timeout_func (Camera *camera, unsigned int timeout,
+ CameraTimeoutFunc func, void __unused__ *data)
+ {
+@@ -1219,7 +1219,7 @@ start_timeout_func (Camera *camera, unsigned int timeout,
+ }
+
+ static void
+-stop_timeout_func (Camera __unused__ *camera, unsigned int id,
++stop_timeout_func (Camera __unused__ *camera, pthread_t id,
+ void __unused__ *data)
+ {
+ pthread_t tid = id;
+
+
+From 366930ccc1a261c3eb883da2bf3c655162ccd75f Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 1 Mar 2023 22:58:37 -0800
+Subject: [PATCH] Match prototypes of callbacks with libgphoto
+
+In https://github.com/gphoto/gphoto2/pull/535/commits/ccc4c1f092bd21ebc713f4d7b9be85be49f92f1e
+we tried to fix by using pthread_t but it also needs to make changes in
+libgphoto and these changes can be invasive, therefore lets revert to
+older types and to fix musl problem fix it via type casts
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/gphoto2/main.c
++++ b/gphoto2/main.c
+@@ -1198,7 +1198,7 @@ thread_func (void *data)
+ pthread_cleanup_pop (1);
+ }
+
+-static pthread_t
++static unsigned int
+ start_timeout_func (Camera *camera, unsigned int timeout,
+ CameraTimeoutFunc func, void __unused__ *data)
+ {
+@@ -1215,14 +1215,14 @@ start_timeout_func (Camera *camera, unsigned int timeout,
+
+ pthread_create (&tid, NULL, thread_func, td);
+
+- return (tid);
++ return (unsigned int)tid;
+ }
+
+ static void
+-stop_timeout_func (Camera __unused__ *camera, pthread_t id,
++stop_timeout_func (Camera __unused__ *camera, unsigned int id,
+ void __unused__ *data)
+ {
+- pthread_t tid = id;
++ pthread_t tid = (pthread_t)id;
+
+ pthread_cancel (tid);
+ pthread_join (tid, NULL);
+
diff --git a/media-gfx/gphoto2/gphoto2-2.5.28-r1.ebuild b/media-gfx/gphoto2/gphoto2-2.5.28-r1.ebuild
new file mode 100644
index 000000000000..451c24940a8e
--- /dev/null
+++ b/media-gfx/gphoto2/gphoto2-2.5.28-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Free, redistributable digital camera software application"
+HOMEPAGE="http://www.gphoto.org/"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="aalib ncurses nls readline"
+
+# aalib -> needs libjpeg
+RDEPEND="
+ >=dev-libs/popt-1.6.1
+ >=media-libs/libexif-0.6.9
+ >=media-libs/libgphoto2-2.5.17:=[exif]
+ aalib? (
+ media-libs/aalib
+ media-libs/libjpeg-turbo
+ )
+ ncurses? ( dev-libs/cdk:= )
+ readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ nls? ( >=sys-devel/gettext-0.14.1 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-clang-16.patch
+)
+
+src_prepare() {
+ default
+ # Leave GCC debug builds under user control
+ sed -r '/(C|LD)FLAGS/ s/ -g( |")/\1/' \
+ -i configure{.ac,} || die
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_with aalib) \
+ $(use_with aalib jpeg) \
+ $(use_with ncurses cdk) \
+ $(use_enable nls) \
+ $(use_with readline)
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-03-17 23:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-11 17:11 [gentoo-commits] repo/gentoo:master commit in: media-gfx/gphoto2/, media-gfx/gphoto2/files/ Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2023-03-17 23:56 Sam James
2018-12-08 15:41 Gilles Dartiguelongue
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox