Commit eb1b485a authored by Hideki Yamane's avatar Hideki Yamane 🐈 Committed by Kyle Robbertze

Fix RC Bug#887601 and more

parent b91a41fc
camlimages (1:4.2.0-1.2) UNRELEASED; urgency=medium
* Non-maintainer upload.
* debian/control
- Move Vcs-* to salsa.debian.org
- Add "Build-Depends: pkg-config" to detect freetype (Closes: #887601)
- Add "Build-Depends: libexif-dev"
- Use "Build-Depends: debhelper-compat", instead of debian/compat file
- Set Standards-Version: 4.2.1
* debian/patches
- Add 0002-Use-pkg-config-to-detect-freetype.patch
- Add 0003-drop-Check_header_library-for-freetype.patch
* Update debian/watch to detect upstream version correctly
-- Hideki Yamane <henrich@debian.org> Tue, 11 Dec 2018 20:13:51 +0900
camlimages (1:4.2.0-1.1) unstable; urgency=medium
* Non-maintainer upload.
......
......@@ -6,22 +6,25 @@ Uploaders:
Ralf Treinen <treinen@debian.org>,
Mehdi Dogguy <mehdi@debian.org>
Build-Depends:
debhelper (>= 8),
debhelper (>= 11),
debhelper-compat (= 11),
pkg-config,
ocaml (>= 3.11.1),
ocaml-findlib (>> 1.2.5),
libpng-dev,
libjpeg-dev,
libtiff-dev,
libxpm-dev,
libexif-dev,
libfreetype6-dev (>= 2.1.7),
libgif-dev,
liblablgtk2-ocaml-dev (>> 2.12.0-3),
ghostscript,
dh-ocaml (>= 0.9),
omake
Standards-Version: 3.9.4
Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/camlimages.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ocaml-maint/packages/camlimages.git
Standards-Version: 4.2.1
Vcs-Git: https://salsa.debian.org/ocaml-team/camlimages.git
Vcs-Browser: https://salsa.debian.org/ocaml-team/camlimages
Homepage: http://gallium.inria.fr/camlimages/
Package: libcamlimages-ocaml
......
......@@ -13,4 +13,3 @@ index 0322740..b78a24a 100644
@@ -1 +1 @@
-.SUBDIRS: edgedetect liv normalize ttfimg converter gifanim resize crop imgstat monochrome tiffps
+.SUBDIRS: edgedetect normalize ttfimg converter gifanim resize crop imgstat monochrome tiffps
--
From: Hideki Yamane <h-yamane@sios.com>
Date: Tue, 11 Dec 2018 15:42:16 +0900
Subject: Use pkg-config to detect freetype
---
OMakefile | 25 +++++++++----------------
1 file changed, 9 insertions(+), 16 deletions(-)
diff --git a/OMakefile b/OMakefile
index 7c5f3fe..dcafe62 100644
--- a/OMakefile
+++ b/OMakefile
@@ -88,7 +88,7 @@ print_configured() =
println(exif: $(get_support EXIF) \($(get_flags exif)\))
println(tiff: $(get_support TIFF) \($(get_flags tiff)\))
println(xpm: $(get_support XPM) \($(get_flags xpm)\))
- println(freetype: $(get_support FREETYPE) \($(PATH_FREETYPE_CONFIG)\) \($(get_flags freetype)\))
+ println(freetype: $(get_support FREETYPE) \($(get_flags freetype)\))
println(ps: $(get_support PS) \($(PATH_GS)\))
println(rgb.txt: $(get_support RGB_TXT) \($(string $(PATH_RGB_TXT))\))
println(lablgtk2: $(get_support LABLGTK2))
@@ -328,26 +328,19 @@ print_configured() =
LDFLAGS_freetype=
SUPPORT_FREETYPE=false
if $(true_if_not_defined ARG_WANT_FREETYPE)
- PATH_FREETYPE_CONFIG=
- if $(defined ARG_PATH_FREETYPE_CONFIG):
- PATH_FREETYPE_CONFIG = $(ARG_PATH_FREETYPE_CONFIG)
- SUPPORT_FREETYPE = true
- export
- else
- PATH_FREETYPE_CONFIG = $(Check_prog_in_path freetype-config)
- SUPPORT_FREETYPE=$(if $(PATH_FREETYPE_CONFIG), true, false)
+ res=$(pkg_config freetype, freetype2)
+ if $(not $(res))
+ HAVE_FREETYPE = $(Check_header_library freetype, freetype/freetype.h, FT_Library_Version)
+ SUPPORT_FREETYPE = $(HAVE_FREETYPE)
+ if $(SUPPORT_FREETYPE)
+ LDFLAGS_freetype=-lfreetype
export
- if $(SUPPORT_FREETYPE)
- # println(SUPPORT_FREETYPE=$(SUPPORT_FREETYPE)!)
- CFLAGS_freetype= $(shell $(PATH_FREETYPE_CONFIG) --cflags)
- LDFLAGS_freetype= $(shell $(PATH_FREETYPE_CONFIG) --libs)
+ else
+ failwith_if_defined(ARG_WANT_FREETYPE, freetype requested but not found)
export
if $(SUPPORT_FREETYPE)
SUPPORTED_NON_FORMATS+=freetype
export
- else
- failwith_if_defined(ARG_WANT_FREETYPE, freetype requested but not found)
- export
SUPPORTED_SUBPACKAGES= $(SUPPORTED_FORMATS) $(SUPPORTED_NON_FORMATS)
From: Hideki Yamane <h-yamane@sios.com>
Date: Tue, 11 Dec 2018 16:44:35 +0900
Subject: drop Check_header_library for freetype
I don't know why but Check_header_library for freetype doesn't work...
---
OMakefile | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/OMakefile b/OMakefile
index dcafe62..1a5c333 100644
--- a/OMakefile
+++ b/OMakefile
@@ -330,17 +330,15 @@ print_configured() =
if $(true_if_not_defined ARG_WANT_FREETYPE)
res=$(pkg_config freetype, freetype2)
if $(not $(res))
- HAVE_FREETYPE = $(Check_header_library freetype, freetype/freetype.h, FT_Library_Version)
- SUPPORT_FREETYPE = $(HAVE_FREETYPE)
- if $(SUPPORT_FREETYPE)
- LDFLAGS_freetype=-lfreetype
- export
- else
- failwith_if_defined(ARG_WANT_FREETYPE, freetype requested but not found)
+ SUPPORT_FREETYPE = true
+ LDFLAGS_freetype=-lfreetype
export
if $(SUPPORT_FREETYPE)
SUPPORTED_NON_FORMATS+=freetype
export
+ else
+ failwith_if_defined(ARG_WANT_FREETYPE, freetype requested but not found)
+ export
SUPPORTED_SUBPACKAGES= $(SUPPORTED_FORMATS) $(SUPPORTED_NON_FORMATS)
0001-Disable-liv-example.patch
0002-Use-pkg-config-to-detect-freetype.patch
0003-drop-Check_header_library-for-freetype.patch
version=3
https://bitbucket.org/camlspotter/camlimages/downloads .*/(?:v|camlimages-)?(\d.*)\.tar\.gz
version=4
https://bitbucket.org/camlspotter/camlimages/downloads/?tab=tags \
/camlspotter/@PACKAGE@/get/(4.*)@ARCHIVE_EXT@
# 5.0.x series seems to work in progress, so limit it to 4.x
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment