summaryrefslogtreecommitdiff
path: root/games-sports/foobillard
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-04-28 20:21:43 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-04-28 20:21:43 +0100
commit40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree758c221bad35c9288d0bd6df9c7dfc226728e52c /games-sports/foobillard
parent8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
gentoo resync : 28.04.2021
Diffstat (limited to 'games-sports/foobillard')
-rw-r--r--games-sports/foobillard/Manifest12
-rw-r--r--games-sports/foobillard/files/foobillard-3.0a-as-needed.patch8
-rw-r--r--games-sports/foobillard/files/foobillard-3.0a-fbsd.patch12
-rw-r--r--games-sports/foobillard/files/foobillard-3.0a-freetype_pkgconfig.patch14
-rw-r--r--games-sports/foobillard/files/foobillard-3.0a-gl-clamp.patch5
-rw-r--r--games-sports/foobillard/files/foobillard-3.0a-no_nvidia.patch4
-rw-r--r--games-sports/foobillard/foobillard-3.0a-r1.ebuild26
7 files changed, 41 insertions, 40 deletions
diff --git a/games-sports/foobillard/Manifest b/games-sports/foobillard/Manifest
index 78c0464378d4..5f56f0448c34 100644
--- a/games-sports/foobillard/Manifest
+++ b/games-sports/foobillard/Manifest
@@ -1,8 +1,8 @@
-AUX foobillard-3.0a-as-needed.patch 809 BLAKE2B 413b55b273f0f52ff877b926a2e92952559e9ad10bdbac84baef63f957873a5ba007a1429c21a60b0df5117761a931a9b2ecb8b608b47a2a35d51b9fc9b1cbc7 SHA512 331c225bccac11daa57deafee373b3b44ab0ce5dfb3299be331c287ebf04bdcda99be1a72103cac2c65610d0dc8371a3b081bcb3ec0ad95ab146fb2ea5ad30cd
-AUX foobillard-3.0a-fbsd.patch 908 BLAKE2B 59c80d913f6e37c586a6f9d3fc88e60d286c92e208243d39d5d94c0b80c8652e15c02893afa0eaf01e6b69872999569df5c63d4db18471091cbcaa5d9fe852af SHA512 30c96452301ce60b9c42e8816a153724b05edb099e682a3ebaec776accd2e998bc059c2f6993c65a70972aa309b11b73121ff1fe10fe22229b934b21063ae835
-AUX foobillard-3.0a-freetype_pkgconfig.patch 1525 BLAKE2B 9922d7d44e8cd11c46e5007fbf8a85e3ca648699f9410173bf90bd808bc59108053da445bc6f14e86548d0bf66481c2884382c11713b900fbff9ae832eb6fb1a SHA512 6d310cc911e7729a1b0b4a575c83be91924eec994dc254d75cfad764549a47479ed8abb56131543deace6d7f440d210f036dc5263b1b8e8d9dbbb98f6a1cc594
-AUX foobillard-3.0a-gl-clamp.patch 841 BLAKE2B a5a8715e41dbd5426253f2ce2b60724ac7700c6617ad821354ce4821ef7af0d2ce6efd75f34aa7960dd4af5ba9ee5108776329a0eb23074952d710ead194ee45 SHA512 3be3c896f9e789d35236b630e7a587d53112abbfc70e0b5cb32bad1f2b5f0692ed804e14ed7d1f84db89cdb8c34eaccc09801fd5a450efee9d741eb59bd3a3e1
-AUX foobillard-3.0a-no_nvidia.patch 774 BLAKE2B 26cee332da6fefab8dd44cdd74fc392bac04fab70415bfa0b529f5f6e86abea7273aec6be9ba1bed9720d6069a77b12f36f40808a447d547dcfaf4105960890b SHA512 d24dd67aff4b69f9776613ac06289c75feded056f7aadc40b47a25dbaf6518d0e6a1d2d38e33004cea6c3f57ffb6716631ce3d1ead28a40b4de1791f18adc023
+AUX foobillard-3.0a-as-needed.patch 711 BLAKE2B ffe0b9762057bc928432d7e1e4307da050edf45d772fc87b1d2220b81a19cb3dcb3c20670ddc363fdceeda00c3427bfe51568236cc608574cbfde38fbac8d7c6 SHA512 365021ac777f989d3b2222728189448dd1d4917b6ad5417079433aff31c6b50a19c756c2812b5d2815cd0894994cdb5b15ef76b012848f3a667071b35abc0e1a
+AUX foobillard-3.0a-fbsd.patch 631 BLAKE2B a4ef4672eb7f415b125b4e5588891fbe947f5ce39697db048acbdd826130908530bc71f14159acdde6787ad859e12e6df35b595440cf4e314a74e10006f6f7e2 SHA512 e1e590c901964752bafc050a03b3b2d2f80bf09967f2fddc8404f2e24ec15e115918d018f64f17b9b1972b33542740f603ef99368ad60c60bd574ec352678346
+AUX foobillard-3.0a-freetype_pkgconfig.patch 1478 BLAKE2B cbeacfbafc656f530e986836752b5b97033d1da50a4f90d2cf80d8010bfef2f3b84afbc59dbe74febb2c249d1e5ac6491f801d00bf08544f399ab894997b0286 SHA512 16cf93b98fad501951dfab6ff6b429b21bce215f37f083ca645d555124fdf7c2fef2b8deec705d0254142248a2f2cda6705d3b58e76b2f73ad121ffc55f3645a
+AUX foobillard-3.0a-gl-clamp.patch 660 BLAKE2B 6062b1bbc2b5909ca94f09b901a2b4298678925ef38813ba8598a1f8e744c6170d87f39ae338135684bd6a139fa1c96de0d3eb141514212f30bcf207f6c4e237 SHA512 5eb0e7e357df8a0617274cdcd3795fa24d4fd13442ea52ab1b38e639cea1a348fd89f69840d28df4c89fe3e22003a6f79fcad7b486bf9640de572d8d518603b2
+AUX foobillard-3.0a-no_nvidia.patch 697 BLAKE2B 72f8eee1cb830fe0ce94573de236f1433efef4e379f70ab398f8f8a9feb3c53eaa6163374d82d1dcba91ef10445d0db5687a899b8bf4ef5fe0903c3ae1028335 SHA512 2f769a1000b617d07756bec33355bd95c23f492ec4e6dd02244f1812509f3794c64f1fe2a714233517bb87519f005cd98e674633c31b09c6c0a79a93d71f8d40
DIST foobillard-3.0a.tar.gz 1138477 BLAKE2B 8abb068ec9deacff9748e199782699fe3df70a4e787ece2e8247086ed35f6260b6389fb8fb3f17ebf815f167b7c3a672740de889537e025160614a67bc734c87 SHA512 6ff85255384a83cb147a9682beefa021658ba34ad00ed7879bf7887fff248d41aeb34d2dbe39148ee10bffc53091ea5f168b4afeddac9b50d577bad7799d59b2
-EBUILD foobillard-3.0a-r1.ebuild 1269 BLAKE2B b86ac34c91642e6547535273def1e734c7c724952d4d68c44122752d23e24d33e58291a03da4b8fe8aaa0442cca1925c9239dacd4cf4176d77dacb565281988d SHA512 5a9d69f057fd93630298b4a1a3df5b556c58cf16b5dd68fbd3fef13342322d3f595cf0f0a0acf3be6b93071c8076da36f1e25138189ed02c44f125956986329a
+EBUILD foobillard-3.0a-r1.ebuild 1293 BLAKE2B 56795ae9517d1949b4123643820fae9ea81df9a16d07bfd401fd18207d6f6a334d7e2963d6c1aa28aa02608ef6a75e7fb976710fe3903eb19dcf5626432b5222 SHA512 279893b1d834fad4a5732914252279f60618cce6f71fa263488186b2c4bbce506fa13542256bee5a0eb60cb02560b6fdef8e9a3a00c84cbe6bbc72cb4b80894b
MISC metadata.xml 333 BLAKE2B 0734c0d7cb2cc15deca03ad77aa234c2ede6c95baddca35dd5c07adb2fdf0229f526e664a7b22036257ed16fd86669ab65e6fca819a839f16a698dac90a3739b SHA512 0dd5f539d8dbd30c937ca6a8b67ad9c2d2b62627a0629dffb04b95673635f44f54b99773b0f938ba24b3aec19aa858c5458e9abb121230d9fa7e3652318a9689
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 272f9c711778..cb3f4236b719 100644
--- a/games-sports/foobillard/files/foobillard-3.0a-as-needed.patch
+++ b/games-sports/foobillard/files/foobillard-3.0a-as-needed.patch
@@ -1,10 +1,10 @@
---- foobillard-3.0a.old/src/Makefile.am 2004-02-25 07:23:56.000000000 +0100
-+++ foobillard-3.0a/src/Makefile.am 2008-12-06 21:57:03.000000000 +0100
+--- a/src/Makefile.am
++++ b/src/Makefile.am
@@ -83,6 +83,5 @@ AM_CFLAGS = -Wall `freetype-config --cfl
#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} `pkg-config --libs freetype2` ${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} `pkg-config --libs freetype2` ${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 3b7fc953a4de..08fa262f415f 100644
--- a/games-sports/foobillard/files/foobillard-3.0a-fbsd.patch
+++ b/games-sports/foobillard/files/foobillard-3.0a-fbsd.patch
@@ -1,7 +1,5 @@
-Index: foobillard-3.0a/configure.in
-===================================================================
---- foobillard-3.0a.orig/configure.in
-+++ foobillard-3.0a/configure.in
+--- a/configure.in
++++ b/configure.in
@@ -13,7 +13,7 @@ dnl Checks for libraries.
dnl Checks for header files.
@@ -11,10 +9,8 @@ Index: foobillard-3.0a/configure.in
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
-Index: foobillard-3.0a/src/billard3d.c
-===================================================================
---- foobillard-3.0a.orig/src/billard3d.c
-+++ foobillard-3.0a/src/billard3d.c
+--- a/src/billard3d.c
++++ b/src/billard3d.c
@@ -24,7 +24,11 @@
#include <string.h>
#include <math.h>
diff --git a/games-sports/foobillard/files/foobillard-3.0a-freetype_pkgconfig.patch b/games-sports/foobillard/files/foobillard-3.0a-freetype_pkgconfig.patch
index b01c53ecbc8b..2fc284580aad 100644
--- a/games-sports/foobillard/files/foobillard-3.0a-freetype_pkgconfig.patch
+++ b/games-sports/foobillard/files/foobillard-3.0a-freetype_pkgconfig.patch
@@ -1,5 +1,5 @@
---- foobillard-3.0a/configure.in
-+++ foobillard-3.0a/configure.in
+--- a/configure.in
++++ b/configure.in
@@ -13,7 +13,7 @@
dnl Checks for header files.
@@ -9,14 +9,14 @@
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
---- foobillard-3.0a/src/Makefile.am
-+++ foobillard-3.0a/src/Makefile.am
+--- a/src/Makefile.am
++++ b/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`
++#CFLAGS = -Wall -O3 -I$(INCDIR) `${PKG_CONFIG} --cflags freetype2`
if USE_SDL
SDL_CFLAGS = `sdl-config --cflags` -DUSE_SDL
SDL_LIBS = `sdl-config --libs`
@@ -25,11 +25,11 @@
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}
++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}
++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/files/foobillard-3.0a-gl-clamp.patch b/games-sports/foobillard/files/foobillard-3.0a-gl-clamp.patch
index 972d14cabb0a..3d185e8d2776 100644
--- a/games-sports/foobillard/files/foobillard-3.0a-gl-clamp.patch
+++ b/games-sports/foobillard/files/foobillard-3.0a-gl-clamp.patch
@@ -1,6 +1,5 @@
-diff -ur foobillard-3.0a/src/table.c foobillard-3.0a-glclamp/src/table.c
---- foobillard-3.0a/src/table.c 2004-01-11 21:53:02.000000000 +0000
-+++ foobillard-3.0a-glclamp/src/table.c 2011-02-21 09:14:36.000000000 +0000
+--- a/src/table.c
++++ b/src/table.c
@@ -1214,8 +1214,8 @@
GL_UNSIGNED_BYTE, tabletexdata);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, options_tex_min_filter);
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 8a9a33c43ea4..82e80cef0b7f 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 @@
---- a/src/ball.c.orig 2004-06-02 07:00:57.000000000 -0400
-+++ b/src/ball.c 2004-06-02 07:03:52.000000000 -0400
+--- a/src/ball.c
++++ b/src/ball.c
@@ -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
index 1e0053bfc696..365d327eec0c 100644
--- a/games-sports/foobillard/foobillard-3.0a-r1.ebuild
+++ b/games-sports/foobillard/foobillard-3.0a-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+
inherit autotools desktop flag-o-matic toolchain-funcs
DESCRIPTION="8ball, 9ball, snooker and carambol game"
@@ -22,20 +23,25 @@ RDEPEND="x11-libs/libXaw
sdl? ( media-libs/libsdl[video] )
!sdl? ( media-libs/freeglut )
"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-no_nvidia.patch
+ "${FILESDIR}"/${P}-freetype_pkgconfig.patch
+ "${FILESDIR}"/${P}-fbsd.patch
+ "${FILESDIR}"/${P}-as-needed.patch
+ "${FILESDIR}"/${P}-gl-clamp.patch
+)
src_prepare() {
default
- eapply \
- "${FILESDIR}"/${P}-no_nvidia.patch \
- "${FILESDIR}"/${P}-freetype_pkgconfig.patch \
- "${FILESDIR}"/${P}-fbsd.patch \
- "${FILESDIR}"/${P}-as-needed.patch \
- "${FILESDIR}"/${P}-gl-clamp.patch
+
mv configure.{in,ac} || die
rm aclocal.m4
+ tc-export PKG_CONFIG
+
eautoreconf
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 22:50:18 +0000