| 1 |
commit: 47848d3088963101e51b601a146c656657d1893f |
| 2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 4 13:32:49 2021 +0000 |
| 4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 4 13:37:41 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47848d30 |
| 7 |
|
| 8 |
dev-scheme/gauche-gl: fix build with USE=cg |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/682046 |
| 11 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 12 |
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-scheme/gauche-gl/files/gauche-gl-0.6-cg.patch | 47 +++++++++++++++++++++++ |
| 15 |
dev-scheme/gauche-gl/gauche-gl-0.6.ebuild | 13 ++++++- |
| 16 |
2 files changed, 59 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/dev-scheme/gauche-gl/files/gauche-gl-0.6-cg.patch b/dev-scheme/gauche-gl/files/gauche-gl-0.6-cg.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..3c2b6014a80 |
| 21 |
--- /dev/null |
| 22 |
+++ b/dev-scheme/gauche-gl/files/gauche-gl-0.6-cg.patch |
| 23 |
@@ -0,0 +1,47 @@ |
| 24 |
+--- a/cg/Makefile.in |
| 25 |
++++ b/cg/Makefile.in |
| 26 |
+@@ -17,8 +17,8 @@ |
| 27 |
+ # These are set by configure |
| 28 |
+ # NB: cc and various flags must match the ones used to compile Gauche, |
| 29 |
+ # so the make invocator shouldn't casually override them. |
| 30 |
+-CFLAGS = @DEFS@ @CFLAGS@ @X_CFLAGS@ @GLUT_INCDIR@ -I../src |
| 31 |
+-LDFLAGS = -I../src @LDFLAGS@ |
| 32 |
++CFLAGS = @DEFS@ @CFLAGS@ @X_CFLAGS@ @GLUT_INCDIR@ @CG_CFLAGS@ -I../src |
| 33 |
++LDFLAGS = @LDFLAGS@ |
| 34 |
+ OBJEXT = @OBJEXT@ |
| 35 |
+ SOEXT = @SOEXT@ |
| 36 |
+ OLIBS = @LIBS@ |
| 37 |
+--- a/cg/cg-lib.stub |
| 38 |
++++ b/cg/cg-lib.stub |
| 39 |
+@@ -430,7 +430,6 @@ |
| 40 |
+ ;; |
| 41 |
+ ;; Cg/cg_profiles.h |
| 42 |
+ ;; |
| 43 |
+-(define-enum CG_PROFILE_START) |
| 44 |
+ (define-enum CG_PROFILE_UNKNOWN) |
| 45 |
+ |
| 46 |
+ (define-enum CG_PROFILE_VS_1_1) |
| 47 |
+@@ -443,8 +442,6 @@ |
| 48 |
+ (define-enum CG_PROFILE_PS_2_0) |
| 49 |
+ (define-enum CG_PROFILE_PS_2_X) |
| 50 |
+ |
| 51 |
+-(define-enum CG_PROFILE_MAX) |
| 52 |
+- |
| 53 |
+ ;; |
| 54 |
+ ;; Cg/cg_errors.h |
| 55 |
+ ;; |
| 56 |
+--- a/configure.ac |
| 57 |
++++ b/configure.ac |
| 58 |
+@@ -46,10 +46,11 @@ |
| 59 |
+ AC_HELP_STRING([--enable-cg], [Enable NVidia's Cg binding.]), [ |
| 60 |
+ AC_DEFINE(HAVE_CG, 1) |
| 61 |
+ ENABLE_CG=1 |
| 62 |
+- CG_LIBS="-lCgGL -lCg" |
| 63 |
++ PKG_CHECK_MODULES([CG], [nvidia-cg-toolkit-gl]) |
| 64 |
+ CG_SCM="cg/gl/cg.scm"; |
| 65 |
+ ]) |
| 66 |
+ AC_SUBST(ENABLE_CG) |
| 67 |
++AC_SUBST(CG_CFLAGS) |
| 68 |
+ AC_SUBST(CG_LIBS) |
| 69 |
+ AC_SUBST(CG_SCM) |
| 70 |
+ |
| 71 |
|
| 72 |
diff --git a/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild b/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild |
| 73 |
index fa04d0668da..4e7df252b47 100644 |
| 74 |
--- a/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild |
| 75 |
+++ b/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild |
| 76 |
@@ -3,6 +3,8 @@ |
| 77 |
|
| 78 |
EAPI="7" |
| 79 |
|
| 80 |
+inherit autotools |
| 81 |
+ |
| 82 |
MY_P="${P^g}" |
| 83 |
|
| 84 |
DESCRIPTION="OpenGL binding for Gauche" |
| 85 |
@@ -20,9 +22,18 @@ RDEPEND=">=dev-scheme/gauche-0.9.4 |
| 86 |
x11-libs/libXmu |
| 87 |
cg? ( media-gfx/nvidia-cg-toolkit )" |
| 88 |
DEPEND="${RDEPEND}" |
| 89 |
+BDEPEND="virtual/pkgconfig" |
| 90 |
S="${WORKDIR}/${MY_P}" |
| 91 |
|
| 92 |
-PATCHES=( "${FILESDIR}"/${P}-simple.viewer.patch ) |
| 93 |
+PATCHES=( |
| 94 |
+ "${FILESDIR}"/${P}-simple.viewer.patch |
| 95 |
+ "${FILESDIR}"/${P}-cg.patch |
| 96 |
+) |
| 97 |
+ |
| 98 |
+src_prepare() { |
| 99 |
+ default |
| 100 |
+ eautoreconf |
| 101 |
+} |
| 102 |
|
| 103 |
src_configure() { |
| 104 |
econf $(usex cg --enable-cg "") |
Archives