aces-container: add patches and fixes

4 files changed, 193 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b4950eff1970..5e9bda8a4ec6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,18 @@
 pkgbase = aces-container
 	pkgdesc = ACES Container Reference Implementation
 	pkgver = 1.0.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/ampas/aces_container
 	arch = x86_64
 	license = custom
 	makedepends = cmake
 	depends = gcc-libs
-	source = https://github.com/ampas/aces_container/archive/v1.0.2.tar.gz
+	source = aces-container-1.0.2.tar.gz::https://github.com/ampas/aces_container/archive/v1.0.2.tar.gz
+	source = Switch-to-CMAKE-default-variables.patch
+	source = Set-the-appropriate-SONAME-for-the-library.patch
 	sha256sums = cbbba395d2425251263e4ae05c4829319a3e399a0aee70df2eb9efb6a8afdbae
+	sha256sums = 3f1d84e01eed4a6300fdb7ac6d242e617eb530207bd95283ff1e34eddc99a41d
+	sha256sums = 7ac19a147d590471c585fcf73a424a9cb99b164e673f861ca1a0db3d2d907068
 
 pkgname = aces-container
 
diff --git a/PKGBUILD b/PKGBUILD
index a305ae68ef2f..fb30d7170ad9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,36 @@
 # Maintainer: Andrew Sun <adsun701@gmail.com>
+
 pkgname=aces-container
 _srcname=aces_container
 pkgver=1.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="ACES Container Reference Implementation"
 arch=('x86_64')
 url="https://github.com/ampas/aces_container"
 license=('custom')
 depends=('gcc-libs')
 makedepends=('cmake')
-source=("https://github.com/ampas/${_srcname}/archive/v${pkgver}.tar.gz")
-sha256sums=('cbbba395d2425251263e4ae05c4829319a3e399a0aee70df2eb9efb6a8afdbae')
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ampas/${_srcname}/archive/v${pkgver}.tar.gz"
+        "Switch-to-CMAKE-default-variables.patch"
+        "Set-the-appropriate-SONAME-for-the-library.patch")
+sha256sums=('cbbba395d2425251263e4ae05c4829319a3e399a0aee70df2eb9efb6a8afdbae'
+            '3f1d84e01eed4a6300fdb7ac6d242e617eb530207bd95283ff1e34eddc99a41d'
+            '7ac19a147d590471c585fcf73a424a9cb99b164e673f861ca1a0db3d2d907068')
 
 prepare() {
-	cd "${srcdir}/${_srcname}-${pkgver}"
-  mkdir "${srcdir}/build"
+  cd "${srcdir}/${_srcname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/Switch-to-CMAKE-default-variables.patch"
+  patch -Np1 -i "${srcdir}/Set-the-appropriate-SONAME-for-the-library.patch"
+
+  # fix issue with permissions of aces_writeattributes.*
+  chmod 644 aces_writeattributes.*
 }
 
 build() {
-  cd "${srcdir}/build"
+  mkdir -p "${srcdir}/build" && cd "${srcdir}/build"
   cmake "../${_srcname}-${pkgver}" \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
     -DCMAKE_BUILD_TYPE=Release
   make
 }
@@ -30,9 +40,5 @@ package() {
   make DESTDIR="${pkgdir}" install
   
   # License file
-  install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 "${srcdir}/${_srcname}-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}"
-  
-  # Correct to lowercase for the lib/cmake/AcesContainer
-  mv "${pkgdir}/usr/lib/CMake" "${pkgdir}/usr/lib/cmake"
+  install -Dm644 "${srcdir}/${_srcname}-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/Set-the-appropriate-SONAME-for-the-library.patch b/Set-the-appropriate-SONAME-for-the-library.patch
new file mode 100644
index 000000000000..9f5f0c670113
--- /dev/null
+++ b/Set-the-appropriate-SONAME-for-the-library.patch
@@ -0,0 +1,30 @@
+From 96683a250492efcc7059c8c234859ce4a89910b7 Mon Sep 17 00:00:00 2001
+From: Nicolas Chauvet <kwizart@gmail.com>
+Date: Wed, 18 Jul 2018 11:16:29 +0200
+Subject: [PATCH 2/2] Set the appropriate SONAME for the library
+
+Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
+---
+ CMakeLists.txt | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f5fa059..02f1631 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -88,6 +88,12 @@ GENERATE_EXPORT_HEADER( AcesContainer
+              STATIC_DEFINE AcesContainer_BUILT_AS_STATIC
+ )
+ 
++# Set the build version (VERSION) and the API version (SOVERSION)
++set_target_properties(AcesContainer
++	PROPERTIES
++	VERSION ${AcesContainer_VERSION}
++	SOVERSION ${AcesContainer_MAJOR_VERSION})
++
+ install (TARGETS AcesContainer EXPORT AcesContainerTargets DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ install (FILES 
+ 			aces_errors.h
+-- 
+2.17.1
+
diff --git a/Switch-to-CMAKE-default-variables.patch b/Switch-to-CMAKE-default-variables.patch
new file mode 100644
index 000000000000..29f438a7e869
--- /dev/null
+++ b/Switch-to-CMAKE-default-variables.patch
@@ -0,0 +1,140 @@
+From 3d759d35c5cbc393d1848b0476fe6bccb1866ae5 Mon Sep 17 00:00:00 2001
+From: Nicolas Chauvet <kwizart@gmail.com>
+Date: Wed, 18 Jul 2018 11:08:04 +0200
+Subject: [PATCH 1/2] Switch to CMAKE default variables
+
+Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
+---
+ CMakeLists.txt                      | 31 ++++++-----------------------
+ config/AcesContainer.pc.in          |  6 +++---
+ config/AcesContainerConfig.cmake.in |  4 ++--
+ 3 files changed, 11 insertions(+), 30 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 314d42c..f5fa059 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -48,35 +48,20 @@ cmake_minimum_required (VERSION 2.6)
+ project (AcesContainer)
+ 
+ include (GenerateExportHeader)
++include (GNUInstallDirs)
+ 
+ set( AcesContainer_MAJOR_VERSION 1 )
+ set( AcesContainer_MINOR_VERSION 0 )
+ set( AcesContainer_PATCH_VERSION 2 )
+ set( AcesContainer_VERSION ${AcesContainer_MAJOR_VERSION}.${AcesContainer_MINOR_VERSION}.${AcesContainer_PATCH_VERSION} )
+ 
+-set( INSTALL_LIB_DIR lib CACHE PATH "Install directory for libraries" )
+-set( INSTALL_INCLUDE_DIR include CACHE PATH "Install directory for public header files" )
+-
+-
+ if(APPLE)
+   set( CMAKE_MACOSX_RPATH 1 )
+ endif()
+ 
+ if( WIN32 AND NOT CYGWIN )
+-  set(DEF_INSTALL_CMAKE_DIR CMake)
+   set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W0" )
+-else()
+-  set(DEF_INSTALL_CMAKE_DIR lib/CMake/AcesContainer)
+ endif()
+-set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Install directory for project CMake files" )
+-
+-## convert install paths to absolute
+-foreach( p LIB INCLUDE CMAKE )
+-  set( var INSTALL_${p}_DIR )
+-  if( NOT IS_ABSOLUTE "${${var}}" )
+-    set( ${var} "${CMAKE_INSTALL_PREFIX}/${${var}}" )
+-  endif()
+-endforeach()
+ 
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+ IF ( BUILD_SHARED_LIBS )
+@@ -103,7 +88,7 @@ GENERATE_EXPORT_HEADER( AcesContainer
+              STATIC_DEFINE AcesContainer_BUILT_AS_STATIC
+ )
+ 
+-install (TARGETS AcesContainer EXPORT AcesContainerTargets DESTINATION ${INSTALL_LIB_DIR})
++install (TARGETS AcesContainer EXPORT AcesContainerTargets DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ install (FILES 
+ 			aces_errors.h
+ 			aces_genericWriter.h
+@@ -118,14 +103,14 @@ install (FILES
+ 			aces_types.h
+ 			aces_writeattributes.h
+ 		 DESTINATION 
+-		 	${INSTALL_INCLUDE_DIR}/aces
++		 	${CMAKE_INSTALL_INCLUDEDIR}/aces
+ 		 )
+ 
+ 
+ find_package( PkgConfig )
+ if ( PKG_CONFIG_FOUND )
+ configure_file(config/AcesContainer.pc.in "${PROJECT_BINARY_DIR}/AcesContainer.pc" @ONLY)
+-install( FILES "${PROJECT_BINARY_DIR}/AcesContainer.pc" DESTINATION lib/pkgconfig COMPONENT dev )
++install( FILES "${PROJECT_BINARY_DIR}/AcesContainer.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT dev )
+ endif()
+ 
+ include_directories(
+@@ -143,10 +128,6 @@ export(TARGETS AcesContainer
+ export(PACKAGE AcesContainer)
+ # export(PACKAGE AcesContainer_lib)
+ 
+-# Create the FooBarConfig.cmake and FooBarConfigVersion files
+-file(RELATIVE_PATH REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}"
+-   "${INSTALL_INCLUDE_DIR}")
+-
+ # ... for the build tree
+ set(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}" "${PROJECT_BINARY_DIR}")
+ set(CONF_LIB_DIRS "${PROJECT_BINARY_DIR}")
+@@ -166,10 +147,10 @@ configure_file(config/AcesContainerConfigVersion.cmake.in
+ install(FILES
+   "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/AcesContainerConfig.cmake"
+   "${PROJECT_BINARY_DIR}/AcesContainerConfigVersion.cmake"
+-  DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev)
++  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/AcesContainer" COMPONENT dev)
+  
+ # Install the export set for use with the install-tree
+ install(EXPORT AcesContainerTargets DESTINATION
+-  "${INSTALL_CMAKE_DIR}" COMPONENT dev)
++  "${CMAKE_INSTALL_LIBDIR}/cmake/AcesContainer" COMPONENT dev)
+   
+   
+diff --git a/config/AcesContainer.pc.in b/config/AcesContainer.pc.in
+index 838a1d9..a186346 100644
+--- a/config/AcesContainer.pc.in
++++ b/config/AcesContainer.pc.in
+@@ -45,9 +45,9 @@
+ # A.M.P.A.S., WHETHER DISCLOSED OR UNDISCLOSED.
+ 
+ prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@INSTALL_LIB_DIR@
+-includedir=@INSTALL_INCLUDE_DIR@
+-AcesContainer_includedir=@INSTALL_INCLUDE_DIR@/aces
++libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
++includedir=@CMAKE_INSTALL_PREFIX@@CMAKE_INSTALL_INCLUDEDIR@
++AcesContainer_includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/aces
+ 
+ Name: AcesContainer
+ Description: A library containing an implementation of ACES Image Container File
+diff --git a/config/AcesContainerConfig.cmake.in b/config/AcesContainerConfig.cmake.in
+index f5e6392..c35e145 100644
+--- a/config/AcesContainerConfig.cmake.in
++++ b/config/AcesContainerConfig.cmake.in
+@@ -53,10 +53,10 @@
+ # find paths
+ get_filename_component( AcesContainer_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH )
+ 
+-set(AcesContainer_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@")
++set(AcesContainer_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/aces")
+ 
+ set(AcesContainer_LIBRARIES AcesContainer )
+-set(AcesContainer_LIBRARY_DIRS "@CONF_LIB_DIRS@" )
++set(AcesContainer_LIBRARY_DIRS "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@" )
+ set(AcesContainer_VERSION "@AcesContainer_VERSION@" )
+ 
+ set(AcesContainer_FOUND 1 )
+-- 
+2.17.1
+