commit: 79b7f13361498d8e77b6c5c559f3453b81fe24f5
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 22 07:17:40 2025 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Jun 22 07:19:01 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79b7f133
media-libs/libsixel: drop old
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
media-libs/libsixel/Manifest | 1 -
media-libs/libsixel/files/libsixel-meson.patch | 65 ---------------
media-libs/libsixel/files/libsixel-musl.patch | 57 -------------
.../libsixel/files/libsixel-static-libs.patch | 11 ---
media-libs/libsixel/libsixel-1.10.3-r1.ebuild | 93 ----------------------
5 files changed, 227 deletions(-)
diff --git a/media-libs/libsixel/Manifest b/media-libs/libsixel/Manifest
index d27281a5b66f..04c824f09346 100644
--- a/media-libs/libsixel/Manifest
+++ b/media-libs/libsixel/Manifest
@@ -1,2 +1 @@
-DIST libsixel-1.10.3.tar.gz 4272940 BLAKE2B
f65d9a3bdd54917f5746b7b1650dfca7084c64b505ea9cae07863c476d1189114d9fb303ec01d8fa209542e891f1d359ec6dbdc9babc4313b06b709813fab020
SHA512
ef16f9ccecec8289728ec84ce9f24145648f8a38184c1ec3df8ead3499c6cf7d3e0a0c738f8bfcb1093e16ee8ae7ce5e46d3890707c8104752ce4ab7eb3bc7ac
DIST libsixel-1.10.5.tar.gz 4286415 BLAKE2B
a05981c627529ba0bc045726d46a865b676f7057e436b2b9ed367738d655ac149b5a524e8da7379b56275eb62a113c9acbfe0f7ad8066a08fd583b29eae2277b
SHA512
94fc972ee304885936d5d8fbc3dadc5feadebf1ab262bb49c9ae9b1eed19c528ed823f4d31c17326340f06a5b7ee28a1817be15ae55c3e9d0c4437cd36b3e49d
diff --git a/media-libs/libsixel/files/libsixel-meson.patch
b/media-libs/libsixel/files/libsixel-meson.patch
deleted file mode 100644
index b912288e2e66..000000000000
--- a/media-libs/libsixel/files/libsixel-meson.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -27,7 +27,7 @@
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
- __attribute__((deprecated)) void test(void) {}
- ''')
-- conf_data.set('HAVE_DIAGNOSTIC_DEPRECATED_DECLARATIONS', true)
-+ conf_data.set('HAVE_DIAGNOSTIC_DEPRECATED_DECLARATIONS', 1)
- endif
-
- c_args = [
-@@ -101,24 +101,24 @@
- python2_installation = pymod.find_installation('python2', required:
get_option('python2'))
-
- if get_option('libcurl').enabled() and curl_found.found()
-- conf_data.set('HAVE_LIBCURL', true)
-+ conf_data.set('HAVE_LIBCURL', 1)
- libsixel_deps += [curl_found]
- endif
-
--if get_option('jpeg').enabled() and jpeg_found
-- conf_data.set('HAVE_JPEG', true)
-+if get_option('jpeg').enabled() and jpeg_found.found()
-+ conf_data.set('HAVE_JPEG', 1)
- libsixel_deps += [jpeg_found]
- endif
-
--if get_option('png').enabled() and png_found
-- conf_data.set('HAVE_PNG', true)
-+if get_option('png').enabled() and png_found.found()
-+ conf_data.set('HAVE_PNG', 1)
- libsixel_deps += [png_found]
- endif
-
- loaders = ['stb-image']
-
- if get_option('gd').enabled() and gd_found.found()
-- conf_data.set('HAVE_GD', true)
-+ conf_data.set('HAVE_GD', 1)
- libsixel_deps += [gd_found]
- loaders += ['gd']
-
-@@ -132,19 +132,19 @@
-
- foreach f : gd_funcs
- if cc.has_function(f, dependencies: gd_found)
-- conf_data.set('HAVE_DECL_@0@'.format(f.to_upper()), true)
-+ conf_data.set('HAVE_DECL_@0@'.format(f.to_upper()), 1)
- endif
- endforeach
- endif
-
- if get_option('gdk-pixbuf2').enabled() and gdkpixbuf2_found.found()
-- conf_data.set('HAVE_GDK_PIXBUF2', true)
-+ conf_data.set('HAVE_GDK_PIXBUF2', 1)
- libsixel_deps += [gdkpixbuf2_found]
- loaders += ['gdk-pixbuf2']
- endif
-
- if have_getopt_long
-- conf_data.set('HAVE_GETOPT_LONG', true)
-+ conf_data.set('HAVE_GETOPT_LONG', 1)
- endif
-
- configure_file(output: 'config.h', configuration: conf_data)
diff --git a/media-libs/libsixel/files/libsixel-musl.patch
b/media-libs/libsixel/files/libsixel-musl.patch
deleted file mode 100644
index f353a2f7c8d6..000000000000
--- a/media-libs/libsixel/files/libsixel-musl.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-https://github.com/libsixel/libsixel/commit/a8d60939d00af520e7139741b58928a9cc2c5f04.patch
-https://bugs.gentoo.org/830074
-
-From: nick black <[email protected]>
-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/files/libsixel-static-libs.patch
b/media-libs/libsixel/files/libsixel-static-libs.patch
deleted file mode 100644
index 5184debb2b68..000000000000
--- a/media-libs/libsixel/files/libsixel-static-libs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-r1.ebuild
b/media-libs/libsixel/libsixel-1.10.3-r1.ebuild
deleted file mode 100644
index 3f03a5c10242..000000000000
--- a/media-libs/libsixel/libsixel-1.10.3-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-PYTHON_COMPAT=( python3_{9..12} )
-DISTUTILS_USE_PEP517="setuptools"
-DISTUTILS_OPTIONAL="1"
-
-inherit bash-completion-r1 distutils-r1 meson
-
-DESCRIPTION="A lightweight, fast implementation of DEC SIXEL graphics codec"
-HOMEPAGE="https://github.com/libsixel/libsixel";
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
-IUSE="curl gd gtk jpeg png python test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="curl? ( net-misc/curl )
- gd? ( media-libs/gd )
- gtk? ( x11-libs/gdk-pixbuf:2 )
- jpeg? ( virtual/jpeg:0 )
- png? ( media-libs/libpng:0 )
- python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
- python? (
- ${PYTHON_DEPS}
- ${DISTUTILS_DEPS}
- )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-meson.patch
- "${FILESDIR}"/${PN}-musl.patch
- "${FILESDIR}"/${PN}-static-libs.patch
-)
-
-src_prepare() {
- sed -i '/^have/d' converters/shell-completion/bash/img2sixel
-
- default
- if use python; then
- cd python || die
- distutils-r1_src_prepare
- cd - >/dev/null || die
- fi
-}
-
-src_configure() {
- emesonargs=(
- $(meson_feature curl libcurl)
- $(meson_feature gd)
- $(meson_feature gtk gdk-pixbuf2)
- $(meson_feature jpeg)
- $(meson_feature png)
- $(meson_feature test tests)
- -Dbashcompletiondir="$(get_bashcompdir)"
- )
- meson_src_configure
- if use python; then
- cd python || die
- distutils-r1_src_configure
- cd - >/dev/null || die
- fi
-}
-
-src_compile() {
- meson_src_compile
- if use python; then
- cd python || die
- distutils-r1_src_compile
- cd - >/dev/null || die
- fi
-}
-
-src_install() {
- meson_src_install
-
- cd images || die
- docompress -x /usr/share/doc/${PF}/images
- docinto images
- dodoc egret.jpg map{8,16}.png snake.jpg vimperator3.png
- cd - >/dev/null || die
-
- if use python; then
- cd python || die
- distutils-r1_src_install
- cd - >/dev/null || die
- fi
-}
