diff options
Diffstat (limited to 'app-misc/bb')
| -rw-r--r-- | app-misc/bb/bb-1.3.0_rc1-r3.ebuild | 63 | ||||
| -rw-r--r-- | app-misc/bb/bb-1.3.0_rc1-r4.ebuild | 66 | ||||
| -rw-r--r-- | app-misc/bb/bb-1.3.0_rc1-r6.ebuild | 75 | ||||
| -rw-r--r-- | app-misc/bb/files/bb-1.3.0_rc1-disable-pulse.patch | 2 | ||||
| -rw-r--r-- | app-misc/bb/files/bb-1.3.0_rc1-fix-build-for-clang16.patch | 23 | ||||
| -rw-r--r-- | app-misc/bb/files/bb-1.3.0_rc1-fix-lto-type-mismatch.patch | 18 | ||||
| -rw-r--r-- | app-misc/bb/files/bb-1.3.0_rc1-fix-protos.patch | 2 | ||||
| -rw-r--r-- | app-misc/bb/files/bb-1.3.0_rc1-fix-return-type-and-QA.patch | 47 | ||||
| -rw-r--r-- | app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch | 10 | ||||
| -rw-r--r-- | app-misc/bb/files/bb-1.3.0_rc1-messager-overlap.patch | 2 | ||||
| -rw-r--r-- | app-misc/bb/files/bb-1.3.0_rc1-noattr.patch | 4 | ||||
| -rw-r--r-- | app-misc/bb/files/bb-1.3.0_rc1-printf-cleanup.patch | 2 | ||||
| -rw-r--r-- | app-misc/bb/files/bb-1.3.0_rc1-protos.patch | 4 | ||||
| -rw-r--r-- | app-misc/bb/files/bb-1.3.0_rc1-zbuff-fault.patch | 2 | ||||
| -rw-r--r-- | app-misc/bb/metadata.xml | 7 |
15 files changed, 169 insertions, 158 deletions
diff --git a/app-misc/bb/bb-1.3.0_rc1-r3.ebuild b/app-misc/bb/bb-1.3.0_rc1-r3.ebuild deleted file mode 100644 index 467732903e63..000000000000 --- a/app-misc/bb/bb-1.3.0_rc1-r3.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools eutils versionator - -MY_P="${PN}-$(get_version_component_range 1-2)$(get_version_component_range 4-4)" - -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 ~x86" -IUSE="mikmod" - -DEPEND="media-libs/aalib:= - dev-libs/lzo:= - mikmod? ( media-libs/libmikmod:= ) -" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)" - -src_prepare() { - epatch "${FILESDIR}/${P}-noattr.patch" - epatch "${FILESDIR}/${P}-fix-protos.patch" - epatch "${FILESDIR}"/${P}-messager-overlap.patch - epatch "${FILESDIR}"/${P}-zbuff-fault.patch - epatch "${FILESDIR}"/${P}-printf-cleanup.patch - epatch "${FILESDIR}"/${P}-m4-stuff.patch - - # 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 - - 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/bb-1.3.0_rc1-r4.ebuild b/app-misc/bb/bb-1.3.0_rc1-r4.ebuild deleted file mode 100644 index 668b4f4df30b..000000000000 --- a/app-misc/bb/bb-1.3.0_rc1-r4.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools eutils versionator - -MY_P="${PN}-$(get_version_component_range 1-2)$(get_version_component_range 4-4)" - -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}-$(get_version_component_range 1-3)" - -src_prepare() { - epatch "${FILESDIR}"/${P}-noattr.patch - epatch "${FILESDIR}"/${P}-fix-protos.patch - epatch "${FILESDIR}"/${P}-messager-overlap.patch - epatch "${FILESDIR}"/${P}-zbuff-fault.patch - epatch "${FILESDIR}"/${P}-printf-cleanup.patch - epatch "${FILESDIR}"/${P}-m4-stuff.patch - epatch "${FILESDIR}"/${P}-protos.patch - epatch "${FILESDIR}"/${P}-disable-pulse.patch - - # 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 - - 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/bb-1.3.0_rc1-r6.ebuild b/app-misc/bb/bb-1.3.0_rc1-r6.ebuild new file mode 100644 index 000000000000..5824d4e52374 --- /dev/null +++ b/app-misc/bb/bb-1.3.0_rc1-r6.ebuild @@ -0,0 +1,75 @@ +# 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-disable-pulse.patch b/app-misc/bb/files/bb-1.3.0_rc1-disable-pulse.patch index dcc00c642335..3d7889101b93 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-build-for-clang16.patch b/app-misc/bb/files/bb-1.3.0_rc1-fix-build-for-clang16.patch new file mode 100644 index 000000000000..77b06874760b --- /dev/null +++ b/app-misc/bb/files/bb-1.3.0_rc1-fix-build-for-clang16.patch @@ -0,0 +1,23 @@ +The two functions that are assigned to the formulas structs secnod field +`int (*calculate)(number_t number_t number_t number_t)` +(without the REGISTERS(3) which is just a macro to GCC regparm) + +However, clang16 has -Wincompatible-function-pointer-types by default, and it +does not like that and complains, that assigning these functions into the +structs fields is a problem due to incompatible types. + +Bug: https://bugs.gentoo.org/880385 + +Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de> + +--- a/formulas.h ++++ b/formulas.h +@@ -50,7 +50,7 @@ struct symetryinfo { + #define FORMULAMAGIC 1121 + struct formula { + int magic; +- int (*calculate) (number_t, number_t, number_t, number_t) REGISTERS(3); ++ int (*calculate) (number_t, number_t, number_t, number_t); + char *name[2]; + vinfo v; + int mandelbrot; diff --git a/app-misc/bb/files/bb-1.3.0_rc1-fix-lto-type-mismatch.patch b/app-misc/bb/files/bb-1.3.0_rc1-fix-lto-type-mismatch.patch new file mode 100644 index 000000000000..6442a9c9fd29 --- /dev/null +++ b/app-misc/bb/files/bb-1.3.0_rc1-fix-lto-type-mismatch.patch @@ -0,0 +1,18 @@ +In tex.c these variables are initialized as unsigned longs, so they should +be declared as unsigned longs. I have scanned the code base for any usage +of them in the negatives - nothing. + +Bug: https://bugs.gentoo.org/854720 + +Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de> + +--- a/tex.h ++++ b/tex.h +@@ -28,5 +28,6 @@ extern void disp3d(void); + extern void set_zbuff(void); + extern void unset_zbuff(void); + +-extern int alfa,beta,gama,centerx,centery,centerz; ++extern unsigned long alfa,beta,gama; ++extern int centerx,centery,centerz; + extern float zoom; 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 577f306c8169..a85166b01309 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-fix-return-type-and-QA.patch b/app-misc/bb/files/bb-1.3.0_rc1-fix-return-type-and-QA.patch new file mode 100644 index 000000000000..b1c8f8115605 --- /dev/null +++ b/app-misc/bb/files/bb-1.3.0_rc1-fix-return-type-and-QA.patch @@ -0,0 +1,47 @@ +diff --git a/ctrl87.c b/ctrl87.c +index 05f1e6d..8789d92 100644 +--- a/ctrl87.c ++++ b/ctrl87.c +@@ -43,8 +43,7 @@ unsigned short _control87(unsigned short newcw, unsigned short mask) + : /* registers */ "ax", "bx", "dx" + ); + } +- return cw; + #endif + #endif +- ++return cw; + } /* _control87 */ +diff --git a/main.c b/main.c +index a9fac57..41b56d1 100644 +--- a/main.c ++++ b/main.c +@@ -73,8 +73,8 @@ load_song (char *name) + sleep (1); + } + } +- return 0; + #endif ++return 0; + } + + void +diff --git a/scene4.c b/scene4.c +index 12b640c..b2f69f3 100644 +--- a/scene4.c ++++ b/scene4.c +@@ -231,10 +231,10 @@ void scene4(void) + draw(); + bbflushwait(0.1 * 1000000); + for (i = 20; i < aa_imgwidth(context) - 20; i++) +- aa_putpixel(context, i, aa_imgheight(context) - 10, 255), +- aa_putpixel(context, i, aa_imgheight(context) - 11, 255), +- aa_putpixel(context, i, aa_imgheight(context) - 12, 255), +- aa_putpixel(context, i, aa_imgheight(context) - 13, 255), ++ aa_putpixel(context, i, aa_imgheight(context) - 10, 255); ++ aa_putpixel(context, i, aa_imgheight(context) - 11, 255); ++ aa_putpixel(context, i, aa_imgheight(context) - 12, 255); ++ aa_putpixel(context, i, aa_imgheight(context) - 13, 255); + gentable(); + timestuff(-25, drawfire, mydraw, 7 * 1000000); + free(table); 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 0fa98f8162f5..12d9276aeb63 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,11 +6,8 @@ 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 ++++ a/m4/aalib.m4 @@ -0,0 +1,169 @@ +# Configure paths for AALIB +# Jan Hubicka 4/22/2001 @@ -181,11 +178,8 @@ 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 ++++ a/m4/libmikmod.m4 @@ -0,0 +1,207 @@ +# Configure paths for libmikmod +# 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 e46b75fd5815..378e6b7798b6 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 7a6f9474a71e..a4768ab75e28 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 da113795124b..b11b2333d1d6 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 aa3fc021e5c1..40f77a0f20cd 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 b3e882ed55e9..7b6eda327d18 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() diff --git a/app-misc/bb/metadata.xml b/app-misc/bb/metadata.xml index 401e82106a05..68ac98b8491c 100644 --- a/app-misc/bb/metadata.xml +++ b/app-misc/bb/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>slyfox@gentoo.org</email> - <name>Sergei Trofimovich</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">aa-project</remote-id> </upstream> |