commit: dd9e2f8cdfd87946c1a373357e4aaaa5c5375aed Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Mon May 7 08:54:17 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Mon May 7 08:54:57 2018 +0000 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 00000000000..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/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
