* [gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/files/, media-libs/libcaca/
@ 2021-10-24 4:06 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2021-10-24 4:06 UTC (permalink / raw
To: gentoo-commits
commit: e4d9018ad6d87a731a9fd621561cad1b170aec89
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Oct 23 08:42:34 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 24 04:05:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4d9018a
media-libs/libcaca: min java 1.8:*
Closes: https://bugs.gentoo.org/786807
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/22681
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/libcaca/files/foo | 77 ++++++++++++++++++++++
...a19-r7.ebuild => libcaca-0.99_beta19-r8.ebuild} | 4 +-
2 files changed, 79 insertions(+), 2 deletions(-)
diff --git a/media-libs/libcaca/files/foo b/media-libs/libcaca/files/foo
new file mode 100644
index 00000000000..d35de1aa7d2
--- /dev/null
+++ b/media-libs/libcaca/files/foo
@@ -0,0 +1,77 @@
+diff --git a/src/common-image.c b/src/common-image.c
+index 7059bf4..d40eba1 100644
+--- a/src/common-image.c
++++ b/src/common-image.c
+@@ -22,6 +22,7 @@
+ #endif
+
+ #include "caca.h"
++#include "caca_internals.h"
+
+ #include "common-image.h"
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 5f0b22f..2f48f27 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -11,7 +11,7 @@ noinst_PROGRAMS = cacadraw
+
+ cacademo_SOURCES = cacademo.c texture.h
+ cacademo_LDADD = ../caca/libcaca.la ../caca/libcaca.la
+-cacademo_LDFLAGS = @MATH_LIBS@
++cacademo_LIBS = @MATH_LIBS@
+
+ cacafire_SOURCES = aafire.c
+ cacafire_LDADD = ../caca/libcaca.la ../caca/libcaca.la
+@@ -19,7 +19,7 @@ cacafire_LDADD = ../caca/libcaca.la ../caca/libcaca.la
+ cacaview_SOURCES = cacaview.c common-image.c common-image.h
+ cacaview_LDADD = ../caca/libcaca.la ../caca/libcaca.la
+ cacaview_CFLAGS = $(IMLIB2_CFLAGS)
+-cacaview_LDFLAGS = $(IMLIB2_LIBS)
++cacaview_LIBS = $(IMLIB2_LIBS)
+
+ cacadraw_SOURCES = cacadraw.c
+ cacadraw_LDADD = ../caca/libcaca.la ../caca/libcaca.la
+@@ -37,7 +37,7 @@ cacaclock_LDADD = ../caca/libcaca.la
+ img2txt_SOURCES = img2txt.c common-image.c common-image.h
+ img2txt_LDADD = ../caca/libcaca.la
+ img2txt_CFLAGS = $(IMLIB2_CFLAGS)
+-img2txt_LDFLAGS = $(IMLIB2_LIBS)
++img2txt_LIBS = $(IMLIB2_LIBS)
+
+ if USE_NETWORK
+ fcntl_programs = cacaserver
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 2f48f27..725ad36 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -10,16 +10,14 @@ bin_PROGRAMS = cacademo cacafire cacaplay cacaview img2txt cacaclock $(fcntl_pro
+ noinst_PROGRAMS = cacadraw
+
+ cacademo_SOURCES = cacademo.c texture.h
+-cacademo_LDADD = ../caca/libcaca.la ../caca/libcaca.la
+-cacademo_LIBS = @MATH_LIBS@
++cacademo_LDADD = ../caca/libcaca.la @MATH_LIBS@
+
+ cacafire_SOURCES = aafire.c
+ cacafire_LDADD = ../caca/libcaca.la ../caca/libcaca.la
+
+ cacaview_SOURCES = cacaview.c common-image.c common-image.h
+-cacaview_LDADD = ../caca/libcaca.la ../caca/libcaca.la
++cacaview_LDADD = ../caca/libcaca.la $(IMLIB2_LIBS)
+ cacaview_CFLAGS = $(IMLIB2_CFLAGS)
+-cacaview_LIBS = $(IMLIB2_LIBS)
+
+ cacadraw_SOURCES = cacadraw.c
+ cacadraw_LDADD = ../caca/libcaca.la ../caca/libcaca.la
+@@ -35,9 +33,8 @@ cacaclock_LDADD = ../caca/libcaca.la
+
+
+ img2txt_SOURCES = img2txt.c common-image.c common-image.h
+-img2txt_LDADD = ../caca/libcaca.la
++img2txt_LDADD = ../caca/libcaca.la $(IMLIB2_LIBS)
+ img2txt_CFLAGS = $(IMLIB2_CFLAGS)
+-img2txt_LIBS = $(IMLIB2_LIBS)
+
+ if USE_NETWORK
+ fcntl_programs = cacaserver
diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r7.ebuild b/media-libs/libcaca/libcaca-0.99_beta19-r8.ebuild
similarity index 98%
rename from media-libs/libcaca/libcaca-0.99_beta19-r7.ebuild
rename to media-libs/libcaca/libcaca-0.99_beta19-r8.ebuild
index 1fbb143b911..07175fc779e 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r7.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r8.ebuild
@@ -40,7 +40,7 @@ DEPEND="
>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
)
"
-RDEPEND="java? ( >=virtual/jre-1.5 )"
+RDEPEND="java? ( >=virtual/jre-1.8:* )"
BDEPEND="
virtual/pkgconfig
doc? (
@@ -50,7 +50,7 @@ BDEPEND="
>=dev-texlive/texlive-latexextra-2012
dev-texlive/texlive-latexrecommended
)
- java? ( >=virtual/jdk-1.5 )
+ java? ( >=virtual/jdk-1.8:* )
test? ( dev-util/cppunit )
"
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/files/, media-libs/libcaca/
@ 2024-03-12 7:17 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2024-03-12 7:17 UTC (permalink / raw
To: gentoo-commits
commit: 1e0b8f0d7458644b7e5ef8f697de9c52ec36e4ea
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 12 07:16:16 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 07:16:48 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e0b8f0d
media-libs/libcaca: fix build w/ LTO on some arches
Avoid configure test getting optimised out.
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/libcaca/files/configure-lto.patch | 44 +++++++++++++++++++++++
media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild | 1 +
2 files changed, 45 insertions(+)
diff --git a/media-libs/libcaca/files/configure-lto.patch b/media-libs/libcaca/files/configure-lto.patch
new file mode 100644
index 000000000000..c60989b3c8f4
--- /dev/null
+++ b/media-libs/libcaca/files/configure-lto.patch
@@ -0,0 +1,44 @@
+https://github.com/cacalabs/libcaca/pull/76
+
+[Modified to just save/restore flags.]
+
+From 07cb730bf3dc49170f0c387d9edcf5537a4e26b6 Mon Sep 17 00:00:00 2001
+From: kxxt <rsworktech@outlook.com>
+Date: Wed, 21 Jun 2023 00:06:04 +0800
+Subject: [PATCH] Disable LTO when checking for fsin/fcos/fldln2/...
+
+LTO might interfere with the instruction detection and produce false positives.
+(The conftest.c compiles with `-flto=auto` but fails without it)
+
+The build for riscv64 arch linux fails because of this:
+https://archriscv.felixc.at/.status/log.htm?url=logs/libcaca/libcaca-0.99.beta20-2.log
+
+This PR fixes it.
+---
+ configure.ac | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 27b8d5b4..ee38ead3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -145,6 +145,9 @@ AC_COMPILE_IFELSE(
+ AC_DEFINE(HAVE_SLEEP, 1, [Define to 1 if you have the ‘Sleep’ function.])],
+ [AC_MSG_RESULT(no)])
+
++OLD_CFLAGS="${CFLAGS}" # Disable LTO when checking for the instructions
++CFLAGS="${CFLAGS} -fno-lto"
++
+ AC_MSG_CHECKING(for fsin/fcos)
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+@@ -163,6 +166,8 @@ AC_COMPILE_IFELSE(
+ AC_DEFINE(HAVE_FLDLN2, 1, [Define to 1 if you have the ‘fldln2’ and other floating point instructions.])],
+ [AC_MSG_RESULT(no)])
+
++CFLAGS="${OLD_CFLAGS}"
++
+ AC_CHECK_HEADERS(zlib.h)
+ AC_CHECK_LIB(z, gzopen, [ZLIB_LIBS="${ZLIB_LIBS} -lz"])
+
+
diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild b/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
index 32b14aa901c4..917b1e972fc7 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
@@ -61,6 +61,7 @@ PATCHES=(
"${FILESDIR}/100_doxygen.diff"
# Fix doxygen docs install, bug 543870
"${FILESDIR}/fix-css-path.patch"
+ "${FILESDIR}/configure-lto.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-03-12 7:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-12 7:17 [gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/files/, media-libs/libcaca/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-10-24 4:06 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox