Compare commits

..

No commits in common. "rawhide" and "f25" have entirely different histories.

4 changed files with 98 additions and 114 deletions

4
.gitignore vendored
View file

@ -2,7 +2,3 @@
/angelscript_2.30.2.zip
/angelscript_2.31.0.zip
/angelscript_2.31.1.zip
/angelscript_2.31.2.zip
/angelscript_2.32.0.zip
/angelscript_2.35.1.zip
/angelscript_2.38.0.zip

View file

@ -0,0 +1,76 @@
diff -uNr angelscript-2.31.1.orig/sdk/angelscript/projects/meson/detect_ver.py angelscript-2.31.1/sdk/angelscript/projects/meson/detect_ver.py
--- angelscript-2.31.1.orig/sdk/angelscript/projects/meson/detect_ver.py 2015-05-21 23:01:38.000000000 +0200
+++ angelscript-2.31.1/sdk/angelscript/projects/meson/detect_ver.py 2016-06-27 10:39:52.288537225 +0200
@@ -1,5 +1,17 @@
+import argparse
+import os
import re
-with open('../../include/angelscript.h') as f:
- for l in f.readlines():
- if l.startswith('#define ANGELSCRIPT_VERSION_STRING'):
- print(re.search('[\d]+\.[\d]+\.[\d]+', l).group(0))
+
+if __name__ == "__main__":
+ parser = argparse.ArgumentParser()
+ parser.add_argument("--major", action="store_true")
+ args = parser.parse_args()
+ hdr = os.path.join(os.path.dirname(os.path.abspath(__file__)),
+ "..", "..", "include", "angelscript.h")
+ count = 2 if args.major else 3
+ regex = re.compile(r"\.".join(count * [r"[\d]+"]))
+ with open(hdr, "r") as f:
+ for l in f.readlines():
+ if l.startswith('#define ANGELSCRIPT_VERSION_STRING'):
+ print(re.search(regex, l).group(0))
+ break
diff -uNr angelscript-2.31.1.orig/sdk/angelscript/projects/meson/meson.build angelscript-2.31.1/sdk/angelscript/projects/meson/meson.build
--- angelscript-2.31.1.orig/sdk/angelscript/projects/meson/meson.build 2015-05-21 23:02:54.000000000 +0200
+++ angelscript-2.31.1/sdk/angelscript/projects/meson/meson.build 2016-06-27 10:39:52.293537384 +0200
@@ -1,9 +1,13 @@
-project('angelscript', 'cpp', 'c')
+project('angelscript', 'cpp', 'c',
+ version : run_command(find_program('python3'), 'detect_ver.py').stdout().strip(),
+ meson_version : '>0.28.0',
+ license : 'zlib')
arch = run_command('uname', '-p').stdout().strip()
-version = run_command(find_program('python3'), 'detect_ver.py').stdout().strip()
+major_version = run_command(find_program('python3'), 'detect_ver.py', '--major').stdout().strip()
+threads = dependency('threads')
-srcs = [
+angel_srcs = [
'../../source/as_atomic.cpp',
'../../source/as_builder.cpp',
'../../source/as_bytecode.cpp',
@@ -42,18 +46,21 @@
'../../source/as_variablescope.cpp',
]
if arch == 'armv7l'
- srcs = srcs + [
- '../../source/as_callfunc_arm.cpp',
- '../../source/as_callfunc_arm_gcc.S'
- ]
+ angel_srcs += ['../../source/as_callfunc_arm_gcc.S']
endif
+angelscript_inc = include_directories('../../include/')
-shared_library(
- 'angelscript',
- sources : srcs,
+angelscript_lib = library('angelscript', angel_srcs,
+ dependencies : threads,
install : true,
- soversion : '0',
- version : version,
+ soversion : major_version,
+ version : meson.project_version()
)
install_headers('../../include/angelscript.h')
+
+angelscript_dep = declare_dependency(
+ link_with : angelscript_lib,
+ include_directories : angelscript_inc,
+ version : meson.project_version()
+)

View file

@ -1,18 +1,20 @@
%global optflags %(echo %{optflags} -fno-strict-aliasing)
%global _vpath_srcdir sdk/%{name}/projects/meson/
Name: angelscript
Version: 2.38.0
Release: 3%{?dist}
Version: 2.31.1
Release: 1%{?dist}
Summary: Flexible cross-platform scripting library
License: zlib
URL: http://www.angelcode.com/angelscript/
Source0: %{url}/sdk/files/%{name}_%{version}.zip
BuildRequires: meson
BuildRequires: gcc-c++
# Sent upstream via mail
Patch0: angelscript-2.31.1-meson.diff
BuildRequires: meson >= 0.23.0-3
ExclusiveArch: x86_64 %{ix86} %{arm}
%description
The AngelScript library is a software library for easy integration of
@ -31,20 +33,27 @@ The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%prep
%autosetup -c
%autosetup -c -p1
mkdir build
%build
%meson
%meson_build
pushd build
%meson ../sdk/%{name}/projects/meson/
ninja-build -v
popd
%install
%meson_install
pushd build
DESTDIR=%{buildroot} ninja-build -v install
popd
%ldconfig_scriptlets
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%doc sdk/docs/articles/*.html
%{_libdir}/lib%{name}.so.23800
%{_libdir}/lib%{name}.so.*
%files devel
%doc sdk/docs/manual/*
@ -52,103 +61,6 @@ developing applications that use %{name}.
%{_includedir}/%{name}.h
%changelog
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.38.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Thu Aug 14 2025 Gwyn Ciesla <gwync@protonmail.com> - 2.38.0-2
- specify solib
* Thu Aug 14 2025 Gwyn Ciesla <gwync@protonmail.com> - 2.38.0-1
- 2.38.0
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.35.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.35.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.35.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.35.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.35.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.35.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.35.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Mon Nov 21 2022 Pete Walter <pwalter@fedoraproject.org> - 2.35.1-1
- Update to 2.35.1
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.32.0-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.32.0-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.32.0-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.32.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.32.0-10
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.32.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.32.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.32.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.32.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.32.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Sun Feb 18 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.32.0-4
- Add BuildRequires: gcc-c++
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.32.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Wed Jan 31 2018 Igor Gnatenko <ignatenko@redhat.com> - 2.32.0-2
- Switch to %%ldconfig_scriptlets
* Sun Dec 31 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.32.0-1
- Update to 2.32.0
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.31.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.31.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.31.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Sun Dec 18 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 2.31.2-1
- Update to 2.31.2
* Fri Dec 16 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 2.31.1-4
- Use VPATH macro properly
* Fri Nov 25 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 2.31.1-3
- Build on all architectures
* Sun Nov 20 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 2.31.1-2
- Fix FTBFS (RHBZ #1385042)
* Mon Jun 27 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 2.31.1-1
- Update to 2.31.1 (RHBZ #1350286)

View file

@ -1 +1 @@
SHA512 (angelscript_2.38.0.zip) = 87c94042932f15d07fe6ede4c3671b1f73ac757b68ab360187591497eeabc56a4ddb7901e4567108e44886a2011a29c2884d4b7389557826f36a6c384f4a9c69
961ddac47dde68f3c4b27b7bd0d136f7 angelscript_2.31.1.zip