* [gentoo-commits] repo/gentoo:master commit in: media-libs/libsixel/, media-libs/libsixel/files/
@ 2016-02-27 6:04 Akinori Hattori
0 siblings, 0 replies; 3+ messages in thread
From: Akinori Hattori @ 2016-02-27 6:04 UTC (permalink / raw
To: gentoo-commits
commit: 2947c44e67e81a55aa085cbdf516310d91448e22
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 27 06:01:59 2016 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 06:01:59 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2947c44e
media-libs/libsixel: fix build
Gentoo-Bug: 570068
Package-Manager: portage-2.2.26
media-libs/libsixel/files/libsixel-gd.patch | 11 +++++++++++
media-libs/libsixel/libsixel-1.5.2.ebuild | 9 +++++++--
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/media-libs/libsixel/files/libsixel-gd.patch b/media-libs/libsixel/files/libsixel-gd.patch
new file mode 100644
index 0000000..6c94749
--- /dev/null
+++ b/media-libs/libsixel/files/libsixel-gd.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -354,7 +354,7 @@
+ [gdImageCreateFromGifPtr],
+ [AC_CHECK_DECLS([gdImageCreateFromGifPtr], [], [], [ #include <gd.h> ])])
+ AC_CHECK_LIB([gd],
+- [gdImageCreateFromBmpPtr],
++ [gdImageCreateFromPngPtr],
+ [AC_CHECK_DECLS([gdImageCreateFromPngPtr], [], [], [ #include <gd.h> ])])
+ AC_CHECK_LIB([gd],
+ [gdImageCreateFromBmpPtr],
diff --git a/media-libs/libsixel/libsixel-1.5.2.ebuild b/media-libs/libsixel/libsixel-1.5.2.ebuild
index ef878d2..076be8b 100644
--- a/media-libs/libsixel/libsixel-1.5.2.ebuild
+++ b/media-libs/libsixel/libsixel-1.5.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
-inherit bash-completion-r1
+inherit autotools bash-completion-r1 eutils
DESCRIPTION="A lightweight, fast implementation of DEC SIXEL graphics codec"
HOMEPAGE="https://github.com/saitoha/libsixel"
@@ -23,6 +23,11 @@ RDEPEND="curl? ( net-misc/curl )
DEPEND="${RDEPEND}
virtual/pkgconfig"
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-gd.patch
+ eautoreconf
+}
+
src_configure() {
econf \
--disable-python \
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libsixel/, media-libs/libsixel/files/
@ 2021-10-02 13:12 Akinori Hattori
0 siblings, 0 replies; 3+ messages in thread
From: Akinori Hattori @ 2021-10-02 13:12 UTC (permalink / raw
To: gentoo-commits
commit: f50ec2dfd70a0d9a63effda0f5416f2989862939
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 2 13:10:12 2021 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Oct 2 13:12:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f50ec2df
media-libs/libsixel: drop static library
Closes: https://bugs.gentoo.org/815679
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
media-libs/libsixel/files/libsixel-static-libs.patch | 11 +++++++++++
media-libs/libsixel/libsixel-1.10.3.ebuild | 5 ++++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/media-libs/libsixel/files/libsixel-static-libs.patch b/media-libs/libsixel/files/libsixel-static-libs.patch
new file mode 100644
index 00000000000..5184debb2b6
--- /dev/null
+++ b/media-libs/libsixel/files/libsixel-static-libs.patch
@@ -0,0 +1,11 @@
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -21,7 +21,7 @@
+ 'writer.c'
+ ]
+
+-libsixel = both_libraries('sixel',
++libsixel = shared_library('sixel',
+ sources,
+ include_directories: [inc, inc_config],
+ dependencies: libsixel_deps,
diff --git a/media-libs/libsixel/libsixel-1.10.3.ebuild b/media-libs/libsixel/libsixel-1.10.3.ebuild
index d9e158874cf..9dc7dd57b9e 100644
--- a/media-libs/libsixel/libsixel-1.10.3.ebuild
+++ b/media-libs/libsixel/libsixel-1.10.3.ebuild
@@ -30,7 +30,10 @@ BDEPEND="python? (
dev-python/setuptools[${PYTHON_USEDEP}]
)"
-PATCHES=( "${FILESDIR}"/${PN}-meson.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-meson.patch
+ "${FILESDIR}"/${PN}-static-libs.patch
+)
src_prepare() {
default
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libsixel/, media-libs/libsixel/files/
@ 2022-02-16 1:42 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-02-16 1:42 UTC (permalink / raw
To: gentoo-commits
commit: 024897195560f8288889e352cf5992cd3a657321
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 01:42:07 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 01:42:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02489719
media-libs/libsixel: fix build on musl
Closes: https://bugs.gentoo.org/830074
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/libsixel/files/libsixel-musl.patch | 57 +++++++++++++++++++++++++++
media-libs/libsixel/libsixel-1.10.3.ebuild | 3 +-
2 files changed, 59 insertions(+), 1 deletion(-)
diff --git a/media-libs/libsixel/files/libsixel-musl.patch b/media-libs/libsixel/files/libsixel-musl.patch
new file mode 100644
index 000000000000..f353a2f7c8d6
--- /dev/null
+++ b/media-libs/libsixel/files/libsixel-musl.patch
@@ -0,0 +1,57 @@
+https://github.com/libsixel/libsixel/commit/a8d60939d00af520e7139741b58928a9cc2c5f04.patch
+https://bugs.gentoo.org/830074
+
+From: nick black <dankamongmen@gmail.com>
+Date: Wed, 29 Sep 2021 22:31:58 -0400
+Subject: [PATCH] no need for sys/unistd.h
+
+--- a/converters/img2sixel.c
++++ b/converters/img2sixel.c
+@@ -28,7 +28,6 @@
+ #include <string.h>
+
+ # include <unistd.h>
+-# include <sys/unistd.h>
+ #include <sys/types.h>
+ # include <getopt.h>
+ # include <inttypes.h>
+--- a/meson.build
++++ b/meson.build
+@@ -66,7 +66,6 @@ needed_headers = [
+ 'string.h',
+ 'unistd.h',
+ 'stdint.h',
+- 'sys/unistd.h',
+ 'getopt.h',
+ 'sys/types.h',
+ 'sys/stat.h',
+--- a/src/decoder.c
++++ b/src/decoder.c
+@@ -26,7 +26,6 @@
+ # include <stdarg.h>
+ # include <string.h>
+ # include <unistd.h>
+-# include <sys/unistd.h>
+ #include <sys/types.h>
+ #include <sys/select.h>
+ # include <time.h>
+--- a/src/encoder.c
++++ b/src/encoder.c
+@@ -27,7 +27,6 @@
+ # include <stdarg.h>
+ #include <string.h>
+ # include <unistd.h>
+-# include <sys/unistd.h>
+ # include <sys/types.h>
+ # include <time.h>
+ # include <sys/time.h>
+--- a/src/tty.c
++++ b/src/tty.c
+@@ -28,7 +28,6 @@
+ # include <sys/time.h>
+ # include <sys/types.h>
+ # include <unistd.h>
+-# include <sys/unistd.h>
+ # include <sys/select.h>
+ # include <errno.h>
+ # include <termios.h>
diff --git a/media-libs/libsixel/libsixel-1.10.3.ebuild b/media-libs/libsixel/libsixel-1.10.3.ebuild
index 4e9128a773dd..636229521e33 100644
--- a/media-libs/libsixel/libsixel-1.10.3.ebuild
+++ b/media-libs/libsixel/libsixel-1.10.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
@@ -34,6 +34,7 @@ BDEPEND="virtual/pkgconfig
PATCHES=(
"${FILESDIR}"/${PN}-meson.patch
"${FILESDIR}"/${PN}-static-libs.patch
+ "${FILESDIR}"/${PN}-musl.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-02-16 1:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-02 13:12 [gentoo-commits] repo/gentoo:master commit in: media-libs/libsixel/, media-libs/libsixel/files/ Akinori Hattori
-- strict thread matches above, loose matches on Subject: below --
2022-02-16 1:42 Sam James
2016-02-27 6:04 Akinori Hattori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox