commit: f83326e76d9b6d20c937e3d1f6889774128e0126 Author: Dongxu Li <dongxuli2011 <AT> gmail <DOT> com> AuthorDate: Tue Apr 28 19:45:12 2015 +0000 Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> CommitDate: Tue Apr 28 20:26:26 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=f83326e7
media-gfx/brlcad: version bump: 7.24.2 media-gfx/brlcad/ChangeLog | 4 ++ media-gfx/brlcad/brlcad-7.22.0.ebuild | 15 +++--- .../{brlcad-7.20.4.ebuild => brlcad-7.24.0.ebuild} | 33 ++++++------ .../{brlcad-7.20.4.ebuild => brlcad-7.24.2.ebuild} | 60 +++++++++++----------- media-gfx/brlcad/brlcad-9999.ebuild | 53 ++++++++++--------- media-gfx/brlcad/files/brlcad-7.24.2-cmake.patch | 13 +++++ 6 files changed, 99 insertions(+), 79 deletions(-) diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog index d513a93..7f24f5e 100644 --- a/media-gfx/brlcad/ChangeLog +++ b/media-gfx/brlcad/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/media-gfx/brlcad/ChangeLog,v 1.3 2011/04/18 22:47:37 dilfridge Exp $ + 28 April 2015; Dongxu Li <dongxuli2...@gmail.com> + +brlcad-7.24.2.ebuild, brlcad-7.24.0.ebuild, brlcad-9999.ebuild: + Version bumped to 7.24.2 + 4 July 2013; Dongxu Li <dongxuli2...@gmail.com> +brlcad-7.24.0.ebuild: Version bumped to 7.24.0 diff --git a/media-gfx/brlcad/brlcad-7.22.0.ebuild b/media-gfx/brlcad/brlcad-7.22.0.ebuild index 7eae12b..b089f9d 100644 --- a/media-gfx/brlcad/brlcad-7.22.0.ebuild +++ b/media-gfx/brlcad/brlcad-7.22.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=4 +EAPI=5 inherit cmake-utils eutils java-pkg-2 flag-o-matic DESCRIPTION="Constructive solid geometry modeling system" @@ -14,12 +14,12 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="benchmarks debug doc examples java opengl smp" -RDEPEND="media-libs/libpng +RDEPEND="media-libs/libpng:0 sys-libs/zlib >=sci-libs/tnt-3 sci-libs/jama - <dev-lang/tcl-8.6 - <dev-lang/tk-8.6 + <dev-lang/tcl-8.6:0 + <dev-lang/tk-8.6:0 <dev-tcltk/itcl-4.0 <dev-tcltk/itk-4.0 dev-tcltk/iwidgets @@ -29,14 +29,14 @@ RDEPEND="media-libs/libpng media-libs/urt x11-libs/libXt x11-libs/libXi - java? ( >=virtual/jre-1.5 ) + java? ( >=virtual/jre-1.5:* ) " DEPEND="${RDEPEND} sys-devel/bison sys-devel/flex dev-tcltk/tktable - >=virtual/jre-1.5 + >=virtual/jre-1.5:* doc? ( dev-libs/libxslt app-doc/doxygen @@ -50,7 +50,6 @@ BRLCAD_DIR="${EPREFIX}/usr/${PN}" src_configure() { filter-flags -std=c++0x -append-ldflags $(no-as-needed) if use Debug; then CMAKE_BUILD_TYPE=Debug else diff --git a/media-gfx/brlcad/brlcad-7.20.4.ebuild b/media-gfx/brlcad/brlcad-7.24.0.ebuild similarity index 84% copy from media-gfx/brlcad/brlcad-7.20.4.ebuild copy to media-gfx/brlcad/brlcad-7.24.0.ebuild index 39a6f49..7f3a439 100644 --- a/media-gfx/brlcad/brlcad-7.20.4.ebuild +++ b/media-gfx/brlcad/brlcad-7.24.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=4 +EAPI=5 inherit cmake-utils eutils java-pkg-2 flag-o-matic DESCRIPTION="Constructive solid geometry modeling system" @@ -14,14 +14,14 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="benchmarks debug doc examples java opengl smp" -RDEPEND="media-libs/libpng +RDEPEND="media-libs/libpng:0 sys-libs/zlib >=sci-libs/tnt-3 sci-libs/jama - >=dev-lang/tcl-8.5 - >=dev-lang/tk-8.5 - =dev-tcltk/itcl-3.4* - =dev-tcltk/itk-3.4* + <dev-lang/tcl-8.6:0 + <dev-lang/tk-8.6:0 + <dev-tcltk/itcl-4.0 + <dev-tcltk/itk-4.0 dev-tcltk/iwidgets dev-tcltk/tkimg dev-tcltk/tkpng @@ -29,14 +29,14 @@ RDEPEND="media-libs/libpng media-libs/urt x11-libs/libXt x11-libs/libXi - java? ( >=virtual/jre-1.5 ) + java? ( >=virtual/jre-1.5:* ) " DEPEND="${RDEPEND} sys-devel/bison sys-devel/flex dev-tcltk/tktable - >=virtual/jre-1.5 + >=virtual/jre-1.5:* doc? ( dev-libs/libxslt app-doc/doxygen @@ -44,13 +44,12 @@ DEPEND="${RDEPEND} BRLCAD_DIR="${EPREFIX}/usr/${PN}" -src_prepare() { - epatch "${FILESDIR}/${P}-cmake.patch" -} +#src_prepare() { +# epatch "${FILESDIR}/${P}-cmake.patch" +#} src_configure() { filter-flags -std=c++0x -append-ldflags $(no-as-needed) if use Debug; then CMAKE_BUILD_TYPE=Debug else @@ -58,12 +57,12 @@ append-ldflags $(no-as-needed) fi local mycmakeargs=( -DCMAKE_INSTALL_PREFIX="${BRLCAD_DIR}" - -DBRLCAD_ENABLE_STRICT=OFF - -DBRLCAD-ENABLE_STRICT=OFF - -DBRLCAD-ENABLE_COMPILER_WARNINGS=OFF + -DBRLCAD_ENABLE_STRICT=NO + -DBRLCAD-ENABLE_COMPILER_WARNINGS=NO + -DBRLCAD_BUNDLED_LIBS=ON -DBRLCAD_FLAGS_OPTIMIZATION=ON -DBRLCAD_ENABLE_X11=ON - -DBRLCAD_BUNDLED_LIBS=AUTO + -DCMAKE_BUILD_TYPE=Release ) # use flag triggered options diff --git a/media-gfx/brlcad/brlcad-7.20.4.ebuild b/media-gfx/brlcad/brlcad-7.24.2.ebuild similarity index 77% rename from media-gfx/brlcad/brlcad-7.20.4.ebuild rename to media-gfx/brlcad/brlcad-7.24.2.ebuild index 39a6f49..b1bffea 100644 --- a/media-gfx/brlcad/brlcad-7.20.4.ebuild +++ b/media-gfx/brlcad/brlcad-7.24.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=4 +EAPI=5 inherit cmake-utils eutils java-pkg-2 flag-o-matic DESCRIPTION="Constructive solid geometry modeling system" @@ -14,29 +14,31 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="benchmarks debug doc examples java opengl smp" -RDEPEND="media-libs/libpng - sys-libs/zlib +RDEPEND=" + java? ( + >=virtual/jre-1.5:* + ) + " + +DEPEND="${RDEPEND} >=sci-libs/tnt-3 - sci-libs/jama - >=dev-lang/tcl-8.5 - >=dev-lang/tk-8.5 - =dev-tcltk/itcl-3.4* - =dev-tcltk/itk-3.4* - dev-tcltk/iwidgets + sys-devel/bison + sys-devel/flex + media-libs/libpng:0 dev-tcltk/tkimg dev-tcltk/tkpng + <dev-lang/tcl-8.6:0 + <dev-lang/tk-8.6:0 + dev-tcltk/tktable + sys-libs/zlib sys-libs/libtermcap-compat media-libs/urt x11-libs/libXt x11-libs/libXi - java? ( >=virtual/jre-1.5 ) - " - -DEPEND="${RDEPEND} - sys-devel/bison - sys-devel/flex - dev-tcltk/tktable - >=virtual/jre-1.5 + java? ( + sci-libs/jama + >=virtual/jre-1.5:* + ) doc? ( dev-libs/libxslt app-doc/doxygen @@ -49,21 +51,20 @@ src_prepare() { } src_configure() { -filter-flags -std=c++0x -append-ldflags $(no-as-needed) - if use Debug; then + append-cflags "-w" + if use debug; then CMAKE_BUILD_TYPE=Debug else CMAKE_BUILD_TYPE=Release fi local mycmakeargs=( -DCMAKE_INSTALL_PREFIX="${BRLCAD_DIR}" - -DBRLCAD_ENABLE_STRICT=OFF - -DBRLCAD-ENABLE_STRICT=OFF - -DBRLCAD-ENABLE_COMPILER_WARNINGS=OFF + -DBRLCAD_ENABLE_STRICT=NO + -DBRLCAD-ENABLE_COMPILER_WARNINGS=NO + -DBRLCAD_BUNDLED_LIBS=AUTO -DBRLCAD_FLAGS_OPTIMIZATION=ON -DBRLCAD_ENABLE_X11=ON - -DBRLCAD_BUNDLED_LIBS=AUTO + -DBRLCAD_ENABLE_VERBOSE_PROGRESS=ON ) # use flag triggered options @@ -75,16 +76,15 @@ append-ldflags $(no-as-needed) mycmakeargs+=( $(cmake-utils_use opengl BRLCAD_ENABLE_OPENGL) #experimental RTGL support - # $(cmake-utils_use opengl BRLCAD_ENABLE_RTGL) +# $(cmake-utils_use opengl BRLCAD_ENABLE_RTGL) $(cmake-utils_use amd64 BRLCAD_ENABLE_64BIT) $(cmake-utils_use smp BRLCAD_ENABLE_SMP) - # $(cmake-utils_use java BRLCAD_ENABLE_RTSERVER) + $(cmake-utils_use java BRLCAD_ENABLE_RTSERVER) $(cmake-utils_use examples BRLCAD_INSTALL_EXAMPLE_GEOMETRY) $(cmake-utils_use doc BRLCAD_EXTRADOCS) $(cmake-utils_use doc BRLCAD_EXTRADOCS_PDF) $(cmake-utils_use doc BRLCAD_EXTRADOCS_MAN) - $(cmake-utils_use debug BRLCAD_ENABLE_VERBOSE_PROGRESS) - ) + ) cmake-utils_src_configure } @@ -94,7 +94,7 @@ src_compile() { src_test() { cmake-utils_src_test - #emake check || die "emake check failed" + emake check || die "emake check failed" if use benchmarks; then emake benchmark || die "emake benchmark failed" fi diff --git a/media-gfx/brlcad/brlcad-9999.ebuild b/media-gfx/brlcad/brlcad-9999.ebuild index c829549..e96e498 100644 --- a/media-gfx/brlcad/brlcad-9999.ebuild +++ b/media-gfx/brlcad/brlcad-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=4 +EAPI=5 inherit cmake-utils eutils subversion java-pkg-2 flag-o-matic DESCRIPTION="Constructive solid geometry modeling system" @@ -14,25 +14,31 @@ SLOT="0" KEYWORDS="" IUSE="benchmarks debug doc examples java opengl smp" -RDEPEND="media-libs/libpng - sys-libs/zlib +RDEPEND=" + java? ( + >=virtual/jre-1.5:* + ) + " + +DEPEND="${RDEPEND} >=sci-libs/tnt-3 - sci-libs/jama - dev-tcltk/iwidgets + sys-devel/bison + sys-devel/flex + media-libs/libpng:0 dev-tcltk/tkimg dev-tcltk/tkpng + <dev-lang/tcl-8.6:0 + <dev-lang/tk-8.6:0 + dev-tcltk/tktable + sys-libs/zlib sys-libs/libtermcap-compat media-libs/urt x11-libs/libXt x11-libs/libXi - java? ( >=virtual/jre-1.5 ) - " - -DEPEND="${RDEPEND} - sys-devel/bison - sys-devel/flex - dev-tcltk/tktable - >=virtual/jre-1.5 + java? ( + sci-libs/jama + >=virtual/jre-1.5:* + ) doc? ( dev-libs/libxslt app-doc/doxygen @@ -41,20 +47,20 @@ DEPEND="${RDEPEND} BRLCAD_DIR="${EPREFIX}/usr/${PN}" src_configure() { -filter-flags -std=c++0x - append-ldflags $(no-as-needed) - if use Debug; then + append-cflags "-w" + if use debug; then CMAKE_BUILD_TYPE=Debug else CMAKE_BUILD_TYPE=Release fi local mycmakeargs=( -DCMAKE_INSTALL_PREFIX="${BRLCAD_DIR}" - -DBRLCAD_ENABLE_STRICT=OFF - -DBRLCAD_ENABLE_COMPILER_WARNINGS=OFF + -DBRLCAD_ENABLE_STRICT=NO + -DBRLCAD-ENABLE_COMPILER_WARNINGS=NO + -DBRLCAD_BUNDLED_LIBS=AUTO -DBRLCAD_FLAGS_OPTIMIZATION=ON -DBRLCAD_ENABLE_X11=ON - -DBRLCAD_BUNDLED_LIBS=ON + -DBRLCAD_ENABLE_VERBOSE_PROGRESS=ON ) # use flag triggered options @@ -66,16 +72,15 @@ filter-flags -std=c++0x mycmakeargs+=( $(cmake-utils_use opengl BRLCAD_ENABLE_OPENGL) #experimental RTGL support - # $(cmake-utils_use opengl BRLCAD_ENABLE_RTGL) +# $(cmake-utils_use opengl BRLCAD_ENABLE_RTGL) $(cmake-utils_use amd64 BRLCAD_ENABLE_64BIT) $(cmake-utils_use smp BRLCAD_ENABLE_SMP) - # $(cmake-utils_use java BRLCAD_ENABLE_RTSERVER) + $(cmake-utils_use java BRLCAD_ENABLE_RTSERVER) $(cmake-utils_use examples BRLCAD_INSTALL_EXAMPLE_GEOMETRY) $(cmake-utils_use doc BRLCAD_EXTRADOCS) $(cmake-utils_use doc BRLCAD_EXTRADOCS_PDF) $(cmake-utils_use doc BRLCAD_EXTRADOCS_MAN) - $(cmake-utils_use debug BRLCAD_ENABLE_VERBOSE_PROGRESS) - ) + ) cmake-utils_src_configure } diff --git a/media-gfx/brlcad/files/brlcad-7.24.2-cmake.patch b/media-gfx/brlcad/files/brlcad-7.24.2-cmake.patch new file mode 100644 index 0000000..52d423d --- /dev/null +++ b/media-gfx/brlcad/files/brlcad-7.24.2-cmake.patch @@ -0,0 +1,13 @@ +--- a/misc/CMake/BRLCAD_CMakeFiles.cmake 2015-04-27 12:18:13.159285916 -0400 ++++ b/misc/CMake/BRLCAD_CMakeFiles.cmake 2015-04-27 12:19:40.722856052 -0400 +@@ -82,6 +82,10 @@ + endif("${ITEM}" MATCHES "${TARGET_FLAG}") + endforeach(TARGET_FLAG ${FUZZY_TARGET_FLAGS}) + ++ if("${ITEM}" MATCHES "MODULE") ++ set(CMAKEFILES_DO_TEST 0) ++ endif("") ++ + # Handled target flags, proceeding with tests. + if(CMAKEFILES_DO_TEST) + get_filename_component(ITEM_PATH "${ITEM}" PATH)