[gentoo-commits] repo/gentoo:master commit in: app-misc/bb/files/, app-misc/bb/

[gentoo-commits] repo/gentoo:master commit in: app-misc/bb/files/, app-misc/bb/

[Sergei Trofimovich]

commit:     2ebcf571537f84030611472713e5d08f0524f6ba
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 22 08:45:45 2015 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 08:49:26 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ebcf571

app-misc/bb: disable broken pulseaudio plugin, bug #516964 by James L. Hammons

Package-Manager: portage-2.2.20

 app-misc/bb/bb-1.3.0_rc1-r4.ebuild                 | 66 ++++++++++++++++++++++
 app-misc/bb/files/bb-1.3.0_rc1-disable-pulse.patch | 23 ++++++++
 app-misc/bb/files/bb-1.3.0_rc1-protos.patch        | 16 ++++++
 3 files changed, 105 insertions(+)

diff --git a/app-misc/bb/bb-1.3.0_rc1-r4.ebuild b/app-misc/bb/bb-1.3.0_rc1-r4.ebuild
new file mode 100644
index 0000000..8dc6338
--- /dev/null
+++ b/app-misc/bb/bb-1.3.0_rc1-r4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+	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/files/bb-1.3.0_rc1-disable-pulse.patch b/app-misc/bb/files/bb-1.3.0_rc1-disable-pulse.patch
new file mode 100644
index 0000000..dcc00c6
--- /dev/null
+++ b/app-misc/bb/files/bb-1.3.0_rc1-disable-pulse.patch
@@ -0,0 +1,23 @@
+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[])
+   aa_flush (context);
+   if (tolower (aa_getkey (context, 1)) != 'n')
+     {
++      /* Unfortunately recently added native pulseaudio
++       * driver in libmikmod does not allow you to
++       * call 'MikMod_Update' in a non-blocking way.
++       *
++       * It's a known limitation of simple pulseaudio API
++       * thus we derevisted pulseaudio driver to fallback
++       * on alsa, oss or whatever used to work for user.
++       */
++      drv_pulseaudio.Name    = NULL;
++      drv_pulseaudio.Version = NULL;
++
+       MikMod_RegisterAllDrivers ();
+       MikMod_RegisterLoader (&load_s3m);
+       /*md_mode |= DMODE_SOFT_MUSIC; */

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
new file mode 100644
index 0000000..aa3fc02
--- /dev/null
+++ b/app-misc/bb/files/bb-1.3.0_rc1-protos.patch
@@ -0,0 +1,16 @@
+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 @@
+ 
++#include <ctype.h>
+ #include <string.h>

[gentoo-commits] repo/gentoo:master commit in: app-misc/bb/files/, app-misc/bb/

[Sam James]

commit:     996809c0e52057ec8e5f32dd1d9f8f9bea559c18
Author:     Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Fri Nov 11 21:59:27 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 22 06:48:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=996809c0

app-misc/bb: revbump, fix build for clang16 and lto

Closes: https://bugs.gentoo.org/880385
Closes: https://bugs.gentoo.org/854720
Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>
Closes: https://github.com/gentoo/gentoo/pull/28233
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...-1.3.0_rc1-r5.ebuild => bb-1.3.0_rc1-r6.ebuild} |  7 +++-
 .../files/bb-1.3.0_rc1-fix-build-for-clang16.patch | 23 +++++++++++
 .../files/bb-1.3.0_rc1-fix-lto-type-mismatch.patch | 18 +++++++++
 .../bb-1.3.0_rc1-fix-return-type-and-QA.patch      | 47 ++++++++++++++++++++++
 4 files changed, 93 insertions(+), 2 deletions(-)

diff --git a/app-misc/bb/bb-1.3.0_rc1-r5.ebuild b/app-misc/bb/bb-1.3.0_rc1-r6.ebuild
similarity index 90%
rename from app-misc/bb/bb-1.3.0_rc1-r5.ebuild
rename to app-misc/bb/bb-1.3.0_rc1-r6.ebuild
index f1111fd96715..2a3d4e24f6b5 100644
--- a/app-misc/bb/bb-1.3.0_rc1-r5.ebuild
+++ b/app-misc/bb/bb-1.3.0_rc1-r6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
@@ -34,6 +34,9 @@ PATCHES=(
 	"${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() {

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-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);