| 1 |
slyfox 10/06/30 05:30:53 |
| 2 |
|
| 3 |
Added: xmms2-0.7DrNo-windres-build-fix.patch |
| 4 |
Log: |
| 5 |
New package: media-sound/xmms2. Bug #93583 |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-sound/xmms2/files/xmms2-0.7DrNo-windres-build-fix.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xmms2/files/xmms2-0.7DrNo-windres-build-fix.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xmms2/files/xmms2-0.7DrNo-windres-build-fix.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: xmms2-0.7DrNo-windres-build-fix.patch |
| 15 |
=================================================================== |
| 16 |
commit 3bc7fbff50bfcb065fb89d020c1b3fb8de049b19 |
| 17 |
Author: Sergei Trofimovich <st@××××××××××.by> |
| 18 |
Date: Mon Apr 19 13:16:56 2010 +0300 |
| 19 |
|
| 20 |
OTHER: fix build failure on windres aware binutils (linux host, native build) |
| 21 |
|
| 22 |
Trying to use windres under linux (native build) is worthless: |
| 23 |
|
| 24 |
[ 26/269] winrc: pixmaps/xmms2.rc -> _build_/default/pixmaps/xmms2.rc.o |
| 25 |
/usr/bin/windres: can't get BFD_RELOC_RVA relocation type: No error |
| 26 |
Waf: Leaving directory `/var/tmp/paludis/media-sound-xmms2-9999-r3/work/xmms2-devel/_build_' |
| 27 |
Build failed |
| 28 |
-> task failed (err #1): |
| 29 |
{task: winrc xmms2.rc -> xmms2.rc.o} |
| 30 |
|
| 31 |
Signed-off-by: Sergei Trofimovich <st@××××××××××.by> |
| 32 |
|
| 33 |
diff --git a/wscript b/wscript |
| 34 |
index 2a29016..1d73813 100644 |
| 35 |
--- a/wscript |
| 36 |
+++ b/wscript |
| 37 |
@@ -265,12 +265,6 @@ def configure(conf): |
| 38 |
conf.check_tool('gcc') |
| 39 |
conf.check_tool('g++') |
| 40 |
|
| 41 |
- try: |
| 42 |
- conf.check_tool('winres') |
| 43 |
- conf.env['WINRCFLAGS'] = '-I' + os.path.abspath('pixmaps') |
| 44 |
- conf.env['xmms_icon'] = True |
| 45 |
- except Configure.ConfigurationError: |
| 46 |
- conf.env['xmms_icon'] = False |
| 47 |
|
| 48 |
if Options.options.target_platform: |
| 49 |
Options.platform = Options.options.target_platform |
| 50 |
@@ -412,6 +406,17 @@ def configure(conf): |
| 51 |
else: |
| 52 |
conf.env['socket_impl'] = 'posix' |
| 53 |
|
| 54 |
+ # platform does not support icons ... |
| 55 |
+ conf.env['xmms_icon'] = False |
| 56 |
+ # ... unless we target on windows |
| 57 |
+ if Options.platform == 'win32': |
| 58 |
+ try: |
| 59 |
+ conf.check_tool('winres') |
| 60 |
+ conf.env['WINRCFLAGS'] = '-I' + os.path.abspath('pixmaps') |
| 61 |
+ conf.env['xmms_icon'] = True |
| 62 |
+ except Configure.ConfigurationError: |
| 63 |
+ pass |
| 64 |
+ |
| 65 |
# Glib is required by everyone, so check for it here and let them |
| 66 |
# assume its presence. |
| 67 |
conf.check_cfg(package='glib-2.0', atleast_version='2.8.0', uselib_store='glib2', args='--cflags --libs', mandatory=1) |
Archives