public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-misc/bb/, app-misc/bb/files/
@ 2019-11-10 11:59 Sergei Trofimovich
  0 siblings, 0 replies; 4+ messages in thread
From: Sergei Trofimovich @ 2019-11-10 11:59 UTC (permalink / raw
  To: gentoo-commits

commit:     858ec6f5894382690a6e7a7700a8193e3f5ba368
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 11:53:06 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 11:59:42 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=858ec6f5

app-misc/bb: update to EAPI=7

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-misc/bb/bb-1.3.0_rc1-r5.ebuild                 | 71 ++++++++++++++++++++++
 app-misc/bb/files/bb-1.3.0_rc1-disable-pulse.patch |  2 -
 app-misc/bb/files/bb-1.3.0_rc1-fix-protos.patch    |  2 -
 app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch      |  6 --
 .../bb/files/bb-1.3.0_rc1-messager-overlap.patch   |  2 -
 app-misc/bb/files/bb-1.3.0_rc1-noattr.patch        |  4 +-
 .../bb/files/bb-1.3.0_rc1-printf-cleanup.patch     |  2 -
 app-misc/bb/files/bb-1.3.0_rc1-protos.patch        |  4 --
 app-misc/bb/files/bb-1.3.0_rc1-zbuff-fault.patch   |  2 -
 9 files changed, 73 insertions(+), 22 deletions(-)

diff --git a/app-misc/bb/bb-1.3.0_rc1-r5.ebuild b/app-misc/bb/bb-1.3.0_rc1-r5.ebuild
new file mode 100644
index 00000000000..793a64d7de5
--- /dev/null
+++ b/app-misc/bb/bb-1.3.0_rc1-r5.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="${PN}-$(ver_cut 1-2)$(ver_cut 4-5)"
+
+DESCRIPTION="Demonstration program for visual effects of aalib"
+HOMEPAGE="http://aa-project.sourceforge.net/"
+SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="mikmod"
+
+DEPEND="media-libs/aalib:=
+	dev-libs/lzo:=
+	mikmod? ( media-libs/libmikmod:=[openal] )
+"
+# media-libs/libmikmod[openal] is due to bug #516964
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-noattr.patch
+	"${FILESDIR}"/${P}-fix-protos.patch
+	"${FILESDIR}"/${P}-messager-overlap.patch
+	"${FILESDIR}"/${P}-zbuff-fault.patch
+	"${FILESDIR}"/${P}-printf-cleanup.patch
+	"${FILESDIR}"/${P}-m4-stuff.patch
+	"${FILESDIR}"/${P}-protos.patch
+	"${FILESDIR}"/${P}-disable-pulse.patch
+)
+
+src_prepare() {
+	default
+
+	# unbundle lzo, #515286
+	rm -v README.LZO minilzo.{c,h} mylzo.h || die
+	sed -e 's/minilzo.c//' \
+	    -e 's/minilzo.h//' \
+	    -e 's/README.LZO//' \
+		-i Makefile.am || die
+	echo 'bb_LDADD = -llzo2' >> Makefile.am || die
+	# update code
+	sed -e 's,#include "minilzo.h",#include <lzo/lzo1x.h>,' \
+	    -e 's,int size = image,lzo_uint size = image,' \
+		-i image.c || die
+
+	# rename binary and manpage bb -> bb-aalib
+
+	mv bb.1 bb-aalib.1 || die
+	sed -e 's/bb/bb-aalib/' \
+		-i bb-aalib.1
+	sed -e 's/bin_PROGRAMS = bb/bin_PROGRAMS = bb-aalib/' \
+	    -e 's/man_MANS = bb.1/man_MANS = bb-aalib.1/'     \
+	    -e 's/bb_SOURCES/bb_aalib_SOURCES/'               \
+	    -e 's/bb_LDADD/bb_aalib_LDADD/'                   \
+		-i Makefile.am || die
+
+	mv -v configure.{in,ac} || die
+	eautoreconf
+}
+
+pkg_postinst() {
+	elog "bb binary has been renamed to bb-aalib to avoid a naming conflict with sys-apps/busybox."
+}

diff --git a/app-misc/bb/files/bb-1.3.0_rc1-disable-pulse.patch b/app-misc/bb/files/bb-1.3.0_rc1-disable-pulse.patch
index dcc00c64233..3d7889101b9 100644
--- a/app-misc/bb/files/bb-1.3.0_rc1-disable-pulse.patch
+++ b/app-misc/bb/files/bb-1.3.0_rc1-disable-pulse.patch
@@ -1,6 +1,4 @@
 https://bugs.gentoo.org/516964
-diff --git a/main.c b/main.c
-index c0648b4..a9fac57 100644
 --- a/main.c
 +++ b/main.c
 @@ -160,6 +160,17 @@ main (int argc, char *argv[])

diff --git a/app-misc/bb/files/bb-1.3.0_rc1-fix-protos.patch b/app-misc/bb/files/bb-1.3.0_rc1-fix-protos.patch
index 577f306c816..a85166b0130 100644
--- a/app-misc/bb/files/bb-1.3.0_rc1-fix-protos.patch
+++ b/app-misc/bb/files/bb-1.3.0_rc1-fix-protos.patch
@@ -1,8 +1,6 @@
 Fixes warning:
 main.c: In function 'load_song':
 main.c:56:23: warning: incompatible implicit declaration of built-in function 'strlen'
-diff --git a/main.c b/main.c
-index ae852a7..417ff62 100644
 --- a/main.c
 +++ b/main.c
 @@ -21,6 +21,7 @@

diff --git a/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch b/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch
index 0fa98f8162f..843d839908f 100644
--- a/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch
+++ b/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch
@@ -6,9 +6,6 @@ Date:   Tue Feb 7 10:59:09 2012 +0300
 
     bb-1.3.0_rc1: bundle m4 source
 
-diff --git m4/aalib.m4 m4/aalib.m4
-new file mode 100644
-index 0000000..991fbda
 --- /dev/null
 +++ m4/aalib.m4
 @@ -0,0 +1,169 @@
@@ -181,9 +178,6 @@ index 0000000..991fbda
 +  AC_SUBST(AALIB_LIBS)
 +  rm -f conf.aalibtest
 +])
-diff --git m4/libmikmod.m4 m4/libmikmod.m4
-new file mode 100644
-index 0000000..18feebe
 --- /dev/null
 +++ m4/libmikmod.m4
 @@ -0,0 +1,207 @@

diff --git a/app-misc/bb/files/bb-1.3.0_rc1-messager-overlap.patch b/app-misc/bb/files/bb-1.3.0_rc1-messager-overlap.patch
index e46b75fd581..378e6b7798b 100644
--- a/app-misc/bb/files/bb-1.3.0_rc1-messager-overlap.patch
+++ b/app-misc/bb/files/bb-1.3.0_rc1-messager-overlap.patch
@@ -8,8 +8,6 @@ messager.c: fix memory overlap (fixes artefacts in scrolling text)
 ==363==    by 0x403009: bb (bb.c:258)
 ==363==    by 0x407C06: main (main.c:202)
 
-diff --git a/messager.c b/messager.c
-index 95cc410..964080b 100644
 --- a/messager.c
 +++ b/messager.c
 @@ -40,8 +40,8 @@ static void newline()

diff --git a/app-misc/bb/files/bb-1.3.0_rc1-noattr.patch b/app-misc/bb/files/bb-1.3.0_rc1-noattr.patch
index 7a6f9474a71..a4768ab75e2 100644
--- a/app-misc/bb/files/bb-1.3.0_rc1-noattr.patch
+++ b/app-misc/bb/files/bb-1.3.0_rc1-noattr.patch
@@ -1,7 +1,7 @@
 # remove __attribute__
 
---- timers.h	Thu Apr 26 18:04:22 2001
-+++ timers.h	Sun Dec  9 18:44:31 2007
+--- a/timers.h	Thu Apr 26 18:04:22 2001
++++ b/timers.h	Sun Dec  9 18:44:31 2007
 @@ -49,8 +49,8 @@
  extern tl_group *syncgroup, *asyncgroup;
  void tl_sleep (int);

diff --git a/app-misc/bb/files/bb-1.3.0_rc1-printf-cleanup.patch b/app-misc/bb/files/bb-1.3.0_rc1-printf-cleanup.patch
index da113795124..b11b2333d1d 100644
--- a/app-misc/bb/files/bb-1.3.0_rc1-printf-cleanup.patch
+++ b/app-misc/bb/files/bb-1.3.0_rc1-printf-cleanup.patch
@@ -8,8 +8,6 @@ zoom.c:260:113: warning: format '%i' expects type 'int', but argument 3 has type
 zoom.c: In function 'moveoldpoints':
 zoom.c:590:3: warning: format '%i' expects type 'int', but argument 3 has type 'long unsigned int'
 zoom.c:596:3: warning: format '%i' expects type 'int', but argument 3 has type 'long unsigned int'
-diff --git a/zoom.c b/zoom.c
-index 7450095..b86cc8b 100644
 --- a/zoom.c
 +++ b/zoom.c
 @@ -241,13 +241,13 @@ static /*INLINE */ void mkrealloc_table(register number_t * pos, realloc_t * rea

diff --git a/app-misc/bb/files/bb-1.3.0_rc1-protos.patch b/app-misc/bb/files/bb-1.3.0_rc1-protos.patch
index aa3fc021e5c..40f77a0f20c 100644
--- a/app-misc/bb/files/bb-1.3.0_rc1-protos.patch
+++ b/app-misc/bb/files/bb-1.3.0_rc1-protos.patch
@@ -1,13 +1,9 @@
-diff --git a/bb.c b/bb.c
-index 95850ef..a394d00 100644
 --- a/bb.c
 +++ b/bb.c
 @@ -27,2 +27,3 @@
  #include <aalib.h>
 +#include <time.h>
  #include "bb.h"
-diff --git a/main.c b/main.c
-index 417ff62..c0648b4 100644
 --- a/main.c
 +++ b/main.c
 @@ -23,2 +23,3 @@

diff --git a/app-misc/bb/files/bb-1.3.0_rc1-zbuff-fault.patch b/app-misc/bb/files/bb-1.3.0_rc1-zbuff-fault.patch
index b3e882ed55e..7b6eda327d1 100644
--- a/app-misc/bb/files/bb-1.3.0_rc1-zbuff-fault.patch
+++ b/app-misc/bb/files/bb-1.3.0_rc1-zbuff-fault.patch
@@ -20,8 +20,6 @@ Valgrind says:
 ==4525==    by 0x4031BC: bb (bb.c:325)
 ==4525==    by 0x407C56: main (main.c:202)
 
-diff --git a/tex.c b/tex.c
-index 9f2f99d..b390510 100644
 --- a/tex.c
 +++ b/tex.c
 @@ -92,7 +92,7 @@ void unset_zbuff()


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-misc/bb/, app-misc/bb/files/
@ 2019-11-13 22:02 Sergei Trofimovich
  0 siblings, 0 replies; 4+ messages in thread
From: Sergei Trofimovich @ 2019-11-13 22:02 UTC (permalink / raw
  To: gentoo-commits

commit:     b80d8ef5ee97c9e9400007fca285566a2fc74a16
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 13 22:01:57 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Nov 13 22:02:06 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b80d8ef5

app-misc/bb: unbreak m4 handling

Fix 'm4-stuff.patch' to restore m4/ directory.
Was broken by upgrade to EAPI=7. Instead of failing
patch dumped files into root directory instead of m4/.

Reported-by: Gabriele Pelissetto
Closes: https://bugs.gentoo.org/699826
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-misc/bb/bb-1.3.0_rc1-r5.ebuild            | 3 ++-
 app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app-misc/bb/bb-1.3.0_rc1-r5.ebuild b/app-misc/bb/bb-1.3.0_rc1-r5.ebuild
index 793a64d7de5..23d546b2831 100644
--- a/app-misc/bb/bb-1.3.0_rc1-r5.ebuild
+++ b/app-misc/bb/bb-1.3.0_rc1-r5.ebuild
@@ -63,7 +63,8 @@ src_prepare() {
 		-i Makefile.am || die
 
 	mv -v configure.{in,ac} || die
-	eautoreconf
+	# m4/ dir is added with 'm4-stuff.patch' patch
+	AT_M4DIR="m4" eautoreconf
 }
 
 pkg_postinst() {

diff --git a/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch b/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch
index 843d839908f..12d9276aeb6 100644
--- a/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch
+++ b/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch
@@ -7,7 +7,7 @@ Date:   Tue Feb 7 10:59:09 2012 +0300
     bb-1.3.0_rc1: bundle m4 source
 
 --- /dev/null
-+++ m4/aalib.m4
++++ a/m4/aalib.m4
 @@ -0,0 +1,169 @@
 +# Configure paths for AALIB
 +# Jan Hubicka 4/22/2001
@@ -179,7 +179,7 @@ Date:   Tue Feb 7 10:59:09 2012 +0300
 +  rm -f conf.aalibtest
 +])
 --- /dev/null
-+++ m4/libmikmod.m4
++++ a/m4/libmikmod.m4
 @@ -0,0 +1,207 @@
 +# Configure paths for libmikmod
 +#


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-misc/bb/, app-misc/bb/files/
@ 2025-07-26  5:06 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2025-07-26  5:06 UTC (permalink / raw
  To: gentoo-commits

commit:     294502452ef39cedc3ba773697fbcf1c54d22ef5
Author:     Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Sat Jul 19 22:28:11 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 26 05:05:10 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29450245

app-misc/bb: use pkg-config for libmikmod

Avoids the complexity of m4/libmikmod.m4 which had a missing <string.h>,
which also silently disables libmikmod and so require a revbump anyway.

Sadly aalib does not provides a pkg-config file.

Closes: https://bugs.gentoo.org/955778
Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>
Part-of: https://github.com/gentoo/gentoo/pull/43076
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-misc/bb/bb-1.3.0_rc1-r7.ebuild                 | 76 ++++++++++++++++++++++
 .../files/bb-1.3.0_rc1-libmikmod-pkgconfig.patch   | 26 ++++++++
 2 files changed, 102 insertions(+)

diff --git a/app-misc/bb/bb-1.3.0_rc1-r7.ebuild b/app-misc/bb/bb-1.3.0_rc1-r7.ebuild
new file mode 100644
index 000000000000..66a1437dbbed
--- /dev/null
+++ b/app-misc/bb/bb-1.3.0_rc1-r7.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_P="${PN}-$(ver_cut 1-2)$(ver_cut 4-5)"
+
+DESCRIPTION="Lightweight ASCII art demo using media-libs/aalib"
+HOMEPAGE="https://aa-project.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/aa-project/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="mikmod"
+
+DEPEND="media-libs/aalib:=
+	dev-libs/lzo:=
+	mikmod? ( media-libs/libmikmod:=[openal] )
+"
+# media-libs/libmikmod[openal] is due to bug #516964
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-noattr.patch
+	"${FILESDIR}"/${P}-fix-protos.patch
+	"${FILESDIR}"/${P}-messager-overlap.patch
+	"${FILESDIR}"/${P}-zbuff-fault.patch
+	"${FILESDIR}"/${P}-printf-cleanup.patch
+	"${FILESDIR}"/${P}-libmikmod-pkgconfig.patch
+	"${FILESDIR}"/${P}-protos.patch
+	"${FILESDIR}"/${P}-disable-pulse.patch
+	"${FILESDIR}"/${P}-fix-build-for-clang16.patch
+	"${FILESDIR}"/${P}-fix-lto-type-mismatch.patch
+	"${FILESDIR}"/${P}-fix-return-type-and-QA.patch
+)
+
+src_prepare() {
+	default
+
+	# unbundle lzo, #515286
+	rm -v README.LZO minilzo.{c,h} mylzo.h || die
+	sed -e 's/minilzo.c//' \
+		-e 's/minilzo.h//' \
+		-e 's/README.LZO//' \
+		-i Makefile.am || die
+	echo 'bb_LDADD = -llzo2' >> Makefile.am || die
+	# update code
+	sed -e 's,#include "minilzo.h",#include <lzo/lzo1x.h>,' \
+		-e 's,int size = image,lzo_uint size = image,' \
+		-i image.c || die
+
+	# rename binary and manpage bb -> bb-aalib
+
+	mv bb.1 bb-aalib.1 || die
+	sed -e 's/bb/bb-aalib/' \
+		-i bb-aalib.1
+	sed -e 's/bin_PROGRAMS = bb/bin_PROGRAMS = bb-aalib/' \
+		-e 's/man_MANS = bb.1/man_MANS = bb-aalib.1/'     \
+		-e 's/bb_SOURCES/bb_aalib_SOURCES/'               \
+		-e 's/bb_LDADD/bb_aalib_LDADD/'                   \
+		-i Makefile.am || die
+
+	mv -v configure.{in,ac} || die
+	# m4/ dir is added with 'm4-stuff.patch' patch
+	AT_M4DIR="m4" eautoreconf
+}
+
+pkg_postinst() {
+	elog "bb binary has been renamed to bb-aalib to avoid a naming conflict with sys-apps/busybox."
+}

diff --git a/app-misc/bb/files/bb-1.3.0_rc1-libmikmod-pkgconfig.patch b/app-misc/bb/files/bb-1.3.0_rc1-libmikmod-pkgconfig.patch
new file mode 100644
index 000000000000..40c2a585ba9d
--- /dev/null
+++ b/app-misc/bb/files/bb-1.3.0_rc1-libmikmod-pkgconfig.patch
@@ -0,0 +1,26 @@
+--- a/configure.in
++++ b/configure.in
+@@ -34,14 +34,15 @@ CFLAGS="$CFLAGS $AALIB_CFLAGS"
+ LIBS="$LIBS $AALIB_LIBS"
+ 
+ SOUNDFILES=""
+-AM_PATH_LIBMIKMOD(3.0.0, 
+-CFLAGS="$CFLAGS $LIBMIKMOD_CFLAGS"
+-LIBS="$LIBS $LIBMIKMOD_LIBS"
+-LDADD="$LDADD $LIBMIKMOD_LDADD"
+-AC_DEFINE(HAVE_LIBMIKMOD)
+-SOUNDFILES="bb.s3m bb2.s3m bb3.s3m"
+-dnl AC_DEFINE_UNQUOTED(SOUNDDIR,"$datadir/bb")
+-,
++PKG_CHECK_MODULES([LIBMIKMOD],
++[libmikmod >= 3.0.0],
++[
++	CFLAGS="$CFLAGS $LIBMIKMOD_CFLAGS"
++	LIBS="$LIBS $LIBMIKMOD_LIBS"
++	AC_DEFINE(HAVE_LIBMIKMOD)
++	SOUNDFILES="bb.s3m bb2.s3m bb3.s3m"
++	dnl AC_DEFINE_UNQUOTED(SOUNDDIR,"$datadir/bb")
++],
+ AC_MSG_RESULT([Libmikmod is missing - sound support will be disabled])
+ )
+ 


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-misc/bb/, app-misc/bb/files/
@ 2025-07-26  5:06 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2025-07-26  5:06 UTC (permalink / raw
  To: gentoo-commits

commit:     c5ff57977bf26d9a213b53dd03840686f21a3688
Author:     Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Sat Jul 19 22:30:07 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 26 05:05:11 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5ff5797

app-misc/bb: drop 1.3.0_rc1-r6

Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>
Part-of: https://github.com/gentoo/gentoo/pull/43076
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-misc/bb/bb-1.3.0_rc1-r6.ebuild            |  75 -----
 app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch | 390 --------------------------
 2 files changed, 465 deletions(-)

diff --git a/app-misc/bb/bb-1.3.0_rc1-r6.ebuild b/app-misc/bb/bb-1.3.0_rc1-r6.ebuild
deleted file mode 100644
index 5824d4e52374..000000000000
--- a/app-misc/bb/bb-1.3.0_rc1-r6.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MY_P="${PN}-$(ver_cut 1-2)$(ver_cut 4-5)"
-
-DESCRIPTION="Lightweight ASCII art demo using media-libs/aalib"
-HOMEPAGE="https://aa-project.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/aa-project/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE="mikmod"
-
-DEPEND="media-libs/aalib:=
-	dev-libs/lzo:=
-	mikmod? ( media-libs/libmikmod:=[openal] )
-"
-# media-libs/libmikmod[openal] is due to bug #516964
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-noattr.patch
-	"${FILESDIR}"/${P}-fix-protos.patch
-	"${FILESDIR}"/${P}-messager-overlap.patch
-	"${FILESDIR}"/${P}-zbuff-fault.patch
-	"${FILESDIR}"/${P}-printf-cleanup.patch
-	"${FILESDIR}"/${P}-m4-stuff.patch
-	"${FILESDIR}"/${P}-protos.patch
-	"${FILESDIR}"/${P}-disable-pulse.patch
-	"${FILESDIR}"/${P}-fix-build-for-clang16.patch
-	"${FILESDIR}"/${P}-fix-lto-type-mismatch.patch
-	"${FILESDIR}"/${P}-fix-return-type-and-QA.patch
-)
-
-src_prepare() {
-	default
-
-	# unbundle lzo, #515286
-	rm -v README.LZO minilzo.{c,h} mylzo.h || die
-	sed -e 's/minilzo.c//' \
-		-e 's/minilzo.h//' \
-		-e 's/README.LZO//' \
-		-i Makefile.am || die
-	echo 'bb_LDADD = -llzo2' >> Makefile.am || die
-	# update code
-	sed -e 's,#include "minilzo.h",#include <lzo/lzo1x.h>,' \
-		-e 's,int size = image,lzo_uint size = image,' \
-		-i image.c || die
-
-	# rename binary and manpage bb -> bb-aalib
-
-	mv bb.1 bb-aalib.1 || die
-	sed -e 's/bb/bb-aalib/' \
-		-i bb-aalib.1
-	sed -e 's/bin_PROGRAMS = bb/bin_PROGRAMS = bb-aalib/' \
-		-e 's/man_MANS = bb.1/man_MANS = bb-aalib.1/'     \
-		-e 's/bb_SOURCES/bb_aalib_SOURCES/'               \
-		-e 's/bb_LDADD/bb_aalib_LDADD/'                   \
-		-i Makefile.am || die
-
-	mv -v configure.{in,ac} || die
-	# m4/ dir is added with 'm4-stuff.patch' patch
-	AT_M4DIR="m4" eautoreconf
-}
-
-pkg_postinst() {
-	elog "bb binary has been renamed to bb-aalib to avoid a naming conflict with sys-apps/busybox."
-}

diff --git a/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch b/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch
deleted file mode 100644
index 12d9276aeb63..000000000000
--- a/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-Fix aclocal failure on libmikmod-less systems
-
-commit 55b86efdc3e2a1febb593169b10ab252c75fdb10
-Author: Sergei Trofimovich <slyfox@gentoo.org>
-Date:   Tue Feb 7 10:59:09 2012 +0300
-
-    bb-1.3.0_rc1: bundle m4 source
-
---- /dev/null
-+++ a/m4/aalib.m4
-@@ -0,0 +1,169 @@
-+# Configure paths for AALIB
-+# Jan Hubicka 4/22/2001
-+# stolen from Sam Lantinga 9/21/99
-+# stolen from Manish Singh
-+# stolen back from Frank Belew
-+# stolen from Manish Singh
-+# Shamelessly stolen from Owen Taylor
-+
-+dnl AM_PATH_AALIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-+dnl Test for AALIB, and define AALIB_CFLAGS and AALIB_LIBS
-+dnl
-+AC_DEFUN([AM_PATH_AALIB],
-+[dnl 
-+dnl Get the cflags and libraries from the aalib-config script
-+dnl
-+AC_ARG_WITH(aalib-prefix,[  --with-aalib-prefix=PFX   Prefix where AALIB is installed (optional)],
-+            aalib_prefix="$withval", aalib_prefix="")
-+AC_ARG_WITH(aalib-exec-prefix,[  --with-aalib-exec-prefix=PFX Exec prefix where AALIB is installed (optional)],
-+            aalib_exec_prefix="$withval", aalib_exec_prefix="")
-+AC_ARG_ENABLE(aalibtest, [  --disable-aalibtest       Do not try to compile and run a test AALIB program],
-+		    , enable_aalibtest=yes)
-+
-+  if test x$aalib_exec_prefix != x ; then
-+     aalib_args="$aalib_args --exec-prefix=$aalib_exec_prefix"
-+     if test x${AALIB_CONFIG+set} != xset ; then
-+        AALIB_CONFIG=$aalib_exec_prefix/bin/aalib-config
-+     fi
-+  fi
-+  if test x$aalib_prefix != x ; then
-+     aalib_args="$aalib_args --prefix=$aalib_prefix"
-+     if test x${AALIB_CONFIG+set} != xset ; then
-+        AALIB_CONFIG=$aalib_prefix/bin/aalib-config
-+     fi
-+  fi
-+
-+  AC_PATH_PROG(AALIB_CONFIG, aalib-config, no)
-+  min_aalib_version=ifelse([$1], ,0.11.0,$1)
-+  AC_MSG_CHECKING(for AALIB - version >= $min_aalib_version)
-+  no_aalib=""
-+  if test "$AALIB_CONFIG" = "no" ; then
-+    no_aalib=yes
-+  else
-+    AALIB_CFLAGS=`$AALIB_CONFIG $aalibconf_args --cflags`
-+    AALIB_LIBS=`$AALIB_CONFIG $aalibconf_args --libs`
-+
-+    aalib_major_version=`$AALIB_CONFIG $aalib_args --version | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+    aalib_minor_version=`$AALIB_CONFIG $aalib_args --version | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+    aalib_micro_version=`$AALIB_CONFIG $aalib_config_args --version | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-+    if test "x$enable_aalibtest" = "xyes" ; then
-+      ac_save_CFLAGS="$CFLAGS"
-+      ac_save_LIBS="$LIBS"
-+      CFLAGS="$CFLAGS $AALIB_CFLAGS"
-+      LIBS="$LIBS $AALIB_LIBS"
-+dnl
-+dnl Now check if the installed AALIB is sufficiently new. (Also sanity
-+dnl checks the results of aalib-config to some extent
-+dnl
-+      rm -f conf.aalibtest
-+      AC_TRY_RUN([
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include "aalib.h"
-+
-+char*
-+my_strdup (char *str)
-+{
-+  char *new_str;
-+  
-+  if (str)
-+    {
-+      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
-+      strcpy (new_str, str);
-+    }
-+  else
-+    new_str = NULL;
-+  
-+  return new_str;
-+}
-+
-+int main (int argc, char *argv[])
-+{
-+  int major, minor, micro;
-+  char *tmp_version;
-+
-+  /* This hangs on some systems (?)
-+  system ("touch conf.aalibtest");
-+  */
-+  { FILE *fp = fopen("conf.aalibtest", "a"); if ( fp ) fclose(fp); }
-+
-+  /* HP/UX 9 (%@#!) writes to sscanf strings */
-+  tmp_version = my_strdup("$min_aalib_version");
-+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-+     printf("%s, bad version string\n", "$min_aalib_version");
-+     exit(1);
-+   }
-+
-+   if (($aalib_major_version > major) ||
-+      (($aalib_major_version == major) && ($aalib_minor_version > minor)) ||
-+      (($aalib_major_version == major) && ($aalib_minor_version == minor) && ($aalib_micro_version >= micro)))
-+    {
-+      return 0;
-+    }
-+  else
-+    {
-+      printf("\n*** 'aalib-config --version' returned %d.%d.%d, but the minimum version\n", $aalib_major_version, $aalib_minor_version, $aalib_micro_version);
-+      printf("*** of AALIB required is %d.%d.%d. If aalib-config is correct, then it is\n", major, minor, micro);
-+      printf("*** best to upgrade to the required version.\n");
-+      printf("*** If aalib-config was wrong, set the environment variable AALIB_CONFIG\n");
-+      printf("*** to point to the correct copy of aalib-config, and remove the file\n");
-+      printf("*** config.cache before re-running configure\n");
-+      return 1;
-+    }
-+}
-+
-+],, no_aalib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-+       CFLAGS="$ac_save_CFLAGS"
-+       LIBS="$ac_save_LIBS"
-+     fi
-+  fi
-+  if test "x$no_aalib" = x ; then
-+     AC_MSG_RESULT(yes)
-+     ifelse([$2], , :, [$2])     
-+  else
-+     AC_MSG_RESULT(no)
-+     if test "$AALIB_CONFIG" = "no" ; then
-+       echo "*** The aalib-config script installed by AALIB could not be found"
-+       echo "*** If AALIB was installed in PREFIX, make sure PREFIX/bin is in"
-+       echo "*** your path, or set the AALIB_CONFIG environment variable to the"
-+       echo "*** full path to aalib-config."
-+     else
-+       if test -f conf.aalibtest ; then
-+        :
-+       else
-+          echo "*** Could not run AALIB test program, checking why..."
-+          CFLAGS="$CFLAGS $AALIB_CFLAGS"
-+          LIBS="$LIBS $AALIB_LIBS"
-+          AC_TRY_LINK([
-+#include <stdio.h>
-+#include "AALIB.h"
-+],      [ return 0; ],
-+        [ echo "*** The test program compiled, but did not run. This usually means"
-+          echo "*** that the run-time linker is not finding AALIB or finding the wrong"
-+          echo "*** version of AALIB. If it is not finding AALIB, you'll need to set your"
-+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-+          echo "*** is required on your system"
-+	  echo "***"
-+          echo "*** If you have an old version installed, it is best to remove it, although"
-+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-+          echo "*** exact error that occured. This usually means AALIB was incorrectly installed"
-+          echo "*** or that you have moved AALIB since it was installed. In the latter case, you"
-+          echo "*** may want to edit the aalib-config script: $AALIB_CONFIG" ])
-+          CFLAGS="$ac_save_CFLAGS"
-+          LIBS="$ac_save_LIBS"
-+       fi
-+     fi
-+     AALIB_CFLAGS=""
-+     AALIB_LIBS=""
-+     ifelse([$3], , :, [$3])
-+  fi
-+  AC_SUBST(AALIB_CFLAGS)
-+  AC_SUBST(AALIB_LIBS)
-+  rm -f conf.aalibtest
-+])
---- /dev/null
-+++ a/m4/libmikmod.m4
-@@ -0,0 +1,207 @@
-+# Configure paths for libmikmod
-+#
-+# Derived from glib.m4 (Owen Taylor 97-11-3)
-+# Improved by Chris Butler
-+#
-+
-+dnl AM_PATH_LIBMIKMOD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-+dnl Test for libmikmod, and define LIBMIKMOD_CFLAGS, LIBMIKMOD_LIBS and
-+dnl LIBMIKMOD_LDADD
-+dnl
-+AC_DEFUN([AM_PATH_LIBMIKMOD],
-+[dnl 
-+dnl Get the cflags and libraries from the libmikmod-config script
-+dnl
-+AC_ARG_WITH(libmikmod-prefix,[  --with-libmikmod-prefix=PFX   Prefix where libmikmod is installed (optional)],
-+            libmikmod_config_prefix="$withval", libmikmod_config_prefix="")
-+AC_ARG_WITH(libmikmod-exec-prefix,[  --with-libmikmod-exec-prefix=PFX Exec prefix where libmikmod is installed (optional)],
-+            libmikmod_config_exec_prefix="$withval", libmikmod_config_exec_prefix="")
-+AC_ARG_ENABLE(libmikmodtest, [  --disable-libmikmodtest       Do not try to compile and run a test libmikmod program],
-+		    , enable_libmikmodtest=yes)
-+
-+  if test x$libmikmod_config_exec_prefix != x ; then
-+     libmikmod_config_args="$libmikmod_config_args --exec-prefix=$libmikmod_config_exec_prefix"
-+     if test x${LIBMIKMOD_CONFIG+set} != xset ; then
-+        LIBMIKMOD_CONFIG=$libmikmod_config_exec_prefix/bin/libmikmod-config
-+     fi
-+  fi
-+  if test x$libmikmod_config_prefix != x ; then
-+     libmikmod_config_args="$libmikmod_config_args --prefix=$libmikmod_config_prefix"
-+     if test x${LIBMIKMOD_CONFIG+set} != xset ; then
-+        LIBMIKMOD_CONFIG=$libmikmod_config_prefix/bin/libmikmod-config
-+     fi
-+  fi
-+
-+  AC_PATH_PROG(LIBMIKMOD_CONFIG, libmikmod-config, no)
-+  min_libmikmod_version=ifelse([$1], ,3.1.5,$1)
-+  AC_MSG_CHECKING(for libmikmod - version >= $min_libmikmod_version)
-+  no_libmikmod=""
-+  if test "$LIBMIKMOD_CONFIG" = "no" ; then
-+    no_libmikmod=yes
-+  else
-+    LIBMIKMOD_CFLAGS=`$LIBMIKMOD_CONFIG $libmikmod_config_args --cflags`
-+    LIBMIKMOD_LIBS=`$LIBMIKMOD_CONFIG $libmikmod_config_args --libs`
-+    LIBMIKMOD_LDADD=`$LIBMIKMOD_CONFIG $libmikmod_config_args --ldadd`
-+    libmikmod_config_major_version=`$LIBMIKMOD_CONFIG $libmikmod_config_args --version | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
-+    libmikmod_config_minor_version=`$LIBMIKMOD_CONFIG $libmikmod_config_args --version | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
-+    libmikmod_config_micro_version=`$LIBMIKMOD_CONFIG $libmikmod_config_args --version | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'`
-+    if test "x$enable_libmikmodtest" = "xyes" ; then
-+      ac_save_CFLAGS="$CFLAGS"
-+      ac_save_LIBS="$LIBS"
-+	  AC_LANG_SAVE
-+	  AC_LANG_C
-+      CFLAGS="$CFLAGS $LIBMIKMOD_CFLAGS $LIBMIKMOD_LDADD"
-+      LIBS="$LIBMIKMOD_LIBS $LIBS"
-+dnl
-+dnl Now check if the installed libmikmod is sufficiently new. (Also sanity
-+dnl checks the results of libmikmod-config to some extent
-+dnl
-+      rm -f conf.mikmodtest
-+      AC_TRY_RUN([
-+#include <mikmod.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+char* my_strdup (char *str)
-+{
-+  char *new_str;
-+
-+  if (str) {
-+    new_str = malloc ((strlen (str) + 1) * sizeof(char));
-+    strcpy (new_str, str);
-+  } else
-+    new_str = NULL;
-+
-+  return new_str;
-+}
-+
-+int main()
-+{
-+  int major,minor,micro;
-+  int libmikmod_major_version,libmikmod_minor_version,libmikmod_micro_version;
-+  char *tmp_version;
-+
-+  system("touch conf.mikmodtest");
-+
-+  /* HP/UX 9 (%@#!) writes to sscanf strings */
-+  tmp_version = my_strdup("$min_libmikmod_version");
-+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-+     printf("%s, bad version string\n", "$min_libmikmod_version");
-+     exit(1);
-+   }
-+
-+  libmikmod_major_version=(MikMod_GetVersion() >> 16) & 255;
-+  libmikmod_minor_version=(MikMod_GetVersion() >>  8) & 255;
-+  libmikmod_micro_version=(MikMod_GetVersion()      ) & 255;
-+
-+  if ((libmikmod_major_version != $libmikmod_config_major_version) ||
-+      (libmikmod_minor_version != $libmikmod_config_minor_version) ||
-+      (libmikmod_micro_version != $libmikmod_config_micro_version))
-+    {
-+      printf("\n*** 'libmikmod-config --version' returned %d.%d.%d, but libmikmod (%d.%d.%d)\n", 
-+             $libmikmod_config_major_version, $libmikmod_config_minor_version, $libmikmod_config_micro_version,
-+             libmikmod_major_version, libmikmod_minor_version, libmikmod_micro_version);
-+      printf ("*** was found! If libmikmod-config was correct, then it is best\n");
-+      printf ("*** to remove the old version of libmikmod. You may also be able to fix the error\n");
-+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-+      printf("*** required on your system.\n");
-+      printf("*** If libmikmod-config was wrong, set the environment variable LIBMIKMOD_CONFIG\n");
-+      printf("*** to point to the correct copy of libmikmod-config, and remove the file config.cache\n");
-+      printf("*** before re-running configure\n");
-+    } 
-+  else if ((libmikmod_major_version != LIBMIKMOD_VERSION_MAJOR) ||
-+	   (libmikmod_minor_version != LIBMIKMOD_VERSION_MINOR) ||
-+           (libmikmod_micro_version != LIBMIKMOD_REVISION))
-+    {
-+      printf("*** libmikmod header files (version %d.%d.%d) do not match\n",
-+	     LIBMIKMOD_VERSION_MAJOR, LIBMIKMOD_VERSION_MINOR, LIBMIKMOD_REVISION);
-+      printf("*** library (version %d.%d.%d)\n",
-+	     libmikmod_major_version, libmikmod_minor_version, libmikmod_micro_version);
-+    }
-+  else
-+    {
-+      if ((libmikmod_major_version > major) ||
-+        ((libmikmod_major_version == major) && (libmikmod_minor_version > minor)) ||
-+        ((libmikmod_major_version == major) && (libmikmod_minor_version == minor) && (libmikmod_micro_version >= micro)))
-+      {
-+        return 0;
-+       }
-+     else
-+      {
-+        printf("\n*** An old version of libmikmod (%d.%d.%d) was found.\n",
-+               libmikmod_major_version, libmikmod_minor_version, libmikmod_micro_version);
-+        printf("*** You need a version of libmikmod newer than %d.%d.%d.\n",
-+	       major, minor, micro);
-+        printf("***\n");
-+        printf("*** If you have already installed a sufficiently new version, this error\n");
-+        printf("*** probably means that the wrong copy of the libmikmod-config shell script is\n");
-+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-+        printf("*** of libmikmod, but you can also set the LIBMIKMOD_CONFIG environment to point to the\n");
-+        printf("*** correct copy of libmikmod-config. (In this case, you will have to\n");
-+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-+        printf("*** so that the correct libraries are found at run-time))\n");
-+      }
-+    }
-+  return 1;
-+}
-+],, no_libmikmod=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-+       CFLAGS="$ac_save_CFLAGS"
-+       LIBS="$ac_save_LIBS"
-+	   AC_LANG_RESTORE
-+     fi
-+  fi
-+  if test "x$no_libmikmod" = x ; then
-+     AC_MSG_RESULT([yes, `$LIBMIKMOD_CONFIG --version`])
-+     ifelse([$2], , :, [$2])     
-+  else
-+     AC_MSG_RESULT(no)
-+     if test "$LIBMIKMOD_CONFIG" = "no" ; then
-+       echo "*** The libmikmod-config script installed by libmikmod could not be found"
-+       echo "*** If libmikmod was installed in PREFIX, make sure PREFIX/bin is in"
-+       echo "*** your path, or set the LIBMIKMOD_CONFIG environment variable to the"
-+       echo "*** full path to libmikmod-config."
-+     else
-+       if test -f conf.mikmodtest ; then
-+        :
-+       else
-+          echo "*** Could not run libmikmod test program, checking why..."
-+          CFLAGS="$CFLAGS $LIBMIKMOD_CFLAGS"
-+          LIBS="$LIBS $LIBMIKMOD_LIBS"
-+		  AC_LANG_SAVE
-+		  AC_LANG_C
-+          AC_TRY_LINK([
-+#include <mikmod.h>
-+#include <stdio.h>
-+],      [ return (MikMod_GetVersion()!=0); ],
-+        [ echo "*** The test program compiled, but did not run. This usually means"
-+          echo "*** that the run-time linker is not finding libmikmod or finding the wrong"
-+          echo "*** version of libmikmod. If it is not finding libmikmod, you'll need to set your"
-+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-+          echo "*** to the installed location. Also, make sure you have run ldconfig if that"
-+          echo "*** is required on your system."
-+	  echo "***"
-+          echo "*** If you have an old version installed, it is best to remove it, although"
-+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-+          echo "*** exact error that occured. This usually means libmikmod was incorrectly installed"
-+          echo "*** or that you have moved libmikmod since it was installed. In the latter case, you"
-+          echo "*** may want to edit the libmikmod-config script: $LIBMIKMOD_CONFIG" ])
-+          CFLAGS="$ac_save_CFLAGS"
-+          LIBS="$ac_save_LIBS"
-+		  AC_LANG_RESTORE
-+       fi
-+     fi
-+     LIBMIKMOD_CFLAGS=""
-+     LIBMIKMOD_LIBS=""
-+     LIBMIKMOD_LDADD=""
-+     ifelse([$3], , :, [$3])
-+  fi
-+  AC_SUBST(LIBMIKMOD_CFLAGS)
-+  AC_SUBST(LIBMIKMOD_LIBS)
-+  AC_SUBST(LIBMIKMOD_LDADD)
-+  rm -f conf.mikmodtest
-+])


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2025-07-26  5:06 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-07-26  5:06 [gentoo-commits] repo/gentoo:master commit in: app-misc/bb/, app-misc/bb/files/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2025-07-26  5:06 Sam James
2019-11-13 22:02 Sergei Trofimovich
2019-11-10 11:59 Sergei Trofimovich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox