disko: update to newer git rev

* stole some input form the disko-oe-git, but rework some stuff

1 files changed, 32 insertions, 31 deletions

diff --git a/recipes/disko/files/pkgconfig.patch b/recipes/disko/files/pkgconfig.patch
index 4bf50dcfa4..3e4a84bfe8 100644
--- a/recipes/disko/files/pkgconfig.patch
+++ b/recipes/disko/files/pkgconfig.patch
@@ -1,60 +1,60 @@
 Index: git/SConstruct
 ===================================================================
---- git.orig/SConstruct	2009-07-14 23:53:04.460889326 +0200
-+++ git/SConstruct	2009-07-14 23:56:23.408030317 +0200
-@@ -542,6 +542,7 @@
+--- git.orig/SConstruct	2009-09-11 01:53:54.000000000 +0200
++++ git/SConstruct	2009-09-11 02:08:12.789878911 +0200
+@@ -585,6 +585,7 @@
  #######################################################################
  # TODO: handle disko_pc_libs                                          #
  if 'install' in BUILD_TARGETS:
 +	PKG_CCFLAGS = ''
  	disko_pc = open('disko.pc', 'w')
- 	disko_pc_requires = 'libxml-2.0 >= 2.6, libcurl, sigc++-2.0, libpng >= 1.2, freetype2'
+ 	disko_pc_requires = 'libxml-2.0 >= 2.6, sigc++-2.0, libpng >= 1.2, freetype2'
  	if env['LIBPATH']:
-@@ -559,31 +560,43 @@
+@@ -610,30 +611,43 @@
+ 	if env.has_key('libdl'):
+ 		disko_pc_libs += ' -ldl'
  
- 	if env.has_key('libiconv'):
- 		disko_pc_libs += ' -liconv'
 +        if('fbdev' in env['graphics']):
-+        	PKG_CCFLAGS += '-D__HAVE_FBDEV__ '
- 	
++                PKG_CCFLAGS += '-D__HAVE_FBDEV__ '
++
  	if 'dfb' in env['graphics']:
  		disko_pc_requires += ', directfb'
-+		PKG_CCFLAGS += '-D__HAVE_DIRECTFB__ '
++                PKG_CCFLAGS += '-D__HAVE_DIRECTFB__ '
  	  
  	if 'x11' in env['graphics']:
  		disko_pc_requires += ', x11, xv, xxf86vm'
-+		PKG_CCFLAGS += '-D__HAVE_XLIB__ '
-+		PKG_CCFLAGS += '-D__ENABLE_MMSFB_X11_CORE__ '
-+		PKG_CCFLAGS += '-D__ENABLE_MMSFBSURFACE_X11_CORE__ '
++                PKG_CCFLAGS += '-D__HAVE_XLIB__ '
++                PKG_CCFLAGS += '-D__ENABLE_MMSFB_X11_CORE__ '
++                PKG_CCFLAGS += '-D__ENABLE_MMSFBSURFACE_X11_CORE__ '
  		
- 	if env['media'] != 'none':
+ 	if env['media'] and env['media'] != 'none':
  	 	disko_pc_requires += ', alsa'
- 		if not env['big_lib']:
+ 		if not env['big_lib'] and not env['static_lib']:
  			disko_pc_libs += ' -lmmsmedia'
-+		PKG_CCFLAGS += '-D__HAVE_MMSMEDIA__ -D__HAVE_MIXER__ '
++                        PKG_CCFLAGS += '-D__HAVE_MMSMEDIA__ -D__HAVE_MIXER__ '
  		
  	if 'xine' in env['media']:
  		if('x11' in env['graphics']):
  			disko_pc_requires += ', libxine >= 1.1.15'
  		else:
  			disko_pc_requires += ', libxine'
-+		PKG_CCFLAGS += '-D__HAVE_XINE__ '
-+		if conf.checkXineBlDvb():
-+                                PKG_CCFLAGS += '-D__HAVE_XINE_BLDVB__ '
++                PKG_CCFLAGS += '-D__HAVE_XINE__ '
++                if conf.checkXineBlDvb():
++                        PKG_CCFLAGS += '-D__HAVE_XINE_BLDVB__ '
  
  	if 'gstreamer' in env['media']:
  		disko_pc_requires += ', gstreamer-0.10'
-+		PKG_CCFLAGS += '-D__HAVE_GSTREAMER__ '
++                PKG_CCFLAGS += '-D__HAVE_GSTREAMER__ '
  
  	if env['enable_flash']:
- 		disko_pc_requires += ', swfdec-0.8'
- 		if not env['big_lib']:
+ 		disko_pc_requires += ', swfdec-' + swfdecversion
+ 		if not env['big_lib'] and not env['static_lib']:
  			disko_pc_libs += ' -lmmsflash'
-+		PKG_CCFLAGS += '-D__HAVE_MMSFLASH__ '
++                        PKG_CCFLAGS += '-D__HAVE_MMSFLASH__ '
  
  	if env['enable_sip']:
  		disko_pc_requires += ', libpj'
-@@ -591,18 +604,32 @@
+@@ -641,18 +655,32 @@
  			disko_pc_libs += ' -lmmssip'
  		if('uuid' in env['LIBS']):
  			disko_pc_requires += ', uuid'
@@ -87,17 +87,18 @@ Index: git/SConstruct
  
  	disko_pc.write('prefix=' + env['prefix'] + '\n')
  	disko_pc.write('exec_prefix=${prefix}\n')
-@@ -614,12 +641,7 @@
+@@ -664,13 +692,7 @@
  	disko_pc.write('Requires: ' + disko_pc_requires + '\n')
  	disko_pc.write('Libs: -L${libdir} ' + disko_pc_libs + '\n')
  	disko_pc.write('Cflags: -I${includedir}/ ')
 -	for ccflag in env['CCFLAGS']:
--		disko_pc.write(' ')
--		if(type(ccflag).__name__ == 'str'):
--			disko_pc.write(ccflag)
--		else:
--			disko_pc.write(' '.join(ccflag))
-+	disko_pc.write(PKG_CCFLAGS)
+-		if type(ccflag).__name__ == 'str' and not ccflag.startswith('-isystem'):
+-			disko_pc.write(' ')
+-			if(type(ccflag).__name__ == 'str'):
+-				disko_pc.write(ccflag)
+-			else:
+-				disko_pc.write(' '.join(ccflag))
++        disko_pc.write(PKG_CCFLAGS)
  	disko_pc.write('\n')
  	
  	disko_pc.close()