From f83326e76d9b6d20c937e3d1f6889774128e0126 Mon Sep 17 00:00:00 2001 From: Dongxu Li Date: Tue, 28 Apr 2015 15:45:12 -0400 Subject: media-gfx/brlcad: version bump: 7.24.2 --- media-gfx/brlcad/ChangeLog | 4 + media-gfx/brlcad/Manifest | 3 +- media-gfx/brlcad/brlcad-7.20.4.ebuild | 112 ----------------------- media-gfx/brlcad/brlcad-7.22.0.ebuild | 15 ++- media-gfx/brlcad/brlcad-7.24.0.ebuild | 111 ++++++++++++++++++++++ media-gfx/brlcad/brlcad-7.24.2.ebuild | 112 +++++++++++++++++++++++ media-gfx/brlcad/brlcad-9999.ebuild | 53 ++++++----- media-gfx/brlcad/files/brlcad-7.24.2-cmake.patch | 13 +++ 8 files changed, 278 insertions(+), 145 deletions(-) delete mode 100644 media-gfx/brlcad/brlcad-7.20.4.ebuild create mode 100644 media-gfx/brlcad/brlcad-7.24.0.ebuild create mode 100644 media-gfx/brlcad/brlcad-7.24.2.ebuild create mode 100644 media-gfx/brlcad/files/brlcad-7.24.2-cmake.patch (limited to 'media-gfx') diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog index d513a937c..7f24f5e38 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 + +brlcad-7.24.2.ebuild, brlcad-7.24.0.ebuild, brlcad-9999.ebuild: + Version bumped to 7.24.2 + 4 July 2013; Dongxu Li +brlcad-7.24.0.ebuild: Version bumped to 7.24.0 diff --git a/media-gfx/brlcad/Manifest b/media-gfx/brlcad/Manifest index cd637e6b3..d07c8bf1e 100644 --- a/media-gfx/brlcad/Manifest +++ b/media-gfx/brlcad/Manifest @@ -1,2 +1,3 @@ -DIST brlcad-7.20.4.tar.gz 70674938 SHA256 ee6210890f9f2115613b40dc25af95091dc700b5cc1ae390758a62b64854b65e SHA512 ac75675af04bfad444f66c0597aae6738883f49a92b775e1324d981968671adb8ac2a9aec921135498be84d4f6724741a2eeab7c3b3da64add2b20681f87dfdd WHIRLPOOL 8ba8093428c8aeb281538dd0a17c871dd8500affc118e524b0b12356d5dec082db3b136af7f80b524ad25fab6e49b3590dd9ef1f8e1310936ef106d53ee33a29 DIST brlcad-7.22.0.tar.gz 80633583 SHA256 4cc10161efbf9713c9b5810d259a039431096a37c95eb87b52f4ac669e16bcb1 SHA512 515df65cf0e6a7a2109309c05a31abfad80889a40236f79bf09fe92528cd35742be76a3074d3aa12320c8e85a32d35661af8c7e2acef0b2a2a588de885a0e30d WHIRLPOOL bb5f30edbaf9455330df69406b07ab955b0dfc5d1dffd44c9a94ab0cb0438c5d938d67caeeb2be75e38c88761f1036425881eb3a8cb872b514b1eb480c371bf7 +DIST brlcad-7.24.0.tar.gz 80060095 SHA256 31ddffd14674a9c570dc17af2dbce2b75542f2a9f5b2007efc01855bfaaf1240 SHA512 53c549173b95640125fa22ee7eec8a891c327bb1a8d3d046cc23a53a8e34d4a1b03c1729be30ad69aa9e28f05ec2880786d0a972707fa974e50ff227677b3b51 WHIRLPOOL e5777e5fca958ec02ed29630a7cbd1fd26aab210a5f4d99640d3c7496ee59ded4dd0c21940ce324bfb49c5b16b92436fb849384dca3c8cdb584105964d70167b +DIST brlcad-7.24.2.tar.gz 81355643 SHA256 6fe54268230a08aee29e1448802706ae00a3c3d1d8a9601954f28f560da3de26 SHA512 c0280bd55ad07c267fc77c643f8d687f91c7b193dc40d23fb6757d43378891121be762e07fdefeb621d72bcde0be42fb6a7ad67088446cf97df3ec299c86db88 WHIRLPOOL 80c1f7910ad126eb63def685adf12eddb7601ea7f3cef890ba75c4d4562e12c2ee9b38c28c9a470fdb65b881b8f3354af68c40a63da07bbc9356cd79a7499dec diff --git a/media-gfx/brlcad/brlcad-7.20.4.ebuild b/media-gfx/brlcad/brlcad-7.20.4.ebuild deleted file mode 100644 index 39a6f491a..000000000 --- a/media-gfx/brlcad/brlcad-7.20.4.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 -inherit cmake-utils eutils java-pkg-2 flag-o-matic - -DESCRIPTION="Constructive solid geometry modeling system" -HOMEPAGE="http://brlcad.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2 BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="benchmarks debug doc examples java opengl smp" - -RDEPEND="media-libs/libpng - 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-tcltk/iwidgets - dev-tcltk/tkimg - dev-tcltk/tkpng - 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 - doc? ( - dev-libs/libxslt - app-doc/doxygen - )" - -BRLCAD_DIR="${EPREFIX}/usr/${PN}" - -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 - 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_FLAGS_OPTIMIZATION=ON - -DBRLCAD_ENABLE_X11=ON - -DBRLCAD_BUNDLED_LIBS=AUTO - ) - - # use flag triggered options - if use debug; then - mycmakeargs += "-DCMAKE_BUILD_TYPE=Debug" - else - mycmakeargs += "-DCMAKE_BUILD_TYPE=Release" - fi - mycmakeargs+=( - $(cmake-utils_use opengl BRLCAD_ENABLE_OPENGL) -#experimental RTGL support - # $(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 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 -} - -src_compile() { - cmake-utils_src_compile -} - -src_test() { - cmake-utils_src_test - #emake check || die "emake check failed" - if use benchmarks; then - emake benchmark || die "emake benchmark failed" - fi -} - -src_install() { - cmake-utils_src_install - rm -f "${D}"usr/share/brlcad/{README,NEWS,AUTHORS,HACKING,INSTALL,COPYING} - dodoc AUTHORS NEWS README HACKING TODO BUGS ChangeLog - echo "PATH=\"${BRLCAD_DIR}/bin\"" > 99brlcad - echo "MANPATH=\"${BRLCAD_DIR}/man\"" >> 99brlcad - doenvd 99brlcad || die - newicon misc/macosx/Resources/ReadMe.rtfd/brlcad_logo_tiny.png brlcad.png - make_desktop_entry mged "BRL-CAD" brlcad "Graphics;Engineering" -} diff --git a/media-gfx/brlcad/brlcad-7.22.0.ebuild b/media-gfx/brlcad/brlcad-7.22.0.ebuild index 7eae12be3..b089f9d86 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 - 99brlcad + echo "MANPATH=\"${BRLCAD_DIR}/man\"" >> 99brlcad + doenvd 99brlcad || die + newicon misc/macosx/Resources/ReadMe.rtfd/brlcad_logo_tiny.png brlcad.png + make_desktop_entry mged "BRL-CAD" brlcad "Graphics;Engineering" +} diff --git a/media-gfx/brlcad/brlcad-7.24.2.ebuild b/media-gfx/brlcad/brlcad-7.24.2.ebuild new file mode 100644 index 000000000..b1bffeaec --- /dev/null +++ b/media-gfx/brlcad/brlcad-7.24.2.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 +inherit cmake-utils eutils java-pkg-2 flag-o-matic + +DESCRIPTION="Constructive solid geometry modeling system" +HOMEPAGE="http://brlcad.org/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2 BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="benchmarks debug doc examples java opengl smp" + +RDEPEND=" + java? ( + >=virtual/jre-1.5:* + ) + " + +DEPEND="${RDEPEND} + >=sci-libs/tnt-3 + sys-devel/bison + sys-devel/flex + media-libs/libpng:0 + dev-tcltk/tkimg + dev-tcltk/tkpng + =virtual/jre-1.5:* + ) + doc? ( + dev-libs/libxslt + app-doc/doxygen + )" + +BRLCAD_DIR="${EPREFIX}/usr/${PN}" + +src_prepare() { + epatch "${FILESDIR}/${P}-cmake.patch" +} + +src_configure() { + 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=NO + -DBRLCAD-ENABLE_COMPILER_WARNINGS=NO + -DBRLCAD_BUNDLED_LIBS=AUTO + -DBRLCAD_FLAGS_OPTIMIZATION=ON + -DBRLCAD_ENABLE_X11=ON + -DBRLCAD_ENABLE_VERBOSE_PROGRESS=ON + ) + + # use flag triggered options + if use debug; then + mycmakeargs += "-DCMAKE_BUILD_TYPE=Debug" + else + mycmakeargs += "-DCMAKE_BUILD_TYPE=Release" + fi + mycmakeargs+=( + $(cmake-utils_use opengl BRLCAD_ENABLE_OPENGL) +#experimental RTGL support +# $(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 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_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +src_test() { + cmake-utils_src_test + emake check || die "emake check failed" + if use benchmarks; then + emake benchmark || die "emake benchmark failed" + fi +} + +src_install() { + cmake-utils_src_install + rm -f "${D}"usr/share/brlcad/{README,NEWS,AUTHORS,HACKING,INSTALL,COPYING} + dodoc AUTHORS NEWS README HACKING TODO BUGS ChangeLog + echo "PATH=\"${BRLCAD_DIR}/bin\"" > 99brlcad + echo "MANPATH=\"${BRLCAD_DIR}/man\"" >> 99brlcad + doenvd 99brlcad || die + newicon misc/macosx/Resources/ReadMe.rtfd/brlcad_logo_tiny.png brlcad.png + make_desktop_entry mged "BRL-CAD" brlcad "Graphics;Engineering" +} diff --git a/media-gfx/brlcad/brlcad-9999.ebuild b/media-gfx/brlcad/brlcad-9999.ebuild index c829549d7..e96e498d9 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 + =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 000000000..52d423d75 --- /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) -- cgit v1.2.3-65-gdbad