[gentoo-commits] repo/gentoo:master commit in: games-sports/foobillard/
commit: 8b035ee2a03df85e58a5b61d318ecd99bde83e89
Author: Eli Schwartz gmail com>
AuthorDate: Tue Mar 12 01:45:36 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Mar 12 02:24:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b035ee2
games-sports/foobillard: mark as LTO-unsafe
Closes: https://bugs.gentoo.org/859235
Signed-off-by: Eli Schwartz gmail.com>
Signed-off-by: Sam James gentoo.org>
games-sports/foobillard/foobillard-3.0a-r1.ebuild | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/games-sports/foobillard/foobillard-3.0a-r1.ebuild
b/games-sports/foobillard/foobillard-3.0a-r1.ebuild
index ad8a7bd2411d..3cb4c991c6c5 100644
--- a/games-sports/foobillard/foobillard-3.0a-r1.ebuild
+++ b/games-sports/foobillard/foobillard-3.0a-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -46,6 +46,12 @@ src_prepare() {
}
src_configure() {
+ # -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/859235
+ #
+ # Upstream is sourceforge, and dead since 2010. Not reported upstream.
+ filter-lto
+
use video_cards_nvidia && append-ldflags
-L/usr/$(get_libdir)/opengl/nvidia/lib
econf \
--enable-sound \
[gentoo-commits] repo/gentoo:master commit in: games-sports/foobillard/
commit: d23cc9977be5576fca05d2c91e9ff4664896d3f5
Author: Michał Górny gentoo org>
AuthorDate: Fri Oct 11 15:35:36 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Fri Oct 11 15:35:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d23cc997
games-sports: Remove *-fbsd KEYWORDS
Signed-off-by: Michał Górny gentoo.org>
games-sports/foobillard/foobillard-3.0a-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-sports/foobillard/foobillard-3.0a-r1.ebuild
b/games-sports/foobillard/foobillard-3.0a-r1.ebuild
index 4847f1d1ffc..c615300c947 100644
--- a/games-sports/foobillard/foobillard-3.0a-r1.ebuild
+++ b/games-sports/foobillard/foobillard-3.0a-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
IUSE="sdl video_cards_nvidia"
RDEPEND="x11-libs/libXaw
[gentoo-commits] repo/gentoo:master commit in: games-sports/foobillard/, games-sports/foobillard/files/
commit: dd9e2f8cdfd87946c1a373357e45c5375aed
Author: Lars Wendler gentoo org>
AuthorDate: Mon May 7 08:54:17 2018 +
Commit: Lars Wendler gentoo org>
CommitDate: Mon May 7 08:54:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd9e2f8c
games-sports/foobillard: Use pkg-config to find freetype
Closes: https://bugs.gentoo.org/654978
Package-Manager: Portage-2.3.36, Repoman-2.3.9
.../files/foobillard-3.0a-as-needed.patch | 4 +--
.../foobillard/files/foobillard-3.0a-fbsd.patch| 4 +--
.../files/foobillard-3.0a-freetype_pkgconfig.patch | 35 ++
games-sports/foobillard/foobillard-3.0a-r1.ebuild | 8 +++--
4 files changed, 44 insertions(+), 7 deletions(-)
diff --git a/games-sports/foobillard/files/foobillard-3.0a-as-needed.patch
b/games-sports/foobillard/files/foobillard-3.0a-as-needed.patch
index 1d9ddbd8b72..272f9c71177 100644
--- a/games-sports/foobillard/files/foobillard-3.0a-as-needed.patch
+++ b/games-sports/foobillard/files/foobillard-3.0a-as-needed.patch
@@ -4,7 +4,7 @@
#LIBS = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz
#LIBS = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz
--AM_LDFLAGS = ${all_libraries} `freetype-config --libs` ${SDL_LIBS}
${GLUT_LIBS}
+-AM_LDFLAGS = ${all_libraries} `pkg-config --libs freetype2` ${SDL_LIBS}
${GLUT_LIBS}
#LDADD = ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi
-lpng -lz -L/home/floh/nvsdk/OpenGL/lib/ -lnvparse
-LDADD = ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi
-lpng -lz
-+LIBS = ${all_libraries} `freetype-config --libs` ${SDL_LIBS} ${GLUT_LIBS}
${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi -lpng -lz
++LIBS = ${all_libraries} `pkg-config --libs freetype2` ${SDL_LIBS}
${GLUT_LIBS} ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi
-lpng -lz
diff --git a/games-sports/foobillard/files/foobillard-3.0a-fbsd.patch
b/games-sports/foobillard/files/foobillard-3.0a-fbsd.patch
index 301260cb836..3b7fc953a4d 100644
--- a/games-sports/foobillard/files/foobillard-3.0a-fbsd.patch
+++ b/games-sports/foobillard/files/foobillard-3.0a-fbsd.patch
@@ -6,8 +6,8 @@ Index: foobillard-3.0a/configure.in
dnl Checks for header files.
AC_HEADER_STDC
--AC_CHECK_HEADERS(limits.h unistd.h math.h stdlib.h stdio.h ft2build.h)
-+AC_CHECK_HEADERS(limits.h unistd.h math.h stdlib.h stdio.h ft2build.h
endian.h sys/endian.h)
+-AC_CHECK_HEADERS(limits.h unistd.h math.h stdlib.h stdio.h)
++AC_CHECK_HEADERS(limits.h unistd.h math.h stdlib.h stdio.h endian.h
sys/endian.h)
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
diff --git
a/games-sports/foobillard/files/foobillard-3.0a-freetype_pkgconfig.patch
b/games-sports/foobillard/files/foobillard-3.0a-freetype_pkgconfig.patch
new file mode 100644
index 000..b01c53ecbc8
--- /dev/null
+++ b/games-sports/foobillard/files/foobillard-3.0a-freetype_pkgconfig.patch
@@ -0,0 +1,35 @@
+--- foobillard-3.0a/configure.in
foobillard-3.0a/configure.in
+@@ -13,7 +13,7 @@
+
+ dnl Checks for header files.
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS(limits.h unistd.h math.h stdlib.h stdio.h ft2build.h)
++AC_CHECK_HEADERS(limits.h unistd.h math.h stdlib.h stdio.h)
+
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+--- foobillard-3.0a/src/Makefile.am
foobillard-3.0a/src/Makefile.am
+@@ -50,7 +50,7 @@
+ #CC = gcc
+ #CXXFLAGS = -O6 -s
+ #CFLAGS = -DXMESA -Wall -O3 -I$(INCDIR)
+-#CFLAGS = -Wall -O3 -I$(INCDIR) `freetype-config --cflags`
++#CFLAGS = -Wall -O3 -I$(INCDIR) `pkg-config --cflags freetype2`
+ if USE_SDL
+ SDL_CFLAGS = `sdl-config --cflags` -DUSE_SDL
+ SDL_LIBS = `sdl-config --libs`
+@@ -79,10 +79,10 @@
+ SOUND_CFLAGS =
+ endif
+
+-AM_CFLAGS = -Wall `freetype-config --cflags` ${SDL_CFLAGS} ${NVIDIA_CFLAGS}
${SOUND_CFLAGS} ${DEBUG_CFLAGS}
++AM_CFLAGS = -Wall `pkg-config --cflags freetype2` ${SDL_CFLAGS}
${NVIDIA_CFLAGS} ${SOUND_CFLAGS} ${DEBUG_CFLAGS}
+
+ #LIBS = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz
+ #LIBS = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz
+-AM_LDFLAGS = ${all_libraries} `freetype-config --libs` ${SDL_LIBS}
${GLUT_LIBS}
++AM_LDFLAGS = ${all_libraries} `pkg-config --libs freetype2` ${SDL_LIBS}
${GLUT_LIBS}
+ #LDADD = ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi
-lpng -lz -L/home/floh/nvsdk/OpenGL/lib/ -lnvparse
+ LDADD = ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi
-lpng -lz
diff --git a/games-sports/foobillard/foobillard-3.0a-r1.ebuild
b/games-sports/foobillard/foobillard-3.0a-r1.ebuild
index 02844b26cb9..4847f1d1ffc 100644
--- a/games-sports/foobillard/foobillard-3.0a-r1.ebuild
+++ b/games-sports/foobillard/foobillard-3.0a-r1.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86 ~x86-fbsd"
IUSE="sdl video_cards_nvidia"
-DEPEND="x11-libs/l
[gentoo-commits] repo/gentoo:master commit in: games-sports/foobillard/, games-sports/foobillard/files/
commit: 84207245c6718383b8013a8231ae532dcd80c7d9
Author: Pacho Ramos gentoo org>
AuthorDate: Tue May 1 18:38:58 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Tue May 1 19:35:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84207245
games-sports/foobillard: Stop using games.eclass
Package-Manager: Portage-2.3.31, Repoman-2.3.9
.../files/foobillard-3.0a-no_nvidia.patch | 4 +-
games-sports/foobillard/foobillard-3.0a-r1.ebuild | 54 ++
2 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/games-sports/foobillard/files/foobillard-3.0a-no_nvidia.patch
b/games-sports/foobillard/files/foobillard-3.0a-no_nvidia.patch
index b43707bc403..8a9a33c43ea 100644
--- a/games-sports/foobillard/files/foobillard-3.0a-no_nvidia.patch
+++ b/games-sports/foobillard/files/foobillard-3.0a-no_nvidia.patch
@@ -1,5 +1,5 @@
src/ball.c.orig2004-06-02 07:00:57.0 -0400
-+++ src/ball.c 2004-06-02 07:03:52.0 -0400
+--- a/src/ball.c.orig 2004-06-02 07:00:57.0 -0400
b/src/ball.c 2004-06-02 07:03:52.0 -0400
@@ -1821,6 +1821,7 @@
} else if( options_cuberef && cuberef_binds!=0 ){
glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, cuberef_binds[i]);
diff --git a/games-sports/foobillard/foobillard-3.0a-r1.ebuild
b/games-sports/foobillard/foobillard-3.0a-r1.ebuild
new file mode 100644
index 000..02844b26cb9
--- /dev/null
+++ b/games-sports/foobillard/foobillard-3.0a-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools desktop flag-o-matic toolchain-funcs
+
+DESCRIPTION="8ball, 9ball, snooker and carambol game"
+HOMEPAGE="http://foobillard.sourceforge.net/";
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="sdl video_cards_nvidia"
+
+DEPEND="x11-libs/libXaw
+ x11-libs/libXi
+ virtual/opengl
+ virtual/glu
+ >=media-libs/freetype-2.0.9:2
+ media-libs/libpng:0=
+ sdl? ( media-libs/libsdl[video] )
+ !sdl? ( media-libs/freeglut )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+ eapply \
+ "${FILESDIR}"/${P}-no_nvidia.patch \
+ "${FILESDIR}"/${P}-fbsd.patch \
+ "${FILESDIR}"/${P}-as-needed.patch \
+ "${FILESDIR}"/${P}-gl-clamp.patch
+ mv configure.{in,ac}
+ rm aclocal.m4
+
+ eautoreconf
+}
+
+src_configure() {
+ use video_cards_nvidia && append-ldflags
-L/usr/$(get_libdir)/opengl/nvidia/lib
+ econf \
+ --enable-sound \
+ $(use_enable sdl SDL) \
+ $(use_enable !sdl glut) \
+ $(use_enable video_cards_nvidia nvidia)
+}
+
+src_install() {
+ default
+ doman foobillard.6
+ newicon data/full_symbol.png foobillard.png
+ make_desktop_entry foobillard Foobillard
+}
[gentoo-commits] repo/gentoo:master commit in: games-sports/foobillard/
commit: 2d7761796ac1294dbbb052ed86c0162d156950c6
Author: Pacho Ramos gentoo org>
AuthorDate: Tue May 1 18:39:07 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Tue May 1 19:35:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d776179
games-sports/foobillard: Drop old
Package-Manager: Portage-2.3.31, Repoman-2.3.9
games-sports/foobillard/foobillard-3.0a.ebuild | 53 --
1 file changed, 53 deletions(-)
diff --git a/games-sports/foobillard/foobillard-3.0a.ebuild
b/games-sports/foobillard/foobillard-3.0a.ebuild
deleted file mode 100644
index e68d118c802..000
--- a/games-sports/foobillard/foobillard-3.0a.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic autotools toolchain-funcs games
-
-DESCRIPTION="8ball, 9ball, snooker and carambol game"
-HOMEPAGE="http://foobillard.sourceforge.net/";
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="sdl video_cards_nvidia"
-
-DEPEND="x11-libs/libXaw
- x11-libs/libXi
- virtual/opengl
- virtual/glu
- >=media-libs/freetype-2.0.9
- media-libs/libpng:0
- sdl? ( media-libs/libsdl[video] )
- !sdl? ( media-libs/freeglut )"
-RDEPEND=${DEPEND}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-no_nvidia.patch \
- "${FILESDIR}"/${P}-fbsd.patch \
- "${FILESDIR}"/${P}-as-needed.patch \
- "${FILESDIR}"/${P}-gl-clamp.patch
- mv configure.{in,ac}
- rm aclocal.m4
-
- eautoreconf
-}
-
-src_configure() {
- use video_cards_nvidia && append-ldflags
-L/usr/$(get_libdir)/opengl/nvidia/lib
- egamesconf \
- --enable-sound \
- $(use_enable sdl SDL) \
- $(use_enable !sdl glut) \
- $(use_enable video_cards_nvidia nvidia)
-}
-
-src_install() {
- default
- doman foobillard.6
- newicon data/full_symbol.png foobillard.png
- make_desktop_entry foobillard Foobillard
- prepgamesdirs
-}
[gentoo-commits] repo/gentoo:master commit in: games-sports/foobillard/
commit: 33c3827890b9a6a8879d564dc4aeb73604eddfeb
Author: Michael Sterrett gentoo org>
AuthorDate: Thu Dec 17 02:29:27 2015 +
Commit: Michael Sterrett gentoo org>
CommitDate: Thu Dec 17 02:29:45 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33c38278
better deps and make it work with latest eselect-opengl
Package-Manager: portage-2.2.24
games-sports/foobillard/foobillard-3.0a.ebuild | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/games-sports/foobillard/foobillard-3.0a.ebuild
b/games-sports/foobillard/foobillard-3.0a.ebuild
index babc1d8..360aa07 100644
--- a/games-sports/foobillard/foobillard-3.0a.ebuild
+++ b/games-sports/foobillard/foobillard-3.0a.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-inherit eutils autotools games
+inherit eutils flag-o-matic autotools toolchain-funcs games
DESCRIPTION="8ball, 9ball, snooker and carambol game"
HOMEPAGE="http://foobillard.sourceforge.net/";
@@ -19,10 +19,10 @@ DEPEND="x11-libs/libXaw
virtual/opengl
virtual/glu
>=media-libs/freetype-2.0.9
- media-libs/libpng
- sdl? ( media-libs/libsdl )
+ media-libs/libpng:0
+ sdl? ( media-libs/libsdl[video] )
!sdl? ( media-libs/freeglut )"
-RDEPEND="${DEPEND}"
+RDEPEND=${DEPEND}
src_prepare() {
epatch \
@@ -37,6 +37,7 @@ src_prepare() {
}
src_configure() {
+ use video_cards_nvidia && append-ldflags
-L/usr/$(get_libdir)/opengl/nvidia/lib
egamesconf \
--enable-sound \
$(use_enable sdl SDL) \
