forked from perl/perl-OpenGL
Accepting request 340577 from home:bmwiedemann:branches:devel:languages:perl
update to latest upstream and fix Factory build+test - update to 0.6704 - add 0001-Don-t-check-current-display-for-extensions.patch OpenGL-0.6704-Prefer-system-GL-gl.h-on-non-Win32.patch OpenGL-0.6704-Delete-functions-removed-from-Mesa.patch OBS-URL: https://build.opensuse.org/request/show/340577 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-OpenGL?expand=0&rev=3
This commit is contained in:
Stephan Kulow
committed by
Git OBS Bridge
Git OBS Bridge
parent
952867db75
commit
978e0ae981
62
0001-Don-t-check-current-display-for-extensions.patch
Normal file
62
0001-Don-t-check-current-display-for-extensions.patch
Normal file
@@ -0,0 +1,62 @@
|
||||
From d5b18e9c0986de75a905897205afa2b670b2dec9 Mon Sep 17 00:00:00 2001
|
||||
From: Lubomir Rintel <lkundrak@v3.sk>
|
||||
Date: Mon, 28 Oct 2013 08:53:54 +0100
|
||||
Subject: [PATCH] Don't check current display for extensions
|
||||
|
||||
Build all.
|
||||
---
|
||||
Makefile.PL | 13 +++++++++----
|
||||
1 file changed, 9 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/Makefile.PL b/Makefile.PL
|
||||
index efc21c3..200842b 100644
|
||||
--- a/Makefile.PL
|
||||
+++ b/Makefile.PL
|
||||
@@ -596,9 +596,9 @@ my $build_config =
|
||||
{
|
||||
FILES =>
|
||||
"Config.pm ".
|
||||
- "utils/glversion.txt ".
|
||||
- "utils/glversion$Config{exe_ext} ".
|
||||
- "utils/glversion$Config{obj_ext}"
|
||||
+ "utils/glversion.txt "
|
||||
+ #"utils/glversion$Config{exe_ext} ".
|
||||
+ #"utils/glversion$Config{obj_ext}"
|
||||
}
|
||||
};
|
||||
|
||||
@@ -814,6 +814,7 @@ sub get_extensions
|
||||
print "GLUT not found\n";
|
||||
}
|
||||
|
||||
+=cut
|
||||
# Platform-specific makefiles for glversion
|
||||
my $make_ver;
|
||||
if ($IS_STRAWBERRY)
|
||||
@@ -876,7 +877,9 @@ sub get_extensions
|
||||
print "get_extensions: no extensions found in $glv_file\n" if $verbose;
|
||||
return '';
|
||||
}
|
||||
-
|
||||
+=cut
|
||||
+ use Config;
|
||||
+ my $gldata = { };
|
||||
|
||||
# Parse glext_procs.h file
|
||||
return '' if (!open(GLEXT,"glext_procs.h"));
|
||||
@@ -895,10 +898,12 @@ sub get_extensions
|
||||
|
||||
# Create gl_exclude.h
|
||||
die "Unable to write to $exc_file\n" if (!open(GLEXC,">$exc_file"));
|
||||
+=cut
|
||||
print GLEXC "// OpenGL Extension Exclusions - may be modified before building.\n";
|
||||
print GLEXC "//\n";
|
||||
print GLEXC "// Generated for ".$gldata->{VENDOR}.", ".$gldata->{RENDERER}."\n";
|
||||
print GLEXC "// OpenGL v".$gldata->{VERSION}.", using ";
|
||||
+=cut
|
||||
|
||||
# Fix GLUT flags based on results
|
||||
if ($gldata->{GLUT} > 0)
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:30f11267707517c63b6a1e9e9f36fd4338479311760f9d8ea5ccd40d62bbbe35
|
||||
size 657804
|
||||
95
OpenGL-0.6704-Delete-functions-removed-from-Mesa.patch
Normal file
95
OpenGL-0.6704-Delete-functions-removed-from-Mesa.patch
Normal file
@@ -0,0 +1,95 @@
|
||||
From e83b9048c43cbcbdaeb287dd571ab7e277e19979 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||||
Date: Mon, 8 Jun 2015 17:06:52 +0200
|
||||
Subject: [PATCH] Delete functions removed from Mesa
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
mesa-libGL between 10.6.0-0.devel.5.51e3453 and
|
||||
10.6.0-0.devel.6.5a55f68 removed these functions:
|
||||
|
||||
glWindowPos4dMESA
|
||||
glWindowPos4iMESA
|
||||
glWindowPos3iMESA
|
||||
glWindowPos2dMESA
|
||||
glWindowPos2iMESA
|
||||
glWindowPos3dMESA
|
||||
glResizeBuffersMESA
|
||||
|
||||
<https://bugzilla.redhat.com/show_bug.cgi?id=1224738>
|
||||
<https://bugzilla.redhat.com/show_bug.cgi?id=1224294>
|
||||
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
pogl_gl_Vert_Multi.xs | 54 ---------------------------------------------------
|
||||
1 file changed, 54 deletions(-)
|
||||
|
||||
diff --git a/pogl_gl_Vert_Multi.xs b/pogl_gl_Vert_Multi.xs
|
||||
index e360e5c..4e8a010 100644
|
||||
--- a/pogl_gl_Vert_Multi.xs
|
||||
+++ b/pogl_gl_Vert_Multi.xs
|
||||
@@ -359,60 +359,6 @@ glEdgeFlagPointerEXT_oga(oga)
|
||||
#endif
|
||||
|
||||
|
||||
-#ifdef GL_MESA_window_pos
|
||||
-
|
||||
-#// glWindowPos2iMESA($x, $y);
|
||||
-void
|
||||
-glWindowPos2iMESA(x, y)
|
||||
- GLint x
|
||||
- GLint y
|
||||
-
|
||||
-#// glWindowPos2dMESA($x, $y);
|
||||
-void
|
||||
-glWindowPos2dMESA(x, y)
|
||||
- GLdouble x
|
||||
- GLdouble y
|
||||
-
|
||||
-#// glWindowPos3iMESA($x, $y, $z);
|
||||
-void
|
||||
-glWindowPos3iMESA(x, y, z)
|
||||
- GLint x
|
||||
- GLint y
|
||||
- GLint z
|
||||
-
|
||||
-#// glWindowPos3dMESA($x, $y, $z);
|
||||
-void
|
||||
-glWindowPos3dMESA(x, y, z)
|
||||
- GLdouble x
|
||||
- GLdouble y
|
||||
- GLdouble z
|
||||
-
|
||||
-#// glWindowPos4iMESA($x, $y, $z, $w);
|
||||
-void
|
||||
-glWindowPos4iMESA(x, y, z, w)
|
||||
- GLint x
|
||||
- GLint y
|
||||
- GLint z
|
||||
- GLint w
|
||||
-
|
||||
-#// glWindowPos4dMESA($x, $y, $z, $w);
|
||||
-void
|
||||
-glWindowPos4dMESA(x, y, z, w)
|
||||
- GLdouble x
|
||||
- GLdouble y
|
||||
- GLdouble z
|
||||
- GLdouble w
|
||||
-
|
||||
-#endif
|
||||
-
|
||||
-#ifdef GL_MESA_resize_buffers
|
||||
-
|
||||
-#// glResizeBuffersMESA();
|
||||
-void
|
||||
-glResizeBuffersMESA()
|
||||
-
|
||||
-#endif
|
||||
-
|
||||
#ifdef GL_ARB_draw_buffers
|
||||
|
||||
#//# glDrawBuffersARB_c($n,(CPTR)buffers);
|
||||
--
|
||||
2.1.0
|
||||
|
||||
29
OpenGL-0.6704-Prefer-system-GL-gl.h-on-non-Win32.patch
Normal file
29
OpenGL-0.6704-Prefer-system-GL-gl.h-on-non-Win32.patch
Normal file
@@ -0,0 +1,29 @@
|
||||
From 3f8fa1a5069a6a7e371234f0045819e489242cd3 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||||
Date: Mon, 8 Jun 2015 16:41:48 +0200
|
||||
Subject: [PATCH] Prefer system GL/gl.h on non-Win32
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
gl_util.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gl_util.h b/gl_util.h
|
||||
index a5dc862..c1566fd 100644
|
||||
--- a/gl_util.h
|
||||
+++ b/gl_util.h
|
||||
@@ -13,7 +13,7 @@
|
||||
#endif
|
||||
|
||||
/* Provide GL header files for Windows */
|
||||
-#define INCLUDE_LOCAL_HEADER !defined(HAVE_W32API)
|
||||
+#define INCLUDE_LOCAL_HEADER defined(HAVE_W32API)
|
||||
#if INCLUDE_LOCAL_HEADER
|
||||
#include "./include/GL/gl.h"
|
||||
#else
|
||||
--
|
||||
2.1.0
|
||||
|
||||
3
OpenGL-0.6704.tar.gz
Normal file
3
OpenGL-0.6704.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:36f266e31d617fa9a1bd8928a7dc3b7c40c1bbbfa64bddefe22300ac2bc6c436
|
||||
size 623036
|
||||
21
cpanspec.yml
Normal file
21
cpanspec.yml
Normal file
@@ -0,0 +1,21 @@
|
||||
# http://pkgs.fedoraproject.org/cgit/perl-OpenGL.git/tree/
|
||||
patches:
|
||||
0001-Don-t-check-current-display-for-extensions.patch: -p1
|
||||
OpenGL-0.6704-Prefer-system-GL-gl.h-on-non-Win32.patch: -p1
|
||||
OpenGL-0.6704-Delete-functions-removed-from-Mesa.patch: -p1
|
||||
preamble: |-
|
||||
BuildRequires: freeglut-devel
|
||||
BuildRequires: xvfb-run
|
||||
BuildRequires: pkgconfig(xi)
|
||||
BuildRequires: pkgconfig(xmu)
|
||||
license: GPL-1.0+ or Artistic-1.0
|
||||
post_prep: |-
|
||||
find include -type f \! -name glprocs.h -exec rm {} +
|
||||
custom_build: |-
|
||||
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" dist=NO_EXCLUSIONS
|
||||
# Certain OpenGL calls may not be present in our OpenGL
|
||||
# implementation, let us just ignore them.
|
||||
sed 's/PERL_DL_NONLAZY=1//' -i Makefile
|
||||
%{__make} %{?_smp_mflags}
|
||||
custom_test: |-
|
||||
xvfb-run -a -s "+extension GLX -screen 0 1280x1024x24" %{__make} test
|
||||
@@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 23 08:39:35 UTC 2015 - bwiedemann@suse.com
|
||||
|
||||
- update to 0.6704
|
||||
- add 0001-Don-t-check-current-display-for-extensions.patch
|
||||
OpenGL-0.6704-Prefer-system-GL-gl.h-on-non-Win32.patch
|
||||
OpenGL-0.6704-Delete-functions-removed-from-Mesa.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 16 14:53:46 UTC 2013 - coolo@suse.com
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package perl-OpenGL
|
||||
#
|
||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -17,26 +17,29 @@
|
||||
|
||||
|
||||
Name: perl-OpenGL
|
||||
Version: 0.67
|
||||
Version: 0.6704
|
||||
Release: 0
|
||||
#Upstream: CHECK(GPL-1.0+ or Artistic-1.0)
|
||||
%define cpan_name OpenGL
|
||||
Summary: Perl bindings to the OpenGL API, GLU, and GLUT/FreeGLUT
|
||||
License: CHECK(GPL-1.0+ or Artistic-1.0)
|
||||
License: GPL-1.0+ or Artistic-1.0
|
||||
Group: Development/Libraries/Perl
|
||||
Url: http://search.cpan.org/dist/OpenGL/
|
||||
Source: http://www.cpan.org/authors/id/C/CH/CHM/%{cpan_name}-%{version}.tar.gz
|
||||
Source0: OpenGL-0.6704.tar.gz
|
||||
Source1: cpanspec.yml
|
||||
Patch0: 0001-Don-t-check-current-display-for-extensions.patch
|
||||
Patch1: OpenGL-0.6704-Delete-functions-removed-from-Mesa.patch
|
||||
Patch2: OpenGL-0.6704-Prefer-system-GL-gl.h-on-non-Win32.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: freeglut-devel
|
||||
BuildRequires: perl
|
||||
BuildRequires: perl-macros
|
||||
%{perl_requires}
|
||||
# MANUAL BEGIN
|
||||
BuildRequires: freeglut-devel
|
||||
BuildRequires: xvfb-run
|
||||
BuildRequires: pkgconfig(xi)
|
||||
BuildRequires: pkgconfig(xmu)
|
||||
#BuildRequires: perl(OpenGL)
|
||||
#BuildRequires: perl(OpenGL::Config)
|
||||
#BuildRequires: perl(PDL)
|
||||
#BuildRequires: perl(PDL::Constants)
|
||||
#BuildRequires: perl(Tk)
|
||||
%{perl_requires}
|
||||
# MANUAL END
|
||||
|
||||
%description
|
||||
Perl bindings to the OpenGL API, GLU, and GLUT/FreeGLUT
|
||||
@@ -44,13 +47,21 @@ Perl bindings to the OpenGL API, GLU, and GLUT/FreeGLUT
|
||||
%prep
|
||||
%setup -q -n %{cpan_name}-%{version}
|
||||
find . -type f -print0 | xargs -0 chmod 644
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
# MANUAL BEGIN
|
||||
find include -type f \! -name glprocs.h -exec rm {} +
|
||||
# MANUAL END
|
||||
|
||||
%build
|
||||
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
|
||||
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" dist=NO_EXCLUSIONS
|
||||
# Certain OpenGL calls may not be present in our OpenGL
|
||||
# implementation, let us just ignore them.
|
||||
sed 's/PERL_DL_NONLAZY=1//' -i Makefile
|
||||
%{__make} %{?_smp_mflags}
|
||||
|
||||
%check
|
||||
%{__make} test
|
||||
xvfb-run -a -s "+extension GLX -screen 0 1280x1024x24" %{__make} test
|
||||
|
||||
%install
|
||||
%perl_make_install
|
||||
@@ -59,6 +70,6 @@ find . -type f -print0 | xargs -0 chmod 644
|
||||
|
||||
%files -f %{name}.files
|
||||
%defattr(-,root,root,755)
|
||||
%doc CHANGES COPYRIGHT examples fragment.arb fragment.cg fragment.glsl isosurf.bin KNOWN_PROBLEMS MYMETA.json MYMETA.yml pixel_buffer_object.txt pogl-api.txt README ref-pogl-build-log.txt Release_Notes SUPPORTS test.jpg test.tga TODO vertex.arb vertex.cg vertex.glsl
|
||||
%doc CHANGES COPYRIGHT examples fragment.arb fragment.cg fragment.glsl isosurf.bin KNOWN_PROBLEMS README Release_Notes SUPPORTS test.jpg test.tga TODO vertex.arb vertex.cg vertex.glsl
|
||||
|
||||
%changelog
|
||||
|
||||
Reference in New Issue
Block a user