diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-08 14:01:34 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-08 14:01:34 +0100 |
commit | 4645b6f17f0da81e9fe84081fb126a37102ba153 (patch) | |
tree | e6c48cf3db2213af38cf528a5364fffd5c74c6d6 /games-sports | |
parent | ebce8994fe3cc4ca9fbc96ca837cb4c4e98adcbd (diff) |
gentoo resync : 08.05.2018
Diffstat (limited to 'games-sports')
-rw-r--r-- | games-sports/Manifest.gz | bin | 2733 -> 2732 bytes | |||
-rw-r--r-- | games-sports/foobillard/Manifest | 7 | ||||
-rw-r--r-- | games-sports/foobillard/files/foobillard-3.0a-as-needed.patch | 4 | ||||
-rw-r--r-- | games-sports/foobillard/files/foobillard-3.0a-fbsd.patch | 4 | ||||
-rw-r--r-- | games-sports/foobillard/files/foobillard-3.0a-freetype_pkgconfig.patch | 35 | ||||
-rw-r--r-- | games-sports/foobillard/foobillard-3.0a-r1.ebuild | 8 |
6 files changed, 48 insertions, 10 deletions
diff --git a/games-sports/Manifest.gz b/games-sports/Manifest.gz Binary files differindex f2d18e1d665b..2f146df5c2cc 100644 --- a/games-sports/Manifest.gz +++ b/games-sports/Manifest.gz diff --git a/games-sports/foobillard/Manifest b/games-sports/foobillard/Manifest index fbdc5590e1b6..5d4851f8fc76 100644 --- a/games-sports/foobillard/Manifest +++ b/games-sports/foobillard/Manifest @@ -1,7 +1,8 @@ -AUX foobillard-3.0a-as-needed.patch 799 BLAKE2B a19ccb8eef750a11a98a9a2744ceda0c2fd4a4ab3260ec9d88ba082d86d16550cd58ac6c3894de69932a32229edbaeb71135a6a5764af90de0be79646dc32af9 SHA512 91f003cbc8c6f3ce61b4eff79a7d70200374f17aa8a0c45a8f5fecdd56a4f7b58170ca28c92bf729625dcf819c413fe854f0550eef516339d5c712b4bf5bbe3c -AUX foobillard-3.0a-fbsd.patch 930 BLAKE2B a89503f0f5e7a46d0b5672ff12c7102303ba58b64c0607020c936611e294dd63a5e087e05dad86f2cd43b2d5834aef723ed29704b9de0cba007103e07163d63e SHA512 c0fb2ace1c5e89be8642b0ece28eacf1ace516c59c52f6bd4dfc68701528f71f1830facc9889a50444eb4c799bd57dcbcc6345932c35070aee037453f36b0943 +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 DIST foobillard-3.0a.tar.gz 1138477 BLAKE2B 8abb068ec9deacff9748e199782699fe3df70a4e787ece2e8247086ed35f6260b6389fb8fb3f17ebf815f167b7c3a672740de889537e025160614a67bc734c87 SHA512 6ff85255384a83cb147a9682beefa021658ba34ad00ed7879bf7887fff248d41aeb34d2dbe39148ee10bffc53091ea5f168b4afeddac9b50d577bad7799d59b2 -EBUILD foobillard-3.0a-r1.ebuild 1207 BLAKE2B d616ecc81cbe74727ae4bcbcdcb5423fa28225fbffbab62e21b138ba0f07041def70f5e5e4d7396679ae359ed716b863db196945d50b5a3fb85ed7a7bf8ff604 SHA512 bf537f13f0ef89b2c0bd9f7bc9f4e6021a54d633a83790bfb040e1b470d938423399b4ffd051c60b6f6a8e6e021521b79641eb359c17c10a6144c96cceb2406c +EBUILD foobillard-3.0a-r1.ebuild 1282 BLAKE2B 125999fc2a626644909d9cba1bb313d71d874ff45f15a17ab25cda6b55c217dfd2a600274ba13c44d4a0c8af36c1f65afb8f8fcea97e80636ad5544d99c3119d SHA512 7f50aafc8d71d5721cd9af80f30c897f9c247ade556a2cee553e7945e5b26034fdc9a7518f86041e86f665541a3e89241a1ebd6206b9ee0833f59abf9d7f3541 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 1d9ddbd8b729..272f9c711778 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 301260cb8360..3b7fc953a4de 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 000000000000..b01c53ecbc8b --- /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 02844b26cb97..4847f1d1ffcd 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/libXaw +RDEPEND="x11-libs/libXaw x11-libs/libXi virtual/opengl virtual/glu @@ -22,16 +22,18 @@ DEPEND="x11-libs/libXaw sdl? ( media-libs/libsdl[video] ) !sdl? ( media-libs/freeglut ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + virtual/pkgconfig" 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} + mv configure.{in,ac} || die rm aclocal.m4 eautoreconf |