Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ocaml-parmap for openSUSE:Factory
checked in at 2023-01-05 15:00:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocaml-parmap (Old)
and /work/SRC/openSUSE:Factory/.ocaml-parmap.new.1563 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-parmap"
Thu Jan 5 15:00:56 2023 rev:12 rq:1056076 version:1.2.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/ocaml-parmap/ocaml-parmap.changes
2022-04-06 21:51:39.567452105 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml-parmap.new.1563/ocaml-parmap.changes
2023-01-05 15:01:16.449153517 +0100
@@ -1,0 +2,6 @@
+Sun Jan 1 01:01:01 UTC 2023 - oher...@suse.de
+
+- Update to version 1.2.5
+ Add support for OCaml 5.0
+
+-------------------------------------------------------------------
Old:
----
ocaml-parmap-1.2.4.tar.xz
New:
----
ocaml-parmap-1.2.5.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ocaml-parmap.spec ++++++
--- /var/tmp/diff_new_pack.Zinzo4/_old 2023-01-05 15:01:17.013156490 +0100
+++ /var/tmp/diff_new_pack.Zinzo4/_new 2023-01-05 15:01:17.017156510 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ocaml-parmap
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: ocaml-parmap
-Version: 1.2.4
+Version: 1.2.5
Release: 0
%{?ocaml_preserve_bytecode}
Summary: Multicore architecture exploitation for OCaml programs with
minimal modifications
@@ -27,7 +27,7 @@
Source0: %name-%version.tar.xz
BuildRequires: ocaml
BuildRequires: ocaml-dune >= 2.7
-BuildRequires: ocaml-rpm-macros >= 20220222
+BuildRequires: ocaml-rpm-macros >= 20230101
BuildRequires: ocamlfind(bigarray)
BuildRequires: ocamlfind(dune.configurator)
BuildRequires: ocamlfind(graphics)
++++++ _service ++++++
--- /var/tmp/diff_new_pack.Zinzo4/_old 2023-01-05 15:01:17.065156764 +0100
+++ /var/tmp/diff_new_pack.Zinzo4/_new 2023-01-05 15:01:17.069156784 +0100
@@ -1,7 +1,7 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="filename">ocaml-parmap</param>
- <param name="revision">289660b0cdc71c0c6e88468ca9fb7ee218f30379</param>
+ <param name="revision">963608763589e03de38e744d359884d491e65460</param>
<param name="scm">git</param>
<param name="submodules">disable</param>
<param name="url">https://github.com/rdicosmo/parmap.git</param>
++++++ ocaml-parmap-1.2.4.tar.xz -> ocaml-parmap-1.2.5.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-parmap-1.2.4/codemeta.json
new/ocaml-parmap-1.2.5/codemeta.json
--- old/ocaml-parmap-1.2.4/codemeta.json 1970-01-01 01:00:00.000000000
+0100
+++ new/ocaml-parmap-1.2.5/codemeta.json 2022-11-25 21:30:16.000000000
+0100
@@ -0,0 +1,48 @@
+{
+ "@context": "https://doi.org/10.5063/schema/codemeta-2.0";,
+ "@type": "SoftwareSourceCode",
+ "license": "https://spdx.org/licenses/LGPL-2.0-only";,
+ "codeRepository": "git+https://github.com/rdicosmo/parmap.git";,
+ "datePublished": "2011-07-18",
+ "dateModified": "2022-01-03",
+ "issueTracker": "https://github.com/rdicosmo/parmap/issues";,
+ "name": "Parmap",
+ "version": "1.2.5",
+ "applicationCategory": "Parallel computing",
+ "developmentStatus": "active",
+ "referencePublication": "https://doi.org/10.1016/j.procs.2012.04.202";,
+ "programmingLanguage": [
+ "OCaml"
+ ],
+ "operatingSystem": [
+ "Linux",
+ "MacOS"
+ ],
+ "relatedLink": [
+ "https://opam.ocaml.org/packages/parmap/";
+ ],
+ "author": [
+ {
+ "@type": "Person",
+ "@id": "https://orcid.org/ 0000-0002-7493-5349",
+ "givenName": "Roberto",
+ "familyName": "Di Cosmo",
+ "email": "robe...@dicosmo.org",
+ "affiliation": {
+ "@type": "Organization",
+ "name": "Inria and University Paris Diderot"
+ }
+ },
+ {
+ "@type": "Person",
+ "@id": "https://orcid.org/ 0000-0002-7433-376X",
+ "givenName": "Marco",
+ "familyName": "Danelutto",
+ "email": "marco.danelu...@unipi.it",
+ "affiliation": {
+ "@type": "Organization",
+ "name": "University of Pisa"
+ }
+ }
+ ]
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-parmap-1.2.4/dune-project
new/ocaml-parmap-1.2.5/dune-project
--- old/ocaml-parmap-1.2.4/dune-project 2022-01-02 23:29:28.000000000 +0100
+++ new/ocaml-parmap-1.2.5/dune-project 2022-11-25 21:30:16.000000000 +0100
@@ -26,4 +26,6 @@
base-bigarray
base-unix
(ocaml
- (>= 4.03.0))))
+ (>= 4.03.0)))
+ (conflicts
+ ocaml-option-no-flat-float-array))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-parmap-1.2.4/example/mandels.ml
new/ocaml-parmap-1.2.5/example/mandels.ml
--- old/ocaml-parmap-1.2.4/example/mandels.ml 2022-01-02 23:29:28.000000000
+0100
+++ new/ocaml-parmap-1.2.5/example/mandels.ml 2022-11-25 21:30:16.000000000
+0100
@@ -204,7 +204,7 @@
(match oldimg with
None -> ()
| Some (i,x,y) -> draw_image i x y);
- if w>0 & h>0 then
+ if w>0 && h>0 then
let i = get_image bx by w h in
(* draw the border _inside_ the area *)
draw_rect bx by (w-1) (h-1);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-parmap-1.2.4/parmap.bib
new/ocaml-parmap-1.2.5/parmap.bib
--- old/ocaml-parmap-1.2.4/parmap.bib 1970-01-01 01:00:00.000000000 +0100
+++ new/ocaml-parmap-1.2.5/parmap.bib 2022-11-25 21:30:16.000000000 +0100
@@ -0,0 +1,40 @@
+@comment{For best rendering of software in a bibliography, please use biblatex
with the biblatex-software package}
+@comment{More information available at
https://ctan.org/pkg/biblatex-software?lang=en}
+@comment{See also:
https://www.softwareheritage.org/howto-archive-and-reference-your-code/}
+
+@software {parmap,
+ title = {The Parmap library},
+ author = {Di Cosmo, Roberto and Marco Danelutto},
+ date = {2012},
+ institution = {{Inria} and {University of Paris} and {University of Pisa}},
+ license = {LGPL-2.0},
+ url = {https://rdicosmo.github.io/parmap/},
+ repository= {https://github.com/rdicosmo/parmap},
+}
+
+@comment{For citing a specific version, please use an entry like the following
one}
+@comment{You can get the proper SWHID browsing
https://archive.softwareheritage.org/browse/origin/directory/?origin_url=https://github.com/rdicosmo/parmap}
+
+@softwareversion {parmap-1.2.5,
+ crossref = {parmap},
+ date = {2022},
+ version = {1.2.5},
+ swhid = {swh:1:dir:95845404f319ba5e5c7a2b10ec018de3658c6035;
+ origin=https://github.com/rdicosmo/parmap;
+ visit=swh:1:snp:ee5526130c00c23efec58c5b3c81de1c450dd703;
+ anchor=swh:1:rev:65f9642ddc5c77e91c4131895e32b7c0c771dd7e},
+}
+
+@comment{For citing a code fragment, please use an entry like the following
one}
+@comment{You can get the proper SWHID browsing
https://archive.softwareheritage.org/browse/origin/directory/?origin_url=https://github.com/rdicosmo/parmap}
+
+@codefragment {simplemapper,
+ subtitle = {Core mapping routine},
+ swhid = {swh:1:cnt:3b997e8ef2e38d5b31fb353214a54686e72f0870;
+ origin=https://github.com/rdicosmo/parmap;
+ visit=swh:1:snp:ee5526130c00c23efec58c5b3c81de1c450dd703;
+ anchor=swh:1:rev:65f9642ddc5c77e91c4131895e32b7c0c771dd7e;
+ path=/src/parmap.ml;
+ lines=192-237},
+ crossref = {parmap-1.2.5}
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-parmap-1.2.4/parmap.opam
new/ocaml-parmap-1.2.5/parmap.opam
--- old/ocaml-parmap-1.2.4/parmap.opam 2022-01-02 23:29:28.000000000 +0100
+++ new/ocaml-parmap-1.2.5/parmap.opam 2022-11-25 21:30:16.000000000 +0100
@@ -22,6 +22,7 @@
"ocaml" {>= "4.03.0"}
"odoc" {with-doc}
]
+conflicts: ["ocaml-option-no-flat-float-array"]
build: [
["dune" "subst"] {dev}
[
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-parmap-1.2.4/src/bytearray_stubs.c
new/ocaml-parmap-1.2.5/src/bytearray_stubs.c
--- old/ocaml-parmap-1.2.4/src/bytearray_stubs.c 2022-01-02
23:29:28.000000000 +0100
+++ new/ocaml-parmap-1.2.5/src/bytearray_stubs.c 2022-11-25
21:30:16.000000000 +0100
@@ -13,15 +13,15 @@
{
char *buf;
long len;
- output_value_to_malloc(v, flags, &buf, &len);
- return alloc_bigarray(BIGARRAY_UINT8 | BIGARRAY_C_LAYOUT | BIGARRAY_MANAGED,
- 1, buf, &len);
+ caml_output_value_to_malloc(v, flags, &buf, &len);
+ return caml_ba_alloc(CAML_BA_UINT8 | CAML_BA_C_LAYOUT | CAML_BA_MANAGED,
+ 1, buf, &len);
}
CAMLprim value ml_marshal_to_bigarray_buffer(value b, value ofs,
value v, value flags)
{
- struct caml_bigarray *b_arr = Bigarray_val(b);
+ struct caml_ba_array *b_arr = Caml_ba_array_val(b);
return Val_long(caml_output_value_to_block(v, flags, Array_data (b_arr, ofs),
b_arr->dim[0] - Long_val(ofs)));
}
@@ -29,16 +29,16 @@
CAMLprim value ml_unmarshal_from_bigarray(value b, value ofs)
{
- struct caml_bigarray *b_arr = Bigarray_val(b);
- return input_value_from_block (Array_data (b_arr, ofs),
- b_arr->dim[0] - Long_val(ofs));
+ struct caml_ba_array *b_arr = Caml_ba_array_val(b);
+ return caml_input_value_from_block (Array_data (b_arr, ofs),
+ b_arr->dim[0] - Long_val(ofs));
}
CAMLprim value ml_blit_string_to_bigarray
(value s, value i, value a, value j, value l)
{
const char *src = String_val(s) + Int_val(i);
- char *dest = Array_data(Bigarray_val(a), j);
+ char *dest = Array_data(Caml_ba_array_val(a), j);
memcpy(dest, src, Long_val(l));
return Val_unit;
}
@@ -46,7 +46,7 @@
CAMLprim value ml_blit_bigarray_to_string
(value a, value i, value s, value j, value l)
{
- char *src = Array_data(Bigarray_val(a), i);
+ char *src = Array_data(Caml_ba_array_val(a), i);
char *dest = &Byte(String_val(s), Long_val(j));
memcpy(dest, src, Long_val(l));
return Val_unit;
@@ -57,7 +57,7 @@
{
int w = 8;
char *src = Bp_val(fa) + Long_val(i)*w;
- char *dest = Floatarray_data(Bigarray_val(a), j);
+ char *dest = Floatarray_data(Caml_ba_array_val(a), j);
memcpy(dest, src, Long_val(l)*w);
return Val_unit;
}
@@ -66,7 +66,7 @@
(value a, value i, value fa, value j, value l)
{
int w = 8;
- char *src = Floatarray_data(Bigarray_val(a), i);
+ char *src = Floatarray_data(Caml_ba_array_val(a), i);
char *dest = Bp_val(fa) + Long_val(j)*w;
memcpy(dest, src, Long_val(l)*w);
return Val_unit;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-parmap-1.2.4/src/parmap.ml
new/ocaml-parmap-1.2.5/src/parmap.ml
--- old/ocaml-parmap-1.2.4/src/parmap.ml 2022-01-02 23:29:28.000000000
+0100
+++ new/ocaml-parmap-1.2.5/src/parmap.ml 2022-11-25 21:30:16.000000000
+0100
@@ -80,7 +80,7 @@
else true
let log_debug fmt =
- Printf.kprintf (
+ Printf.ksprintf (
if !debug_enabled then begin
(fun s -> Format.eprintf "[Parmap]: %s@." s)
end else ignore
@@ -102,7 +102,8 @@
(* send stdout and stderr to a file to avoid mixing output from different
cores, if enabled *)
-let redirect ?(path = (Printf.sprintf "/tmp/.parmap.%d" (Unix.getpid ()))) ~id
=
+let[@warning "-16" (*unerasable-optional-argument*)]
+ redirect ?(path = (Printf.sprintf "/tmp/.parmap.%d" (Unix.getpid ()))) ~id =
reopen_out stdout path (Printf.sprintf "stdout.%d" id);
reopen_out stderr path (Printf.sprintf "stderr.%d" id);;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-parmap-1.2.4/src/parmap_utils.ml
new/ocaml-parmap-1.2.5/src/parmap_utils.ml
--- old/ocaml-parmap-1.2.4/src/parmap_utils.ml 2022-01-02 23:29:28.000000000
+0100
+++ new/ocaml-parmap-1.2.5/src/parmap_utils.ml 2022-11-25 21:30:16.000000000
+0100
@@ -1,6 +1,6 @@
let log_error fmt =
- Printf.kprintf (fun s -> Format.eprintf "[Parmap]: %s@.%!" s) fmt
+ Printf.ksprintf (fun s -> Format.eprintf "[Parmap]: %s@.%!" s) fmt
(* tail recursive version of List.append *)
let append_tr l1 l2 =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-parmap-1.2.4/tests/dune
new/ocaml-parmap-1.2.5/tests/dune
--- old/ocaml-parmap-1.2.4/tests/dune 2022-01-02 23:29:28.000000000 +0100
+++ new/ocaml-parmap-1.2.5/tests/dune 2022-11-25 21:30:16.000000000 +0100
@@ -5,10 +5,17 @@
(:standard -w -35-27))
(libraries parmap))
+(test
+ (name floatscale)
+ (modules floatscale)
+ (enabled_if %{arch_sixtyfour})
+ (flags (:standard -w -35-27))
+ (libraries utils parmap))
+
(tests
- (names testexceptions floatscale simplescale simplescale_array simplescalefold
+ (names testexceptions simplescale simplescale_array simplescalefold
simplescalemapfold)
- (modules testexceptions floatscale simplescale simplescale_array
simplescalefold
+ (modules testexceptions simplescale simplescale_array simplescalefold
simplescalemapfold)
(flags
(:standard -w -35-27))
