From bcc3b3d3ef32661d280b19202fa3b7d39759f60d Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Wed, 31 Jan 2018 07:39:56 +0000
Subject: [PATCH] media-libs/libXcm: bump to 0.5.4, add debuginfo, reorder
 sections. (#2166)

---
 media-libs/libxcm/libxcm-0.5.3.recipe | 77 -----------------------
 media-libs/libxcm/libxcm-0.5.4.recipe | 90 +++++++++++++++++++++++++++
 2 files changed, 90 insertions(+), 77 deletions(-)
 delete mode 100644 media-libs/libxcm/libxcm-0.5.3.recipe
 create mode 100644 media-libs/libxcm/libxcm-0.5.4.recipe

diff --git a/media-libs/libxcm/libxcm-0.5.3.recipe b/media-libs/libxcm/libxcm-0.5.3.recipe
deleted file mode 100644
index b2d05da9f..000000000
--- a/media-libs/libxcm/libxcm-0.5.3.recipe
+++ /dev/null
@@ -1,77 +0,0 @@
-SUMMARY="X Color Management library"
-DESCRIPTION="
-The libXcm library contains the a reference implementation of the \
-X Color Management specification. The X Color Management specification \
-allows to attach colour regions to X windows to communicate with colour \
-servers.
-"
-HOMEPAGE="http://www.oyranos.org/libxcm"
-COPYRIGHT="
-	2008 Tomas Carnecky
-	2008-2010 Kai-Uwe Behrmann
-	"
-LICENSE="MIT"
-SOURCE_URI="http://sourceforge.net/projects/oyranos/files/libXcm/libXcm-0.5/libXcm-$portVersion.tar.bz2"
-CHECKSUM_SHA256="04bda6aa4e8b1ef61815ebfc7760277856a5fd3b347948e0d99cf0ec78b03050"
-REVISION="3"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
-
-PROVIDES="
-	libxcm$secondaryArchSuffix = $portVersion compat >= 0.5
-	lib:libXcm$secondaryArchSuffix = 0.0.5 compat >= 0
-	lib:libXcmDDC$secondaryArchSuffix = 0.0.5 compat >= 0
-	lib:libXcmEDID$secondaryArchSuffix = 0.0.5 compat >= 0
-	lib:libXcmX11$secondaryArchSuffix = 0.0.5 compat >= 0
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
-	cmd:make
-	cmd:pkg_config$secondaryArchSuffix
-	"
-
-SOURCE_DIR="libXcm-$portVersion"
-
-BUILD()
-{
-	autoreconf -fi
-	runConfigure ./configure
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-
-	prepareInstalledDevelLibs libXcm libXcmDDC libXcmEDID libXcmX11
-	fixPkgconfig
-
-	# devel package
-	packageEntries devel \
-		$developDir \
-		$manDir/man3
-}
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libxcm${secondaryArchSuffix}_devel = $portVersion compat >= 0.5
-	devel:libXcm$secondaryArchSuffix = 0.0.5 compat >= 0
-	devel:libXcmDDC$secondaryArchSuffix = 0.0.5 compat >= 0
-	devel:libXcmEDID$secondaryArchSuffix = 0.0.5 compat >= 0
-	devel:libXcmX11$secondaryArchSuffix = 0.0.5 compat >= 0
-	"
-REQUIRES_devel="
-	libxcm$secondaryArchSuffix == $portVersion base
-	"
diff --git a/media-libs/libxcm/libxcm-0.5.4.recipe b/media-libs/libxcm/libxcm-0.5.4.recipe
new file mode 100644
index 000000000..9956052fe
--- /dev/null
+++ b/media-libs/libxcm/libxcm-0.5.4.recipe
@@ -0,0 +1,90 @@
+SUMMARY="An X Color Management library"
+DESCRIPTION="libXcm is a reference implementation of the X Color Management \
+specification. This specification allows to attach colour regions to X windows \
+to communicate with colour servers."
+HOMEPAGE="http://www.oyranos.org/libxcm/"
+COPYRIGHT="2008 Tomas Carnecky
+	2008-2010 Kai-Uwe Behrmann"
+LICENSE="MIT"
+REVISION="1"
+SOURCE_URI="https://github.com/oyranos-cms/libxcm/archive/$portVersion.tar.gz"
+CHECKSUM_SHA256="7d97f168be4f87a5118417d7be764e35a1eb94eac5020003c005f3a97a521cc1"
+SOURCE_FILENAME="libxcm-$portVersion.tar.gz"
+
+ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+portVersionCompat="$portVersion compat >= 0.5"
+libVersion="0.0.5"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
+PROVIDES="
+	libxcm$secondaryArchSuffix = $portVersionCompat
+	lib:libXcm$secondaryArchSuffix = libVersionCompat
+	lib:libXcmDDC$secondaryArchSuffix = libVersionCompat
+	lib:libXcmEDID$secondaryArchSuffix = libVersionCompat
+	lib:libXcmX11$secondaryArchSuffix = libVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	libxcm${secondaryArchSuffix}_devel = $portVersionCompat
+	devel:libXcm$secondaryArchSuffix = $libVersionCompat
+	devel:libXcmDDC$secondaryArchSuffix = $libVersionCompat
+	devel:libXcmEDID$secondaryArchSuffix = $libVersionCompat
+	devel:libXcmX11$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	libxcm$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libxfixes$secondaryArchSuffix
+	devel:libxmu$secondaryArchSuffix
+	devel:xextproto$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+defineDebugInfoPackage libxcm$secondaryArchSuffix \
+	$libDir/libXcm.so.$libVersion \
+	$libDir/libXcmDDC.so.$libVersion \
+	$libDir/libXcmEDID.so.$libVersion \
+	$libDir/libXcmX11.so.$libVersion
+
+BUILD()
+{
+	autoreconf -fi
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	rm -f "$libDir"/libXcm*.la
+
+	prepareInstalledDevelLibs libXcm libXcmDDC libXcmEDID libXcmX11
+	fixPkgconfig
+
+	mkdir -p "$dataDir"/cmake
+	mv "$libDir"/cmake "$dataDir"/cmake/Modules
+
+	# devel package
+	packageEntries devel \
+		"$dataDir"/cmake \
+		"$developDir" \
+		"$manDir"
+}