diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /media-gfx/openexr_viewers/files | |
parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) |
gentoo resync : 28.04.2021
Diffstat (limited to 'media-gfx/openexr_viewers/files')
-rw-r--r-- | media-gfx/openexr_viewers/files/openexr_viewers-2.3.0--with-cg-libdir.patch | 23 | ||||
-rw-r--r-- | media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-configure.patch | 83 |
2 files changed, 0 insertions, 106 deletions
diff --git a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0--with-cg-libdir.patch b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0--with-cg-libdir.patch deleted file mode 100644 index 9d118e362d4c..000000000000 --- a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0--with-cg-libdir.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/m4/path.cb.m4 b/m4/path.cb.m4 -index 7e38708..b5675b1 100644 ---- a/m4/path.cb.m4 -+++ b/m4/path.cb.m4 -@@ -10,9 +10,17 @@ dnl - AC_ARG_WITH(cg-prefix,[ --with-cg-prefix=PFX Prefix where Cg is installed (optional)], - cg_prefix="$withval", cg_prefix="") - -+AC_ARG_WITH(cg-libdir, [ --with-cg-libdir=PATH Directory where Cg libraries are installed (optional)], -+ cg_libdir="$withval", cg_libdir="") -+ - if test x$cg_prefix != x ; then - CG_CXXFLAGS="-I$cg_prefix/include" -- CG_LDFLAGS="-L$cg_prefix/lib -lGL -lCg -lCgGL -lGLU -lpthread -lglut" -+ if test x$cg_libdir != x; then -+ CG_LDFLAGS="-L$cg_libdir" -+ else -+ CG_LDFLAGS="-L$cg_prefix/lib" -+ fi -+ CG_LDFLAGS="$CG_LDFLAGS -lGL -lCg -lCgGL -lGLU -lpthread -lglut" - else - case $host_os in - darwin*) diff --git a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-configure.patch b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-configure.patch deleted file mode 100644 index f9d51d5045b6..000000000000 --- a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-configure.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 0ae7531..f2cdfee 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4,8 +4,7 @@ AC_SUBST(OPENEXR_VIEWERS_VERSION, 2.3.0) - AC_CANONICAL_HOST - AC_CONFIG_SRCDIR(playexr/main.cpp) - AM_CONFIG_HEADER(config/OpenEXR_ViewersConfig.h) --AM_INIT_AUTOMAKE(1.6.3) dnl Require automake 1.6.3 or better --AM_MAINTAINER_MODE -+AM_INIT_AUTOMAKE - - - LIBTOOL_CURRENT=24 -@@ -19,7 +18,7 @@ AC_PROG_CXX - AC_PROG_INSTALL - AC_PROG_CC - AC_PROG_LN_S --AC_PROG_LIBTOOL -+LT_INIT - AC_PROG_MAKE_SET - - dnl -@@ -124,19 +109,8 @@ AC_ARG_ENABLE(threading, - [multithread="${enableval}"], [multithread=yes]) - - if test x$PKG_CONFIG == xno && test "x${multithread}" != xno ; then -- ACX_PTHREAD( -- [ -- AC_DEFINE(HAVE_PTHREAD) -- OPENEXR_LIBS="$PTHREAD_LIBS $OPENEXR_LIBS" -- OPENEXR_CXXFLAGS="$OPENEXR_CXXFLAGS $PTHREAD_CFLAGS" -- OPENEXR_CTL_LIBS="$PTHREAD_LIBS $OPENEXR_CTL_LIBS" -- OPENEXR_CTL_CXXFLAGS="$OPENEXR_CTL_CXXFLAGS $PTHREAD_CFLAGS" -- CC="$PTHREAD_CC" -- -- AM_POSIX_SEM() -- ], -- [AC_MSG_ERROR([POSIX thread support required])]) -- AC_MSG_NOTICE([multithread true, LIBS = $LIBS, CC = $CC, CXXFLAGS = $CXXFLAGS]) -+ AX_PTHREAD -+ AC_DEFINE([HAVE_PTHREAD], [1], [define if POSIX thread support is available]) - fi - - -@@ -233,10 +155,13 @@ AM_PATH_FLTK(have_fltk=yes, have_fltk=no) - dnl - dnl check for Cg - dnl --if test "${have_fltk}" = yes; then -+AC_ARG_ENABLE(cg, AS_HELP_STRING([--enable-cg], -+ [enable nvidia cg support [[default: test]]]), [want_cg="${enableval}"], [want_cg=yes]) -+ -+if test "${have_fltk}" = yes -a "${want_cg}" != no; then - AM_PATH_CG(have_cg=yes, have_cg=no) - if test "${have_cg}" = yes; then -- AC_DEFINE(HAVE_FRAGMENT_SHADERS) -+ AC_DEFINE([HAVE_FRAGMENT_SHADERS], [1], [define if Cg support is available]) - fi - else have_cg=no - fi -@@ -251,20 +176,10 @@ AC_C_CONST - AC_C_INLINE - AC_TYPE_SIZE_T - --dnl gcc optimization --AC_MSG_CHECKING(for gcc optimization flags) --old_cflags=$CFLAGS --CFLAGS="$CFLAGS -pipe" --AC_TRY_COMPILE([#include <stdio.h>], --[ printf ("hello, world"); ], --[ EXTRA_OPT_CFLAGS="-pipe"],[ EXTRA_OPT_CFLAGS=""]) --CFLAGS=$old_cflags --AC_MSG_RESULT([$EXTRA_OPT_CFLAGS]) -- - dnl Platform-specific stuff - case "$host" in - *darwin*) -- AC_DEFINE(HAVE_DARWIN) -+ AC_DEFINE([HAVE_DARWIN], [1], [define if compiling on darwin platform (OSX)]) - - dnl OS X universal binary support, requires --disable-dependency-tracking - AC_ARG_ENABLE(osx-universal-binaries, |