[gentoo-commits] repo/gentoo:master commit in: media-libs/blib/, media-libs/blib/files/
commit: d037eb068c98bd2ddbf76a7de3c442bf882ef3f0
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Nov 5 01:44:44 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Nov 5 02:00:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d037eb06
media-libs/blib: EAPI6->8, fix aa+gtk automagic and build w/ clang16
This used `--disable-gtk2/aalib` when the options
actually are `--disable-gtk/aa`.
Also add several missing deps.
Closes: https://bugs.gentoo.org/874642
Signed-off-by: Ionen Wolkens gentoo.org>
media-libs/blib/blib-1.1.7-r2.ebuild | 45 --
media-libs/blib/blib-1.1.7-r3.ebuild | 57 +++
media-libs/blib/files/blib-1.1.7-deprecated.patch | 14 ++
3 files changed, 71 insertions(+), 45 deletions(-)
diff --git a/media-libs/blib/blib-1.1.7-r2.ebuild
b/media-libs/blib/blib-1.1.7-r2.ebuild
deleted file mode 100644
index 972273ede564..
--- a/media-libs/blib/blib-1.1.7-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="blib is a library full of useful things to hack the Blinkenlights"
-HOMEPAGE="http://www.blinkenlights.de;
-SRC_URI="http://www.blinkenlights.de/dist/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="aalib gtk"
-
-RDEPEND="
- >=dev-libs/glib-2:2
- aalib? ( >=media-libs/aalib-1.4_rc4-r2 )
- gtk? ( >=x11-libs/gtk+-2.4.4:2 )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-src_prepare() {
- default
- # Drop DEPRECATED flags, bug #391105
- sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
- blib/Makefile.am blib/Makefile.in \
- gfx/Makefile.am gfx/Makefile.in \
- modules/Makefile.am modules/Makefile.in \
- test/modules/Makefile.am test/modules/Makefile.in || die
-}
-
-src_configure() {
- econf \
- --disable-directfb \
- --disable-static \
- $(use_enable aalib) \
- $(use_enable gtk gtk2)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/blib/blib-1.1.7-r3.ebuild
b/media-libs/blib/blib-1.1.7-r3.ebuild
new file mode 100644
index ..fd6cbbc9415e
--- /dev/null
+++ b/media-libs/blib/blib-1.1.7-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Library full of useful things to hack the Blinkenlights"
+HOMEPAGE="http://www.blinkenlights.de;
+SRC_URI="http://www.blinkenlights.de/dist/${P}.tar.gz;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="aalib gtk"
+
+RDEPEND="
+ dev-libs/glib:2
+ x11-libs/gdk-pixbuf:2
+ aalib? ( media-libs/aalib )
+ gtk? (
+ app-accessibility/at-spi2-core:2
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ x11-libs/cairo
+ x11-libs/gtk+:2
+ x11-libs/pango
+ )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-deprecated.patch
+)
+
+src_prepare() {
+ default
+
+ # drop DEPRECATED flags, bug #391105
+ sed -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
+ -i {blib,gfx,{,test/}modules}/Makefile.{am,in} || die
+}
+
+src_configure() {
+ local econfargs=(
+ $(use_enable aalib aa)
+ --disable-directfb
+ $(use_enable gtk)
+ )
+
+ econf "${econfargs[@]}"
+}
+
+src_install() {
+ default
+
+ find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/media-libs/blib/files/blib-1.1.7-deprecated.patch
b/media-libs/blib/files/blib-1.1.7-deprecated.patch
new file mode 100644
index ..13e43aedadf1
--- /dev/null
+++ b/media-libs/blib/files/blib-1.1.7-deprecated.patch
@@ -0,0 +1,14 @@
+This disables deprecated functions, then proceeds to use newly
+deprecated functions. Given GTK2 is now EOL and unchanging,
+there's no reason to avoid these without migration to newer GTK.
+
+https://bugs.gentoo.org/874642
+https://bugs.gentoo.org/391105 (see also)
+--- a/test/test-module.c
b/test/test-module.c
+@@ -23,5 +23,4 @@
+ #include
+
+-#define GTK_DISABLE_DEPRECATED
+
+ #include
[gentoo-commits] repo/gentoo:master commit in: media-libs/blib/
commit: a1fcd3a1ae20db492324d86136b4b0ed581ee6f3
Author: Pacho Ramos gentoo org>
AuthorDate: Sun Feb 25 15:39:41 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sun Feb 25 15:39:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1fcd3a1
media-libs/blib: Drop old
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-libs/blib/blib-1.1.7-r1.ebuild | 41
1 file changed, 41 deletions(-)
diff --git a/media-libs/blib/blib-1.1.7-r1.ebuild
b/media-libs/blib/blib-1.1.7-r1.ebuild
deleted file mode 100644
index 22a1dc1b36d..000
--- a/media-libs/blib/blib-1.1.7-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-DESCRIPTION="blib is a library full of useful things to hack the Blinkenlights"
-HOMEPAGE="http://www.blinkenlights.de;
-SRC_URI="http://www.blinkenlights.de/dist/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="aalib gtk directfb"
-
-RDEPEND=">=dev-libs/glib-2
- aalib? ( >=media-libs/aalib-1.4_rc4-r2 )
- directfb? ( >=dev-libs/DirectFB-0.9.20-r1 )
- gtk? ( >=x11-libs/gtk+-2.4.4:2 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- # Drop DEPRECATED flags, bug #391105
- sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
- blib/Makefile.am blib/Makefile.in \
- gfx/Makefile.am gfx/Makefile.in \
- modules/Makefile.am modules/Makefile.in \
- test/modules/Makefile.am test/modules/Makefile.in || die
-}
-
-src_configure() {
- econf \
- $(use_enable aalib) \
- $(use_enable directfb) \
- $(use_enable gtk gtk2)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc AUTHORS ChangeLog NEWS README
-}
[gentoo-commits] repo/gentoo:master commit in: media-libs/blib/
commit: b913309ab12d7b8061504842dba384dd2254002a
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Feb 22 09:02:50 2018 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Feb 22 09:05:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b913309a
media-libs/blib: amd64 stable wrt bug #642498
Signed-off-by: Agostino Sarubbo gentoo.org>
Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="amd64"
media-libs/blib/blib-1.1.7-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/blib/blib-1.1.7-r2.ebuild
b/media-libs/blib/blib-1.1.7-r2.ebuild
index 1fafa7e6c51..972273ede56 100644
--- a/media-libs/blib/blib-1.1.7-r2.ebuild
+++ b/media-libs/blib/blib-1.1.7-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.blinkenlights.de/dist/${P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE="aalib gtk"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: media-libs/blib/
commit: 60074ef17329e2981ca3f54d1830179df3f3c9b2
Author: Thomas Deutschmann gentoo org>
AuthorDate: Wed Feb 21 02:54:40 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Wed Feb 21 02:54:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60074ef1
media-libs/blib: x86 stable (bug #642498)
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-libs/blib/blib-1.1.7-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/blib/blib-1.1.7-r2.ebuild
b/media-libs/blib/blib-1.1.7-r2.ebuild
index 43c49ee5e86..1fafa7e6c51 100644
--- a/media-libs/blib/blib-1.1.7-r2.ebuild
+++ b/media-libs/blib/blib-1.1.7-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.blinkenlights.de/dist/${P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="aalib gtk"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: media-libs/blib/
commit: fff22f7da5902bcd73c79d6b94515d4f52075c20
Author: Pacho Ramos gentoo org>
AuthorDate: Wed Feb 14 19:10:19 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Wed Feb 14 20:04:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fff22f7d
media-libs/blib: Drop directfb support (#642498), disable static and drop .la
files
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-libs/blib/blib-1.1.7-r2.ebuild | 45
1 file changed, 45 insertions(+)
diff --git a/media-libs/blib/blib-1.1.7-r2.ebuild
b/media-libs/blib/blib-1.1.7-r2.ebuild
new file mode 100644
index 000..43c49ee5e86
--- /dev/null
+++ b/media-libs/blib/blib-1.1.7-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="blib is a library full of useful things to hack the Blinkenlights"
+HOMEPAGE="http://www.blinkenlights.de;
+SRC_URI="http://www.blinkenlights.de/dist/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aalib gtk"
+
+RDEPEND="
+ >=dev-libs/glib-2:2
+ aalib? ( >=media-libs/aalib-1.4_rc4-r2 )
+ gtk? ( >=x11-libs/gtk+-2.4.4:2 )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ default
+ # Drop DEPRECATED flags, bug #391105
+ sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
+ blib/Makefile.am blib/Makefile.in \
+ gfx/Makefile.am gfx/Makefile.in \
+ modules/Makefile.am modules/Makefile.in \
+ test/modules/Makefile.am test/modules/Makefile.in || die
+}
+
+src_configure() {
+ econf \
+ --disable-directfb \
+ --disable-static \
+ $(use_enable aalib) \
+ $(use_enable gtk gtk2)
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}
