From 196f2899a6c46e9900d5e94eebfb3e60a63f8a76 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Fri, 26 Oct 2018 17:55:13 +0200
Subject: [PATCH] [wip/osg-dae] add patch to install in lib/ instead of lib64/
---
osg-dae/Makefile | 21 +++++++++++----------
osg-dae/PLIST | 8 ++++++--
osg-dae/PLIST.14.04 | 2 +-
osg-dae/PLIST.16.04 | 2 +-
osg-dae/distinfo | 1 +
osg-dae/patches/patch-aa | 29 +++++++++++++++++++++++++++++
6 files changed, 49 insertions(+), 14 deletions(-)
create mode 100644 osg-dae/patches/patch-aa
diff --git a/osg-dae/Makefile b/osg-dae/Makefile
index e3fbc3d3..16626ce4 100644
--- a/osg-dae/Makefile
+++ b/osg-dae/Makefile
@@ -2,22 +2,23 @@
# Created: Nicolas Mansard, 15/DEC/2016
#
+ORG= stack-of-tasks
+NAME= osg-dae
VERSION= 3.2.1
-DISTNAME= osg-dae-${VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
-MASTER_SITES= ${MASTER_SITE_GITHUB:=stack-of-tasks/${PKGBASE}/releases/download/v${VERSION}/}
-MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}/stack-of-tasks/${PKGBASE}
+DISTNAME= ${NAME}-${VERSION}
-MAINTAINER= gepetto@laas.fr
-CATEGORIES= graphics
+MASTER_SITES= ${MASTER_SITE_GITHUB:=${ORG}/${NAME}/releases/download/v${VERSION}/}
+MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}/${ORG}/${NAME}
+CHECKOUT_VCS_OPTS+= --recursive
+
+CATEGORIES= wip
COMMENT= DAE module for OSG
LICENSE= gnu-lgpl-v3
+MAINTAINER= gepetto@laas.fr
-# parallel builds would consume all memory because of the g++ process size
-MAKE_JOBS_SAFE= no
-
-#DYNAMIC_PLIST_DIRS+=
+DYNAMIC_PLIST_DIRS+= share/doc/${NAME}
PLIST_SRC+= ${PKGDIR}/PLIST.${OS_VERSION}
CMAKE_ARGS+= -DINSTALL_DOCUMENTATION=OFF
diff --git a/osg-dae/PLIST b/osg-dae/PLIST
index 56b28cad..7af332dd 100644
--- a/osg-dae/PLIST
+++ b/osg-dae/PLIST
@@ -1,2 +1,6 @@
-@comment Thu Nov 16 15:57:05 CET 2017
-lib/pkgconfig/${PKGBASE}.pc
+@comment Fri Oct 26 17:51:35 CEST 2018
+include/osg/dae/config.h
+include/osg/dae/config.hh
+include/osg/dae/deprecated.hh
+include/osg/dae/warning.hh
+lib/pkgconfig/osg-dae.pc
diff --git a/osg-dae/PLIST.14.04 b/osg-dae/PLIST.14.04
index 511d61f7..28c6ce67 100644
--- a/osg-dae/PLIST.14.04
+++ b/osg-dae/PLIST.14.04
@@ -1 +1 @@
-lib64/osgPlugins-3.2.0/osgdb_dae.so
+lib/osgPlugins-3.2.0/osgdb_dae.so
diff --git a/osg-dae/PLIST.16.04 b/osg-dae/PLIST.16.04
index deca47ba..db9471e6 100644
--- a/osg-dae/PLIST.16.04
+++ b/osg-dae/PLIST.16.04
@@ -1 +1 @@
-lib64/osgPlugins-3.2.1/osgdb_dae.so
+lib/osgPlugins-3.2.1/osgdb_dae.so
diff --git a/osg-dae/distinfo b/osg-dae/distinfo
index d2a9ceb7..e503fb88 100644
--- a/osg-dae/distinfo
+++ b/osg-dae/distinfo
@@ -1,3 +1,4 @@
SHA1 (osg-dae-3.2.1.tar.gz) = 4c1d2ba98eed2aad80c089552e79f42216dafd27
RMD160 (osg-dae-3.2.1.tar.gz) = 56032d266e2b47ff2ca1a7887bed9dde0b7e923d
Size (osg-dae-3.2.1.tar.gz) = 818587 bytes
+SHA1 (patch-aa) = 4fcd38b47a54675e52d8b8381ea24ac93c5c6c61
diff --git a/osg-dae/patches/patch-aa b/osg-dae/patches/patch-aa
new file mode 100644
index 00000000..fde514be
--- /dev/null
+++ b/osg-dae/patches/patch-aa
@@ -0,0 +1,29 @@
+From 9c04eb18996d9401ac489c2f3280b71cfb241c51 Mon Sep 17 00:00:00 2001
+From: Guilhem Saurel <guilhem.saurel@laas.fr>
+Date: Fri, 26 Oct 2018 17:43:55 +0200
+Subject: [PATCH] [CMake] stop installing in lib64
+
+---
+ CMakeLists.txt | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9759b5e..b63a54a 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -258,12 +258,6 @@ IF(CYGWIN)
+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
+ ENDIF()
+
+-IF(UNIX AND NOT WIN32 AND NOT APPLE)
+- IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
+- SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement")
+- MARK_AS_ADVANCED(LIB_POSTFIX)
+- ENDIF()
+-ENDIF()
+ IF(NOT DEFINED LIB_POSTFIX)
+ SET(LIB_POSTFIX "")
+ ENDIF()
+--
+2.7.4
+
--
GitLab