[sfcgal] 05/11: Drop openscenegraph.patch, applied upstream.

Bas Couwenberg sebastic at debian.org
Mon May 29 11:27:47 UTC 2017


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository sfcgal.

commit f672e87bbe6c3f8c473a65dfae6a6ce28ca03c3e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon May 29 10:35:55 2017 +0200

    Drop openscenegraph.patch, applied upstream.
---
 debian/changelog                    |  1 +
 debian/patches/openscenegraph.patch | 25 -------------------------
 debian/patches/series               |  1 -
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bff9591..6d12a30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 sfcgal (1.3.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop openscenegraph.patch, applied upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 29 May 2017 10:34:03 +0200
 
diff --git a/debian/patches/openscenegraph.patch b/debian/patches/openscenegraph.patch
deleted file mode 100644
index 4b40481..0000000
--- a/debian/patches/openscenegraph.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Enable OpenSceneGraph support when available.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/Oslandia/SFCGAL/pull/126
-Applied-Upstream: https://github.com/Oslandia/SFCGAL/commit/acc29aea0b8a27a6049d9b31fb6c755a4048cb04
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -106,6 +106,17 @@ if( NOT ${GMP_FOUND} OR NOT ${MPFR_FOUND
- endif()
- 
- 
-+#-- OpenScenegraph -----------------------------------------
-+find_package( OpenSceneGraph COMPONENTS osgDB osgUtil )
-+if( ${OPENSCENEGRAPH_FOUND} )
-+	message( STATUS "OPENSCENEGRAPH_INCLUDE_DIRS = ${OPENSCENEGRAPH_INCLUDE_DIRS}" )
-+	message( STATUS "OPENSCENEGRAPH_LIBRARIES = ${OPENSCENEGRAPH_LIBRARIES}" )
-+	set( SFCGAL_WITH_OSG ON )
-+
-+	include_directories( SYSTEM ${OPENSCENEGRAPH_INCLUDE_DIRS} )
-+endif()
-+
-+
- #-- find CGAL  ---------------------------------------------
- option( CGAL_USE_AUTOLINK "disable CGAL autolink" OFF )
- if( ${CGAL_USE_AUTOLINK} )
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 11f2e7b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-openscenegraph.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/sfcgal.git



More information about the Pkg-grass-devel mailing list