[gentoo-commits] repo/gentoo:master commit in: games-arcade/briquolo/files/, games-arcade/briquolo/
commit: 50861304fe434395c47e915ff4cd6df25f9afaf7
Author: Sam James gentoo org>
AuthorDate: Sun Jun 13 16:24:36 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Jun 13 17:13:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50861304
games-arcade/briquolo: various compile fixes (GCC 11, Clang)
* Fix build with GCC 11 (const)
* Fix build with Clang (widening conversion, patch from FreeBSD)
* Change delimiter in sed away from colon
Closes: https://bugs.gentoo.org/739094
Closes: https://bugs.gentoo.org/790746
Closes: https://bugs.gentoo.org/715738
Signed-off-by: Sam James gentoo.org>
games-arcade/briquolo/briquolo-0.5.7.ebuild| 4 ++-
.../files/briquolo-0.5.7-clang-widening.patch | 31 ++
.../files/briquolo-0.5.7-gcc11-fix-const.patch | 12 +
3 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/games-arcade/briquolo/briquolo-0.5.7.ebuild
b/games-arcade/briquolo/briquolo-0.5.7.ebuild
index d58d4462cad..fff6d3ea645 100644
--- a/games-arcade/briquolo/briquolo-0.5.7.ebuild
+++ b/games-arcade/briquolo/briquolo-0.5.7.ebuild
@@ -30,6 +30,8 @@ PATCHES=(
"${FILESDIR}"/${P}-gcc43.patch
"${FILESDIR}"/${P}-libpng14.patch
"${FILESDIR}"/${P}-respect-AR.patch
+ "${FILESDIR}"/${P}-gcc11-fix-const.patch
+ "${FILESDIR}"/${P}-clang-widening.patch
)
src_prepare() {
@@ -40,7 +42,7 @@ src_prepare() {
-e '/^SUBDIRS/s/desktop//' \
Makefile.{in,am} || die
sed -i \
- -e "/CXXFLAGS/s:-O3:${CXXFLAGS}:" \
+ -e "/CXXFLAGS/s|-O3|${CXXFLAGS}|" \
-e 's:=.*share/locale:=/usr/share/locale:' \
configure{,.ac} || die
sed -i \
diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch
b/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch
new file mode 100644
index 000..5afaaefd584
--- /dev/null
+++ b/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/739094
+https://svnweb.freebsd.org/ports/head/games/briquolo/files/patch-src-MOGL-MOGL_PoliceTTF.h?revision=460698=co
+
+Fix types passed to SDL_Rect structure (SDL 1.2)
+
+--- a/src/MOGL/MOGL_PoliceTTF.h
b/src/MOGL/MOGL_PoliceTTF.h
+@@ -42,10 +42,10 @@
+ {
+ GLuint TextureName;
+ Uint16 carac;
+-unsigned int x1;
+-unsigned int y1;
+-unsigned int x2;
+-unsigned int y2;
++Sint16 x1;
++Sint16 y1;
++int x2;
++int y2;
+ };
+
+ struct MOGL_Struct_TextureCarac
+@@ -141,7 +141,7 @@
+ MOGL_Struct_Carac * _Caracteres;
+ MOGL_Struct_Carac * (_Correspondance[256-32]);
+
+-unsigned int _LastTextureX, _LastTextureY;
++Sint16 _LastTextureX, _LastTextureY;
+ unsigned int maxHeightCarac;
+ MOGL_Map_Carac _MapCarac;
+ MOGL_Vector_TextureName _VectorTextureName;
diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch
b/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch
new file mode 100644
index 000..d5d68819675
--- /dev/null
+++ b/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/790746
+--- a/src/MOGL/MOGL_Fenetre.h
b/src/MOGL/MOGL_Fenetre.h
+@@ -52,7 +52,7 @@ class MOGL_Fenetre
+ private:
+ struct CompareResolution
+ {
+-bool operator() (const MOGL_Resolution & x, const MOGL_Resolution & y)
++bool operator() (const MOGL_Resolution & x, const MOGL_Resolution &
y) const
+ {
+ return x.w < y.w;
+ }
[gentoo-commits] repo/gentoo:master commit in: games-arcade/briquolo/
commit: 58a38ae5013be60b7c1d7bca53caaa2ad4482d7d Author: Sam James gentoo org> AuthorDate: Sun Apr 4 07:37:02 2021 + Commit: Sam James gentoo org> CommitDate: Sun Apr 4 07:37:43 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58a38ae5 games-arcade/briquolo: toolchain-funcs-- Signed-off-by: Sam James gentoo.org> games-arcade/briquolo/briquolo-0.5.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-arcade/briquolo/briquolo-0.5.7.ebuild b/games-arcade/briquolo/briquolo-0.5.7.ebuild index fe3a911deb6..d58d4462cad 100644 --- a/games-arcade/briquolo/briquolo-0.5.7.ebuild +++ b/games-arcade/briquolo/briquolo-0.5.7.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools desktop toolchain-funcs +inherit autotools desktop DESCRIPTION="Breakout with 3D representation based on OpenGL" HOMEPAGE="http://briquolo.free.fr/en/index.html;
[gentoo-commits] repo/gentoo:master commit in: games-arcade/briquolo/, games-arcade/briquolo/files/
commit: 58042585902cac0190e4623d2569ad9d9663e752
Author: Sam James gentoo org>
AuthorDate: Sun Apr 4 07:15:34 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 4 07:21:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58042585
games-arcade/briquolo: port to EAPI 7, games.eclass--
Signed-off-by: Sam James gentoo.org>
games-arcade/briquolo/briquolo-0.5.7.ebuild| 38 ++
.../briquolo/files/briquolo-0.5.7-gcc43.patch | 35
.../briquolo/files/briquolo-0.5.7-libpng14.patch | 4 +--
.../briquolo/files/briquolo-0.5.7-respect-AR.patch | 10 ++
4 files changed, 50 insertions(+), 37 deletions(-)
diff --git a/games-arcade/briquolo/briquolo-0.5.7.ebuild
b/games-arcade/briquolo/briquolo-0.5.7.ebuild
index 07776ecc773..fe3a911deb6 100644
--- a/games-arcade/briquolo/briquolo-0.5.7.ebuild
+++ b/games-arcade/briquolo/briquolo-0.5.7.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils games
+EAPI=7
+
+inherit autotools desktop toolchain-funcs
DESCRIPTION="Breakout with 3D representation based on OpenGL"
HOMEPAGE="http://briquolo.free.fr/en/index.html;
@@ -13,39 +14,48 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="nls"
-RDEPEND="virtual/opengl
+RDEPEND="
+ virtual/opengl
virtual/glu
media-libs/libsdl[joystick,sound,video]
media-libs/sdl-mixer
media-libs/sdl-ttf
media-libs/libpng:0
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )"
+ nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc43.patch
+ "${FILESDIR}"/${P}-libpng14.patch
+ "${FILESDIR}"/${P}-respect-AR.patch
+)
src_prepare() {
- epatch "${FILESDIR}"/${P}-gcc43.patch \
- "${FILESDIR}"/${P}-libpng14.patch
- # no thanks we'll take care of it.
+ default
+
+ # No thanks, we'll take care of it.
sed -i \
-e '/^SUBDIRS/s/desktop//' \
- Makefile.in || die
+ Makefile.{in,am} || die
sed -i \
-e "/CXXFLAGS/s:-O3:${CXXFLAGS}:" \
-e 's:=.*share/locale:=/usr/share/locale:' \
- configure || die
+ configure{,.ac} || die
sed -i \
-e 's:$(datadir)/locale:/usr/share/locale:' \
po/Makefile.in.in || die
+
+ eautoreconf
}
src_configure() {
- egamesconf $(use_enable nls)
+ econf $(use_enable nls)
}
src_install() {
default
doicon desktop/briquolo.svg
make_desktop_entry briquolo Briquolo
- prepgamesdirs
}
diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-gcc43.patch
b/games-arcade/briquolo/files/briquolo-0.5.7-gcc43.patch
index 13e932a1c69..ba2690792dd 100644
--- a/games-arcade/briquolo/files/briquolo-0.5.7-gcc43.patch
+++ b/games-arcade/briquolo/files/briquolo-0.5.7-gcc43.patch
@@ -1,6 +1,5 @@
-diff -ru src.orig/Constante.cpp src/Constante.cpp
src.orig/Constante.cpp 2008-03-22 05:40:33.0 -0400
-+++ src/Constante.cpp 2008-06-11 23:16:46.0 -0400
+--- a/src/Constante.cpp
b/src/Constante.cpp
@@ -27,6 +27,7 @@
#define DATADIR_BRIQUOLO "./"
#define PACKAGE "briquolo"
@@ -9,9 +8,8 @@ diff -ru src.orig/Constante.cpp src/Constante.cpp
#ifdef WIN32
#define WIN32_LEAN_AND_MEAN
-diff -ru src.orig/MOGL/MOGL_EnsembleObjet.cpp src/MOGL/MOGL_EnsembleObjet.cpp
src.orig/MOGL/MOGL_EnsembleObjet.cpp 2008-03-24 09:12:36.0
-0400
-+++ src/MOGL/MOGL_EnsembleObjet.cpp2008-06-11 23:17:11.0 -0400
+--- a/src/MOGL/MOGL_EnsembleObjet.cpp
b/src/MOGL/MOGL_EnsembleObjet.cpp
@@ -24,7 +24,8 @@
#include "MOGL_Armature.h"
#include "MOGL_Peau.h"
@@ -22,9 +20,8 @@ diff -ru src.orig/MOGL/MOGL_EnsembleObjet.cpp
src/MOGL/MOGL_EnsembleObjet.cpp
//#include
-diff -ru src.orig/MOGL/MOGL_GestionnaireObjet.cpp
src/MOGL/MOGL_GestionnaireObjet.cpp
src.orig/MOGL/MOGL_GestionnaireObjet.cpp 2008-03-24 08:56:13.0
-0400
-+++ src/MOGL/MOGL_GestionnaireObjet.cpp2008-06-11 23:18:45.0
-0400
+--- a/src/MOGL/MOGL_GestionnaireObjet.cpp
b/src/MOGL/MOGL_GestionnaireObjet.cpp
@@ -21,6 +21,7 @@
*/
#include "../I18n.h"
@@ -33,9 +30,8 @@ diff -ru src.orig/MOGL/MOGL_GestionnaireObjet.cpp
src/MOGL/MOGL_GestionnaireObje
bool MOGL_GestionnaireObjet::ChargerObjetASCTriangle(const char *
p_NomFichier, const MOGL_GestionnaireTexture & p_GM,
MOGL_Objet & p_Objet)
-diff -ru src.orig/MOGL/MOGL_GestionnaireObjet.h
src/MOGL/MOGL_GestionnaireObjet.h
src.orig/MOGL/MOGL_GestionnaireObjet.h
[gentoo-commits] repo/gentoo:master commit in: games-arcade/briquolo/
commit: 78f8b903d7b1e36ce3f85fc7ba21fe324b126b2d
Author: Michael Sterrett gentoo org>
AuthorDate: Fri Dec 18 09:33:15 2015 +
Commit: Michael Sterrett gentoo org>
CommitDate: Fri Dec 18 09:33:15 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78f8b903
EAPI=5; minor tidying
Package-Manager: portage-2.2.24
games-arcade/briquolo/briquolo-0.5.7.ebuild | 18 +++---
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/games-arcade/briquolo/briquolo-0.5.7.ebuild
b/games-arcade/briquolo/briquolo-0.5.7.ebuild
index 2690ebc..efd0d53 100644
--- a/games-arcade/briquolo/briquolo-0.5.7.ebuild
+++ b/games-arcade/briquolo/briquolo-0.5.7.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=4
+EAPI=5
inherit eutils games
DESCRIPTION="Breakout with 3D representation based on OpenGL"
@@ -16,10 +16,10 @@ IUSE="nls"
RDEPEND="virtual/opengl
virtual/glu
- media-libs/libsdl
+ media-libs/libsdl[joystick,sound,video]
media-libs/sdl-mixer
media-libs/sdl-ttf
- media-libs/libpng
+ media-libs/libpng:0
nls? ( virtual/libintl )"
DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )"
@@ -30,22 +30,18 @@ src_prepare() {
# no thanks we'll take care of it.
sed -i \
-e '/^SUBDIRS/s/desktop//' \
- Makefile.in \
- || die "sed Makefile.in failed"
+ Makefile.in || die
sed -i \
-e "/CXXFLAGS/s:-O3:${CXXFLAGS}:" \
-e 's:=.*share/locale:=/usr/share/locale:' \
- configure \
- || die "sed configure failed"
+ configure || die
sed -i \
-e 's:$(datadir)/locale:/usr/share/locale:' \
- po/Makefile.in.in \
- || die "sed Makefile.in.in failed"
+ po/Makefile.in.in || die
}
src_configure() {
- egamesconf \
- $(use_enable nls)
+ egamesconf $(use_enable nls)
}
src_install() {
