[gentoo-commits] repo/gentoo:master commit in: dev-scheme/gauche-gl/files/, dev-scheme/gauche-gl/

[gentoo-commits] repo/gentoo:master commit in: dev-scheme/gauche-gl/files/, dev-scheme/gauche-gl/

[Akinori Hattori]

commit:     ba64bc9b46cbf14b40737bcaf623d9a0487b0268
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 30 13:07:49 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 13:07:49 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba64bc9b

dev-scheme/gauche-gl: rename patch

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 ...he-gl-0.6-simple.viewer.diff => gauche-gl-0.6-simple.viewer.patch} | 0
 dev-scheme/gauche-gl/gauche-gl-0.6.ebuild                             | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-scheme/gauche-gl/files/gauche-gl-0.6-simple.viewer.diff b/dev-scheme/gauche-gl/files/gauche-gl-0.6-simple.viewer.patch
similarity index 100%
rename from dev-scheme/gauche-gl/files/gauche-gl-0.6-simple.viewer.diff
rename to dev-scheme/gauche-gl/files/gauche-gl-0.6-simple.viewer.patch

diff --git a/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild b/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild
index c8308043af5..ab4d26ce0bd 100644
--- a/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild
+++ b/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-simple.viewer.diff
+	epatch "${FILESDIR}"/${P}-simple.viewer.patch
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: dev-scheme/gauche-gl/files/, dev-scheme/gauche-gl/

[Akinori Hattori]

commit:     47848d3088963101e51b601a146c656657d1893f
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  4 13:32:49 2021 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Mon Oct  4 13:37:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47848d30

dev-scheme/gauche-gl: fix build with USE=cg

Closes: https://bugs.gentoo.org/682046
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 dev-scheme/gauche-gl/files/gauche-gl-0.6-cg.patch | 47 +++++++++++++++++++++++
 dev-scheme/gauche-gl/gauche-gl-0.6.ebuild         | 13 ++++++-
 2 files changed, 59 insertions(+), 1 deletion(-)

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
new file mode 100644
index 00000000000..3c2b6014a80
--- /dev/null
+++ b/dev-scheme/gauche-gl/files/gauche-gl-0.6-cg.patch
@@ -0,0 +1,47 @@
+--- a/cg/Makefile.in
++++ b/cg/Makefile.in
+@@ -17,8 +17,8 @@
+ # These are set by configure
+ # NB: cc and various flags must match the ones used to compile Gauche,
+ # so the make invocator shouldn't casually override them.
+-CFLAGS   = @DEFS@ @CFLAGS@ @X_CFLAGS@ @GLUT_INCDIR@ -I../src
+-LDFLAGS  = -I../src @LDFLAGS@ 
++CFLAGS   = @DEFS@ @CFLAGS@ @X_CFLAGS@ @GLUT_INCDIR@ @CG_CFLAGS@ -I../src
++LDFLAGS  = @LDFLAGS@
+ OBJEXT   = @OBJEXT@
+ SOEXT    = @SOEXT@
+ OLIBS    = @LIBS@
+--- a/cg/cg-lib.stub
++++ b/cg/cg-lib.stub
+@@ -430,7 +430,6 @@
+ ;;
+ ;; Cg/cg_profiles.h
+ ;;
+-(define-enum CG_PROFILE_START)
+ (define-enum CG_PROFILE_UNKNOWN)
+ 
+ (define-enum CG_PROFILE_VS_1_1)
+@@ -443,8 +442,6 @@
+ (define-enum CG_PROFILE_PS_2_0)
+ (define-enum CG_PROFILE_PS_2_X)
+ 
+-(define-enum CG_PROFILE_MAX)
+-
+ ;;
+ ;; Cg/cg_errors.h
+ ;;
+--- a/configure.ac
++++ b/configure.ac
+@@ -46,10 +46,11 @@
+    AC_HELP_STRING([--enable-cg], [Enable NVidia's Cg binding.]), [
+    AC_DEFINE(HAVE_CG, 1)
+    ENABLE_CG=1
+-   CG_LIBS="-lCgGL -lCg"
++   PKG_CHECK_MODULES([CG], [nvidia-cg-toolkit-gl])
+    CG_SCM="cg/gl/cg.scm";
+ ])
+ AC_SUBST(ENABLE_CG)
++AC_SUBST(CG_CFLAGS)
+ AC_SUBST(CG_LIBS)
+ AC_SUBST(CG_SCM)
+ 

diff --git a/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild b/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild
index fa04d0668da..4e7df252b47 100644
--- a/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild
+++ b/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild
@@ -3,6 +3,8 @@
 
 EAPI="7"
 
+inherit autotools
+
 MY_P="${P^g}"
 
 DESCRIPTION="OpenGL binding for Gauche"
@@ -20,9 +22,18 @@ RDEPEND=">=dev-scheme/gauche-0.9.4
 	x11-libs/libXmu
 	cg? ( media-gfx/nvidia-cg-toolkit )"
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}"/${P}-simple.viewer.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-simple.viewer.patch
+	"${FILESDIR}"/${P}-cg.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
 	econf $(usex cg --enable-cg "")