Build sugar-platform with jhconvert

6 files changed, 226 insertions, 16 deletions

diff --git a/0.84/platform/olpcsound/SOURCES/olpcsound-5.10.1-gentoo-proaudio-csound-SConsruct.patch b/0.84/platform/olpcsound/SOURCES/olpcsound-5.10.1-gentoo-proaudio-csound-SConsruct.patch
new file mode 100644
index 0000000..2921e82
--- /dev/null
+++ b/0.84/platform/olpcsound/SOURCES/olpcsound-5.10.1-gentoo-proaudio-csound-SConsruct.patch
@@ -0,0 +1,15 @@
+--- Csound5.09.0/SConstruct.orig	2009-03-04 11:37:31.000000000 +0000
++++ Csound5.09.0/SConstruct	2009-03-04 11:37:31.000000000 +0000
+@@ -727,12 +727,6 @@
+     if configure.CheckHeader(h[0], language = "C"):
+         commonEnvironment.Append(CPPFLAGS = [h[1]])
+ 
+-if getPlatform() == 'win32':
+-    if configure.CheckHeader("winsock.h", language = "C"):
+-        commonEnvironment.Append(CPPFLAGS = '-DHAVE_SOCKETS')
+-elif configure.CheckHeader("sys/socket.h", language = "C"):
+-    commonEnvironment.Append(CPPFLAGS = '-DHAVE_SOCKETS')
+-
+ if getPlatform() == 'darwin':
+     commonEnvironment.Append(CPPFLAGS = '-DHAVE_DIRENT_H')
+ elif configure.CheckHeader("dirent.h", language = "C"):
diff --git a/0.84/platform/olpcsound/SOURCES/olpcsound-5.10.1-sugar-csound-64bit.patch b/0.84/platform/olpcsound/SOURCES/olpcsound-5.10.1-sugar-csound-64bit.patch
new file mode 100644
index 0000000..b60ed66
--- /dev/null
+++ b/0.84/platform/olpcsound/SOURCES/olpcsound-5.10.1-sugar-csound-64bit.patch
@@ -0,0 +1,46 @@
+--- Csound5.09.0/SConstruct.orig	2008-09-14 19:15:20.000000000 +0000
++++ Csound5.09.0/SConstruct	2008-12-16 22:04:42.000000000 +0000
+@@ -361,11 +361,7 @@
+     fltkFound = False
+     portaudioFound = False
+     oscFound = True
+-    ##commonEnvironment['gcc4opt'] = '1'
+-    commonEnvironment['gcc3opt'] = 'k6'
+     commonEnvironment['useLrint'] = '1'
+-    commonEnvironment['Word64'] = '0'
+-    commonEnvironment['Lib64'] = '0'
+     commonEnvironment['buildPDClass'] = '0'
+     commonEnvironment['buildDSSI'] = '0'
+     commonEnvironment['buildVirtual'] = '1'
+--- Csound5.09.0/install-olpc.py.orig	2008-05-29 10:12:38.000000000 +0000
++++ Csound5.09.0/install-olpc.py	2008-12-16 22:36:58.000000000 +0000
+@@ -58,6 +58,8 @@
+             raise SystemExit(0)
+         elif sys.argv[i][:9] == '--prefix=':
+             prefix = sys.argv[i][9:]
++        elif sys.argv[i][:9] == '--libdir=':
++            libdir = sys.argv[i][9:]
+         elif sys.argv[i][:10] == '--instdir=':
+             instDir = sys.argv[i][10:]
+         elif sys.argv[i][:17] == '--install-headers':
+@@ -92,7 +94,10 @@
+ # Csound API header files
+ includeDir  = concatPath([prefix, '/include/csound'])
+ # Csound API libraries
+-libDir      = concatPath([prefix, '/lib'])
++if libdir:
++    libDir  = libdir
++else:
++    libDir  = concatPath([prefix, '/lib'])
+ # single precision plugin libraries
+ pluginDir32 = concatPath([libDir, '/csound/plugins'])
+ # documentation
+@@ -100,7 +105,7 @@
+ # locale
+ localeDir   = concatPath([prefix, '/share/locale'])
+ # python module
+-pythonDir   = concatPath([prefix, '/lib/python%s/site-packages' % (pyVersion)])
++pythonDir   = concatPath([libDir, '/python%s/site-packages' % (pyVersion)])
+ 
+ def runCmd(args):
+     return os.spawnvp(os.P_WAIT, args[0], args)
diff --git a/0.84/platform/olpcsound/SOURCES/olpcsound-5.10.1-sugar-csound-bad-symbols.patch b/0.84/platform/olpcsound/SOURCES/olpcsound-5.10.1-sugar-csound-bad-symbols.patch
new file mode 100644
index 0000000..9fbe5a6
--- /dev/null
+++ b/0.84/platform/olpcsound/SOURCES/olpcsound-5.10.1-sugar-csound-bad-symbols.patch
@@ -0,0 +1,10 @@
+--- Csound5.10.1/SConstruct.orig	2008-12-18 18:26:46.000000000 +0000
++++ Csound5.10.1/SConstruct	2009-03-18 17:02:12.000000000 +0000
+@@ -1960,7 +1960,6 @@
+     util/envext.c        util/lpanal.c util/mixer.c
+     util/pvanal.c       util/pvlook.c       util/scale.c
+     util/sndinfo.c      util/srconv.c
+-    util/std_util.c
+   ''')
+ else :
+   stdutilSources = Split('''
diff --git a/0.84/platform/olpcsound/SOURCES/olpcsound-5.10.1-sugar-csound-python-version.patch b/0.84/platform/olpcsound/SOURCES/olpcsound-5.10.1-sugar-csound-python-version.patch
new file mode 100644
index 0000000..8ef62ba
--- /dev/null
+++ b/0.84/platform/olpcsound/SOURCES/olpcsound-5.10.1-sugar-csound-python-version.patch
@@ -0,0 +1,11 @@
+--- Csound5.10.1/SConstruct.orig	2009-04-23 22:34:30.000000000 -0400
++++ Csound5.10.1/SConstruct	2009-04-23 22:35:06.000000000 -0400
+@@ -329,7 +329,7 @@
+ commonEnvironment.Prepend(SWIGFLAGS = customSWIGFLAGS)
+ 
+ if commonEnvironment['buildOLPC'] == '1':
+-    commonEnvironment['pythonVersion'] = '2.5'
++    commonEnvironment['pythonVersion'] = '%d.%d' % sys.version_info[0:2]
+     buildOLPC = True;
+     commonEnvironment.Prepend(CPPFLAGS = ['-DOLPC'])
+     commonEnvironment.Prepend(CPPFLAGS = ['-DENABLE_OPCODEDIR_WARNINGS=0'])
diff --git a/0.84/platform/olpcsound/SPECS/olpcsound.spec b/0.84/platform/olpcsound/SPECS/olpcsound.spec
index 69250d3..64df565 100644
--- a/0.84/platform/olpcsound/SPECS/olpcsound.spec
+++ b/0.84/platform/olpcsound/SPECS/olpcsound.spec
@@ -1,16 +1,11 @@
 # NOTE: Do not edit, file was generated by jhconvert
 
-%define libname %{name}
+%define libname lib%{name}
 %define pyname python-%{name}
 
 Name: olpcsound
 Version: 5.10.1
-%if 0%{?suse_version}
 Release: 1
-%else
-Release: %mkrel 2
-%endif
-
 Summary: Csound - sound synthesis language and library, OLPC subset
 License: LGPLv2+
 Group: Sound
@@ -21,10 +16,11 @@ Source: http://downloads.sourceforge.net/csound/Csound5.10.1.tar.gz
 Patch: olpcsound-5.10.1-gentoo-proaudio-csound-SConsruct.patch
 Patch1: olpcsound-5.10.1-sugar-csound-64bit.patch
 Patch2: olpcsound-5.10.1-sugar-csound-bad-symbols.patch
+Patch3: olpcsound-5.10.1-sugar-csound-python-version.patch
 
 
 BuildRequires: alsa-devel  
-BuildRequires: gettext-runtime  
+BuildRequires: gettext  
 BuildRequires: liblo-devel  
 BuildRequires: libogg-devel  
 BuildRequires: libpng-devel  
@@ -33,7 +29,10 @@ BuildRequires: libvorbis-devel
 BuildRequires: python-devel  
 BuildRequires: scons  
 BuildRequires: swig  
-BuildPreReq: gcc-c++
+BuildRequires: fdupes
+BuildRequires: gcc-c++
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Olpcsound is a subset of the Csound sound and music synthesis system,
@@ -71,6 +70,7 @@ tailored specifically for XO platform.
 %patch -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %ifarch x86_64
 %global x86_64_flags Word64=1 Lib64=1
@@ -99,11 +99,6 @@ python  \
 	--install-headers \
 	--instdir=%{buildroot} \
 	--libdir=%{_libdir}
-%ifarch x86_64
-mkdir -p %{buildroot}/%{python_sitelib}
-mv %{buildroot}/%{_libdir}/python*/site-packages/* 
-%{buildroot}/%{python_sitelib}/
-%endif
 %find_lang csound5
 
 %clean
@@ -127,7 +122,7 @@ rm -rf %{buildroot}
 
 %files -n %{pyname}
 %defattr(-,root,root,-)
-%{python_sitelib}/*
+%(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")/*
+
+%changelog
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
diff --git a/0.84/platform/sugar-platform/SPECS/sugar-platform.ymp b/0.84/platform/sugar-platform/SPECS/sugar-platform.ymp
new file mode 100644
index 0000000..34f5428
--- /dev/null
+++ b/0.84/platform/sugar-platform/SPECS/sugar-platform.ymp
@@ -0,0 +1,133 @@
+<!--NOTE: Do not edit, file was generated by jhconvert-->
+
+<metapackage xmlns:os="http://opensuse.org/Standards/One_Click_Install" xmlns="http://opensuse.org/Standards/One_Click_Install">
+  <group>
+    <name>sugar-platform</name>
+    <summary>Sugar Platform</summary>
+    <description>The Sugar Platform is a set of versioned components on which activity
+authors can rely when targeting their activities to run on a particular
+Sugar version.
+Installing Sugar Platform should mean for user that he can download actities
+from http://activities.sugarlabs.org/ and they won't be failed due to
+missed dependencies.</description>
+    <repositories>
+      <repository recommended="true">
+        <name>X11:Sugar</name>
+        <summary>Sugar is the core of the OLPC Human Interface.</summary>
+        <description>Sugar is the core of the OLPC Human Interface. Its goal is to turn the Laptop into a fun, easy to use, social experience that promotes sharing and learning.
+
+Sugar reinvents how computers can be used for education. Sugar promotes sharing, collaborative learning, and reflection. Through Sugar's clarity of design, children and their teachers have the opportunity to use computation on their own terms; they are free to reshape, reinvent, and reapply both software and content into powerful learning activities. Sugar is a community project; it is based on GNU/Linux, a free and open-source operating system.</description>
+        <url>http://download.opensuse.org/repositories/X11:/Sugar/openSUSE_11.1/</url>
+      </repository>
+      <repository recommended="true">
+        <name>openSUSE:11.1:Update</name>
+        <summary>Official Released Updates For openSUSE 11.1</summary>
+        <description></description>
+        <url>http://download.opensuse.org/update/11.1/</url>
+      </repository>
+      <repository recommended="true">
+        <name>openSUSE:11.1</name>
+        <summary>The openSUSE 11.1 distribution</summary>
+        <description>The openSUSE 11.1 distribution
+
+rpm and iso file downloads are disabled by intention, please use our
+official released RCs from the download mirrors.
+</description>
+        <url>http://download.opensuse.org/distribution/11.1/repo/oss/</url>
+      </repository>
+      <repository recommended="true">
+        <name>devel:languages:python</name>
+        <summary>Python and Python Modules</summary>
+        <description>This project provides Python and Python modules.
+</description>
+        <url>http://download.opensuse.org/repositories/devel:/languages:/python/openSUSE_11.1/</url>
+      </repository>
+    </repositories>
+    <software>
+              <item>
+        <name>etoys</name>
+        <summary>Squeak Etoys activity for Sugar</summary>
+        <description>Squeak Etoys was inspired by LOGO, PARC-Smalltalk, Hypercard, starLOGO
+and AgentSheets. It is a media-rich authoring environment with a simple,
+powerful scripted object model for many kinds of objects created by end-users
+that runs on many platforms, and it is free and open source. It includes 2D and
+3D graphics, images, text, particles, presentations, web-pages, videos, sound
+and MIDI, etc. It includes the ability to share desktops with other Etoy users
+in real-time, so many forms of immersive mentoring and play can be done over
+the Internet.</description>
+      </item>
+
+      <item>
+        <name>sugar-fructose</name>
+        <summary>Core Sugar activities</summary>
+        <description>This virtual package depends on core Sugar activities that follow the Sugarlabs
+six months release schedule.
+Sugar is a graphical user interface aimed at children which promotes sharing
+and collaborative learning. It was introduced on the One Laptop Per Child
+(OLPC) XO laptop but is useful on other devices as well.</description>
+      </item>
+
+      <item>
+        <name>sugar-glucose</name>
+        <summary>Core Sugar components</summary>
+        <description>Virtual package of core Sugar components that follow the Sugarlabs
+six months release schedule.
+Sugar is a graphical user interface aimed at children which promotes sharing
+and collaborative learning. It was introduced on the One Laptop Per Child
+(OLPC) XO laptop but is useful on other devices as well.</description>
+      </item>
+
+      <item>
+        <name>gstreamer-0_10-plugins-base</name>
+        <summary></summary>
+        <description></description>
+      </item>
+
+      <item>
+        <name>gstreamer-0_10-plugins-espeak</name>
+        <summary>Simple gstreamer plugin to use espeak by way of sound source</summary>
+        <description>Simple gstreamer plugin to use espeak by way of sound source.
+It was developed to simplify espeak usage in Sugar Speak activity.</description>
+      </item>
+
+      <item>
+        <name>gstreamer-0_10-plugins-good</name>
+        <summary></summary>
+        <description></description>
+      </item>
+
+      <item>
+        <name>libxml2-python</name>
+        <summary></summary>
+        <description></description>
+      </item>
+
+      <item>
+        <name>python-numpy</name>
+        <summary></summary>
+        <description></description>
+      </item>
+
+      <item>
+        <name>olpcsound</name>
+        <summary>Csound - sound synthesis language and library, OLPC subset</summary>
+        <description>Olpcsound is a subset of the Csound sound and music synthesis system,
+tailored specifically for XO platform.</description>
+      </item>
+
+      <item>
+        <name>python-olpcsound</name>
+        <summary></summary>
+        <description></description>
+      </item>
+
+      <item>
+        <name>pygame</name>
+        <summary></summary>
+        <description></description>
+      </item>
+
+    </software>
+  </group>
+</metapackage>
+