Gentoo Archives: gentoo-commits

From: "Andreas Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-perl/OpenGL/files/, dev-perl/OpenGL/
Date: Sat, 24 Dec 2016 20:10:53
Message-Id: 1482610216.099664a9d810f22a31bc7d99232837397c6b129f.dilfridge@gentoo
1 commit: 099664a9d810f22a31bc7d99232837397c6b129f
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 24 20:09:50 2016 +0000
4 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 24 20:10:16 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=099664a9
7
8 dev-perl/OpenGL: Version bump
9
10 Package-Manager: portage-2.3.3
11
12 dev-perl/OpenGL/Manifest | 1 +
13 dev-perl/OpenGL/OpenGL-0.700.0.ebuild | 51 +++++++++++
14 .../OpenGL/files/OpenGL-0.700.0-no-display.patch | 99 ++++++++++++++++++++++
15 3 files changed, 151 insertions(+)
16
17 diff --git a/dev-perl/OpenGL/Manifest b/dev-perl/OpenGL/Manifest
18 index 8d55859..93d2a78 100644
19 --- a/dev-perl/OpenGL/Manifest
20 +++ b/dev-perl/OpenGL/Manifest
21 @@ -1 +1,2 @@
22 DIST OpenGL-0.6704.tar.gz 623036 SHA256 36f266e31d617fa9a1bd8928a7dc3b7c40c1bbbfa64bddefe22300ac2bc6c436 SHA512 3a2c9970802242ebae58256cd80dc81ac04a2af974105d3fbdf4dfcf1aa64a769b1ffcb5b0156eceb6bf7aed6eb6b2eb9332ec9f4724b0a1bc61d15f0de99d09 WHIRLPOOL f6cb34b30c7ef2af0d2dc16ab4b5d9f7216f2ab08c0bf904305f358fec751492fe605bdb783d6ebb9dcdb83fa3601f831e9162fe4bc0d33a68cbafa7c289b86c
23 +DIST OpenGL-0.70.tar.gz 783810 SHA256 b20e2af4404b4901ab35bba6ad5e3a8aa60bff72413c99288f01018c4cf874e0 SHA512 7d418015b2553dd69805252b5957bc97013260617d5a358f692e29b8da884590421c81fbc71d4dd678c93a5c89047d6af8c32f15bf0bd0e4ce514c200e634af5 WHIRLPOOL 39094d8124f46f45595a01467ac40becdf33090a254475bb32810ea791952a7829fc6fcddc9f685ee8683f87604b81d29ab2fe21821fb9c8de8d4a6fe85470cf
24
25 diff --git a/dev-perl/OpenGL/OpenGL-0.700.0.ebuild b/dev-perl/OpenGL/OpenGL-0.700.0.ebuild
26 new file mode 100644
27 index 00000000..df2063f
28 --- /dev/null
29 +++ b/dev-perl/OpenGL/OpenGL-0.700.0.ebuild
30 @@ -0,0 +1,51 @@
31 +# Copyright 1999-2016 Gentoo Foundation
32 +# Distributed under the terms of the GNU General Public License v2
33 +# $Id$
34 +
35 +EAPI=6
36 +
37 +DIST_AUTHOR=CHM
38 +DIST_VERSION=0.70
39 +
40 +inherit perl-module eutils
41 +
42 +DESCRIPTION="Perl interface providing graphics display using OpenGL"
43 +
44 +SLOT="0"
45 +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
46 +IUSE="examples"
47 +
48 +RDEPEND="
49 + media-libs/freeglut:0=
50 + x11-libs/libICE:0=
51 + x11-libs/libXext:0=
52 + x11-libs/libXi:0=
53 + x11-libs/libXmu:0="
54 +DEPEND="${RDEPEND}"
55 +
56 +mydoc="Release_Notes"
57 +
58 +src_prepare() {
59 + eapply "${FILESDIR}"/${P}-no-display.patch
60 + # This should be merely moved to t/ as it gets
61 + # installed to OS otherwise.
62 + # But it presently fails tests, and can't be made not to.
63 + # ( And will need virtualx when it can )
64 + # Something to do with OpenGL implementation ala eselect.
65 + perl_rm_files "test.pl";
66 + perl-module_src_prepare
67 +}
68 +
69 +src_compile() {
70 + sed -i -e 's/PERL_DL_NONLAZY=1//' Makefile || die
71 + perl-module_src_compile
72 +}
73 +
74 +src_install() {
75 + perl-module_src_install
76 + if use examples; then
77 + docompress -x /usr/share/doc/${PF}/examples
78 + insinto /usr/share/doc/${PF}/examples
79 + doins -r examples/*
80 + fi
81 +}
82
83 diff --git a/dev-perl/OpenGL/files/OpenGL-0.700.0-no-display.patch b/dev-perl/OpenGL/files/OpenGL-0.700.0-no-display.patch
84 new file mode 100644
85 index 00000000..e351c3f
86 --- /dev/null
87 +++ b/dev-perl/OpenGL/files/OpenGL-0.700.0-no-display.patch
88 @@ -0,0 +1,99 @@
89 +diff -urN OpenGL-0.70.orig/Makefile.PL OpenGL-0.70/Makefile.PL
90 +--- OpenGL-0.70.orig/Makefile.PL 2016-10-08 21:11:14.000000000 +0200
91 ++++ OpenGL-0.70/Makefile.PL 2016-12-24 21:08:08.674243142 +0100
92 +@@ -601,9 +601,9 @@
93 + {
94 + FILES =>
95 + "Config.pm ".
96 +- "utils/glversion.txt ".
97 +- "utils/glversion$Config{exe_ext} ".
98 +- "utils/glversion$Config{obj_ext}"
99 ++ "utils/glversion.txt "
100 ++ #"utils/glversion$Config{exe_ext} ".
101 ++ #"utils/glversion$Config{obj_ext}"
102 + }
103 + };
104 +
105 +@@ -824,65 +824,6 @@
106 + print "GLUT not found\n";
107 + }
108 +
109 +- # Platform-specific makefiles for glversion
110 +- my $make_ver;
111 +- if ($IS_STRAWBERRY)
112 +- {
113 +- $make_ver = "&strawberry.bat";
114 +- print "strawberry glversion: '$make_ver'\n" if $verbose>1;
115 +- }
116 +- elsif ($IS_MINGW)
117 +- {
118 +- $make_ver = "&mingw.bat";
119 +- print "mingw glversion: '$make_ver'\n" if $verbose>1;
120 +- }
121 +- elsif ($IS_W32API)
122 +- {
123 +- $make_ver = ";make -f Makefile.cygwin " . (length($lib) ? "GLUT_LIB=$lib " : "") . (length($def) ? "GLUT_DEF=$def " : "");
124 +- print "cygwin glversion: '$make_ver'\n" if $verbose>1;
125 +- }
126 +- elsif ($^O eq 'MSWin32')
127 +- {
128 +- $make_ver = '&nmake -f makefile.mak ' . (length($def) ? "GLUT_DEF=$def " : "");
129 +- print "MSWin32 glversion: '$make_ver'\n" if $verbose>1;
130 +- }
131 +- elsif ($^O eq 'darwin')
132 +- {
133 +- $make_ver = ";make -f Makefile.macosx " . (length($lib) ? "GLUT_LIB=$lib " : "") . (length($def) ? "GLUT_DEF=$def " : "");
134 +- print "MacOSX glversion: '$make_ver'\n" if $verbose>1;
135 +- }
136 +- else
137 +- {
138 +- if ($ENV{TERM} ne 'xterm')
139 +- {
140 +- print "\nIn order to test your GPU's capabilities, run this make under an X11 shell\n\n";
141 +- }
142 +-
143 +- $make_ver = ";make -f Makefile " . (length($lib) ? "GLUT_LIB=$lib " : "") . (length($def) ? "GLUT_DEF=$def " : "");
144 +- print "glversion: '$make_ver'\n" if $verbose>1;
145 +- }
146 +- my $exec = 'cd utils'."$make_ver clean".$make_ver;
147 +- print "glversion: $exec\n" if ($verbose);
148 +- my $stat = `$exec`;
149 +- print "\n$stat\n\n" if ($verbose);
150 +- unlink "utils/freeglut.dll" or die "could not remove temporary freeglut: $!" if -f "utils/freeglut.dll";
151 +-
152 +- # Parse glversion.txt file
153 +- open GLDATA, $glv_file or die "get_extensions: could not open $glv_file: $!\n";
154 +- my $gldata = {};
155 +- my @gldata = <GLDATA>;
156 +- close(GLDATA);
157 +-
158 +- foreach my $line (@gldata)
159 +- {
160 +- $line =~ s|[\r\n]+||;
161 +- my($key,$val) = split('=',$line);
162 +- $gldata->{$key} = $val;
163 +- }
164 +- die "get_extensions: no extensions found in $glv_file\n" if !keys %$gldata;
165 +-
166 +- print "This looks like OpenGL Version: $gldata->{VERSION}\n";
167 +-
168 + # Parse glext_procs.h file
169 + open GLEXT, "glext_procs.h" or die "get_extensions: could not open glext_procs.h: $!\n";
170 + my @lines = <GLEXT>;
171 +@@ -896,14 +837,11 @@
172 + next if ($ext =~ m|^GL_VERSION_|);
173 + $no_ext->{$ext}++;
174 + }
175 +-
176 ++ use Config;
177 ++ my $gldata = { };
178 +
179 + # Create gl_exclude.h
180 + die "Unable to write to $exc_file\n" if (!open(GLEXC,">$exc_file"));
181 +- print GLEXC "// OpenGL Extension Exclusions - may be modified before building.\n";
182 +- print GLEXC "//\n";
183 +- print GLEXC "// Generated for ".$gldata->{VENDOR}.", ".$gldata->{RENDERER}."\n";
184 +- print GLEXC "// OpenGL v".$gldata->{VERSION}.", using ";
185 +
186 + # Fix GLUT flags based on results
187 + if ($gldata->{FREEGLUT})