Compare commits

...

7 Commits

Author SHA1 Message Date
David Abdurachmanov b2bf7a0c59
Bootstrap (riscv64)
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
2024-01-08 11:47:34 +02:00
Florian Weimer 16fd200569 Fix C compatibility issues
Related to:

  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
2024-01-05 11:24:52 +01:00
Mamoru TASAKA f776bfeb89 kill bootstrap 2024-01-03 23:17:46 +09:00
Mamoru TASAKA c67671e87c bootstrap 2024-01-03 22:10:23 +09:00
Mamoru TASAKA 7dbbfe0f78 Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.3 2024-01-03 22:10:06 +09:00
Mamoru TASAKA ef59e08645 Use recent gem2rpm style
Use recent bootstrap style
2023-12-24 19:33:14 +09:00
Fedora Release Engineering d84c8fcaa8 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-21 17:39:47 +00:00
2 changed files with 95 additions and 15 deletions

63
rubygem-glu-c99.patch Normal file
View File

@ -0,0 +1,63 @@
VALUE casts for rb_funcall arguments
The Ruby API expects VALUE types instead of void *, so add casts. This
avoids compilation errors with current compilers.
Submitted upstream: <https://github.com/larskanis/glu/pull/3>
diff -ur glu-8.3.0.orig/ext/glu/glu.c glu-8.3.0/ext/glu/glu.c
--- glu-8.3.0.orig/ext/glu/glu.c 2024-01-05 11:12:18.598561476 +0100
+++ glu-8.3.0/ext/glu/glu.c 2024-01-05 11:18:42.217732888 +0100
@@ -636,7 +636,7 @@
void* data;
{
TESS_CALLBACK_COMMON
- rb_funcall(rb_ary_entry(tdata->t_ref, TESS_VERTEX), callId, 1, data);
+ rb_funcall(rb_ary_entry(tdata->t_ref, TESS_VERTEX), callId, 1, (VALUE) data);
}
static void CALLBACK
t_end()
@@ -657,7 +657,7 @@
void* user_data;
{
TESS_CALLBACK_COMMON
- rb_funcall(rb_ary_entry(tdata->t_ref, TESS_BEGIN_DATA), callId, 2, INT2NUM(type), user_data);
+ rb_funcall(rb_ary_entry(tdata->t_ref, TESS_BEGIN_DATA), callId, 2, INT2NUM(type), (VALUE) user_data);
}
static void CALLBACK
t_edgeFlag_data(flag, user_data)
@@ -665,7 +665,7 @@
void* user_data;
{
TESS_CALLBACK_COMMON
- rb_funcall(rb_ary_entry(tdata->t_ref, TESS_EDGE_FLAG_DATA), callId, 2, GLBOOL2RUBY(flag), user_data);
+ rb_funcall(rb_ary_entry(tdata->t_ref, TESS_EDGE_FLAG_DATA), callId, 2, GLBOOL2RUBY(flag), (VALUE) user_data);
}
static void CALLBACK
t_vertex_data(data, user_data)
@@ -673,14 +673,14 @@
void* user_data;
{
TESS_CALLBACK_COMMON
- rb_funcall(rb_ary_entry(tdata->t_ref, TESS_VERTEX_DATA), callId, 2, data, user_data);
+ rb_funcall(rb_ary_entry(tdata->t_ref, TESS_VERTEX_DATA), callId, 2, (VALUE) data, (VALUE) user_data);
}
static void CALLBACK
t_end_data(user_data)
void* user_data;
{
TESS_CALLBACK_COMMON
- rb_funcall(rb_ary_entry(tdata->t_ref, TESS_END_DATA), callId, 1, user_data);
+ rb_funcall(rb_ary_entry(tdata->t_ref, TESS_END_DATA), callId, 1, (VALUE) user_data);
}
static void CALLBACK
t_error_data(errorno, user_data)
@@ -688,7 +688,7 @@
void* user_data;
{
TESS_CALLBACK_COMMON
- rb_funcall(rb_ary_entry(tdata->t_ref, TESS_ERROR_DATA), callId, 2, INT2NUM(errorno), user_data);
+ rb_funcall(rb_ary_entry(tdata->t_ref, TESS_ERROR_DATA), callId, 2, INT2NUM(errorno), (VALUE) user_data);
}
static void CALLBACK

View File

@ -1,15 +1,17 @@
%global gem_name glu
%global need_bootstrap 0
%bcond_without bootstrap
Name: rubygem-%{gem_name}
Version: 8.3.0
Release: 23%{?dist}
Release: 27.0.riscv64%{?dist}
Summary: Glu bindings for the opengl gem
# SPDX confirmed
License: MIT
URL: https://github.com/larskanis/glu
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
Patch1: rubygem-glu-c99.patch
BuildRequires: gcc
BuildRequires: rubygems-devel
@ -17,17 +19,15 @@ BuildRequires: ruby-devel
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
# %%check
%if 0%{?need_bootstrap} < 1
%if %{without bootstrap}
BuildRequires: rubygem(minitest) >= 5
BuildRequires: rubygem(opengl)
BuildRequires: %{_bindir}/xvfb-run
BuildRequires: mesa-dri-drivers
BuildRequires: rubygem(opengl) >= 0.9
BuildRequires: rubygem(glut)
%if 0%{?fedora} >= 36
BuildRequires: rubygem(matrix)
%endif
%endif
%description
Glu bindings for the opengl gem.
@ -41,12 +41,11 @@ BuildArch: noarch
Documentation for %{name}.
%prep
gem unpack %{SOURCE0}
%setup -q -D -T -n %{gem_name}-%{version}
gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
%autosetup -p1 -n %{gem_name}-%{version}
mv ../%{gem_name}-%{version}.gemspec .
%build
gem build %{gem_name}.gemspec
gem build %{gem_name}-%{version}.gemspec
%gem_install
%install
@ -57,8 +56,11 @@ cp -a .%{gem_dir}/* \
mkdir -p %{buildroot}%{gem_extdir_mri}
cp -a .%{gem_extdir_mri}/* %{buildroot}%{gem_extdir_mri}/
pushd %{buildroot}
rm -f .%{gem_extdir_mri}/{gem_make.out,mkmf.log}
pushd %{buildroot}%{gem_extdir_mri}
rm -f \
gem_make.out \
mkmf.log \
%{nil}
popd
@ -69,19 +71,20 @@ rm -rf \
ext/ \
test/
popd
rm -f %{buildroot}%{gem_cache}
%check
%if 0%{?need_bootstrap} < 1
%if %{without bootstrap}
pushd .%{gem_instdir}
%ifarch %arm
exit 0
%endif
export RUBYLIB=$(pwd)/lib:$(pwd):%{buildroot}%{gem_extdir_mri}
xvfb-run \
-s "-screen 0 640x480x24" \
ruby \
-Ilib:.:%{buildroot}%{gem_extdir_mri} \
-e "Dir.glob('test/test_*.rb').each { |f| require f }"
popd
%endif
@ -95,14 +98,28 @@ popd
%{gem_libdir}/
%{gem_extdir_mri}/
%exclude %{gem_cache}
%{gem_spec}
%files doc
%doc %{gem_docdir}
%changelog
* Mon Jan 08 2024 David Abdurachmanov <davidlt@rivosinc.com> - 8.3.0-27.0.riscv64
- Bootstrap (riscv64)
* Fri Jan 05 2024 Florian Weimer <fweimer@redhat.com> - 8.3.0-27
- Fix C compatibility issues
* Wed Jan 03 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 8.3.0-26
- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.3
* Sun Dec 24 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 8.3.0-25
- Use recent gem2rpm style
- Use recent bootstrap style
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8.3.0-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8.3.0-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild