New upstream version 4.2.5.
New version fixes compatibility with latest lablgtk.
This commit is contained in:
Richard W.M. Jones
parent
074b2883a2
commit
2d77d7b115
|
|
@ -6,3 +6,4 @@ camlimages-3.0.2.tgz
|
|||
/4.1.0.tar.gz
|
||||
/4.2.2.tar.gz
|
||||
/4.2.4.tar.gz
|
||||
/4.2.5.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
--- camlspotter-camlimages-13777ef409e7/OMakefile.old 2017-08-09 11:22:20.223133043 +0100
|
||||
+++ camlspotter-camlimages-13777ef409e7/OMakefile 2017-08-09 11:22:26.886132978 +0100
|
||||
@@ -19,7 +19,7 @@
|
||||
# For release, -warn-error should not be put
|
||||
|
||||
# OCAMLFLAGS= -w A-4-9-35-37-40-41-42-44-45-48
|
||||
-OCAMLFLAGS= -w A-4-9-37-40-41-42-44-45-41-48-50 -unsafe-string
|
||||
+OCAMLFLAGS= -w A-4-9-37-40-41-42-44-45-41-48-50 -unsafe-string -g
|
||||
|
||||
# For the development, -warn-error A is turned on
|
||||
if $(file-exists DEV)
|
||||
--- camlspotter-camlimages-13777ef409e7/OMyMakeroot.old 2017-08-09 12:38:11.026148848 +0100
|
||||
+++ camlspotter-camlimages-13777ef409e7/OMyMakeroot 2017-08-09 12:38:20.812149472 +0100
|
||||
@@ -133,7 +133,7 @@
|
||||
OCamlMkLibC(name, files, ldflags) =
|
||||
protected.COBJS=$(addsuffix .o, $(files))
|
||||
dll$(name).so lib$(name).a: $(COBJS)
|
||||
- $(OCAMLMKLIB) -o $(name) $(LDFLAGS) $(ldflags) $(COBJS)
|
||||
+ $(OCAMLMKLIB) -g -o $(name) $(LDFLAGS) $(ldflags) $(COBJS)
|
||||
return $(array dll$(name).so, lib$(name).a)
|
||||
|
||||
# If ocamlmklib does not work for you, you can do:
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
diff -ur camlspotter-camlimages-8ca76028cff3.old/OMakefile camlspotter-camlimages-8ca76028cff3/OMakefile
|
||||
--- camlspotter-camlimages-8ca76028cff3.old/OMakefile 2017-11-20 10:50:59.000000000 +0000
|
||||
+++ camlspotter-camlimages-8ca76028cff3/OMakefile 2017-11-22 14:19:46.903902025 +0000
|
||||
@@ -19,7 +19,7 @@
|
||||
# For release, -warn-error should not be put
|
||||
|
||||
# OCAMLFLAGS= -w A-4-9-35-37-40-41-42-44-45-48
|
||||
-OCAMLFLAGS= -w A-3-4-9-37-40-41-42-44-45-41-48-50 -safe-string
|
||||
+OCAMLFLAGS= -w A-3-4-9-37-40-41-42-44-45-41-48-50 -safe-string -g
|
||||
|
||||
# For the development, -warn-error A is turned on
|
||||
if $(file-exists DEV)
|
||||
diff -ur camlspotter-camlimages-8ca76028cff3.old/OMyMakeroot camlspotter-camlimages-8ca76028cff3/OMyMakeroot
|
||||
--- camlspotter-camlimages-8ca76028cff3.old/OMyMakeroot 2017-11-20 10:50:59.000000000 +0000
|
||||
+++ camlspotter-camlimages-8ca76028cff3/OMyMakeroot 2017-11-22 14:19:32.461902772 +0000
|
||||
@@ -133,7 +133,7 @@
|
||||
OCamlMkLibC(name, files, ldflags) =
|
||||
protected.COBJS=$(addsuffix .o, $(files))
|
||||
dll$(name).so lib$(name).a: $(COBJS)
|
||||
- $(OCAMLMKLIB) -o $(name) $(LDFLAGS) $(ldflags) $(COBJS)
|
||||
+ $(OCAMLMKLIB) -g -o $(name) $(LDFLAGS) $(ldflags) $(COBJS)
|
||||
return $(array dll$(name).so, lib$(name).a)
|
||||
|
||||
# If ocamlmklib does not work for you, you can do:
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
--- ./camlspotter-camlimages-8ca76028cff3.old/examples/tiffps/tiffps.ml 2017-11-20 10:50:59.000000000 +0000
|
||||
+++ ./camlspotter-camlimages-8ca76028cff3/examples/tiffps/tiffps.ml 2017-11-22 14:24:13.276888193 +0000
|
||||
@@ -58,7 +58,7 @@
|
||||
|
||||
(* Scanlined loader *)
|
||||
type scanlined_loader = {
|
||||
- read_next_line: (string -> unit);
|
||||
+ read_next_line: (bytes -> unit);
|
||||
close: (unit -> unit)
|
||||
}
|
||||
|
||||
@@ -410,7 +410,7 @@
|
||||
function x ->
|
||||
let adrs = x * 3 in
|
||||
for i = 0 to 2 do
|
||||
- print_string (sprintf "%02x" (Char.code buf.[adrs+i]))
|
||||
+ print_string (sprintf "%02x" (Char.code (Bytes.get buf (adrs+i))))
|
||||
done
|
||||
else
|
||||
let mono r g b =
|
||||
@@ -418,9 +418,9 @@
|
||||
function x ->
|
||||
let adrs = x * 3 in
|
||||
let m =
|
||||
- mono (Char.code buf.[adrs])
|
||||
- (Char.code buf.[adrs + 1])
|
||||
- (Char.code buf.[adrs + 2]) in
|
||||
+ mono (Char.code (Bytes.get buf adrs))
|
||||
+ (Char.code (Bytes.get buf (adrs + 1)))
|
||||
+ (Char.code (Bytes.get buf (adrs + 2))) in
|
||||
for _i = 0 to 2 do print_string (sprintf "%02x" m) done in
|
||||
if not conf.mirror
|
||||
then for x = x1 to x1 + w - 1 do print_pixel x done
|
||||
|
|
@ -4,8 +4,8 @@
|
|||
%undefine _debugsource_packages
|
||||
|
||||
Name: ocaml-camlimages
|
||||
Version: 4.2.4
|
||||
Release: 2%{?dist}
|
||||
Version: 4.2.5
|
||||
Release: 1%{?dist}
|
||||
Summary: OCaml image processing library
|
||||
License: LGPLv2 with exceptions
|
||||
|
||||
|
|
@ -17,7 +17,9 @@ Source0: https://bitbucket.org/camlspotter/camlimages/get/%{version}.tar.
|
|||
# use the library.
|
||||
Source1: camlimages-2.2.0-htmlref.tar.gz
|
||||
|
||||
Patch1: camlimages-4.2.4-add-g-flag.patch
|
||||
Patch1: camlimages-4.2.5-add-g-flag.patch
|
||||
# Fix an example which has safe-string problems.
|
||||
Patch2: camlimages-4.2.5-safe-string.patch
|
||||
|
||||
BuildRequires: ocaml, ocaml-findlib-devel, ocaml-omake
|
||||
BuildRequires: ocaml-lablgtk-devel
|
||||
|
|
@ -49,9 +51,10 @@ developing applications using camlimages
|
|||
Includes documentation provided by ocamldoc
|
||||
|
||||
%prep
|
||||
%setup -q -n camlspotter-camlimages-13777ef409e7
|
||||
%setup -q -T -D -a 1 -n camlspotter-camlimages-13777ef409e7
|
||||
%setup -q -n camlspotter-camlimages-8ca76028cff3
|
||||
%setup -q -T -D -a 1 -n camlspotter-camlimages-8ca76028cff3
|
||||
%patch1 -p1
|
||||
%patch2 -p2
|
||||
|
||||
%build
|
||||
omake CFLAGS="$RPM_OPT_FLAGS" --verbose
|
||||
|
|
@ -92,6 +95,10 @@ cp -pr License.txt htmlref $RPM_BUILD_ROOT/usr/share/doc/ocaml-camlimages
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed Nov 22 2017 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-1
|
||||
- New upstream version 4.2.5.
|
||||
- New version fixes compatibility with latest lablgtk.
|
||||
|
||||
* Fri Nov 17 2017 Richard W.M. Jones <rjones@redhat.com> - 4.2.4-2
|
||||
- OCaml 4.06.0 rebuild.
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (4.2.4.tar.gz) = fbd132ad1a88ff7d2e5f72190893806f97a08dfe1d8aad9e50f9417701ba6142e36e5e4253962869befda4cc87e96b1e714fbee5a03fbd48cd051d7034bf0ad6
|
||||
SHA512 (camlimages-2.2.0-htmlref.tar.gz) = 20cc6b7d92494f2e38700e9c9aed0d9663bed857662037a532241e60a80c5a2dcb308426007c50dfcfbf718098e930fd886ecdc22d5b8c168d08b4f287ab4d02
|
||||
SHA512 (4.2.5.tar.gz) = 8ca5f4f9c49dc2ad86dac3da640422f45816f510ace5fba975eda0046e4973b624d13022b50a4d5f93d425d0fe1e126ca7a008f3421b8383f43ca7c27442bceb
|
||||
|
|
|
|||
Loading…
Reference in New Issue