From edca81efad5ce23ab0ad8e58f5a58982fc1eeb2b Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 18 May 2015 15:48:04 +0300 Subject: [PATCH 01/59] Initial import Signed-off-by: Igor Gnatenko --- .gitignore | 1 + angelscript-meson.build | 47 +++++++++++++++++++++++++++++ angelscript.spec | 67 +++++++++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 116 insertions(+) create mode 100644 angelscript-meson.build create mode 100644 angelscript.spec diff --git a/.gitignore b/.gitignore index e69de29..e8c9eab 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/angelscript_2.30.0.zip diff --git a/angelscript-meson.build b/angelscript-meson.build new file mode 100644 index 0000000..36a2c60 --- /dev/null +++ b/angelscript-meson.build @@ -0,0 +1,47 @@ +project('angelscript', 'cpp') + +shared_library( + 'angelscript', + sources : [ + 'source/as_atomic.cpp', + 'source/as_builder.cpp', + 'source/as_bytecode.cpp', + 'source/as_callfunc.cpp', + 'source/as_callfunc_arm.cpp', + 'source/as_callfunc_mips.cpp', + 'source/as_callfunc_ppc.cpp', + 'source/as_callfunc_ppc_64.cpp', + 'source/as_callfunc_sh4.cpp', + 'source/as_callfunc_x86.cpp', + 'source/as_callfunc_x64_gcc.cpp', + 'source/as_callfunc_x64_mingw.cpp', + 'source/as_compiler.cpp', + 'source/as_context.cpp', + 'source/as_configgroup.cpp', + 'source/as_datatype.cpp', + 'source/as_generic.cpp', + 'source/as_gc.cpp', + 'source/as_globalproperty.cpp', + 'source/as_memory.cpp', + 'source/as_module.cpp', + 'source/as_objecttype.cpp', + 'source/as_outputbuffer.cpp', + 'source/as_parser.cpp', + 'source/as_restore.cpp', + 'source/as_scriptcode.cpp', + 'source/as_scriptengine.cpp', + 'source/as_scriptfunction.cpp', + 'source/as_scriptnode.cpp', + 'source/as_scriptobject.cpp', + 'source/as_string.cpp', + 'source/as_string_util.cpp', + 'source/as_thread.cpp', + 'source/as_tokenizer.cpp', + 'source/as_typeinfo.cpp', + 'source/as_variablescope.cpp', + ], + install : true, + soversion : '2.30', + version : '2.30.0', +) +install_headers('include/angelscript.h') diff --git a/angelscript.spec b/angelscript.spec new file mode 100644 index 0000000..b8057fd --- /dev/null +++ b/angelscript.spec @@ -0,0 +1,67 @@ +Name: angelscript +Version: 2.30.0 +Release: 3%{?dist} +Summary: Flexible cross-platform scripting library + +License: zlib +URL: http://www.angelcode.com/angelscript/ +Source0: http://www.angelcode.com/angelscript/sdk/files/%{name}_%{version}.zip +Source1: angelscript-meson.build + +BuildRequires: meson chrpath + +%description +The AngelScript library is a software library for easy integration of +external scripting to applications, with built-in compiler and virtual +machine. The scripting language is easily extendable to incorporate +application specific data types and functions. It is designed with C++ +in mind, as such it shares many features with C++, for example syntax +and data types. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%prep +%setup -q -c +rm -rf build && mkdir build +cp %{SOURCE1} sdk/%{name}/meson.build + +%build +pushd build + %meson ../sdk/%{name}/ + ninja-build -v +popd + +%install +pushd build + DESTDIR=%{buildroot} ninja-build -v install +popd +chrpath -d %{buildroot}%{_libdir}/* + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%doc sdk/docs/articles/*.html +%{_libdir}/lib%{name}.so.* + +%files devel +%doc sdk/docs/manual/* +%{_libdir}/lib%{name}.so +%{_includedir}/%{name}.h + +%changelog +* Mon May 18 2015 Igor Gnatenko - 2.30.0-3 +- Fix docs in devel subpkg + +* Wed May 13 2015 Igor Gnatenko - 2.30.0-2 +- Use custom builsystem to avoid multiple patching Makefile + +* Sun Apr 26 2015 Igor Gnatenko - 2.30.0-1 +- Initial package diff --git a/sources b/sources index e69de29..dff5fed 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +1b0ec7ead145cbcb252d9e1ce14f490d angelscript_2.30.0.zip From c3c78ecfd0d774788e7070bc3ed8ea7cdb26b817 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 20 May 2015 22:11:00 +0300 Subject: [PATCH 02/59] Fix arm building Signed-off-by: Igor Gnatenko --- angelscript-meson.build | 86 ++++++++++++++++++++++------------------- angelscript.spec | 5 ++- 2 files changed, 51 insertions(+), 40 deletions(-) diff --git a/angelscript-meson.build b/angelscript-meson.build index 36a2c60..10aff65 100644 --- a/angelscript-meson.build +++ b/angelscript-meson.build @@ -1,47 +1,55 @@ project('angelscript', 'cpp') +arch = run_command('uname', '-p') + +srcs = [ + 'source/as_atomic.cpp', + 'source/as_builder.cpp', + 'source/as_bytecode.cpp', + 'source/as_callfunc.cpp', + 'source/as_callfunc_arm.cpp', + 'source/as_callfunc_mips.cpp', + 'source/as_callfunc_ppc.cpp', + 'source/as_callfunc_ppc_64.cpp', + 'source/as_callfunc_sh4.cpp', + 'source/as_callfunc_x86.cpp', + 'source/as_callfunc_x64_gcc.cpp', + 'source/as_callfunc_x64_mingw.cpp', + 'source/as_compiler.cpp', + 'source/as_context.cpp', + 'source/as_configgroup.cpp', + 'source/as_datatype.cpp', + 'source/as_generic.cpp', + 'source/as_gc.cpp', + 'source/as_globalproperty.cpp', + 'source/as_memory.cpp', + 'source/as_module.cpp', + 'source/as_objecttype.cpp', + 'source/as_outputbuffer.cpp', + 'source/as_parser.cpp', + 'source/as_restore.cpp', + 'source/as_scriptcode.cpp', + 'source/as_scriptengine.cpp', + 'source/as_scriptfunction.cpp', + 'source/as_scriptnode.cpp', + 'source/as_scriptobject.cpp', + 'source/as_string.cpp', + 'source/as_string_util.cpp', + 'source/as_thread.cpp', + 'source/as_tokenizer.cpp', + 'source/as_typeinfo.cpp', + 'source/as_variablescope.cpp', +] + +if arch.stdout().strip() == 'armv7l' + srcs += ['source/as_callfunc_arm.cpp', 'source/as_callfunc_arm_gcc.S'] +endif + shared_library( 'angelscript', - sources : [ - 'source/as_atomic.cpp', - 'source/as_builder.cpp', - 'source/as_bytecode.cpp', - 'source/as_callfunc.cpp', - 'source/as_callfunc_arm.cpp', - 'source/as_callfunc_mips.cpp', - 'source/as_callfunc_ppc.cpp', - 'source/as_callfunc_ppc_64.cpp', - 'source/as_callfunc_sh4.cpp', - 'source/as_callfunc_x86.cpp', - 'source/as_callfunc_x64_gcc.cpp', - 'source/as_callfunc_x64_mingw.cpp', - 'source/as_compiler.cpp', - 'source/as_context.cpp', - 'source/as_configgroup.cpp', - 'source/as_datatype.cpp', - 'source/as_generic.cpp', - 'source/as_gc.cpp', - 'source/as_globalproperty.cpp', - 'source/as_memory.cpp', - 'source/as_module.cpp', - 'source/as_objecttype.cpp', - 'source/as_outputbuffer.cpp', - 'source/as_parser.cpp', - 'source/as_restore.cpp', - 'source/as_scriptcode.cpp', - 'source/as_scriptengine.cpp', - 'source/as_scriptfunction.cpp', - 'source/as_scriptnode.cpp', - 'source/as_scriptobject.cpp', - 'source/as_string.cpp', - 'source/as_string_util.cpp', - 'source/as_thread.cpp', - 'source/as_tokenizer.cpp', - 'source/as_typeinfo.cpp', - 'source/as_variablescope.cpp', - ], + sources : srcs, install : true, - soversion : '2.30', + soversion : '0', version : '2.30.0', ) install_headers('include/angelscript.h') diff --git a/angelscript.spec b/angelscript.spec index b8057fd..d8057d8 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -1,6 +1,6 @@ Name: angelscript Version: 2.30.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -57,6 +57,9 @@ chrpath -d %{buildroot}%{_libdir}/* %{_includedir}/%{name}.h %changelog +* Wed May 20 2015 Igor Gnatenko - 2.30.0-4 +- Fix arm building + * Mon May 18 2015 Igor Gnatenko - 2.30.0-3 - Fix docs in devel subpkg From 34d8918b2c0f3c24ddcf6b9597b07a3b9db2b775 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 20 May 2015 22:21:42 +0300 Subject: [PATCH 03/59] fix meson usage Signed-off-by: Igor Gnatenko --- angelscript-meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/angelscript-meson.build b/angelscript-meson.build index 10aff65..191e844 100644 --- a/angelscript-meson.build +++ b/angelscript-meson.build @@ -42,7 +42,7 @@ srcs = [ ] if arch.stdout().strip() == 'armv7l' - srcs += ['source/as_callfunc_arm.cpp', 'source/as_callfunc_arm_gcc.S'] + srcs = srcs + ['source/as_callfunc_arm.cpp', 'source/as_callfunc_arm_gcc.S'] endif shared_library( From 066cc3d44ccec8fd760ce5691b4ae793521c460f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 20 May 2015 22:30:29 +0300 Subject: [PATCH 04/59] fix building due meson don't accept upper-case .S Signed-off-by: Igor Gnatenko --- angelscript-meson.build | 2 +- angelscript.spec | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/angelscript-meson.build b/angelscript-meson.build index 191e844..a98823d 100644 --- a/angelscript-meson.build +++ b/angelscript-meson.build @@ -42,7 +42,7 @@ srcs = [ ] if arch.stdout().strip() == 'armv7l' - srcs = srcs + ['source/as_callfunc_arm.cpp', 'source/as_callfunc_arm_gcc.S'] + srcs = srcs + ['source/as_callfunc_arm.cpp', 'source/as_callfunc_arm_gcc.s'] endif shared_library( diff --git a/angelscript.spec b/angelscript.spec index d8057d8..73b5420 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -30,6 +30,7 @@ developing applications that use %{name}. %setup -q -c rm -rf build && mkdir build cp %{SOURCE1} sdk/%{name}/meson.build +mv -f sdk/%{name}/source/as_callfunc_arm_gcc.S sdk/%{name}/source/as_callfunc_arm_gcc.s %build pushd build From fd01d872c80b80b6cd4e0436d4001ed41f374afb Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 20 May 2015 22:43:36 +0300 Subject: [PATCH 05/59] add c compiler to able to build asm file Signed-off-by: Igor Gnatenko --- angelscript-meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/angelscript-meson.build b/angelscript-meson.build index a98823d..274542d 100644 --- a/angelscript-meson.build +++ b/angelscript-meson.build @@ -1,4 +1,4 @@ -project('angelscript', 'cpp') +project('angelscript', 'cpp', 'c') arch = run_command('uname', '-p') From 78fa1c19dfc43ddc8eaa31c08083f30090c5c6e7 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 20 May 2015 23:08:34 +0300 Subject: [PATCH 06/59] drop asm file due to already defined error Signed-off-by: Igor Gnatenko --- angelscript-meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/angelscript-meson.build b/angelscript-meson.build index 274542d..3af3b39 100644 --- a/angelscript-meson.build +++ b/angelscript-meson.build @@ -1,4 +1,4 @@ -project('angelscript', 'cpp', 'c') +project('angelscript', 'cpp') arch = run_command('uname', '-p') @@ -42,7 +42,7 @@ srcs = [ ] if arch.stdout().strip() == 'armv7l' - srcs = srcs + ['source/as_callfunc_arm.cpp', 'source/as_callfunc_arm_gcc.s'] + srcs = srcs + ['source/as_callfunc_arm.cpp'] endif shared_library( From 7e7b7f9263076ed501fec6f139880cbcb866471a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 21 May 2015 00:34:12 +0300 Subject: [PATCH 07/59] Revert "drop asm file due to already defined error" This reverts commit 78fa1c19dfc43ddc8eaa31c08083f30090c5c6e7. --- angelscript-meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/angelscript-meson.build b/angelscript-meson.build index 3af3b39..274542d 100644 --- a/angelscript-meson.build +++ b/angelscript-meson.build @@ -1,4 +1,4 @@ -project('angelscript', 'cpp') +project('angelscript', 'cpp', 'c') arch = run_command('uname', '-p') @@ -42,7 +42,7 @@ srcs = [ ] if arch.stdout().strip() == 'armv7l' - srcs = srcs + ['source/as_callfunc_arm.cpp'] + srcs = srcs + ['source/as_callfunc_arm.cpp', 'source/as_callfunc_arm_gcc.s'] endif shared_library( From 856208e7a3ed08c762b0e9631213ce08d7ae53fb Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 21 May 2015 11:05:38 +0300 Subject: [PATCH 08/59] arm build fixes Signed-off-by: Igor Gnatenko --- angelscript-meson.build | 6 +++++- angelscript.spec | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/angelscript-meson.build b/angelscript-meson.build index 274542d..c7506ec 100644 --- a/angelscript-meson.build +++ b/angelscript-meson.build @@ -42,12 +42,16 @@ srcs = [ ] if arch.stdout().strip() == 'armv7l' - srcs = srcs + ['source/as_callfunc_arm.cpp', 'source/as_callfunc_arm_gcc.s'] + srcs = srcs + ['source/as_callfunc_arm.cpp'] + obj = shared_library('as_callfunc_arm_gcc', 'source/as_callfunc_arm_gcc.s').extract('as_callfunc_arm_gcc.s') +else + obj = [] endif shared_library( 'angelscript', sources : srcs, + objects : obj, install : true, soversion : '0', version : '2.30.0', diff --git a/angelscript.spec b/angelscript.spec index 73b5420..e1933f9 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -1,6 +1,6 @@ Name: angelscript Version: 2.30.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -58,6 +58,9 @@ chrpath -d %{buildroot}%{_libdir}/* %{_includedir}/%{name}.h %changelog +* Thu May 21 2015 Igor Gnatenko - 2.30.0-5 +- arm build fixes + * Wed May 20 2015 Igor Gnatenko - 2.30.0-4 - Fix arm building From e240bbd4a70d8cd80efc22d9d9660215f775144d Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 21 May 2015 11:08:57 +0300 Subject: [PATCH 09/59] s/extract/extract_objects/ Signed-off-by: Igor Gnatenko --- angelscript-meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/angelscript-meson.build b/angelscript-meson.build index c7506ec..08c4e5f 100644 --- a/angelscript-meson.build +++ b/angelscript-meson.build @@ -43,7 +43,7 @@ srcs = [ if arch.stdout().strip() == 'armv7l' srcs = srcs + ['source/as_callfunc_arm.cpp'] - obj = shared_library('as_callfunc_arm_gcc', 'source/as_callfunc_arm_gcc.s').extract('as_callfunc_arm_gcc.s') + obj = shared_library('as_callfunc_arm_gcc', 'source/as_callfunc_arm_gcc.s').extract_objects('as_callfunc_arm_gcc.s') else obj = [] endif From 7cdc10a1e28ab7d285ebbe055704709e2a5d2430 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 21 May 2015 11:19:46 +0300 Subject: [PATCH 10/59] fix extract_objects Signed-off-by: Igor Gnatenko --- angelscript-meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/angelscript-meson.build b/angelscript-meson.build index 08c4e5f..09157e6 100644 --- a/angelscript-meson.build +++ b/angelscript-meson.build @@ -43,7 +43,7 @@ srcs = [ if arch.stdout().strip() == 'armv7l' srcs = srcs + ['source/as_callfunc_arm.cpp'] - obj = shared_library('as_callfunc_arm_gcc', 'source/as_callfunc_arm_gcc.s').extract_objects('as_callfunc_arm_gcc.s') + obj = shared_library('as_callfunc_arm_gcc', 'source/as_callfunc_arm_gcc.s').extract_objects('source/as_callfunc_arm_gcc.s') else obj = [] endif From 3ec8daaac035d81976bad5e2e7297bed8332628a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 21 May 2015 11:44:56 +0300 Subject: [PATCH 11/59] more arm fixes Signed-off-by: Igor Gnatenko --- angelscript-meson.build | 58 ++-------------------------------- angelscript-source-meson.build | 54 +++++++++++++++++++++++++++++++ angelscript.spec | 2 ++ 3 files changed, 58 insertions(+), 56 deletions(-) create mode 100644 angelscript-source-meson.build diff --git a/angelscript-meson.build b/angelscript-meson.build index 09157e6..8f4a601 100644 --- a/angelscript-meson.build +++ b/angelscript-meson.build @@ -1,59 +1,5 @@ project('angelscript', 'cpp', 'c') -arch = run_command('uname', '-p') - -srcs = [ - 'source/as_atomic.cpp', - 'source/as_builder.cpp', - 'source/as_bytecode.cpp', - 'source/as_callfunc.cpp', - 'source/as_callfunc_arm.cpp', - 'source/as_callfunc_mips.cpp', - 'source/as_callfunc_ppc.cpp', - 'source/as_callfunc_ppc_64.cpp', - 'source/as_callfunc_sh4.cpp', - 'source/as_callfunc_x86.cpp', - 'source/as_callfunc_x64_gcc.cpp', - 'source/as_callfunc_x64_mingw.cpp', - 'source/as_compiler.cpp', - 'source/as_context.cpp', - 'source/as_configgroup.cpp', - 'source/as_datatype.cpp', - 'source/as_generic.cpp', - 'source/as_gc.cpp', - 'source/as_globalproperty.cpp', - 'source/as_memory.cpp', - 'source/as_module.cpp', - 'source/as_objecttype.cpp', - 'source/as_outputbuffer.cpp', - 'source/as_parser.cpp', - 'source/as_restore.cpp', - 'source/as_scriptcode.cpp', - 'source/as_scriptengine.cpp', - 'source/as_scriptfunction.cpp', - 'source/as_scriptnode.cpp', - 'source/as_scriptobject.cpp', - 'source/as_string.cpp', - 'source/as_string_util.cpp', - 'source/as_thread.cpp', - 'source/as_tokenizer.cpp', - 'source/as_typeinfo.cpp', - 'source/as_variablescope.cpp', -] - -if arch.stdout().strip() == 'armv7l' - srcs = srcs + ['source/as_callfunc_arm.cpp'] - obj = shared_library('as_callfunc_arm_gcc', 'source/as_callfunc_arm_gcc.s').extract_objects('source/as_callfunc_arm_gcc.s') -else - obj = [] -endif - -shared_library( - 'angelscript', - sources : srcs, - objects : obj, - install : true, - soversion : '0', - version : '2.30.0', -) +arch = run_command('uname', '-p').stdout().strip() +subdir('source') install_headers('include/angelscript.h') diff --git a/angelscript-source-meson.build b/angelscript-source-meson.build new file mode 100644 index 0000000..631904a --- /dev/null +++ b/angelscript-source-meson.build @@ -0,0 +1,54 @@ +srcs = [ + 'as_atomic.cpp', + 'as_builder.cpp', + 'as_bytecode.cpp', + 'as_callfunc.cpp', + 'as_callfunc_arm.cpp', + 'as_callfunc_mips.cpp', + 'as_callfunc_ppc.cpp', + 'as_callfunc_ppc_64.cpp', + 'as_callfunc_sh4.cpp', + 'as_callfunc_x86.cpp', + 'as_callfunc_x64_gcc.cpp', + 'as_callfunc_x64_mingw.cpp', + 'as_compiler.cpp', + 'as_context.cpp', + 'as_configgroup.cpp', + 'as_datatype.cpp', + 'as_generic.cpp', + 'as_gc.cpp', + 'as_globalproperty.cpp', + 'as_memory.cpp', + 'as_module.cpp', + 'as_objecttype.cpp', + 'as_outputbuffer.cpp', + 'as_parser.cpp', + 'as_restore.cpp', + 'as_scriptcode.cpp', + 'as_scriptengine.cpp', + 'as_scriptfunction.cpp', + 'as_scriptnode.cpp', + 'as_scriptobject.cpp', + 'as_string.cpp', + 'as_string_util.cpp', + 'as_thread.cpp', + 'as_tokenizer.cpp', + 'as_typeinfo.cpp', + 'as_variablescope.cpp', +] + +if arch == 'armv7l' + srcs = srcs + ['as_callfunc_arm.cpp'] + obj = shared_library('as_callfunc_arm_gcc', 'as_callfunc_arm_gcc.s').extract_objects('as_callfunc_arm_gcc.s') +else + obj = [] +endif + +shared_library( + 'angelscript', + sources : srcs, + objects : obj, + install : true, + soversion : '0', + version : '2.30.0', +) diff --git a/angelscript.spec b/angelscript.spec index e1933f9..800addf 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -7,6 +7,7 @@ License: zlib URL: http://www.angelcode.com/angelscript/ Source0: http://www.angelcode.com/angelscript/sdk/files/%{name}_%{version}.zip Source1: angelscript-meson.build +Source2: angelscript-source-meson.build BuildRequires: meson chrpath @@ -30,6 +31,7 @@ developing applications that use %{name}. %setup -q -c rm -rf build && mkdir build cp %{SOURCE1} sdk/%{name}/meson.build +cp %{SOURCE2} sdk/%{name}/source/meson.build mv -f sdk/%{name}/source/as_callfunc_arm_gcc.S sdk/%{name}/source/as_callfunc_arm_gcc.s %build From b89259c698a71ab8afe527634e07615cc7aa2457 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 21 May 2015 11:48:52 +0300 Subject: [PATCH 12/59] fix compiling on arm with -mimplicit Signed-off-by: Igor Gnatenko --- angelscript-source-meson.build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/angelscript-source-meson.build b/angelscript-source-meson.build index 631904a..a319218 100644 --- a/angelscript-source-meson.build +++ b/angelscript-source-meson.build @@ -39,7 +39,12 @@ srcs = [ if arch == 'armv7l' srcs = srcs + ['as_callfunc_arm.cpp'] - obj = shared_library('as_callfunc_arm_gcc', 'as_callfunc_arm_gcc.s').extract_objects('as_callfunc_arm_gcc.s') + lib = shared_library( + 'as_callfunc_arm_gcc', + sources : 'as_callfunc_arm_gcc.s', + c_args : '-Wa,-mimplicit-it=always' + ) + obj = lib.extract_objects('as_callfunc_arm_gcc.s') else obj = [] endif From 66adc577980f8a35eca7ed5e03ae04778ffb1d70 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 21 May 2015 12:48:53 +0300 Subject: [PATCH 13/59] use .S file otherwise gcc won't compile Signed-off-by: Igor Gnatenko --- angelscript-source-meson.build | 5 ++--- angelscript.spec | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/angelscript-source-meson.build b/angelscript-source-meson.build index a319218..72b916a 100644 --- a/angelscript-source-meson.build +++ b/angelscript-source-meson.build @@ -41,10 +41,9 @@ if arch == 'armv7l' srcs = srcs + ['as_callfunc_arm.cpp'] lib = shared_library( 'as_callfunc_arm_gcc', - sources : 'as_callfunc_arm_gcc.s', - c_args : '-Wa,-mimplicit-it=always' + sources : 'as_callfunc_arm_gcc.S' ) - obj = lib.extract_objects('as_callfunc_arm_gcc.s') + obj = lib.extract_objects('as_callfunc_arm_gcc.S') else obj = [] endif diff --git a/angelscript.spec b/angelscript.spec index 800addf..3aea6b6 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -9,7 +9,8 @@ Source0: http://www.angelcode.com/angelscript/sdk/files/%{name}_%{version Source1: angelscript-meson.build Source2: angelscript-source-meson.build -BuildRequires: meson chrpath +BuildRequires: meson >= 0.23.0-3 +BuildRequires: chrpath %description The AngelScript library is a software library for easy integration of @@ -32,7 +33,6 @@ developing applications that use %{name}. rm -rf build && mkdir build cp %{SOURCE1} sdk/%{name}/meson.build cp %{SOURCE2} sdk/%{name}/source/meson.build -mv -f sdk/%{name}/source/as_callfunc_arm_gcc.S sdk/%{name}/source/as_callfunc_arm_gcc.s %build pushd build From aa6d88b8eb3f5dbb1806ea0a1868e585388f9b13 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 21 May 2015 16:07:15 +0300 Subject: [PATCH 14/59] simplify buildsystem Signed-off-by: Igor Gnatenko --- angelscript-meson.build | 55 +++++++++++++++++++++++++++++++- angelscript-source-meson.build | 58 ---------------------------------- angelscript.spec | 8 ++--- 3 files changed, 58 insertions(+), 63 deletions(-) delete mode 100644 angelscript-source-meson.build diff --git a/angelscript-meson.build b/angelscript-meson.build index 8f4a601..8604b82 100644 --- a/angelscript-meson.build +++ b/angelscript-meson.build @@ -1,5 +1,58 @@ project('angelscript', 'cpp', 'c') arch = run_command('uname', '-p').stdout().strip() -subdir('source') + +srcs = [ + 'source/as_atomic.cpp', + 'source/as_builder.cpp', + 'source/as_bytecode.cpp', + 'source/as_callfunc.cpp', + 'source/as_callfunc_arm.cpp', + 'source/as_callfunc_mips.cpp', + 'source/as_callfunc_ppc.cpp', + 'source/as_callfunc_ppc_64.cpp', + 'source/as_callfunc_sh4.cpp', + 'source/as_callfunc_x86.cpp', + 'source/as_callfunc_x64_gcc.cpp', + 'source/as_callfunc_x64_mingw.cpp', + 'source/as_compiler.cpp', + 'source/as_context.cpp', + 'source/as_configgroup.cpp', + 'source/as_datatype.cpp', + 'source/as_generic.cpp', + 'source/as_gc.cpp', + 'source/as_globalproperty.cpp', + 'source/as_memory.cpp', + 'source/as_module.cpp', + 'source/as_objecttype.cpp', + 'source/as_outputbuffer.cpp', + 'source/as_parser.cpp', + 'source/as_restore.cpp', + 'source/as_scriptcode.cpp', + 'source/as_scriptengine.cpp', + 'source/as_scriptfunction.cpp', + 'source/as_scriptnode.cpp', + 'source/as_scriptobject.cpp', + 'source/as_string.cpp', + 'source/as_string_util.cpp', + 'source/as_thread.cpp', + 'source/as_tokenizer.cpp', + 'source/as_typeinfo.cpp', + 'source/as_variablescope.cpp', +] +if arch == 'armv7l' + srcs = srcs + [ + 'source/as_callfunc_arm.cpp', + 'source/as_callfunc_arm_gcc.S' + ] +endif + +shared_library( + 'angelscript', + sources : srcs, + install : true, + soversion : '0', + version : '2.30.0', +) + install_headers('include/angelscript.h') diff --git a/angelscript-source-meson.build b/angelscript-source-meson.build deleted file mode 100644 index 72b916a..0000000 --- a/angelscript-source-meson.build +++ /dev/null @@ -1,58 +0,0 @@ -srcs = [ - 'as_atomic.cpp', - 'as_builder.cpp', - 'as_bytecode.cpp', - 'as_callfunc.cpp', - 'as_callfunc_arm.cpp', - 'as_callfunc_mips.cpp', - 'as_callfunc_ppc.cpp', - 'as_callfunc_ppc_64.cpp', - 'as_callfunc_sh4.cpp', - 'as_callfunc_x86.cpp', - 'as_callfunc_x64_gcc.cpp', - 'as_callfunc_x64_mingw.cpp', - 'as_compiler.cpp', - 'as_context.cpp', - 'as_configgroup.cpp', - 'as_datatype.cpp', - 'as_generic.cpp', - 'as_gc.cpp', - 'as_globalproperty.cpp', - 'as_memory.cpp', - 'as_module.cpp', - 'as_objecttype.cpp', - 'as_outputbuffer.cpp', - 'as_parser.cpp', - 'as_restore.cpp', - 'as_scriptcode.cpp', - 'as_scriptengine.cpp', - 'as_scriptfunction.cpp', - 'as_scriptnode.cpp', - 'as_scriptobject.cpp', - 'as_string.cpp', - 'as_string_util.cpp', - 'as_thread.cpp', - 'as_tokenizer.cpp', - 'as_typeinfo.cpp', - 'as_variablescope.cpp', -] - -if arch == 'armv7l' - srcs = srcs + ['as_callfunc_arm.cpp'] - lib = shared_library( - 'as_callfunc_arm_gcc', - sources : 'as_callfunc_arm_gcc.S' - ) - obj = lib.extract_objects('as_callfunc_arm_gcc.S') -else - obj = [] -endif - -shared_library( - 'angelscript', - sources : srcs, - objects : obj, - install : true, - soversion : '0', - version : '2.30.0', -) diff --git a/angelscript.spec b/angelscript.spec index 3aea6b6..0a3a985 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -1,16 +1,14 @@ Name: angelscript Version: 2.30.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Flexible cross-platform scripting library License: zlib URL: http://www.angelcode.com/angelscript/ Source0: http://www.angelcode.com/angelscript/sdk/files/%{name}_%{version}.zip Source1: angelscript-meson.build -Source2: angelscript-source-meson.build BuildRequires: meson >= 0.23.0-3 -BuildRequires: chrpath %description The AngelScript library is a software library for easy integration of @@ -32,7 +30,6 @@ developing applications that use %{name}. %setup -q -c rm -rf build && mkdir build cp %{SOURCE1} sdk/%{name}/meson.build -cp %{SOURCE2} sdk/%{name}/source/meson.build %build pushd build @@ -60,6 +57,9 @@ chrpath -d %{buildroot}%{_libdir}/* %{_includedir}/%{name}.h %changelog +* Thu May 21 2015 Igor Gnatenko - 2.30.0-6 +- Simplify buildsystem + * Thu May 21 2015 Igor Gnatenko - 2.30.0-5 - arm build fixes From 183e734ad12af6e9aec8a4a56deab6962a376288 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 21 May 2015 16:20:40 +0300 Subject: [PATCH 15/59] drop unused chrpath Signed-off-by: Igor Gnatenko --- angelscript.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/angelscript.spec b/angelscript.spec index 0a3a985..48fdb88 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -41,7 +41,6 @@ popd pushd build DESTDIR=%{buildroot} ninja-build -v install popd -chrpath -d %{buildroot}%{_libdir}/* %post -p /sbin/ldconfig From caf01196839b663cc4f3234d585b329cfa7fb744 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 16 Jun 2015 23:54:56 +0000 Subject: [PATCH 16/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- angelscript.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angelscript.spec b/angelscript.spec index 48fdb88..5e60873 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -1,6 +1,6 @@ Name: angelscript Version: 2.30.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -56,6 +56,9 @@ popd %{_includedir}/%{name}.h %changelog +* Tue Jun 16 2015 Fedora Release Engineering - 2.30.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Thu May 21 2015 Igor Gnatenko - 2.30.0-6 - Simplify buildsystem From 834bc181a00442f44d144b16e61b857015161a8e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 23 Jun 2015 11:25:09 +0300 Subject: [PATCH 17/59] Use -fno-strict-aliasing; build only on primary arches Signed-off-by: Igor Gnatenko --- angelscript.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/angelscript.spec b/angelscript.spec index 5e60873..a3baff8 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -1,6 +1,8 @@ +%global optflags %(echo %{optflags} -fno-strict-aliasing) + Name: angelscript Version: 2.30.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -10,6 +12,8 @@ Source1: angelscript-meson.build BuildRequires: meson >= 0.23.0-3 +ExclusiveArch: x86_64 %ix86 %arm + %description The AngelScript library is a software library for easy integration of external scripting to applications, with built-in compiler and virtual @@ -56,6 +60,10 @@ popd %{_includedir}/%{name}.h %changelog +* Tue Jun 23 2015 Igor Gnatenko - 2.30.0-8 +- Use -fno-strict-aliasing +- build only on primary arches + * Tue Jun 16 2015 Fedora Release Engineering - 2.30.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 4f0a834505e606ed975a7524305967e799909574 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 27 Oct 2015 07:35:33 +0100 Subject: [PATCH 18/59] Update to 2.30.2 Signed-off-by: Igor Gnatenko --- .gitignore | 1 + angelscript-meson.build | 58 ----------------------------------------- angelscript.spec | 11 ++++---- sources | 2 +- 4 files changed, 8 insertions(+), 64 deletions(-) delete mode 100644 angelscript-meson.build diff --git a/.gitignore b/.gitignore index e8c9eab..eb4526c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /angelscript_2.30.0.zip +/angelscript_2.30.2.zip diff --git a/angelscript-meson.build b/angelscript-meson.build deleted file mode 100644 index 8604b82..0000000 --- a/angelscript-meson.build +++ /dev/null @@ -1,58 +0,0 @@ -project('angelscript', 'cpp', 'c') - -arch = run_command('uname', '-p').stdout().strip() - -srcs = [ - 'source/as_atomic.cpp', - 'source/as_builder.cpp', - 'source/as_bytecode.cpp', - 'source/as_callfunc.cpp', - 'source/as_callfunc_arm.cpp', - 'source/as_callfunc_mips.cpp', - 'source/as_callfunc_ppc.cpp', - 'source/as_callfunc_ppc_64.cpp', - 'source/as_callfunc_sh4.cpp', - 'source/as_callfunc_x86.cpp', - 'source/as_callfunc_x64_gcc.cpp', - 'source/as_callfunc_x64_mingw.cpp', - 'source/as_compiler.cpp', - 'source/as_context.cpp', - 'source/as_configgroup.cpp', - 'source/as_datatype.cpp', - 'source/as_generic.cpp', - 'source/as_gc.cpp', - 'source/as_globalproperty.cpp', - 'source/as_memory.cpp', - 'source/as_module.cpp', - 'source/as_objecttype.cpp', - 'source/as_outputbuffer.cpp', - 'source/as_parser.cpp', - 'source/as_restore.cpp', - 'source/as_scriptcode.cpp', - 'source/as_scriptengine.cpp', - 'source/as_scriptfunction.cpp', - 'source/as_scriptnode.cpp', - 'source/as_scriptobject.cpp', - 'source/as_string.cpp', - 'source/as_string_util.cpp', - 'source/as_thread.cpp', - 'source/as_tokenizer.cpp', - 'source/as_typeinfo.cpp', - 'source/as_variablescope.cpp', -] -if arch == 'armv7l' - srcs = srcs + [ - 'source/as_callfunc_arm.cpp', - 'source/as_callfunc_arm_gcc.S' - ] -endif - -shared_library( - 'angelscript', - sources : srcs, - install : true, - soversion : '0', - version : '2.30.0', -) - -install_headers('include/angelscript.h') diff --git a/angelscript.spec b/angelscript.spec index a3baff8..0a46472 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -1,14 +1,13 @@ %global optflags %(echo %{optflags} -fno-strict-aliasing) Name: angelscript -Version: 2.30.0 -Release: 8%{?dist} +Version: 2.30.2 +Release: 1%{?dist} Summary: Flexible cross-platform scripting library License: zlib URL: http://www.angelcode.com/angelscript/ Source0: http://www.angelcode.com/angelscript/sdk/files/%{name}_%{version}.zip -Source1: angelscript-meson.build BuildRequires: meson >= 0.23.0-3 @@ -33,11 +32,10 @@ developing applications that use %{name}. %prep %setup -q -c rm -rf build && mkdir build -cp %{SOURCE1} sdk/%{name}/meson.build %build pushd build - %meson ../sdk/%{name}/ + %meson ../sdk/%{name}/projects/meson/ ninja-build -v popd @@ -60,6 +58,9 @@ popd %{_includedir}/%{name}.h %changelog +* Tue Oct 27 2015 Igor Gnatenko - 2.30.2-1 +- Update to 2.30.2 + * Tue Jun 23 2015 Igor Gnatenko - 2.30.0-8 - Use -fno-strict-aliasing - build only on primary arches diff --git a/sources b/sources index dff5fed..573632d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1b0ec7ead145cbcb252d9e1ce14f490d angelscript_2.30.0.zip +219b1df050a1eadb4c5f2e85fb840aa0 angelscript_2.30.2.zip From d1a2a0ac7355b95cbe076a79980b0319b975b3b7 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 30 Oct 2015 18:25:34 +0100 Subject: [PATCH 19/59] Rebuild for new meson macros Signed-off-by: Igor Gnatenko --- angelscript.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angelscript.spec b/angelscript.spec index 0a46472..2406527 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -2,7 +2,7 @@ Name: angelscript Version: 2.30.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -58,6 +58,9 @@ popd %{_includedir}/%{name}.h %changelog +* Fri Oct 30 2015 Igor Gnatenko - 2.30.2-2 +- Rebuild for new meson macros + * Tue Oct 27 2015 Igor Gnatenko - 2.30.2-1 - Update to 2.30.2 From a7afce09dc3b7c6d1e8760c1832e7d5c0182cf68 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 16:11:40 +0000 Subject: [PATCH 20/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- angelscript.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angelscript.spec b/angelscript.spec index 2406527..f16a6e1 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -2,7 +2,7 @@ Name: angelscript Version: 2.30.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -58,6 +58,9 @@ popd %{_includedir}/%{name}.h %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 2.30.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Oct 30 2015 Igor Gnatenko - 2.30.2-2 - Rebuild for new meson macros From ab75f9d73cc0d279c1340a55cf55752f1fd8d36c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 20 Mar 2016 11:51:50 +0100 Subject: [PATCH 21/59] Update to 2.31.0 (RHBZ #1312564) Signed-off-by: Igor Gnatenko --- .gitignore | 1 + angelscript.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index eb4526c..5a322dd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /angelscript_2.30.0.zip /angelscript_2.30.2.zip +/angelscript_2.31.0.zip diff --git a/angelscript.spec b/angelscript.spec index f16a6e1..d148622 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -1,8 +1,8 @@ %global optflags %(echo %{optflags} -fno-strict-aliasing) Name: angelscript -Version: 2.30.2 -Release: 3%{?dist} +Version: 2.31.0 +Release: 1%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -58,6 +58,9 @@ popd %{_includedir}/%{name}.h %changelog +* Sun Mar 20 2016 Igor Gnatenko - 2.31.0-1 +- Update to 2.31.0 (RHBZ #1312564) + * Wed Feb 03 2016 Fedora Release Engineering - 2.30.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 573632d..67b7034 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -219b1df050a1eadb4c5f2e85fb840aa0 angelscript_2.30.2.zip +ceb66b58d9f6fc04df566d6e1ff7018a angelscript_2.31.0.zip From e3d98c0df27b8acdc3fc90f99e2c49deaf1ecb94 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 27 Jun 2016 09:28:21 +0200 Subject: [PATCH 22/59] Update to 2.31.1 (RHBZ #1350286) Signed-off-by: Igor Gnatenko --- .gitignore | 1 + angelscript.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 5a322dd..ec34553 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /angelscript_2.30.0.zip /angelscript_2.30.2.zip /angelscript_2.31.0.zip +/angelscript_2.31.1.zip diff --git a/angelscript.spec b/angelscript.spec index d148622..e3caa21 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -1,17 +1,17 @@ %global optflags %(echo %{optflags} -fno-strict-aliasing) Name: angelscript -Version: 2.31.0 +Version: 2.31.1 Release: 1%{?dist} Summary: Flexible cross-platform scripting library License: zlib URL: http://www.angelcode.com/angelscript/ -Source0: http://www.angelcode.com/angelscript/sdk/files/%{name}_%{version}.zip +Source0: %{url}/sdk/files/%{name}_%{version}.zip BuildRequires: meson >= 0.23.0-3 -ExclusiveArch: x86_64 %ix86 %arm +ExclusiveArch: x86_64 %{ix86} %{arm} %description The AngelScript library is a software library for easy integration of @@ -30,8 +30,8 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep -%setup -q -c -rm -rf build && mkdir build +%autosetup -c +mkdir build %build pushd build @@ -58,6 +58,9 @@ popd %{_includedir}/%{name}.h %changelog +* Mon Jun 27 2016 Igor Gnatenko - 2.31.1-1 +- Update to 2.31.1 (RHBZ #1350286) + * Sun Mar 20 2016 Igor Gnatenko - 2.31.0-1 - Update to 2.31.0 (RHBZ #1312564) diff --git a/sources b/sources index 67b7034..5503adc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ceb66b58d9f6fc04df566d6e1ff7018a angelscript_2.31.0.zip +961ddac47dde68f3c4b27b7bd0d136f7 angelscript_2.31.1.zip From 606f1a2489c4b13af0840f7526de3dc6353e7bf8 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 27 Jun 2016 10:40:32 +0200 Subject: [PATCH 23/59] add fix for building Signed-off-by: Igor Gnatenko --- angelscript-2.31.1-meson.diff | 76 +++++++++++++++++++++++++++++++++++ angelscript.spec | 5 ++- 2 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 angelscript-2.31.1-meson.diff diff --git a/angelscript-2.31.1-meson.diff b/angelscript-2.31.1-meson.diff new file mode 100644 index 0000000..54fdbe9 --- /dev/null +++ b/angelscript-2.31.1-meson.diff @@ -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() ++) diff --git a/angelscript.spec b/angelscript.spec index e3caa21..97c2b78 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -9,6 +9,9 @@ License: zlib URL: http://www.angelcode.com/angelscript/ Source0: %{url}/sdk/files/%{name}_%{version}.zip +# Sent upstream via mail +Patch0: angelscript-2.31.1-meson.diff + BuildRequires: meson >= 0.23.0-3 ExclusiveArch: x86_64 %{ix86} %{arm} @@ -30,7 +33,7 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep -%autosetup -c +%autosetup -c -p1 mkdir build %build From 1b61464d876ce754232e11d5f1a90d5c288d3614 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 20 Nov 2016 14:14:40 +0100 Subject: [PATCH 24/59] Fix FTBFS (RHBZ #1385042) Signed-off-by: Igor Gnatenko --- angelscript-2.31.1-meson.diff | 204 ++++++++++++++++++++++++---------- angelscript.spec | 21 ++-- 2 files changed, 158 insertions(+), 67 deletions(-) diff --git a/angelscript-2.31.1-meson.diff b/angelscript-2.31.1-meson.diff index 54fdbe9..1f1672f 100644 --- a/angelscript-2.31.1-meson.diff +++ b/angelscript-2.31.1-meson.diff @@ -1,76 +1,168 @@ 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 ++++ angelscript-2.31.1/sdk/angelscript/projects/meson/detect_ver.py 2016-11-20 14:14:03.213827982 +0100 +@@ -1,5 +1,28 @@ +-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 ++import argparse ++import os ++import re ++ ++HEADER = os.path.join(os.path.dirname(os.path.abspath(__file__)), ++ "..", "..", "include", "angelscript.h") ++ ++def main(): ++ parser = argparse.ArgumentParser() ++ parser.add_argument("--num", action="store_true", help="Print numeric version") ++ args = parser.parse_args() ++ ++ if args.num: ++ regex = re.compile(r'^#define ANGELSCRIPT_VERSION\s+(\d+)') ++ else: ++ regex = re.compile(r'^#define ANGELSCRIPT_VERSION_STRING\s+"(\d+\.\d+\.\d+.*)"') ++ ++ with open(HEADER, "r") as fobj: ++ for l in fobj: ++ match = re.match(regex, l) ++ if match is not None: ++ print(match.group(1)) ++ return ++ ++ assert False, "Can't find version" ++ ++if __name__ == "__main__": ++ main() 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 @@ ++++ angelscript-2.31.1/sdk/angelscript/projects/meson/meson.build 2016-11-20 14:14:03.214828011 +0100 +@@ -1,59 +1,68 @@ -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() +- +-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' +- '../../source/as_atomic.cpp', +- '../../source/as_builder.cpp', +- '../../source/as_bytecode.cpp', +- '../../source/as_callfunc.cpp', +- '../../source/as_callfunc_arm.cpp', +- '../../source/as_callfunc_mips.cpp', +- '../../source/as_callfunc_ppc.cpp', +- '../../source/as_callfunc_ppc_64.cpp', +- '../../source/as_callfunc_sh4.cpp', +- '../../source/as_callfunc_x86.cpp', +- '../../source/as_callfunc_x64_gcc.cpp', +- '../../source/as_callfunc_x64_mingw.cpp', +- '../../source/as_compiler.cpp', +- '../../source/as_context.cpp', +- '../../source/as_configgroup.cpp', +- '../../source/as_datatype.cpp', +- '../../source/as_generic.cpp', +- '../../source/as_gc.cpp', +- '../../source/as_globalproperty.cpp', +- '../../source/as_memory.cpp', +- '../../source/as_module.cpp', +- '../../source/as_objecttype.cpp', +- '../../source/as_outputbuffer.cpp', +- '../../source/as_parser.cpp', +- '../../source/as_restore.cpp', +- '../../source/as_scriptcode.cpp', +- '../../source/as_scriptengine.cpp', +- '../../source/as_scriptfunction.cpp', +- '../../source/as_scriptnode.cpp', +- '../../source/as_scriptobject.cpp', +- '../../source/as_string.cpp', +- '../../source/as_string_util.cpp', +- '../../source/as_thread.cpp', +- '../../source/as_tokenizer.cpp', +- '../../source/as_typeinfo.cpp', +- '../../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/') - +-endif +- -shared_library( - 'angelscript', - sources : srcs, -+angelscript_lib = library('angelscript', angel_srcs, -+ dependencies : threads, - install : true, +- 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() -+) +-) +- +-install_headers('../../include/angelscript.h') ++project('angelscript', 'cpp', ++ version : run_command(find_program('python3'), 'detect_ver.py').stdout().strip(), ++ meson_version : '>=0.28.0', ++ license : 'zlib') ++ ++threads = dependency('threads') ++ ++angel_srcs = [ ++ '../../source/as_atomic.cpp', ++ '../../source/as_builder.cpp', ++ '../../source/as_bytecode.cpp', ++ '../../source/as_callfunc.cpp', ++ '../../source/as_callfunc_mips.cpp', ++ '../../source/as_callfunc_ppc.cpp', ++ '../../source/as_callfunc_ppc_64.cpp', ++ '../../source/as_callfunc_sh4.cpp', ++ '../../source/as_callfunc_x86.cpp', ++ '../../source/as_callfunc_x64_gcc.cpp', ++ '../../source/as_callfunc_x64_mingw.cpp', ++ '../../source/as_compiler.cpp', ++ '../../source/as_context.cpp', ++ '../../source/as_configgroup.cpp', ++ '../../source/as_datatype.cpp', ++ '../../source/as_generic.cpp', ++ '../../source/as_gc.cpp', ++ '../../source/as_globalproperty.cpp', ++ '../../source/as_memory.cpp', ++ '../../source/as_module.cpp', ++ '../../source/as_objecttype.cpp', ++ '../../source/as_outputbuffer.cpp', ++ '../../source/as_parser.cpp', ++ '../../source/as_restore.cpp', ++ '../../source/as_scriptcode.cpp', ++ '../../source/as_scriptengine.cpp', ++ '../../source/as_scriptfunction.cpp', ++ '../../source/as_scriptnode.cpp', ++ '../../source/as_scriptobject.cpp', ++ '../../source/as_string.cpp', ++ '../../source/as_string_util.cpp', ++ '../../source/as_thread.cpp', ++ '../../source/as_tokenizer.cpp', ++ '../../source/as_typeinfo.cpp', ++ '../../source/as_variablescope.cpp', ++] ++if host_machine.cpu_family() == 'arm' ++ add_languages('c') ++ angel_scrs += [ ++ '../../source/as_callfunc_arm.cpp', ++ '../../source/as_callfunc_arm_gcc.S', ++ ] ++endif ++ ++angelscript_version_num = run_command(find_program('python3'), 'detect_ver.py', '--num').stdout().strip() ++angelscript_lib = library( ++ 'angelscript', ++ sources : angel_srcs, ++ dependencies : threads, ++ version : angelscript_version_num, ++ install : true, ++) ++angelscript_inc = include_directories('../../include') ++angelscript_dep = declare_dependency( ++ link_with : angelscript_lib, ++ include_directories : angelscript_inc, ++ version : meson.project_version(), ++) ++ ++install_headers('../../include/angelscript.h') diff --git a/angelscript.spec b/angelscript.spec index 97c2b78..c5abc4b 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -1,8 +1,10 @@ %global optflags %(echo %{optflags} -fno-strict-aliasing) +%global __sourcedir sdk/%{name}/projects/meson/ + Name: angelscript Version: 2.31.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -12,7 +14,7 @@ Source0: %{url}/sdk/files/%{name}_%{version}.zip # Sent upstream via mail Patch0: angelscript-2.31.1-meson.diff -BuildRequires: meson >= 0.23.0-3 +BuildRequires: meson ExclusiveArch: x86_64 %{ix86} %{arm} @@ -34,21 +36,15 @@ developing applications that use %{name}. %prep %autosetup -c -p1 -mkdir build %build -pushd build - %meson ../sdk/%{name}/projects/meson/ - ninja-build -v -popd +%meson +%meson_build %install -pushd build - DESTDIR=%{buildroot} ninja-build -v install -popd +%meson_install %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig %files @@ -61,6 +57,9 @@ popd %{_includedir}/%{name}.h %changelog +* Sun Nov 20 2016 Igor Gnatenko - 2.31.1-2 +- Fix FTBFS (RHBZ #1385042) + * Mon Jun 27 2016 Igor Gnatenko - 2.31.1-1 - Update to 2.31.1 (RHBZ #1350286) From cdab5a9859f44b403cbbb4894f2ed6c1b1f9d843 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 20 Nov 2016 14:26:37 +0100 Subject: [PATCH 25/59] fix typo Signed-off-by: Igor Gnatenko --- angelscript-2.31.1-meson.diff | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/angelscript-2.31.1-meson.diff b/angelscript-2.31.1-meson.diff index 1f1672f..7a0e304 100644 --- a/angelscript-2.31.1-meson.diff +++ b/angelscript-2.31.1-meson.diff @@ -1,6 +1,6 @@ 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-11-20 14:14:03.213827982 +0100 ++++ angelscript-2.31.1/sdk/angelscript/projects/meson/detect_ver.py 2016-11-20 14:26:13.894259849 +0100 @@ -1,5 +1,28 @@ -import re -with open('../../include/angelscript.h') as f: @@ -37,7 +37,7 @@ diff -uNr angelscript-2.31.1.orig/sdk/angelscript/projects/meson/detect_ver.py a + main() 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-11-20 14:14:03.214828011 +0100 ++++ angelscript-2.31.1/sdk/angelscript/projects/meson/meson.build 2016-11-20 14:26:13.895259878 +0100 @@ -1,59 +1,68 @@ -project('angelscript', 'cpp', 'c') - @@ -144,7 +144,7 @@ diff -uNr angelscript-2.31.1.orig/sdk/angelscript/projects/meson/meson.build ang +] +if host_machine.cpu_family() == 'arm' + add_languages('c') -+ angel_scrs += [ ++ angel_srcs += [ + '../../source/as_callfunc_arm.cpp', + '../../source/as_callfunc_arm_gcc.S', + ] From afb4207cdff85b34232e6f9f8848d4cec68ce9b3 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 25 Nov 2016 10:15:20 +0100 Subject: [PATCH 26/59] Build on all architectures Signed-off-by: Igor Gnatenko --- ...rror-on-Linux-with-non-x86-64bit-pla.patch | 91 ++++++++++ 0002-Changes-to-meson-project-files.patch | 113 ++++++++++++ ...fig.h-so-Linux-for-64bit-ARM-doesn-t.patch | 118 ++++++++++++ angelscript-2.31.1-meson.diff | 168 ------------------ angelscript.spec | 21 ++- 5 files changed, 336 insertions(+), 175 deletions(-) create mode 100644 0001-Fixed-compiler-error-on-Linux-with-non-x86-64bit-pla.patch create mode 100644 0002-Changes-to-meson-project-files.patch create mode 100644 0003-Corrected-as_config.h-so-Linux-for-64bit-ARM-doesn-t.patch delete mode 100644 angelscript-2.31.1-meson.diff diff --git a/0001-Fixed-compiler-error-on-Linux-with-non-x86-64bit-pla.patch b/0001-Fixed-compiler-error-on-Linux-with-non-x86-64bit-pla.patch new file mode 100644 index 0000000..76c97ab --- /dev/null +++ b/0001-Fixed-compiler-error-on-Linux-with-non-x86-64bit-pla.patch @@ -0,0 +1,91 @@ +From 5c3df25a087d2808a4dc7558663b02b318d7e064 Mon Sep 17 00:00:00 2001 +From: angelcode +Date: Thu, 29 Sep 2016 22:38:58 +0000 +Subject: [PATCH 1/3] Fixed compiler error on Linux with non-x86 64bit + platforms, e.g. arm64, mips, and s390x architectures + +git-svn-id: http://svn.code.sf.net/p/angelscript/code/trunk@2353 404ce1b2-830e-0410-a2e2-b09542c77caf +(cherry picked from commit 0fc7f2dbe7cdc455e9c2e5a7a372817b815a6eb4) +--- + sdk/angelscript/projects/cmake/CMakeLists.txt | 7 +++++-- + sdk/angelscript/source/as_config.h | 7 ++++++- + 2 files changed, 11 insertions(+), 3 deletions(-) + +diff --git a/sdk/angelscript/projects/cmake/CMakeLists.txt b/sdk/angelscript/projects/cmake/CMakeLists.txt +index 3af7f6f..9ad2440 100644 +--- a/sdk/angelscript/projects/cmake/CMakeLists.txt ++++ b/sdk/angelscript/projects/cmake/CMakeLists.txt +@@ -63,6 +63,7 @@ set(ANGELSCRIPT_SOURCE + ../../source/as_builder.cpp + ../../source/as_bytecode.cpp + ../../source/as_callfunc.cpp ++ ../../source/as_callfunc_mips.cpp + ../../source/as_callfunc_x86.cpp + ../../source/as_callfunc_x64_gcc.cpp + ../../source/as_callfunc_x64_msvc.cpp +@@ -135,7 +136,8 @@ endif() + set(ANGELSCRIPT_LIBRARY_NAME ${ANGELSCRIPT_LIBRARY_NAME} CACHE STRING "" FORCE) + + add_library(${ANGELSCRIPT_LIBRARY_NAME} ${ANGELSCRIPT_SOURCE} ${ANGELSCRIPT_HEADERS}) +-set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../lib) ++# Don't override the default library output path to avoid conflicts when building for multiple target platforms ++#set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../lib) + target_link_libraries(${ANGELSCRIPT_LIBRARY_NAME} ${CMAKE_THREAD_LIBS_INIT}) + + set_target_properties(${ANGELSCRIPT_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION}) +@@ -156,6 +158,7 @@ if(MSVC) + set_target_properties(${ANGELSCRIPT_LIBRARY_NAME} PROPERTIES COMPILE_FLAGS "/MP") + endif() + +-set(RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/../../bin) ++# Don't override the default runtime output path to avoid conflicts when building for multiple target platforms ++#set(RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/../../bin) + + +diff --git a/sdk/angelscript/source/as_config.h b/sdk/angelscript/source/as_config.h +index 9edaf0f..fce2f25 100644 +--- a/sdk/angelscript/source/as_config.h ++++ b/sdk/angelscript/source/as_config.h +@@ -841,6 +841,7 @@ + #define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY) + + #if (defined(i386) || defined(__i386) || defined(__i386__)) && !defined(__LP64__) ++ // x86 32bit + #define THISCALL_RETURN_SIMPLE_IN_MEMORY + #define CDECL_RETURN_SIMPLE_IN_MEMORY + #define STDCALL_RETURN_SIMPLE_IN_MEMORY +@@ -849,7 +850,8 @@ + #define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK + #define AS_X86 + #undef AS_NO_THISCALL_FUNCTOR_METHOD +- #elif defined(__LP64__) && !defined(__arm64__) && !defined(__PPC64__) ++ #elif defined(__x86_64__) ++ // x86 64bit + #define AS_X64_GCC + #undef AS_NO_THISCALL_FUNCTOR_METHOD + #define HAS_128_BIT_PRIMITIVES +@@ -860,6 +862,7 @@ + #undef STDCALL + #define STDCALL + #elif (defined(__ARMEL__) || defined(__arm__)) && !(defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__)) ++ // arm 32bit + #define AS_ARM + + // TODO: The stack unwind on exceptions currently fails due to the assembler code in as_callfunc_arm_gcc.S +@@ -897,11 +900,13 @@ + #undef AS_NO_THISCALL_FUNCTOR_METHOD + + #elif defined(__mips__) ++ // mips + #define AS_MIPS + #undef STDCALL + #define STDCALL + + #ifdef _ABIO32 ++ // 32bit O32 ABI + #define AS_MIPS + + // All structures are returned in memory regardless of size or complexity +-- +2.10.2 + diff --git a/0002-Changes-to-meson-project-files.patch b/0002-Changes-to-meson-project-files.patch new file mode 100644 index 0000000..1798242 --- /dev/null +++ b/0002-Changes-to-meson-project-files.patch @@ -0,0 +1,113 @@ +From b3a1fa7b884ea8f1ba63a55237c8c773050a185e Mon Sep 17 00:00:00 2001 +From: angelcode +Date: Mon, 21 Nov 2016 23:28:50 +0000 +Subject: [PATCH 2/3] Changes to meson project files + +git-svn-id: http://svn.code.sf.net/p/angelscript/code/trunk@2361 404ce1b2-830e-0410-a2e2-b09542c77caf +(cherry picked from commit 602584f835ef007463bb7d798cf4baeee4d37f2b) +--- + sdk/angelscript/projects/meson/detect_ver.py | 31 ++++++++++++++++++++++---- + sdk/angelscript/projects/meson/meson.build | 33 ++++++++++++++++++---------- + 2 files changed, 48 insertions(+), 16 deletions(-) + +diff --git a/sdk/angelscript/projects/meson/detect_ver.py b/sdk/angelscript/projects/meson/detect_ver.py +index d7ae8a5..2e05ddf 100644 +--- a/sdk/angelscript/projects/meson/detect_ver.py ++++ b/sdk/angelscript/projects/meson/detect_ver.py +@@ -1,5 +1,28 @@ ++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)) ++ ++HEADER = os.path.join(os.path.dirname(os.path.abspath(__file__)), ++ "..", "..", "include", "angelscript.h") ++ ++def main(): ++ parser = argparse.ArgumentParser() ++ parser.add_argument("--num", action="store_true", help="Print numeric version") ++ args = parser.parse_args() ++ ++ if args.num: ++ regex = re.compile(r'^#define ANGELSCRIPT_VERSION\s+(\d+)') ++ else: ++ regex = re.compile(r'^#define ANGELSCRIPT_VERSION_STRING\s+"(\d+\.\d+\.\d+.*)"') ++ ++ with open(HEADER, "r") as fobj: ++ for l in fobj: ++ match = re.match(regex, l) ++ if match is not None: ++ print(match.group(1)) ++ return ++ ++ assert False, "Can't find version" ++ ++if __name__ == "__main__": ++ main() +\ No newline at end of file +diff --git a/sdk/angelscript/projects/meson/meson.build b/sdk/angelscript/projects/meson/meson.build +index 891e8c2..9dea003 100644 +--- a/sdk/angelscript/projects/meson/meson.build ++++ b/sdk/angelscript/projects/meson/meson.build +@@ -1,14 +1,15 @@ +-project('angelscript', 'cpp', 'c') ++project('angelscript', 'cpp', ++ 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() ++threads = dependency('threads') + +-srcs = [ ++angel_srcs = [ + '../../source/as_atomic.cpp', + '../../source/as_builder.cpp', + '../../source/as_bytecode.cpp', + '../../source/as_callfunc.cpp', +- '../../source/as_callfunc_arm.cpp', + '../../source/as_callfunc_mips.cpp', + '../../source/as_callfunc_ppc.cpp', + '../../source/as_callfunc_ppc_64.cpp', +@@ -41,19 +42,27 @@ srcs = [ + '../../source/as_typeinfo.cpp', + '../../source/as_variablescope.cpp', + ] +-if arch == 'armv7l' +- srcs = srcs + [ ++if host_machine.cpu_family() == 'arm' ++ add_languages('c') ++ angel_srcs += [ + '../../source/as_callfunc_arm.cpp', +- '../../source/as_callfunc_arm_gcc.S' ++ '../../source/as_callfunc_arm_gcc.S', + ] + endif + +-shared_library( ++angelscript_version_num = run_command(find_program('python3'), 'detect_ver.py', '--num').stdout().strip() ++angelscript_lib = library( + 'angelscript', +- sources : srcs, ++ sources : angel_srcs, ++ dependencies : threads, ++ version : angelscript_version_num, + install : true, +- soversion : '0', +- version : version, ++) ++angelscript_inc = include_directories('../../include') ++angelscript_dep = declare_dependency( ++ link_with : angelscript_lib, ++ include_directories : angelscript_inc, ++ version : meson.project_version(), + ) + + install_headers('../../include/angelscript.h') +-- +2.10.2 + diff --git a/0003-Corrected-as_config.h-so-Linux-for-64bit-ARM-doesn-t.patch b/0003-Corrected-as_config.h-so-Linux-for-64bit-ARM-doesn-t.patch new file mode 100644 index 0000000..acc24f8 --- /dev/null +++ b/0003-Corrected-as_config.h-so-Linux-for-64bit-ARM-doesn-t.patch @@ -0,0 +1,118 @@ +From ba6c8a4380a54de2e3ef246d8207d2f7dfb71c1a Mon Sep 17 00:00:00 2001 +From: angelcode +Date: Thu, 24 Nov 2016 15:10:09 +0000 +Subject: [PATCH 3/3] Corrected as_config.h so Linux for 64bit ARM doesn't try + to compile as_callfunc_x64_gcc.cpp + +git-svn-id: http://svn.code.sf.net/p/angelscript/code/trunk@2364 404ce1b2-830e-0410-a2e2-b09542c77caf +(cherry picked from commit 58087fcf4b0a9cc950a48e4444654f2930ac997a) +--- + sdk/angelscript/source/as_config.h | 77 +++++++++++++++++++------------------- + 1 file changed, 39 insertions(+), 38 deletions(-) + +diff --git a/sdk/angelscript/source/as_config.h b/sdk/angelscript/source/as_config.h +index fce2f25..8542c18 100644 +--- a/sdk/angelscript/source/as_config.h ++++ b/sdk/angelscript/source/as_config.h +@@ -861,43 +861,47 @@ + // STDCALL is not available on 64bit Linux + #undef STDCALL + #define STDCALL +- #elif (defined(__ARMEL__) || defined(__arm__)) && !(defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__)) +- // arm 32bit +- #define AS_ARM ++ #elif defined(__ARMEL__) || defined(__arm__) || defined(__aarch64__) || defined(__AARCH64EL__) ++ // arm + +- // TODO: The stack unwind on exceptions currently fails due to the assembler code in as_callfunc_arm_gcc.S +- #define AS_NO_EXCEPTIONS ++ // The assembler code currently doesn't support arm v4, nor 64bit (v8) ++ #if !defined(__ARM_ARCH_4__) && !defined(__ARM_ARCH_4T__) && !defined(__LP64__) ++ #define AS_ARM + +- #undef STDCALL +- #define STDCALL ++ // TODO: The stack unwind on exceptions currently fails due to the assembler code in as_callfunc_arm_gcc.S ++ #define AS_NO_EXCEPTIONS + +- #define CDECL_RETURN_SIMPLE_IN_MEMORY +- #define STDCALL_RETURN_SIMPLE_IN_MEMORY +- #define THISCALL_RETURN_SIMPLE_IN_MEMORY ++ #undef STDCALL ++ #define STDCALL + +- #undef THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE +- #undef CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE +- #undef STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE ++ #define CDECL_RETURN_SIMPLE_IN_MEMORY ++ #define STDCALL_RETURN_SIMPLE_IN_MEMORY ++ #define THISCALL_RETURN_SIMPLE_IN_MEMORY + +- #define THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2 +- #define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2 +- #define STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2 ++ #undef THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE ++ #undef CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE ++ #undef STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE + +- #ifndef AS_MAX_PORTABILITY +- // Make a few checks against incompatible ABI combinations +- #if defined(__FAST_MATH__) && __FAST_MATH__ == 1 +- #error -ffast-math is not supported with native calling conventions +- #endif +- #endif ++ #define THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2 ++ #define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2 ++ #define STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2 + +- // Verify if soft-float or hard-float ABI is used +- #if defined(__SOFTFP__) && __SOFTFP__ == 1 +- // -ffloat-abi=softfp or -ffloat-abi=soft +- #define AS_SOFTFP +- #endif ++ #ifndef AS_MAX_PORTABILITY ++ // Make a few checks against incompatible ABI combinations ++ #if defined(__FAST_MATH__) && __FAST_MATH__ == 1 ++ #error -ffast-math is not supported with native calling conventions ++ #endif ++ #endif + +- // Tested with both hard float and soft float abi +- #undef AS_NO_THISCALL_FUNCTOR_METHOD ++ // Verify if soft-float or hard-float ABI is used ++ #if defined(__SOFTFP__) && __SOFTFP__ == 1 ++ // -ffloat-abi=softfp or -ffloat-abi=soft ++ #define AS_SOFTFP ++ #endif ++ ++ // Tested with both hard float and soft float abi ++ #undef AS_NO_THISCALL_FUNCTOR_METHOD ++ #endif + + #elif defined(__mips__) + // mips +@@ -922,15 +926,12 @@ + #define AS_MAX_PORTABILITY + #endif + #elif defined(__PPC64__) +- // Support native calling conventions on Linux with PPC64 +- // TODO: This has not yet been confirmed to work +- #define AS_PPC_64 +- #define SPLIT_OBJS_BY_MEMBER_TYPES +- #define THISCALL_RETURN_SIMPLE_IN_MEMORY +- #define CDECL_RETURN_SIMPLE_IN_MEMORY +- #define STDCALL_RETURN_SIMPLE_IN_MEMORY +- #undef STDCALL +- #define STDCALL ++ // PPC 64bit ++ ++ // The code in as_callfunc_ppc_64.cpp was built for PS3 and XBox 360, that ++ // although use 64bit PPC only uses 32bit pointers. ++ // TODO: Add support for native calling conventions on Linux with PPC 64bit ++ #define AS_MAX_PORTABILITY + #else + #define AS_MAX_PORTABILITY + #endif +-- +2.10.2 + diff --git a/angelscript-2.31.1-meson.diff b/angelscript-2.31.1-meson.diff deleted file mode 100644 index 7a0e304..0000000 --- a/angelscript-2.31.1-meson.diff +++ /dev/null @@ -1,168 +0,0 @@ -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-11-20 14:26:13.894259849 +0100 -@@ -1,5 +1,28 @@ --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)) -+import argparse -+import os -+import re -+ -+HEADER = os.path.join(os.path.dirname(os.path.abspath(__file__)), -+ "..", "..", "include", "angelscript.h") -+ -+def main(): -+ parser = argparse.ArgumentParser() -+ parser.add_argument("--num", action="store_true", help="Print numeric version") -+ args = parser.parse_args() -+ -+ if args.num: -+ regex = re.compile(r'^#define ANGELSCRIPT_VERSION\s+(\d+)') -+ else: -+ regex = re.compile(r'^#define ANGELSCRIPT_VERSION_STRING\s+"(\d+\.\d+\.\d+.*)"') -+ -+ with open(HEADER, "r") as fobj: -+ for l in fobj: -+ match = re.match(regex, l) -+ if match is not None: -+ print(match.group(1)) -+ return -+ -+ assert False, "Can't find version" -+ -+if __name__ == "__main__": -+ main() -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-11-20 14:26:13.895259878 +0100 -@@ -1,59 +1,68 @@ --project('angelscript', 'cpp', 'c') -- --arch = run_command('uname', '-p').stdout().strip() --version = run_command(find_program('python3'), 'detect_ver.py').stdout().strip() -- --srcs = [ -- '../../source/as_atomic.cpp', -- '../../source/as_builder.cpp', -- '../../source/as_bytecode.cpp', -- '../../source/as_callfunc.cpp', -- '../../source/as_callfunc_arm.cpp', -- '../../source/as_callfunc_mips.cpp', -- '../../source/as_callfunc_ppc.cpp', -- '../../source/as_callfunc_ppc_64.cpp', -- '../../source/as_callfunc_sh4.cpp', -- '../../source/as_callfunc_x86.cpp', -- '../../source/as_callfunc_x64_gcc.cpp', -- '../../source/as_callfunc_x64_mingw.cpp', -- '../../source/as_compiler.cpp', -- '../../source/as_context.cpp', -- '../../source/as_configgroup.cpp', -- '../../source/as_datatype.cpp', -- '../../source/as_generic.cpp', -- '../../source/as_gc.cpp', -- '../../source/as_globalproperty.cpp', -- '../../source/as_memory.cpp', -- '../../source/as_module.cpp', -- '../../source/as_objecttype.cpp', -- '../../source/as_outputbuffer.cpp', -- '../../source/as_parser.cpp', -- '../../source/as_restore.cpp', -- '../../source/as_scriptcode.cpp', -- '../../source/as_scriptengine.cpp', -- '../../source/as_scriptfunction.cpp', -- '../../source/as_scriptnode.cpp', -- '../../source/as_scriptobject.cpp', -- '../../source/as_string.cpp', -- '../../source/as_string_util.cpp', -- '../../source/as_thread.cpp', -- '../../source/as_tokenizer.cpp', -- '../../source/as_typeinfo.cpp', -- '../../source/as_variablescope.cpp', --] --if arch == 'armv7l' -- srcs = srcs + [ -- '../../source/as_callfunc_arm.cpp', -- '../../source/as_callfunc_arm_gcc.S' -- ] --endif -- --shared_library( -- 'angelscript', -- sources : srcs, -- install : true, -- soversion : '0', -- version : version, --) -- --install_headers('../../include/angelscript.h') -+project('angelscript', 'cpp', -+ version : run_command(find_program('python3'), 'detect_ver.py').stdout().strip(), -+ meson_version : '>=0.28.0', -+ license : 'zlib') -+ -+threads = dependency('threads') -+ -+angel_srcs = [ -+ '../../source/as_atomic.cpp', -+ '../../source/as_builder.cpp', -+ '../../source/as_bytecode.cpp', -+ '../../source/as_callfunc.cpp', -+ '../../source/as_callfunc_mips.cpp', -+ '../../source/as_callfunc_ppc.cpp', -+ '../../source/as_callfunc_ppc_64.cpp', -+ '../../source/as_callfunc_sh4.cpp', -+ '../../source/as_callfunc_x86.cpp', -+ '../../source/as_callfunc_x64_gcc.cpp', -+ '../../source/as_callfunc_x64_mingw.cpp', -+ '../../source/as_compiler.cpp', -+ '../../source/as_context.cpp', -+ '../../source/as_configgroup.cpp', -+ '../../source/as_datatype.cpp', -+ '../../source/as_generic.cpp', -+ '../../source/as_gc.cpp', -+ '../../source/as_globalproperty.cpp', -+ '../../source/as_memory.cpp', -+ '../../source/as_module.cpp', -+ '../../source/as_objecttype.cpp', -+ '../../source/as_outputbuffer.cpp', -+ '../../source/as_parser.cpp', -+ '../../source/as_restore.cpp', -+ '../../source/as_scriptcode.cpp', -+ '../../source/as_scriptengine.cpp', -+ '../../source/as_scriptfunction.cpp', -+ '../../source/as_scriptnode.cpp', -+ '../../source/as_scriptobject.cpp', -+ '../../source/as_string.cpp', -+ '../../source/as_string_util.cpp', -+ '../../source/as_thread.cpp', -+ '../../source/as_tokenizer.cpp', -+ '../../source/as_typeinfo.cpp', -+ '../../source/as_variablescope.cpp', -+] -+if host_machine.cpu_family() == 'arm' -+ add_languages('c') -+ angel_srcs += [ -+ '../../source/as_callfunc_arm.cpp', -+ '../../source/as_callfunc_arm_gcc.S', -+ ] -+endif -+ -+angelscript_version_num = run_command(find_program('python3'), 'detect_ver.py', '--num').stdout().strip() -+angelscript_lib = library( -+ 'angelscript', -+ sources : angel_srcs, -+ dependencies : threads, -+ version : angelscript_version_num, -+ install : true, -+) -+angelscript_inc = include_directories('../../include') -+angelscript_dep = declare_dependency( -+ link_with : angelscript_lib, -+ include_directories : angelscript_inc, -+ version : meson.project_version(), -+) -+ -+install_headers('../../include/angelscript.h') diff --git a/angelscript.spec b/angelscript.spec index c5abc4b..2c25837 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -4,19 +4,21 @@ Name: angelscript Version: 2.31.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Flexible cross-platform scripting library License: zlib URL: http://www.angelcode.com/angelscript/ Source0: %{url}/sdk/files/%{name}_%{version}.zip - -# Sent upstream via mail -Patch0: angelscript-2.31.1-meson.diff +# r2353 +Patch0001: 0001-Fixed-compiler-error-on-Linux-with-non-x86-64bit-pla.patch +# r2361 +Patch0002: 0002-Changes-to-meson-project-files.patch +# r2364 +Patch0003: 0003-Corrected-as_config.h-so-Linux-for-64bit-ARM-doesn-t.patch BuildRequires: meson - -ExclusiveArch: x86_64 %{ix86} %{arm} +BuildRequires: dos2unix %description The AngelScript library is a software library for easy integration of @@ -35,7 +37,9 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep -%autosetup -c -p1 +%setup -q -c +find -type f -exec dos2unix {} ';' +%autopatch -p1 %build %meson @@ -57,6 +61,9 @@ developing applications that use %{name}. %{_includedir}/%{name}.h %changelog +* Fri Nov 25 2016 Igor Gnatenko - 2.31.1-3 +- Build on all architectures + * Sun Nov 20 2016 Igor Gnatenko - 2.31.1-2 - Fix FTBFS (RHBZ #1385042) From d31ca198872c588d04e97bad34c1f911c3b467c3 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 16 Dec 2016 13:20:04 +0100 Subject: [PATCH 27/59] Use VPATH macro properly Signed-off-by: Igor Gnatenko --- angelscript.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/angelscript.spec b/angelscript.spec index 2c25837..763b282 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -1,10 +1,10 @@ %global optflags %(echo %{optflags} -fno-strict-aliasing) -%global __sourcedir sdk/%{name}/projects/meson/ +%global _vpath_srcdir sdk/%{name}/projects/meson/ Name: angelscript Version: 2.31.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -61,6 +61,9 @@ find -type f -exec dos2unix {} ';' %{_includedir}/%{name}.h %changelog +* Fri Dec 16 2016 Igor Gnatenko - 2.31.1-4 +- Use VPATH macro properly + * Fri Nov 25 2016 Igor Gnatenko - 2.31.1-3 - Build on all architectures From bdcb577458ed91a59853dd30ddd5c57402d7bd20 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 18 Dec 2016 17:28:23 +0100 Subject: [PATCH 28/59] Update to 2.31.2 Signed-off-by: Igor Gnatenko --- .gitignore | 1 + ...rror-on-Linux-with-non-x86-64bit-pla.patch | 91 -------------- 0002-Changes-to-meson-project-files.patch | 113 ----------------- ...fig.h-so-Linux-for-64bit-ARM-doesn-t.patch | 118 ------------------ angelscript.spec | 19 ++- sources | 2 +- 6 files changed, 10 insertions(+), 334 deletions(-) delete mode 100644 0001-Fixed-compiler-error-on-Linux-with-non-x86-64bit-pla.patch delete mode 100644 0002-Changes-to-meson-project-files.patch delete mode 100644 0003-Corrected-as_config.h-so-Linux-for-64bit-ARM-doesn-t.patch diff --git a/.gitignore b/.gitignore index ec34553..8c8ecf4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /angelscript_2.30.2.zip /angelscript_2.31.0.zip /angelscript_2.31.1.zip +/angelscript_2.31.2.zip diff --git a/0001-Fixed-compiler-error-on-Linux-with-non-x86-64bit-pla.patch b/0001-Fixed-compiler-error-on-Linux-with-non-x86-64bit-pla.patch deleted file mode 100644 index 76c97ab..0000000 --- a/0001-Fixed-compiler-error-on-Linux-with-non-x86-64bit-pla.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 5c3df25a087d2808a4dc7558663b02b318d7e064 Mon Sep 17 00:00:00 2001 -From: angelcode -Date: Thu, 29 Sep 2016 22:38:58 +0000 -Subject: [PATCH 1/3] Fixed compiler error on Linux with non-x86 64bit - platforms, e.g. arm64, mips, and s390x architectures - -git-svn-id: http://svn.code.sf.net/p/angelscript/code/trunk@2353 404ce1b2-830e-0410-a2e2-b09542c77caf -(cherry picked from commit 0fc7f2dbe7cdc455e9c2e5a7a372817b815a6eb4) ---- - sdk/angelscript/projects/cmake/CMakeLists.txt | 7 +++++-- - sdk/angelscript/source/as_config.h | 7 ++++++- - 2 files changed, 11 insertions(+), 3 deletions(-) - -diff --git a/sdk/angelscript/projects/cmake/CMakeLists.txt b/sdk/angelscript/projects/cmake/CMakeLists.txt -index 3af7f6f..9ad2440 100644 ---- a/sdk/angelscript/projects/cmake/CMakeLists.txt -+++ b/sdk/angelscript/projects/cmake/CMakeLists.txt -@@ -63,6 +63,7 @@ set(ANGELSCRIPT_SOURCE - ../../source/as_builder.cpp - ../../source/as_bytecode.cpp - ../../source/as_callfunc.cpp -+ ../../source/as_callfunc_mips.cpp - ../../source/as_callfunc_x86.cpp - ../../source/as_callfunc_x64_gcc.cpp - ../../source/as_callfunc_x64_msvc.cpp -@@ -135,7 +136,8 @@ endif() - set(ANGELSCRIPT_LIBRARY_NAME ${ANGELSCRIPT_LIBRARY_NAME} CACHE STRING "" FORCE) - - add_library(${ANGELSCRIPT_LIBRARY_NAME} ${ANGELSCRIPT_SOURCE} ${ANGELSCRIPT_HEADERS}) --set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../lib) -+# Don't override the default library output path to avoid conflicts when building for multiple target platforms -+#set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../lib) - target_link_libraries(${ANGELSCRIPT_LIBRARY_NAME} ${CMAKE_THREAD_LIBS_INIT}) - - set_target_properties(${ANGELSCRIPT_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION}) -@@ -156,6 +158,7 @@ if(MSVC) - set_target_properties(${ANGELSCRIPT_LIBRARY_NAME} PROPERTIES COMPILE_FLAGS "/MP") - endif() - --set(RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/../../bin) -+# Don't override the default runtime output path to avoid conflicts when building for multiple target platforms -+#set(RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/../../bin) - - -diff --git a/sdk/angelscript/source/as_config.h b/sdk/angelscript/source/as_config.h -index 9edaf0f..fce2f25 100644 ---- a/sdk/angelscript/source/as_config.h -+++ b/sdk/angelscript/source/as_config.h -@@ -841,6 +841,7 @@ - #define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY) - - #if (defined(i386) || defined(__i386) || defined(__i386__)) && !defined(__LP64__) -+ // x86 32bit - #define THISCALL_RETURN_SIMPLE_IN_MEMORY - #define CDECL_RETURN_SIMPLE_IN_MEMORY - #define STDCALL_RETURN_SIMPLE_IN_MEMORY -@@ -849,7 +850,8 @@ - #define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK - #define AS_X86 - #undef AS_NO_THISCALL_FUNCTOR_METHOD -- #elif defined(__LP64__) && !defined(__arm64__) && !defined(__PPC64__) -+ #elif defined(__x86_64__) -+ // x86 64bit - #define AS_X64_GCC - #undef AS_NO_THISCALL_FUNCTOR_METHOD - #define HAS_128_BIT_PRIMITIVES -@@ -860,6 +862,7 @@ - #undef STDCALL - #define STDCALL - #elif (defined(__ARMEL__) || defined(__arm__)) && !(defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__)) -+ // arm 32bit - #define AS_ARM - - // TODO: The stack unwind on exceptions currently fails due to the assembler code in as_callfunc_arm_gcc.S -@@ -897,11 +900,13 @@ - #undef AS_NO_THISCALL_FUNCTOR_METHOD - - #elif defined(__mips__) -+ // mips - #define AS_MIPS - #undef STDCALL - #define STDCALL - - #ifdef _ABIO32 -+ // 32bit O32 ABI - #define AS_MIPS - - // All structures are returned in memory regardless of size or complexity --- -2.10.2 - diff --git a/0002-Changes-to-meson-project-files.patch b/0002-Changes-to-meson-project-files.patch deleted file mode 100644 index 1798242..0000000 --- a/0002-Changes-to-meson-project-files.patch +++ /dev/null @@ -1,113 +0,0 @@ -From b3a1fa7b884ea8f1ba63a55237c8c773050a185e Mon Sep 17 00:00:00 2001 -From: angelcode -Date: Mon, 21 Nov 2016 23:28:50 +0000 -Subject: [PATCH 2/3] Changes to meson project files - -git-svn-id: http://svn.code.sf.net/p/angelscript/code/trunk@2361 404ce1b2-830e-0410-a2e2-b09542c77caf -(cherry picked from commit 602584f835ef007463bb7d798cf4baeee4d37f2b) ---- - sdk/angelscript/projects/meson/detect_ver.py | 31 ++++++++++++++++++++++---- - sdk/angelscript/projects/meson/meson.build | 33 ++++++++++++++++++---------- - 2 files changed, 48 insertions(+), 16 deletions(-) - -diff --git a/sdk/angelscript/projects/meson/detect_ver.py b/sdk/angelscript/projects/meson/detect_ver.py -index d7ae8a5..2e05ddf 100644 ---- a/sdk/angelscript/projects/meson/detect_ver.py -+++ b/sdk/angelscript/projects/meson/detect_ver.py -@@ -1,5 +1,28 @@ -+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)) -+ -+HEADER = os.path.join(os.path.dirname(os.path.abspath(__file__)), -+ "..", "..", "include", "angelscript.h") -+ -+def main(): -+ parser = argparse.ArgumentParser() -+ parser.add_argument("--num", action="store_true", help="Print numeric version") -+ args = parser.parse_args() -+ -+ if args.num: -+ regex = re.compile(r'^#define ANGELSCRIPT_VERSION\s+(\d+)') -+ else: -+ regex = re.compile(r'^#define ANGELSCRIPT_VERSION_STRING\s+"(\d+\.\d+\.\d+.*)"') -+ -+ with open(HEADER, "r") as fobj: -+ for l in fobj: -+ match = re.match(regex, l) -+ if match is not None: -+ print(match.group(1)) -+ return -+ -+ assert False, "Can't find version" -+ -+if __name__ == "__main__": -+ main() -\ No newline at end of file -diff --git a/sdk/angelscript/projects/meson/meson.build b/sdk/angelscript/projects/meson/meson.build -index 891e8c2..9dea003 100644 ---- a/sdk/angelscript/projects/meson/meson.build -+++ b/sdk/angelscript/projects/meson/meson.build -@@ -1,14 +1,15 @@ --project('angelscript', 'cpp', 'c') -+project('angelscript', 'cpp', -+ 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() -+threads = dependency('threads') - --srcs = [ -+angel_srcs = [ - '../../source/as_atomic.cpp', - '../../source/as_builder.cpp', - '../../source/as_bytecode.cpp', - '../../source/as_callfunc.cpp', -- '../../source/as_callfunc_arm.cpp', - '../../source/as_callfunc_mips.cpp', - '../../source/as_callfunc_ppc.cpp', - '../../source/as_callfunc_ppc_64.cpp', -@@ -41,19 +42,27 @@ srcs = [ - '../../source/as_typeinfo.cpp', - '../../source/as_variablescope.cpp', - ] --if arch == 'armv7l' -- srcs = srcs + [ -+if host_machine.cpu_family() == 'arm' -+ add_languages('c') -+ angel_srcs += [ - '../../source/as_callfunc_arm.cpp', -- '../../source/as_callfunc_arm_gcc.S' -+ '../../source/as_callfunc_arm_gcc.S', - ] - endif - --shared_library( -+angelscript_version_num = run_command(find_program('python3'), 'detect_ver.py', '--num').stdout().strip() -+angelscript_lib = library( - 'angelscript', -- sources : srcs, -+ sources : angel_srcs, -+ dependencies : threads, -+ version : angelscript_version_num, - install : true, -- soversion : '0', -- version : version, -+) -+angelscript_inc = include_directories('../../include') -+angelscript_dep = declare_dependency( -+ link_with : angelscript_lib, -+ include_directories : angelscript_inc, -+ version : meson.project_version(), - ) - - install_headers('../../include/angelscript.h') --- -2.10.2 - diff --git a/0003-Corrected-as_config.h-so-Linux-for-64bit-ARM-doesn-t.patch b/0003-Corrected-as_config.h-so-Linux-for-64bit-ARM-doesn-t.patch deleted file mode 100644 index acc24f8..0000000 --- a/0003-Corrected-as_config.h-so-Linux-for-64bit-ARM-doesn-t.patch +++ /dev/null @@ -1,118 +0,0 @@ -From ba6c8a4380a54de2e3ef246d8207d2f7dfb71c1a Mon Sep 17 00:00:00 2001 -From: angelcode -Date: Thu, 24 Nov 2016 15:10:09 +0000 -Subject: [PATCH 3/3] Corrected as_config.h so Linux for 64bit ARM doesn't try - to compile as_callfunc_x64_gcc.cpp - -git-svn-id: http://svn.code.sf.net/p/angelscript/code/trunk@2364 404ce1b2-830e-0410-a2e2-b09542c77caf -(cherry picked from commit 58087fcf4b0a9cc950a48e4444654f2930ac997a) ---- - sdk/angelscript/source/as_config.h | 77 +++++++++++++++++++------------------- - 1 file changed, 39 insertions(+), 38 deletions(-) - -diff --git a/sdk/angelscript/source/as_config.h b/sdk/angelscript/source/as_config.h -index fce2f25..8542c18 100644 ---- a/sdk/angelscript/source/as_config.h -+++ b/sdk/angelscript/source/as_config.h -@@ -861,43 +861,47 @@ - // STDCALL is not available on 64bit Linux - #undef STDCALL - #define STDCALL -- #elif (defined(__ARMEL__) || defined(__arm__)) && !(defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__)) -- // arm 32bit -- #define AS_ARM -+ #elif defined(__ARMEL__) || defined(__arm__) || defined(__aarch64__) || defined(__AARCH64EL__) -+ // arm - -- // TODO: The stack unwind on exceptions currently fails due to the assembler code in as_callfunc_arm_gcc.S -- #define AS_NO_EXCEPTIONS -+ // The assembler code currently doesn't support arm v4, nor 64bit (v8) -+ #if !defined(__ARM_ARCH_4__) && !defined(__ARM_ARCH_4T__) && !defined(__LP64__) -+ #define AS_ARM - -- #undef STDCALL -- #define STDCALL -+ // TODO: The stack unwind on exceptions currently fails due to the assembler code in as_callfunc_arm_gcc.S -+ #define AS_NO_EXCEPTIONS - -- #define CDECL_RETURN_SIMPLE_IN_MEMORY -- #define STDCALL_RETURN_SIMPLE_IN_MEMORY -- #define THISCALL_RETURN_SIMPLE_IN_MEMORY -+ #undef STDCALL -+ #define STDCALL - -- #undef THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE -- #undef CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE -- #undef STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE -+ #define CDECL_RETURN_SIMPLE_IN_MEMORY -+ #define STDCALL_RETURN_SIMPLE_IN_MEMORY -+ #define THISCALL_RETURN_SIMPLE_IN_MEMORY - -- #define THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2 -- #define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2 -- #define STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2 -+ #undef THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE -+ #undef CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE -+ #undef STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE - -- #ifndef AS_MAX_PORTABILITY -- // Make a few checks against incompatible ABI combinations -- #if defined(__FAST_MATH__) && __FAST_MATH__ == 1 -- #error -ffast-math is not supported with native calling conventions -- #endif -- #endif -+ #define THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2 -+ #define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2 -+ #define STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2 - -- // Verify if soft-float or hard-float ABI is used -- #if defined(__SOFTFP__) && __SOFTFP__ == 1 -- // -ffloat-abi=softfp or -ffloat-abi=soft -- #define AS_SOFTFP -- #endif -+ #ifndef AS_MAX_PORTABILITY -+ // Make a few checks against incompatible ABI combinations -+ #if defined(__FAST_MATH__) && __FAST_MATH__ == 1 -+ #error -ffast-math is not supported with native calling conventions -+ #endif -+ #endif - -- // Tested with both hard float and soft float abi -- #undef AS_NO_THISCALL_FUNCTOR_METHOD -+ // Verify if soft-float or hard-float ABI is used -+ #if defined(__SOFTFP__) && __SOFTFP__ == 1 -+ // -ffloat-abi=softfp or -ffloat-abi=soft -+ #define AS_SOFTFP -+ #endif -+ -+ // Tested with both hard float and soft float abi -+ #undef AS_NO_THISCALL_FUNCTOR_METHOD -+ #endif - - #elif defined(__mips__) - // mips -@@ -922,15 +926,12 @@ - #define AS_MAX_PORTABILITY - #endif - #elif defined(__PPC64__) -- // Support native calling conventions on Linux with PPC64 -- // TODO: This has not yet been confirmed to work -- #define AS_PPC_64 -- #define SPLIT_OBJS_BY_MEMBER_TYPES -- #define THISCALL_RETURN_SIMPLE_IN_MEMORY -- #define CDECL_RETURN_SIMPLE_IN_MEMORY -- #define STDCALL_RETURN_SIMPLE_IN_MEMORY -- #undef STDCALL -- #define STDCALL -+ // PPC 64bit -+ -+ // The code in as_callfunc_ppc_64.cpp was built for PS3 and XBox 360, that -+ // although use 64bit PPC only uses 32bit pointers. -+ // TODO: Add support for native calling conventions on Linux with PPC 64bit -+ #define AS_MAX_PORTABILITY - #else - #define AS_MAX_PORTABILITY - #endif --- -2.10.2 - diff --git a/angelscript.spec b/angelscript.spec index 763b282..904fb80 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -3,22 +3,16 @@ %global _vpath_srcdir sdk/%{name}/projects/meson/ Name: angelscript -Version: 2.31.1 -Release: 4%{?dist} +Version: 2.31.2 +Release: 1%{?dist} Summary: Flexible cross-platform scripting library License: zlib URL: http://www.angelcode.com/angelscript/ Source0: %{url}/sdk/files/%{name}_%{version}.zip -# r2353 -Patch0001: 0001-Fixed-compiler-error-on-Linux-with-non-x86-64bit-pla.patch -# r2361 -Patch0002: 0002-Changes-to-meson-project-files.patch -# r2364 -Patch0003: 0003-Corrected-as_config.h-so-Linux-for-64bit-ARM-doesn-t.patch BuildRequires: meson -BuildRequires: dos2unix +#BuildRequires: dos2unix %description The AngelScript library is a software library for easy integration of @@ -38,8 +32,8 @@ developing applications that use %{name}. %prep %setup -q -c -find -type f -exec dos2unix {} ';' -%autopatch -p1 +#find -type f -exec dos2unix {} ';' +#autopatch -p1 %build %meson @@ -61,6 +55,9 @@ find -type f -exec dos2unix {} ';' %{_includedir}/%{name}.h %changelog +* Sun Dec 18 2016 Igor Gnatenko - 2.31.2-1 +- Update to 2.31.2 + * Fri Dec 16 2016 Igor Gnatenko - 2.31.1-4 - Use VPATH macro properly diff --git a/sources b/sources index 5503adc..0c5bfdf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -961ddac47dde68f3c4b27b7bd0d136f7 angelscript_2.31.1.zip +SHA512 (angelscript_2.31.2.zip) = 4dd4c64caf4fc66a9fbda55d0fb81b91a6af5f5d4f28728343ff06455418ebaf5a36895e04e0bc2aebd76b510e81357f7e0ffd7e575b49bbc9573c106f24b265 From 26ee40ec6c671f60dd800869fa89ff9cf55ff55d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 05:58:11 +0000 Subject: [PATCH 29/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- angelscript.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angelscript.spec b/angelscript.spec index 904fb80..3203a36 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -4,7 +4,7 @@ Name: angelscript Version: 2.31.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -55,6 +55,9 @@ developing applications that use %{name}. %{_includedir}/%{name}.h %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 2.31.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sun Dec 18 2016 Igor Gnatenko - 2.31.2-1 - Update to 2.31.2 From 58bcc5e8f89e500158a04b3d27edb2a190ece15a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 02:52:26 +0000 Subject: [PATCH 30/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- angelscript.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angelscript.spec b/angelscript.spec index 3203a36..37f0849 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -4,7 +4,7 @@ Name: angelscript Version: 2.31.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -55,6 +55,9 @@ developing applications that use %{name}. %{_includedir}/%{name}.h %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.31.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 2.31.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From bf9e8c008c6fedb4b2c7347a01e3846179e5f159 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 17:35:20 +0000 Subject: [PATCH 31/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- angelscript.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angelscript.spec b/angelscript.spec index 37f0849..a790550 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -4,7 +4,7 @@ Name: angelscript Version: 2.31.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -55,6 +55,9 @@ developing applications that use %{name}. %{_includedir}/%{name}.h %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 2.31.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 2.31.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 6716be75f24804e59365e827827e57fad02aac16 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 31 Dec 2017 13:38:29 +0100 Subject: [PATCH 32/59] Update to 2.32.0 Signed-off-by: Igor Gnatenko --- .gitignore | 1 + angelscript.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8c8ecf4..81bd08f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /angelscript_2.31.0.zip /angelscript_2.31.1.zip /angelscript_2.31.2.zip +/angelscript_2.32.0.zip diff --git a/angelscript.spec b/angelscript.spec index a790550..a8f10bd 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -3,8 +3,8 @@ %global _vpath_srcdir sdk/%{name}/projects/meson/ Name: angelscript -Version: 2.31.2 -Release: 4%{?dist} +Version: 2.32.0 +Release: 1%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -55,6 +55,9 @@ developing applications that use %{name}. %{_includedir}/%{name}.h %changelog +* Sun Dec 31 2017 Igor Gnatenko - 2.32.0-1 +- Update to 2.32.0 + * Wed Aug 02 2017 Fedora Release Engineering - 2.31.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 0c5bfdf..94a5c17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (angelscript_2.31.2.zip) = 4dd4c64caf4fc66a9fbda55d0fb81b91a6af5f5d4f28728343ff06455418ebaf5a36895e04e0bc2aebd76b510e81357f7e0ffd7e575b49bbc9573c106f24b265 +SHA512 (angelscript_2.32.0.zip) = a88bd8e7e9f7116450ea8185642d7f6bfccf1530bff3630957839031aaed80075ecf27b9c551d4282051a8fb28d0b8814b56abf84a45d6008de2afa4019edf8e From edf3170183a96db94ec2fb404a38cc77ed7b2867 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 31 Jan 2018 17:22:04 +0100 Subject: [PATCH 33/59] Switch to %ldconfig_scriptlets Signed-off-by: Igor Gnatenko --- angelscript.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/angelscript.spec b/angelscript.spec index a8f10bd..0401d22 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -4,7 +4,7 @@ Name: angelscript Version: 2.32.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -42,8 +42,7 @@ developing applications that use %{name}. %install %meson_install -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %doc sdk/docs/articles/*.html @@ -55,6 +54,9 @@ developing applications that use %{name}. %{_includedir}/%{name}.h %changelog +* Wed Jan 31 2018 Igor Gnatenko - 2.32.0-2 +- Switch to %%ldconfig_scriptlets + * Sun Dec 31 2017 Igor Gnatenko - 2.32.0-1 - Update to 2.32.0 From 9f656d8433ae5f68fa46185c8c630c12079324fa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 02:16:58 +0000 Subject: [PATCH 34/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- angelscript.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angelscript.spec b/angelscript.spec index 0401d22..2b0c003 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -4,7 +4,7 @@ Name: angelscript Version: 2.32.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -54,6 +54,9 @@ developing applications that use %{name}. %{_includedir}/%{name}.h %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 2.32.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jan 31 2018 Igor Gnatenko - 2.32.0-2 - Switch to %%ldconfig_scriptlets From 5ca1a3071182aa688a63d5eb88472431aba6c6f6 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 18 Feb 2018 21:26:50 +0100 Subject: [PATCH 35/59] Add BuildRequires: gcc-c++ Signed-off-by: Igor Gnatenko --- angelscript.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/angelscript.spec b/angelscript.spec index 2b0c003..df39d82 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -4,7 +4,7 @@ Name: angelscript Version: 2.32.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -12,7 +12,7 @@ URL: http://www.angelcode.com/angelscript/ Source0: %{url}/sdk/files/%{name}_%{version}.zip BuildRequires: meson -#BuildRequires: dos2unix +BuildRequires: gcc-c++ %description The AngelScript library is a software library for easy integration of @@ -31,9 +31,7 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep -%setup -q -c -#find -type f -exec dos2unix {} ';' -#autopatch -p1 +%autosetup -c %build %meson @@ -54,6 +52,9 @@ developing applications that use %{name}. %{_includedir}/%{name}.h %changelog +* Sun Feb 18 2018 Igor Gnatenko - 2.32.0-4 +- Add BuildRequires: gcc-c++ + * Wed Feb 07 2018 Fedora Release Engineering - 2.32.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 9420ec0eaf8c3ff47b5fb6375a545893977587ed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 20:13:47 +0000 Subject: [PATCH 36/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- angelscript.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angelscript.spec b/angelscript.spec index df39d82..fd09964 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -4,7 +4,7 @@ Name: angelscript Version: 2.32.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -52,6 +52,9 @@ developing applications that use %{name}. %{_includedir}/%{name}.h %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 2.32.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sun Feb 18 2018 Igor Gnatenko - 2.32.0-4 - Add BuildRequires: gcc-c++ From c019ab507b84294f6a707a2b579f90d99e8c3559 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 13:19:21 +0000 Subject: [PATCH 37/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- angelscript.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angelscript.spec b/angelscript.spec index fd09964..7f43171 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -4,7 +4,7 @@ Name: angelscript Version: 2.32.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -52,6 +52,9 @@ developing applications that use %{name}. %{_includedir}/%{name}.h %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 2.32.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 2.32.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From c568d64afdc66f8cd1af8bfb175fe2735ac71529 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 17:54:32 +0000 Subject: [PATCH 38/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- angelscript.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angelscript.spec b/angelscript.spec index 7f43171..280cae6 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -4,7 +4,7 @@ Name: angelscript Version: 2.32.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -52,6 +52,9 @@ developing applications that use %{name}. %{_includedir}/%{name}.h %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 2.32.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 2.32.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 6b92079b2b66bb81d5b9cdaa4aa9928a1729b558 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:35:19 +0000 Subject: [PATCH 39/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- angelscript.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angelscript.spec b/angelscript.spec index 280cae6..377253b 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -4,7 +4,7 @@ Name: angelscript Version: 2.32.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -52,6 +52,9 @@ developing applications that use %{name}. %{_includedir}/%{name}.h %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 2.32.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 2.32.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 51d8702298e6177c415b7e798f8e1c1e2dbee74b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 12:03:33 +0000 Subject: [PATCH 40/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- angelscript.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angelscript.spec b/angelscript.spec index 377253b..cdc4c22 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -4,7 +4,7 @@ Name: angelscript Version: 2.32.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -52,6 +52,9 @@ developing applications that use %{name}. %{_includedir}/%{name}.h %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.32.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 2.32.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 29756014cfd5b972ccaf714da9beacbcdac5f1c5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jul 2020 23:59:05 +0000 Subject: [PATCH 41/59] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- angelscript.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/angelscript.spec b/angelscript.spec index cdc4c22..dff59c7 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -4,7 +4,7 @@ Name: angelscript Version: 2.32.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -52,6 +52,10 @@ developing applications that use %{name}. %{_includedir}/%{name}.h %changelog +* Fri Jul 31 2020 Fedora Release Engineering - 2.32.0-10 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 2.32.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From ca33121509416831bf2975dcb9a7de8e42d79887 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:06:20 +0000 Subject: [PATCH 42/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- angelscript.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angelscript.spec b/angelscript.spec index dff59c7..c4083fd 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -4,7 +4,7 @@ Name: angelscript Version: 2.32.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -52,6 +52,9 @@ developing applications that use %{name}. %{_includedir}/%{name}.h %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.32.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Jul 31 2020 Fedora Release Engineering - 2.32.0-10 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From dfcc71385a640680584a4f8df0fd4af1b8f49a94 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:38:31 +0000 Subject: [PATCH 43/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 935f476537d31b9cee12c279533080ff97ad3f3c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:34:08 +0000 Subject: [PATCH 44/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- angelscript.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angelscript.spec b/angelscript.spec index c4083fd..f81e169 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -4,7 +4,7 @@ Name: angelscript Version: 2.32.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -52,6 +52,9 @@ developing applications that use %{name}. %{_includedir}/%{name}.h %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 2.32.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 2.32.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From e97be5d52f9b996d848f72e186dde046142970c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:15:58 +0000 Subject: [PATCH 45/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- angelscript.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angelscript.spec b/angelscript.spec index f81e169..622a762 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -4,7 +4,7 @@ Name: angelscript Version: 2.32.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -52,6 +52,9 @@ developing applications that use %{name}. %{_includedir}/%{name}.h %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 2.32.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 2.32.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From d524c11421d44a245c537209f08edf5a3970826f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:48:11 +0000 Subject: [PATCH 46/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- angelscript.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angelscript.spec b/angelscript.spec index 622a762..0ed5868 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -4,7 +4,7 @@ Name: angelscript Version: 2.32.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -52,6 +52,9 @@ developing applications that use %{name}. %{_includedir}/%{name}.h %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 2.32.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 2.32.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 9b881da220d68d8ab976ed1b6a5196f82fcc543a Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Mon, 21 Nov 2022 23:59:46 +0000 Subject: [PATCH 47/59] Update to 2.35.1 --- .gitignore | 1 + angelscript.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 81bd08f..7060f5e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /angelscript_2.31.1.zip /angelscript_2.31.2.zip /angelscript_2.32.0.zip +/angelscript_2.35.1.zip diff --git a/angelscript.spec b/angelscript.spec index 0ed5868..ac0a9d0 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -3,8 +3,8 @@ %global _vpath_srcdir sdk/%{name}/projects/meson/ Name: angelscript -Version: 2.32.0 -Release: 14%{?dist} +Version: 2.35.1 +Release: 1%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -52,6 +52,9 @@ developing applications that use %{name}. %{_includedir}/%{name}.h %changelog +* Mon Nov 21 2022 Pete Walter - 2.35.1-1 +- Update to 2.35.1 + * Wed Jul 20 2022 Fedora Release Engineering - 2.32.0-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 94a5c17..f7c07eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (angelscript_2.32.0.zip) = a88bd8e7e9f7116450ea8185642d7f6bfccf1530bff3630957839031aaed80075ecf27b9c551d4282051a8fb28d0b8814b56abf84a45d6008de2afa4019edf8e +SHA512 (angelscript_2.35.1.zip) = b15083c7a77434c291e72ea82cfbab7734fa79df654d911a822f306d526669ebe9e55a981e8a1914deda0d2a52ebdc0ffb51a4179f307632c8c7d74b1abc69fa From 2398f5242e1be2d90683204394e7b766b57df18d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:44:31 +0000 Subject: [PATCH 48/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- angelscript.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angelscript.spec b/angelscript.spec index ac0a9d0..fd7223d 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -4,7 +4,7 @@ Name: angelscript Version: 2.35.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -52,6 +52,9 @@ developing applications that use %{name}. %{_includedir}/%{name}.h %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 2.35.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Nov 21 2022 Pete Walter - 2.35.1-1 - Update to 2.35.1 From 518ba30cf459405b623b1bbd60c2608cfa541c22 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:17:02 +0000 Subject: [PATCH 49/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- angelscript.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angelscript.spec b/angelscript.spec index fd7223d..79d3b3b 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -4,7 +4,7 @@ Name: angelscript Version: 2.35.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -52,6 +52,9 @@ developing applications that use %{name}. %{_includedir}/%{name}.h %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.35.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 2.35.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 919dc64f4bf9522d84e4146ce704992f3227b798 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:56:39 +0000 Subject: [PATCH 50/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- angelscript.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angelscript.spec b/angelscript.spec index 79d3b3b..b0ded2e 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -4,7 +4,7 @@ Name: angelscript Version: 2.35.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -52,6 +52,9 @@ developing applications that use %{name}. %{_includedir}/%{name}.h %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2.35.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 2.35.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From eeb5ad673310d9a690b59e635585399a66feba2b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 23:03:00 +0000 Subject: [PATCH 51/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- angelscript.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angelscript.spec b/angelscript.spec index b0ded2e..4586dd1 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -4,7 +4,7 @@ Name: angelscript Version: 2.35.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -52,6 +52,9 @@ developing applications that use %{name}. %{_includedir}/%{name}.h %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 2.35.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.35.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 8367175c2f3d7e2601212d1fbdf775ca4b7731f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:59:44 +0000 Subject: [PATCH 52/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- angelscript.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angelscript.spec b/angelscript.spec index 4586dd1..e37d974 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -4,7 +4,7 @@ Name: angelscript Version: 2.35.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -52,6 +52,9 @@ developing applications that use %{name}. %{_includedir}/%{name}.h %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 2.35.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 2.35.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 9bf6aecdc9a395abb6612567936dcd2b9debeee4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:02:41 +0000 Subject: [PATCH 53/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- angelscript.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angelscript.spec b/angelscript.spec index e37d974..34d0275 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -4,7 +4,7 @@ Name: angelscript Version: 2.35.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -52,6 +52,9 @@ developing applications that use %{name}. %{_includedir}/%{name}.h %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 2.35.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 2.35.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 9c78859b115688a7bd7161b2dacbe9efd638bf03 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:59:05 +0000 Subject: [PATCH 54/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- angelscript.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angelscript.spec b/angelscript.spec index 34d0275..880d580 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -4,7 +4,7 @@ Name: angelscript Version: 2.35.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -52,6 +52,9 @@ developing applications that use %{name}. %{_includedir}/%{name}.h %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 2.35.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 2.35.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 4af1783418424642012ee7a37449b4d65617a839 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 14 Aug 2025 11:39:02 -0500 Subject: [PATCH 55/59] 2.38.0 --- .gitignore | 1 + angelscript.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7060f5e..256d856 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /angelscript_2.31.2.zip /angelscript_2.32.0.zip /angelscript_2.35.1.zip +/angelscript_2.38.0.zip diff --git a/angelscript.spec b/angelscript.spec index 880d580..6ce4e51 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -3,8 +3,8 @@ %global _vpath_srcdir sdk/%{name}/projects/meson/ Name: angelscript -Version: 2.35.1 -Release: 8%{?dist} +Version: 2.38.0 +Release: 1%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -52,6 +52,9 @@ developing applications that use %{name}. %{_includedir}/%{name}.h %changelog +* Thu Aug 14 2025 Gwyn Ciesla - 2.38.0-1 +- 2.38.0 + * Wed Jul 23 2025 Fedora Release Engineering - 2.35.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index f7c07eb..8e7fcbc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (angelscript_2.35.1.zip) = b15083c7a77434c291e72ea82cfbab7734fa79df654d911a822f306d526669ebe9e55a981e8a1914deda0d2a52ebdc0ffb51a4179f307632c8c7d74b1abc69fa +SHA512 (angelscript_2.38.0.zip) = 87c94042932f15d07fe6ede4c3671b1f73ac757b68ab360187591497eeabc56a4ddb7901e4567108e44886a2011a29c2884d4b7389557826f36a6c384f4a9c69 From f44cd24fdc4ff3350de25074ac2c3391614536d1 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 14 Aug 2025 16:17:59 -0500 Subject: [PATCH 56/59] Capture solib in files section to prevent unplanned solib changes --- angelscript.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/angelscript.spec b/angelscript.spec index 6ce4e51..44121fb 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -44,7 +44,7 @@ developing applications that use %{name}. %files %doc sdk/docs/articles/*.html -%{_libdir}/lib%{name}.so.* +%{_libdir}/lib%{name}.so.23501 %files devel %doc sdk/docs/manual/* From 44b5e7376e812b8be59e244e51c5936c47d82a5a Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 14 Aug 2025 16:19:53 -0500 Subject: [PATCH 57/59] Bump EVR --- angelscript.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angelscript.spec b/angelscript.spec index 44121fb..37196b9 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -4,7 +4,7 @@ Name: angelscript Version: 2.38.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -52,6 +52,9 @@ developing applications that use %{name}. %{_includedir}/%{name}.h %changelog +* Thu Aug 14 2025 Gwyn Ciesla - 2.38.0-2 +- specify solib + * Thu Aug 14 2025 Gwyn Ciesla - 2.38.0-1 - 2.38.0 From 3d6e632e6ca0b6e04e144e4894615d85fe1a1e7b Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 14 Aug 2025 16:30:05 -0500 Subject: [PATCH 58/59] Fix solib versionwq --- angelscript.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/angelscript.spec b/angelscript.spec index 37196b9..9f9c71a 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -44,7 +44,7 @@ developing applications that use %{name}. %files %doc sdk/docs/articles/*.html -%{_libdir}/lib%{name}.so.23501 +%{_libdir}/lib%{name}.so.23800 %files devel %doc sdk/docs/manual/* From df21b9ffe9fa7100ba8513e168a2ede94bfb9585 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:40:38 +0000 Subject: [PATCH 59/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- angelscript.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angelscript.spec b/angelscript.spec index 9f9c71a..003fcc5 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -4,7 +4,7 @@ Name: angelscript Version: 2.38.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Flexible cross-platform scripting library License: zlib @@ -52,6 +52,9 @@ developing applications that use %{name}. %{_includedir}/%{name}.h %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 2.38.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Thu Aug 14 2025 Gwyn Ciesla - 2.38.0-2 - specify solib