From 072d9adafab829b7f934637f7ba8a8f29c2ea3db Mon Sep 17 00:00:00 2001
From: Jonathan Scruggs <j.scruggs@gmail.com>
Date: Thu, 21 Sep 2017 10:14:47 +0100
Subject: media-libs/opensubdiv: Version bump to 3.3 and remove ati-drivers

* Fixed compile error about stray quotes
* Changed hardcoded paths to GNUInstallDirs which
  fixed multilib-strict check fail

Closes: https://bugs.gentoo.org/605958
Closes: https://bugs.gentoo.org/611844
Closes: https://github.com/gentoo/gentoo/pull/5751
---
 .../files/opensubdiv-3.3.0-fix-quotes.patch        | 13 ++++++++
 .../opensubdiv-3.3.0-use-gnuinstalldirs.patch      | 39 ++++++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 media-libs/opensubdiv/files/opensubdiv-3.3.0-fix-quotes.patch
 create mode 100644 media-libs/opensubdiv/files/opensubdiv-3.3.0-use-gnuinstalldirs.patch

(limited to 'media-libs/opensubdiv/files')

diff --git a/media-libs/opensubdiv/files/opensubdiv-3.3.0-fix-quotes.patch b/media-libs/opensubdiv/files/opensubdiv-3.3.0-fix-quotes.patch
new file mode 100644
index 000000000000..2b5c71a37cb5
--- /dev/null
+++ b/media-libs/opensubdiv/files/opensubdiv-3.3.0-fix-quotes.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e02ce90c..6d4f5342 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -48,7 +48,7 @@ endif()
+     string(REGEX REPLACE "^v" "" OSD_SONAME ${OSD_SONAME})
+ 
+     add_definitions(
+-        -DOPENSUBDIV_VERSION_STRING="${OSD_SONAME}"
++        -DOPENSUBDIV_VERSION_STRING=\\\"${OSD_SONAME}\\\"
+     )
+ 
+ #-------------------------------------------------------------------------------
diff --git a/media-libs/opensubdiv/files/opensubdiv-3.3.0-use-gnuinstalldirs.patch b/media-libs/opensubdiv/files/opensubdiv-3.3.0-use-gnuinstalldirs.patch
new file mode 100644
index 000000000000..02027763f5ca
--- /dev/null
+++ b/media-libs/opensubdiv/files/opensubdiv-3.3.0-use-gnuinstalldirs.patch
@@ -0,0 +1,39 @@
+diff -purN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2017-07-25 21:58:09.000000000 +0100
++++ b/CMakeLists.txt	2017-08-15 14:51:36.771044414 +0100
+@@ -23,6 +23,7 @@
+ #
+ 
+ project(OpenSubdiv)
++include(GNUInstallDirs)
+ 
+ cmake_minimum_required(VERSION 2.8.6)
+ 
+@@ -63,15 +64,15 @@ if (NOT DEFINED CMAKE_INSTALL_PREFIX)
+ endif()
+ 
+ if (NOT DEFINED CMAKE_INCDIR_BASE)
+-    set( CMAKE_INCDIR_BASE include/opensubdiv )
++    set( CMAKE_INCDIR_BASE ${CMAKE_INSTALL_INCLUDEDIR}/opensubdiv )
+ endif()
+ 
+ if (NOT DEFINED CMAKE_BINDIR_BASE)
+-    set( CMAKE_BINDIR_BASE bin )
++    set( CMAKE_BINDIR_BASE ${CMAKE_INSTALL_BINDIR} )
+ endif()
+ 
+ if (NOT DEFINED CMAKE_LIBDIR_BASE)
+-    set( CMAKE_LIBDIR_BASE lib )
++    set( CMAKE_LIBDIR_BASE ${CMAKE_INSTALL_LIBDIR} )
+ endif()
+ 
+ if (NOT DEFINED CMAKE_FRAMEWORKDIR_BASE)
+@@ -83,7 +84,7 @@ if (NOT DEFINED CMAKE_PLUGINDIR_BASE)
+ endif()
+ 
+ if (NOT DEFINED CMAKE_DOCDIR_BASE)
+-    set( CMAKE_DOCDIR_BASE share/doc/opensubdiv )
++    set( CMAKE_DOCDIR_BASE ${CMAKE_INSTALL_DOCDIR} )
+ else()
+     if (IS_ABSOLUTE ${CMAKE_DOCDIR_BASE})
+         set( CMAKE_DOCDIR_BASE "${CMAKE_DOCDIR_BASE}" )
-- 
cgit v1.2.3-65-gdbad