| [proaudio] [2781] x11-libs/ntk: revision bump, no-optimization patch, python-any-r1 eclass, update variables, restrict test, more USE flags and fixed deps |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
- To: proaudio@xxxxxxxxxxxxxxxxxxx
- Subject: [proaudio] [2781] x11-libs/ntk: revision bump, no-optimization patch, python-any-r1 eclass, update variables, restrict test, more USE flags and fixed deps
- From: subversion@xxxxxxxxxxxxx
- Date: Wed, 31 Jul 2013 18:25:39 +0200
Revision: 2781
Author: lilrc
Date: 2013-07-31 18:25:38 +0200 (Wed, 31 Jul 2013)
Log Message:
-----------
x11-libs/ntk: revision bump, no-optimization patch, python-any-r1 eclass, update variables, restrict test, more USE flags and fixed deps
Modified Paths:
--------------
trunk/overlays/proaudio/x11-libs/ntk/ChangeLog
trunk/overlays/proaudio/x11-libs/ntk/Manifest
Added Paths:
-----------
trunk/overlays/proaudio/x11-libs/ntk/files/ntk-9999-noldconfig-r1.patch
trunk/overlays/proaudio/x11-libs/ntk/files/ntk-9999-nooptimize.patch
trunk/overlays/proaudio/x11-libs/ntk/ntk-9999-r1.ebuild
Modified: trunk/overlays/proaudio/x11-libs/ntk/ChangeLog
===================================================================
--- trunk/overlays/proaudio/x11-libs/ntk/ChangeLog 2013-07-31 15:47:15 UTC (rev 2780)
+++ trunk/overlays/proaudio/x11-libs/ntk/ChangeLog 2013-07-31 16:25:38 UTC (rev 2781)
@@ -2,6 +2,18 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*ntk-9999-r1 (31 Jul 2013)
+
+ 31 Jul 2013; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+ +ntk-9999-r1.ebuild, +files/ntk-9999-noldconfig-r1.patch,
+ +files/ntk-9999-nooptimize.patch:
+ Added patch to not add optimization flags to the build system.
+ Migrarted to python-any-r1 eclass.
+ Updated DESCRIPTION, HOMEPAGE and LICENSE.
+ Restrict test.
+ Add opengl and png USE flags.
+ Fixed dependencies.
+
11 Mar 2013; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
ntk-9999.ebuild, +files/ntk-9999-noldconfig.patch, metadata.xml:
Update EAPI.
Modified: trunk/overlays/proaudio/x11-libs/ntk/Manifest
===================================================================
--- trunk/overlays/proaudio/x11-libs/ntk/Manifest 2013-07-31 15:47:15 UTC (rev 2780)
+++ trunk/overlays/proaudio/x11-libs/ntk/Manifest 2013-07-31 16:25:38 UTC (rev 2781)
@@ -1,4 +1,7 @@
+AUX ntk-9999-noldconfig-r1.patch 1591 SHA256 9bb1ef6289dce928f0ec4739efac673e16fd366cc3111229a85f6f831621c303 SHA512 07502aa787a9ab3a660bbd212d2f686a407abf99200cfe940e3efab963040b7e9fa901e11bab18d75db88577a91e2d1504a259ca2080368f45c2a9ac6453fe7a WHIRLPOOL 14cd48cc5d7a102e252a1f2e01d052ab9659ca42561e02176d73e55552ebbf06b908468133b5e5ca6638e25e1dcff51b275836b78fedb675b6c991d5346e346b
AUX ntk-9999-noldconfig.patch 1048 SHA256 642cf2b5ce71962776eff33f2cd78c0cb9d3fd743b8249e9ac9240077671addd SHA512 19ce44d9b44ddddf607c9160425ddf5827388c742ac95746020c1780237a9b4b45516d89b897ed395cada25a14d72661cb4035b5c13b18967a004d4741ee2e32 WHIRLPOOL 74f7f382df665a7a73b5a90b111da7304c63efe36b5bfb682b86cee6eab222cb032f7fa4baa1b3b4af691325d4120bc79a4f796f0265a774d6913bde261e73ac
+AUX ntk-9999-nooptimize.patch 1369 SHA256 a4da765e0581ec04c8b0198d719cfa34317e709bd220f750c82ecd967e124350 SHA512 47ded85b2a47c2ef5745920a2b7f1beb826a59444e2a2acbe1af2070a54ca4b1c43fb874fa982d99292267f056373da417c9d781b5a18727e1c05a2a4541dcd4 WHIRLPOOL c618ed73ae6c954e3c51744a94351870d9881661dd7b37294f7588f2c64c60272a2b62557face68b60cc178a73672c43ff47484affff96d91c8c614008749a98
+EBUILD ntk-9999-r1.ebuild 1187 SHA256 ba050d2c0ba68ad89e157255c20ba143a3eb34a91e03e7fd63a00f35d1cd79a1 SHA512 aaba351f8c4ea6be95b0e79ea5fa98eb94599da9617aa08db31d4624e07ee6c04b973db71bc319d13c4e8166a1a1a822268f16595b70d1418e398244af327518 WHIRLPOOL df3478392e112874dd9e6b19d8801637d78bc10087f92d94a180a6740c1d98dfef138778414877d3cd77bc3792dcfbb8a83816a32da54bb6221cd6efec0a83f7
EBUILD ntk-9999.ebuild 843 SHA256 965c272f3488d62f40a454b2aa0b39e995671a5641262a07634ab0db7510bfcd SHA512 b946b3ffeb51ebe38a70f569bd86847b7dfde902c12befb10cc4be5865ff24baf44a65cff5db30d46e8c593ac2ae504aba3f91df871cd11b9eeecbebde7aaec9 WHIRLPOOL 7d2b94de949defe328ae3c84d5f62ac14524fb5e7f70ef34e7bb9ecbdf5080ad62098a97799e9fd671fe8d01287b5b4e2fd8b0324590dfeaf4474932cbd5c1b8
-MISC ChangeLog 718 SHA256 83c54fa944fa52a2e9aa235b2d1eb1e971bbe5372a8fcaeb35b236223c198934 SHA512 b24eaf781f83d2d4801d48e21b67ed72c1babf9d10fb6d5b2e939b466dd5b0eb52e146749afa4577d128a1785c83ef10114255a07217a4fb304055373301d166 WHIRLPOOL 466ce55a9300f51d55462798006474e72dccdb80af3744fe5650f5178436d859e8dbf2ed6bd179a68855fa412837e9450589978e666221dfa309d550daf31c60
+MISC ChangeLog 1126 SHA256 0c05ea033c514b49aeb2c94fa2063f9f49686fc137e7aef81137d269641cac4d SHA512 9bb4ab52dbcf297d4d53b360e98e6e8c419b5cb124fb1401f41bd94ab8b5c04f8066d70dc660675e345b1ac92b64b5c249cc26b3fba12c90711623257c2340e5 WHIRLPOOL 8104eb724baa26834b8b46f28a452e8f0571175837df7237569d455525b95a4a21b09c022ddfb6aca12eb2f136e9edac9242fcf87cb6d5ac8fb1fc610bfd1b35
MISC metadata.xml 246 SHA256 f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f SHA512 327022589c637a14219eb603a62050fbb93b980f4693960c0ac4117b6b483d9f0d9fe1366d8e18227b34373a399aef339f49c16df8ca57b9ec870568a4d394f4 WHIRLPOOL e55381a9a9fd1d0efbe87da1c3aa302efdcf4734827f56273faeb55b17361c529518fcf16ac0946102e26165e8eedba81ab0cd07c7b08ce6bad001e944e43a0f
Added: trunk/overlays/proaudio/x11-libs/ntk/files/ntk-9999-noldconfig-r1.patch
===================================================================
--- trunk/overlays/proaudio/x11-libs/ntk/files/ntk-9999-noldconfig-r1.patch (rev 0)
+++ trunk/overlays/proaudio/x11-libs/ntk/files/ntk-9999-noldconfig-r1.patch 2013-07-31 16:25:38 UTC (rev 2781)
@@ -0,0 +1,42 @@
+# Author: Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+# Purpose: Add an option to disable running ldconfig in the end of the
+# build to the build system.
+# The patch has been sent upstream to the non mailing list. See [1] for
+# more information.
+#
+# [1] http://listengine.tuxfamily.org/lists.tuxfamily.org/non/2013/06/msg00010.html
+
+
+diff --git a/wscript b/wscript
+index 0b25ec5..914efbb 100644
+--- a/wscript
++++ b/wscript
+@@ -72,6 +72,8 @@ def options(opt):
+ help='Build with OpenGL extension library')
+ opt.add_option('--enable-test', action='store_true', default=False, dest='ENABLE_TEST',
+ help='Build test programs')
++ opt.add_option('--no-ldconfig', action='store_true', default=False, dest='NO_LDCONFIG',
++ help='Do not run ldconfig after install')
+
+ def configure(conf):
+ conf.load('compiler_c')
+@@ -117,6 +119,9 @@ def configure(conf):
+ if Options.options.ENABLE_TEST:
+ conf.env.ENABLE_TEST = True
+
++ if Options.options.NO_LDCONFIG:
++ conf.env.NO_LDCONFIG = True
++
+ conf.env.BUNDLED = []
+
+ conf.env['LIB_PTHREAD'] = ['pthread']
+@@ -513,7 +518,8 @@ src/Fl_Gl_Window.cxx
+ bld.install_files( bld.env.INCLUDEDIR + '/ntk/FL', start_dir.ant_glob('*.H *.h'),
+ cwd=start_dir, relative_trick=True)
+
+- bld.add_post_fun( run_ldconfig )
++ if not bld.env.NO_LDCONFIG:
++ bld.add_post_fun( run_ldconfig )
+
+ # bld.install_files( string.join( [ '${DATADIR}/doc', APPNAME ], '/' ), bld.path.ant_glob( 'doc/*.html doc/*.png' ) )
+
Added: trunk/overlays/proaudio/x11-libs/ntk/files/ntk-9999-nooptimize.patch
===================================================================
--- trunk/overlays/proaudio/x11-libs/ntk/files/ntk-9999-nooptimize.patch (rev 0)
+++ trunk/overlays/proaudio/x11-libs/ntk/files/ntk-9999-nooptimize.patch 2013-07-31 16:25:38 UTC (rev 2781)
@@ -0,0 +1,32 @@
+# Author: Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+# Purpose: Add an option to disable optimization CFLAGS from the build
+# system.
+# The patch has not been sent upstream.
+
+diff --git a/wscript b/wscript
+index 4d3595f..a1fdd89 100644
+--- a/wscript
++++ b/wscript
+@@ -73,6 +73,8 @@ def options(opt):
+ help='Build test programs')
+ opt.add_option('--no-ldconfig', action='store_true', default=False, dest='NO_LDCONFIG',
+ help='Do not run ldconfig after install')
++ opt.add_option('--no-optimize', action='store_true', default=False, dest='NO_OPTIMIZE',
++ help='Do not add optimizaition CFLAGS')
+
+ def configure(conf):
+ conf.load('compiler_c')
+@@ -167,9 +169,10 @@ def configure(conf):
+ conf.env.append_value('CFLAGS', debug_flags )
+ conf.env.append_value('CXXFLAGS', debug_flags )
+ else:
+- print('Building for performance')
+- conf.env.append_value('CFLAGS', optimization_flags )
+- conf.env.append_value('CXXFLAGS', optimization_flags )
++ if not Options.options.NO_OPTIMIZE:
++ print('Building for performance')
++ conf.env.append_value('CFLAGS', optimization_flags )
++ conf.env.append_value('CXXFLAGS', optimization_flags )
+ conf.define( 'NDEBUG', 1 )
+
+ conf.env.append_value('CFLAGS', CFLAGS )
Copied: trunk/overlays/proaudio/x11-libs/ntk/ntk-9999-r1.ebuild (from rev 2744, trunk/overlays/proaudio/x11-libs/ntk/ntk-9999.ebuild)
===================================================================
--- trunk/overlays/proaudio/x11-libs/ntk/ntk-9999-r1.ebuild (rev 0)
+++ trunk/overlays/proaudio/x11-libs/ntk/ntk-9999-r1.ebuild 2013-07-31 16:25:38 UTC (rev 2781)
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_2,3_3} )
+inherit git-2 python-any-r1 waf-utils
+
+DESCRIPTION="A fork of the Fast Light ToolKit library, adding improved graphics rendering via Cairo"
+HOMEPAGE="http://non.tuxfamily.org/wiki/NTK";
+EGIT_REPO_URI="git://git.tuxfamily.org/gitroot/non/fltk.git"
+
+# --enable-test to waf builds and installs test programs. There is no
+# test suite in the source code.
+RESTRICT="test"
+
+LICENSE="FLTK LGPL-2"
+SLOT="0"
+KEYWORDS=""
+
+IUSE="debug opengl png"
+
+RDEPEND="media-libs/fontconfig
+ x11-libs/cairo
+ x11-libs/libX11
+ x11-libs/libXft
+ virtual/jpeg
+ opengl? ( media-libs/glu )
+ png? ( media-libs/libpng )"
+DEPEND="${RDEPEND}"
+
+DOCS=( ANNOUNCEMENT CREDITS README )
+PATCHES=(
+ "${FILESDIR}"/${P}-noldconfig-r1.patch
+ "${FILESDIR}"/${P}-nooptimize.patch
+)
+
+src_unpack() {
+ git-2_src_unpack
+}
+
+src_configure() {
+ local mywafconfargs=(
+ --no-ldconfig
+ --no-optimize
+ $(usex debug --enable-debug "")
+ $(usex opengl --enable-gl "")
+ )
+ waf-utils_src_configure ${mywafconfargs[@]}
+}
+
+src_install() {
+ DESTDIR="${D}" waf-utils_src_install
+}